Merge pull request #74 from the-grid/placeholder_type

Placeholder type

Author: bergie

examples/contentblock.yml

@@ -56,18 +56,31 @@
       height: 216
       faces:
         -
-          x: 50.61038563900384,
-          y: 70.03941296843249,
-          width: 63.029722675405246,
-          height: 63.029722675405246,
-          neighbors: 4,
+          x: 50.61038563900384
+          y: 70.03941296843249
+          width: 63.029722675405246
+          height: 63.029722675405246
+          neighbors: 4
           confidence: 0.4109060300000006
       colors:
         - [ 213, 188, 135 ]
         - [ 59, 50, 90 ]
         - [ 139, 114, 114 ]
         - [ 112, 104, 140 ]
         - [ 148, 148, 164 ]
+-
+  _valid: true
+  _name: 'interactive'
+  _data:
+    id: "bdcc6765-114a-4184-977d-b01d3132ef69"
+    type: 'interactive'
+    html: '<iframe src="https://google.com"></iframe>'
+-
+  _valid: true
+  _name: 'placeholder'
+  _data:
+    id: "bdcc6765-114a-4184-977d-b01d3132ef69"
+    type: 'placeholder'
 -
   _valid: false
   _name: 'text-h1-join-evolution-invalid-author'
@@ -167,3 +180,25 @@
     updated_at: null
     text: "AI Websites That Design Themselves"
     length: 34
+-
+  _valid: false
+  _name: 'invalid-author'
+  _data:
+    id: "9a502705-bb6c-4b03-95ee-492dbdd295e4"
+    item: "8a342d34-bdc1-427d-9b34-4b3392828d69"
+    type: "h1"
+    src: null
+    html: "<h1>AI Websites That Design Themselves</h1>"
+    metadata:
+      title: "Join the Evolution"
+      datePublished: "2014-10-05T04:37:05.900Z"
+      description: "AI Websites That Design Themselves\nJoin the Evolution\n\n\nBecome a Founding Member"
+      "@type": "Product"
+      "@context": "http://schema.org"
+      author:
+        name: 'Some Person'
+    score: 0,
+    created_at: '2014-05-08T13:22:59.000Z'
+    updated_at: null
+    text: "AI Websites That Design Themselves"
+    length: 34

schemata/contentblock.yaml

@@ -63,11 +63,12 @@ properties:
     oneOf:
     - { type: 'null' }
     - { type: 'string', format: 'date-time' }
-anyOf:
-- { '$ref': 'headline.json' }
-- { '$ref': 'text.json' }
-- { '$ref': 'cta.json' }
-- { '$ref': 'media.json' }
-- { '$ref': 'list.json' }
-
-required: [type, html]
+allOf:
+  - { required: [type] }
+  - oneOf:
+    - { '$ref': 'headline.json' }
+    - { '$ref': 'text.json' }
+    - { '$ref': 'cta.json' }
+    - { '$ref': 'image.json' }
+    - { '$ref': 'list.json' }
+    - { '$ref': 'placeholder.json' }

schemata/cta.yaml

@@ -10,7 +10,11 @@ properties:
   id:
     "$ref": "base.json#/definitions/uuid"
   type:
-    "$ref": "contentblock.json#/definitions/type"
+    description: Block type
+    example: "text"
+    type: string
+    enum:
+      - cta
   html:
     "$ref": "contentblock.json#/definitions/html"
   verb:
@@ -37,6 +41,3 @@ properties:
     type: integer
 
 required: [type, html]
-oneOf:
-  - { required: [url] }
-  - { required: [cta] }

schemata/headline.yaml

@@ -10,7 +10,17 @@ properties:
   id:
     "$ref": "base.json#/definitions/uuid"
   type:
-    "$ref": "contentblock.json#/definitions/type"
+    description: Block type
+    example: "text"
+    type: string
+    enum:
+      - headline
+      - h1
+      - h2
+      - h3
+      - h4
+      - h5
+      - h6
   html:
     "$ref": "contentblock.json#/definitions/html"
   text:
@@ -21,5 +31,4 @@ properties:
     description: Length of extracted text
     example: 18
     type: integer
-
-required: [type, html]
+required: [html]

schemata/image.yaml

@@ -10,12 +10,25 @@ properties:
   id:
     "$ref": "base.json#/definitions/uuid"
   type:
-    "$ref": "contentblock.json#/definitions/type"
+    description: Block type
+    example: "image"
+    type: string
+    enum:
+      - image
+      - video
+      - audio
+      - article
+      - location
+      - interactive
   html:
     "$ref": "contentblock.json#/definitions/html"
   src:
     "$ref": "contentblock.json#/definitions/src"
   cover:
     "$ref": "media.json#/definitions/cover"
+  title:
+    type: string
+  caption:
+    type: string
 
-required: [id, type, html, src]
+required: [type, html]

schemata/list.yaml

@@ -9,7 +9,11 @@ properties:
   id:
     "$ref": "base.json#/definitions/uuid"
   type:
-    "$ref": "contentblock.json#/definitions/type"
+    description: Block type
+    example: "text"
+    type: string
+    enum:
+      - list
   html:
     "$ref": "contentblock.json#/definitions/html"
   items:

schemata/placeholder.yaml

@@ -0,0 +1,20 @@
+---
+id: placeholder.json
+"$schema": "http://json-schema.org/draft-04/schema"
+title: HTML placeholder
+description: "Placeholder for content being shared"
+type:
+- object
+properties:
+  id:
+    "$ref": "base.json#/definitions/uuid"
+  type:
+    description: Block type
+    example: "text"
+    type: string
+    enum:
+      - placeholder
+  html:
+    "$ref": "contentblock.json#/definitions/html"
+
+required: [type]

schemata/text.yaml

@@ -9,7 +9,15 @@ properties:
   id:
     "$ref": "base.json#/definitions/uuid"
   type:
-    "$ref": "contentblock.json#/definitions/type"
+    description: Block type
+    example: "text"
+    type: string
+    enum:
+      - text
+      - code
+      - quote
+      - hr
+      - unknown
   html:
     "$ref": "contentblock.json#/definitions/html"
   text:
@@ -20,5 +28,4 @@ properties:
     description: Length of extracted text
     example: 7
     type: integer
-
 required: [type, html]