Commits

Rob Lanphier committed 3a8c9b9

Schema reshuffling

Comments (0)

Files changed (4)

jsonwidget/schema/desktopcouch/contacts.json

+{
+  "type":"seq",
+  "sequence":
+  [
+    {
+      "type":"map",
+      "mapping":
+      {
+        "first_name":
+        {
+          "type":"str"
+        },
+        "middle_name":
+        {
+          "type":"str"
+        },
+        "last_name":
+        {
+          "type":"str"
+        },
+        "title":
+        {
+          "type":"str"
+        },
+        "suffix":
+        {
+          "type":"str"
+        },
+        "birth_date":
+        {
+          "type":"str"
+        },
+        "nick_name":
+        {
+          "type":"str"
+        },
+        "spouse_name":
+        {
+          "type":"str"
+        },
+        "wedding_date":
+        {
+          "type":"str"
+        },
+        "company":
+        {
+          "type":"str"
+        },
+        "department":
+        {
+          "type":"str"
+        },
+        "job_title":
+        {
+          "type":"str"
+        },
+        "manager_name":
+        {
+          "type":"str"
+        },
+        "assistant_name":
+        {
+          "type":"str"
+        },
+        "office":
+        {
+          "type":"str"
+        },
+        "_rev":
+        {
+          "type":"str"
+        },
+        "record_type":
+        {
+          "type":"str"
+        },
+        "urls":
+        {
+          "type":"map",
+          "user_key":"url_entry",
+          "mapping":
+          {
+            "url_entry":
+            {
+              "type":"map",
+              "mapping":
+              {
+                "description":
+                {
+                  "type":"str"
+                },
+                "address":
+                {
+                  "type":"str"
+                }
+              }
+            }
+          }
+        },
+        "phone_numbers":
+        {
+          "type":"map",
+          "user_key":"phone_number_entry",
+          "mapping":
+          {
+            "phone_number_entry":
+            {
+              "type":"map",
+              "mapping":
+              {
+                "priority":
+                {
+                  "type":"int"
+                },
+                "description":
+                {
+                  "type":"str"
+                },
+                "number":
+                {
+                  "type":"str"
+                }
+              }
+            }
+          }
+        },
+        "_id":
+        {
+          "type":"str"
+        },
+        "notes":
+        {
+          "type":"str"
+        },
+        "email_addresses":
+        {
+          "type":"map",
+          "user_key":"email_address_entry",
+          "mapping":
+          {
+            "email_address_entry":
+            {
+              "type":"map",
+              "mapping":
+              {
+                "description":
+                {
+                  "type":"str"
+                },
+                "address":
+                {
+                  "type":"str"
+                }
+              }
+            }
+          }
+        },
+        "im_addresses":
+        {
+          "type":"map",
+          "user_key":"im_address_entry",
+          "mapping":
+          {
+            "im_address_entry":
+            {
+              "type":"map",
+              "mapping":
+              {
+                "protocol":
+                {
+                  "type":"str"
+                },
+                "description":
+                {
+                  "type":"str"
+                },
+                "address":
+                {
+                  "type":"str"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

jsonwidget/schema/v2/desktopcouch/contacts.json

+{
+    "optional": true, 
+    "type": "array", 
+    "items": [
+        {
+            "optional": true, 
+            "type": "object", 
+            "properties": {
+                "first_name": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "middle_name": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "last_name": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "title": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "suffix": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "birth_date": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "nick_name": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "spouse_name": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "wedding_date": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "company": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "department": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "job_title": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "manager_name": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "assistant_name": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "office": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "_rev": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "record_type": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "urls": {
+                    "optional": true, 
+                    "type": "object", 
+                    "properties": {}, 
+                    "additionalProperties": {
+                        "optional": true, 
+                        "type": "object", 
+                        "properties": {
+                            "description": {
+                                "optional": true, 
+                                "type": "string"
+                            }, 
+                            "address": {
+                                "optional": true, 
+                                "type": "string"
+                            }
+                        }, 
+                        "additionalProperties": false
+                    }
+                }, 
+                "phone_numbers": {
+                    "optional": true, 
+                    "type": "object", 
+                    "properties": {}, 
+                    "additionalProperties": {
+                        "optional": true, 
+                        "type": "object", 
+                        "properties": {
+                            "priority": {
+                                "optional": true, 
+                                "type": "integer"
+                            }, 
+                            "description": {
+                                "optional": true, 
+                                "type": "string"
+                            }, 
+                            "number": {
+                                "optional": true, 
+                                "type": "string"
+                            }
+                        }, 
+                        "additionalProperties": false
+                    }
+                }, 
+                "_id": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "notes": {
+                    "optional": true, 
+                    "type": "string"
+                }, 
+                "email_addresses": {
+                    "optional": true, 
+                    "type": "object", 
+                    "properties": {}, 
+                    "additionalProperties": {
+                        "optional": true, 
+                        "type": "object", 
+                        "properties": {
+                            "description": {
+                                "optional": true, 
+                                "type": "string"
+                            }, 
+                            "address": {
+                                "optional": true, 
+                                "type": "string"
+                            }
+                        }, 
+                        "additionalProperties": false
+                    }
+                }, 
+                "im_addresses": {
+                    "optional": true, 
+                    "type": "object", 
+                    "properties": {}, 
+                    "additionalProperties": {
+                        "optional": true, 
+                        "type": "object", 
+                        "properties": {
+                            "protocol": {
+                                "optional": true, 
+                                "type": "string"
+                            }, 
+                            "description": {
+                                "optional": true, 
+                                "type": "string"
+                            }, 
+                            "address": {
+                                "optional": true, 
+                                "type": "string"
+                            }
+                        }, 
+                        "additionalProperties": false
+                    }
+                }
+            }, 
+            "additionalProperties": false
+        }
+    ]
+}

schema/desktopcouch/contacts-v1.json

-{
-  "type":"seq",
-  "sequence":
-  [
-    {
-      "type":"map",
-      "mapping":
-      {
-        "first_name":
-        {
-          "type":"str"
-        },
-        "middle_name":
-        {
-          "type":"str"
-        },
-        "last_name":
-        {
-          "type":"str"
-        },
-        "title":
-        {
-          "type":"str"
-        },
-        "suffix":
-        {
-          "type":"str"
-        },
-        "birth_date":
-        {
-          "type":"str"
-        },
-        "nick_name":
-        {
-          "type":"str"
-        },
-        "spouse_name":
-        {
-          "type":"str"
-        },
-        "wedding_date":
-        {
-          "type":"str"
-        },
-        "company":
-        {
-          "type":"str"
-        },
-        "department":
-        {
-          "type":"str"
-        },
-        "job_title":
-        {
-          "type":"str"
-        },
-        "manager_name":
-        {
-          "type":"str"
-        },
-        "assistant_name":
-        {
-          "type":"str"
-        },
-        "office":
-        {
-          "type":"str"
-        },
-        "_rev":
-        {
-          "type":"str"
-        },
-        "record_type":
-        {
-          "type":"str"
-        },
-        "urls":
-        {
-          "type":"map",
-          "user_key":"url_entry",
-          "mapping":
-          {
-            "url_entry":
-            {
-              "type":"map",
-              "mapping":
-              {
-                "description":
-                {
-                  "type":"str"
-                },
-                "address":
-                {
-                  "type":"str"
-                }
-              }
-            }
-          }
-        },
-        "phone_numbers":
-        {
-          "type":"map",
-          "user_key":"phone_number_entry",
-          "mapping":
-          {
-            "phone_number_entry":
-            {
-              "type":"map",
-              "mapping":
-              {
-                "priority":
-                {
-                  "type":"int"
-                },
-                "description":
-                {
-                  "type":"str"
-                },
-                "number":
-                {
-                  "type":"str"
-                }
-              }
-            }
-          }
-        },
-        "_id":
-        {
-          "type":"str"
-        },
-        "notes":
-        {
-          "type":"str"
-        },
-        "email_addresses":
-        {
-          "type":"map",
-          "user_key":"email_address_entry",
-          "mapping":
-          {
-            "email_address_entry":
-            {
-              "type":"map",
-              "mapping":
-              {
-                "description":
-                {
-                  "type":"str"
-                },
-                "address":
-                {
-                  "type":"str"
-                }
-              }
-            }
-          }
-        },
-        "im_addresses":
-        {
-          "type":"map",
-          "user_key":"im_address_entry",
-          "mapping":
-          {
-            "im_address_entry":
-            {
-              "type":"map",
-              "mapping":
-              {
-                "protocol":
-                {
-                  "type":"str"
-                },
-                "description":
-                {
-                  "type":"str"
-                },
-                "address":
-                {
-                  "type":"str"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  ]
-}

schema/desktopcouch/contacts.json

-{
-    "optional": true, 
-    "type": "array", 
-    "items": [
-        {
-            "optional": true, 
-            "type": "object", 
-            "properties": {
-                "first_name": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "middle_name": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "last_name": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "title": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "suffix": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "birth_date": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "nick_name": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "spouse_name": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "wedding_date": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "company": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "department": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "job_title": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "manager_name": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "assistant_name": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "office": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "_rev": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "record_type": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "urls": {
-                    "optional": true, 
-                    "type": "object", 
-                    "properties": {}, 
-                    "additionalProperties": {
-                        "optional": true, 
-                        "type": "object", 
-                        "properties": {
-                            "description": {
-                                "optional": true, 
-                                "type": "string"
-                            }, 
-                            "address": {
-                                "optional": true, 
-                                "type": "string"
-                            }
-                        }, 
-                        "additionalProperties": false
-                    }
-                }, 
-                "phone_numbers": {
-                    "optional": true, 
-                    "type": "object", 
-                    "properties": {}, 
-                    "additionalProperties": {
-                        "optional": true, 
-                        "type": "object", 
-                        "properties": {
-                            "priority": {
-                                "optional": true, 
-                                "type": "integer"
-                            }, 
-                            "description": {
-                                "optional": true, 
-                                "type": "string"
-                            }, 
-                            "number": {
-                                "optional": true, 
-                                "type": "string"
-                            }
-                        }, 
-                        "additionalProperties": false
-                    }
-                }, 
-                "_id": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "notes": {
-                    "optional": true, 
-                    "type": "string"
-                }, 
-                "email_addresses": {
-                    "optional": true, 
-                    "type": "object", 
-                    "properties": {}, 
-                    "additionalProperties": {
-                        "optional": true, 
-                        "type": "object", 
-                        "properties": {
-                            "description": {
-                                "optional": true, 
-                                "type": "string"
-                            }, 
-                            "address": {
-                                "optional": true, 
-                                "type": "string"
-                            }
-                        }, 
-                        "additionalProperties": false
-                    }
-                }, 
-                "im_addresses": {
-                    "optional": true, 
-                    "type": "object", 
-                    "properties": {}, 
-                    "additionalProperties": {
-                        "optional": true, 
-                        "type": "object", 
-                        "properties": {
-                            "protocol": {
-                                "optional": true, 
-                                "type": "string"
-                            }, 
-                            "description": {
-                                "optional": true, 
-                                "type": "string"
-                            }, 
-                            "address": {
-                                "optional": true, 
-                                "type": "string"
-                            }
-                        }, 
-                        "additionalProperties": false
-                    }
-                }
-            }, 
-            "additionalProperties": false
-        }
-    ]
-}