Repository: washingtonpost/ans-schema
Pull request #124 (2017-04-07 20:43:05)

Add submit date to image operations


Patch:
diff --git a/lib/upvert/0.5.7.js b/lib/upvert/0.5.7.js
index 241c611..7a786a8 100644
--- a/lib/upvert/0.5.7.js
+++ b/lib/upvert/0.5.7.js
@@ -14,30 +14,23 @@ var cleanFieldNames = transform_utils.cleanFieldNames;
 // Corrections underwent breaking changes
 var convertCorrection = function convertCorrection(old_correction) {
   // Corrections move from open to closed. We will leave any of either the new or old properties in place and move the rest to additional_properties
-  var correction = limitFields(['type', '_id', 'subtype', 'channels', 'alignment', 'additional_properties', 'correction_type', 'text'],
+  var correction = limitFields(['type', '_id', 'subtype', 'channels', 'alignment', 'additional_properties', 'correction_type', 'content', 'text'],
                                old_correction);
 
+  if (_.has(correction, 'text') && !_.isNil(correction.text)) {
+    if(_.has(correction, 'content')) {
+      if (!_.has(correction, 'additional_properties') || !_.isObject(correction.additional_properties)) {
+        correction.additional_properties = {};
+      }
+      correction.additional_properties.content = correction.content;
+    }
 
-  // This was intended to move .corrections.text to .corrections.content.  We are backing that change out to maintain backwards compatibility.
-  //
-  // if (_.has(correction, 'text') && !_.isNil(correction.text)) {
-  //   if(_.has(correction, 'content')) {
-  //     if (!_.has(correction, 'additional_properties') || !_.isObject(correction.additional_properties)) {
-  //       correction.additional_properties = {};
-  //     }
-  //     correction.additional_properties.content = correction.content;
-  //   }
-
-  //   correction.content = correction.text;
-  // }
-
-  if (!_.has(correction, 'text') || !_.isString(correction.text)) {
-    correction.text = "";
+    correction.content = correction.text;
   }
 
   correction.type = 'correction';
 
-  //delete correction.text;
+  delete correction.text;
 
   return correction;
 };
@@ -134,35 +127,33 @@ var convertComments = function convertComments(old_comments) {
   return comments;
 };
 
+var convertCell = function convertCell(old_cell) {
+  return {
+    "type": "table_cell",
+    "content_elements": [
+      old_cell
+    ]
+  };
+}
+
+
+var convertTable = function convertTable(old_table) {
+  // Convert header
+  old_table.header = {
+    "type": "table_row",
+    "cells": _.map(old_table.header, convertCell)
+  };
+
+  // Convert rows
+  old_table.rows = _.map(old_table.rows, function(row, i) {
+    return {
+      "type": "table_row",
+      "cells": _.map(row, convertCell)
+    };
+  });
 
-
-// var convertCell = function convertCell(old_cell) {
-//   return {
-//     "type": "table_cell",
-//     "content_elements": [
-//       old_cell
-//     ]
-//   };
-// }
-
-
-// var convertTable = function convertTable(old_table) {
-//   // Convert header
-//   old_table.header = {
-//     "type": "table_row",
-//     "cells": _.map(old_table.header, convertCell)
-//   };
-
-//   // Convert rows
-//   old_table.rows = _.map(old_table.rows, function(row, i) {
-//     return {
-//       "type": "table_row",
-//       "cells": _.map(row, convertCell)
-//     };
-//   });
-
-//   return old_table;
-// }
+  return old_table;
+}
 
 
 // Convert a top-level ANS document and recur at known points
@@ -208,10 +199,9 @@ var convert = function convert(ans) {
     if (_.includes(top_level_types, ans.type)) {
       return convertDocument(ans);
     }
-    // Note: instead of changing tables, we are making them table_02
-    // else if (ans.type === 'table') {
-    //   return convertTable(ans);
-    // }
+    else if (ans.type === 'table') {
+      return convertTable(ans);
+    }
   }
 
   return _.transform(ans, function(result, value, key, object) {
diff --git a/lib/validator.js b/lib/validator.js
index 9eb256a..31d0173 100644
--- a/lib/validator.js
+++ b/lib/validator.js
@@ -189,7 +189,7 @@ AnsValidator.prototype.getAllContentErrors = function getAllContentErrors(ans, v
   }
 
   // Recurse on items in rows, cells
-  if (_.has(ans, 'rows') && ans.type !== 'table' && ans.type.indexOf("table") === 0) {
+  if (_.has(ans, 'rows')) {
     var ver_object = new v.Version(v.parse_version(version));
     if (ver_object.gt(ver057)) {
       errors = _.reduce(ans.rows, function(errors, row, i) {
@@ -200,7 +200,7 @@ AnsValidator.prototype.getAllContentErrors = function getAllContentErrors(ans, v
     }
   }
 
-  if (_.has(ans, 'cells') && ans.type.indexOf("table_row") === 0) {
+  if (_.has(ans, 'cells')) {
     var ver_object = new v.Version(v.parse_version(version));
     if (ver_object.gt(ver057)) {
       errors = _.reduce(ans.cells, function(errors, cell, i) {
diff --git a/package.json b/package.json
index 92bdda7..2efe278 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ans-schema",
   "description": "The Washington Post's Arc Native Specification",
-  "version": "1.2.17",
+  "version": "1.2.16",
   "homepage": "https://github.com/washingtonpost/ans-schema",
   "repository": {
     "type": "git",
diff --git a/src/main/resources/schema/ans/0.5.8/gallery_operation.json b/src/main/resources/schema/ans/0.5.8/gallery_operation.json
index fa209f4..4e69225 100644
--- a/src/main/resources/schema/ans/0.5.8/gallery_operation.json
+++ b/src/main/resources/schema/ans/0.5.8/gallery_operation.json
@@ -20,6 +20,11 @@
         "type": "string",
         "format": "date-time"
       },
+      "submit_date": {
+        "description": "When this operation was submitted to Content API. Used for latency checking.",
+        "type":"string",
+        "format": "date-time"
+      },
       "_id": {
         "type": "string",
         "description": "The id of the gallery being operated on"
diff --git a/src/main/resources/schema/ans/0.5.8/image_operation.json b/src/main/resources/schema/ans/0.5.8/image_operation.json
index e8e3883..3db3ef2 100644
--- a/src/main/resources/schema/ans/0.5.8/image_operation.json
+++ b/src/main/resources/schema/ans/0.5.8/image_operation.json
@@ -30,6 +30,11 @@
         "type": "string",
         "format": "date-time"
       },
+      "submit_date": {
+        "description": "When this operation was submitted to Content API. Used for latency checking.",
+        "type":"string",
+        "format": "date-time"
+      },
       "_id": {
         "type": "string",
         "description": "The id of the image being operated on"
diff --git a/src/main/resources/schema/ans/0.5.8/story_elements/correction.json b/src/main/resources/schema/ans/0.5.8/story_elements/correction.json
index 2f9c536..ce0b8e2 100644
--- a/src/main/resources/schema/ans/0.5.8/story_elements/correction.json
+++ b/src/main/resources/schema/ans/0.5.8/story_elements/correction.json
@@ -32,11 +32,11 @@
       "description": "Type of correction. E.g., clarification, retraction.",
       "type": "string"
     },
-    "text": {
+    "content": {
       "description": "The text of the correction.",
       "type": "string"
     }
 
   },
-  "required": [ "type", "text" ]
+  "required": [ "type", "content" ]
 }
diff --git a/src/main/resources/schema/ans/0.5.8/story_elements/quote.json b/src/main/resources/schema/ans/0.5.8/story_elements/quote.json
index 46d3e81..b001497 100644
--- a/src/main/resources/schema/ans/0.5.8/story_elements/quote.json
+++ b/src/main/resources/schema/ans/0.5.8/story_elements/quote.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "id": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/story_elements/quote.json",
-  "description": "A blockquote content element, incompatible with the original blockquote: https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/story_elements/blockquote.json",
+  "description": "A blockquote content element",
   "type": "object",
   "additionalPropeties": false,
   "properties": {
diff --git a/src/main/resources/schema/ans/0.5.8/story_elements/table.json b/src/main/resources/schema/ans/0.5.8/story_elements/table.json
index 5788a8f..e31147f 100644
--- a/src/main/resources/schema/ans/0.5.8/story_elements/table.json
+++ b/src/main/resources/schema/ans/0.5.8/story_elements/table.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "id": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/story_element/table.json",
-  "description": "A data table content element",
+  "description": "A data table content element.",
   "type": "object",
   "additonalProperties": false,
   "properties": {
@@ -17,27 +17,23 @@
     "channels": {
       "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_channel.json"
     },
+    "alignment": {
+      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_alignment.json"
+    },
     "additional_properties": {
       "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_additional_properties.json"
     },
 
-
     "header": {
+      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/utils/table_row.json"
+    },
+
+    "rows" : {
       "type": "array",
-      "description": "The header row of the table",
+      "description": "The non-header rows of the table",
       "items": {
-        "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/story_elements/text.json"
+        "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/utils/table_row.json"
       }
-	},
-    "rows" : {
-	  "type" : "array",
-      "description": "The data rows of the table",
-      "items": {
-        "type": "array",
-        "items": {
-          "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/story_elements/text.json"
-        }
-	  }
     }
   },
   "required": [ "type", "rows" ]
diff --git a/src/main/resources/schema/ans/0.5.8/story_elements/table_02.json b/src/main/resources/schema/ans/0.5.8/story_elements/table_02.json
deleted file mode 100644
index 34e38d5..0000000
--- a/src/main/resources/schema/ans/0.5.8/story_elements/table_02.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/story_element/table_02.json",
-  "description": "A data table content element, which is incompatible with the original table: https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/story_element/table.json",
-  "type": "object",
-  "additonalProperties": false,
-  "properties": {
-    "type": {
-      "enum": [ "table_02" ]
-    },
-    "_id": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_id.json"
-    },
-    "subtype": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_subtype.json"
-    },
-    "channels": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_channel.json"
-    },
-    "alignment": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_alignment.json"
-    },
-    "additional_properties": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_additional_properties.json"
-    },
-
-    "header": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/utils/table_row_02.json"
-    },
-
-    "rows" : {
-      "type": "array",
-      "description": "The non-header rows of the table",
-      "items": {
-        "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/utils/table_row_02.json"
-      }
-    }
-  },
-  "required": [ "type", "rows" ]
-
-}
diff --git a/src/main/resources/schema/ans/0.5.8/utils/table_cell_02.json b/src/main/resources/schema/ans/0.5.8/utils/table_cell_02.json
deleted file mode 100644
index d24218e..0000000
--- a/src/main/resources/schema/ans/0.5.8/utils/table_cell_02.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/utils/table_cell_02.json",
-  "description": "A single table cell.",
-  "type": "object",
-
-  "properties": {
-    "type": {
-      "enum": [ "table_cell_02" ]
-    },
-    "_id": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_id.json"
-    },
-    "subtype": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_subtype.json"
-    },
-    "channels": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_channel.json"
-    },
-    "additional_properties": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_additional_properties.json"
-    },
-
-    "content_elements": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_content_elements.json"
-    }
-  }
-}
diff --git a/src/main/resources/schema/ans/0.5.8/utils/table_row_02.json b/src/main/resources/schema/ans/0.5.8/utils/table_row_02.json
deleted file mode 100644
index c4ccc3c..0000000
--- a/src/main/resources/schema/ans/0.5.8/utils/table_row_02.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/utils/table_row_02.json",
-  "description": "A list of table cells, usually for use in a table row.",
-  "type": "object",
-
-  "properties": {
-    "type": {
-      "enum": [ "table_row_02" ]
-    },
-    "_id": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_id.json"
-    },
-    "subtype": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_subtype.json"
-    },
-    "channels": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_channel.json"
-    },
-    "additional_properties": {
-      "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/traits/trait_additional_properties.json"
-    },
-
-    "cells": {
-      "type": "array",
-      "items": {
-        "$ref": "https://raw.githubusercontent.com/washingtonpost/ans-schema/master/src/main/resources/schema/ans/0.5.8/utils/table_cell_02.json"
-      }
-    }
-  }
-}


Test patch:
diff --git a/tests/fixtures/schema/0.5.8/gallery-operation-create.json b/tests/fixtures/schema/0.5.8/gallery-operation-create.json
index 03c0693..3614cbe 100644
--- a/tests/fixtures/schema/0.5.8/gallery-operation-create.json
+++ b/tests/fixtures/schema/0.5.8/gallery-operation-create.json
@@ -69,6 +69,7 @@
     "version" : "0.5.8"
   },
   "date" : "2016-04-02T12:02:00+00:00",
+  "submit_date" : "2016-04-02T12:02:01+00:00",
   "operation" : "insert",
   "organization_id" : "PW5TIZPZINHXBPNQTAJRSIS123",
   "type" : "gallery-operation",
diff --git a/tests/fixtures/schema/0.5.8/image-operation-create.json b/tests/fixtures/schema/0.5.8/image-operation-create.json
index 0808e0d..d811a1a 100644
--- a/tests/fixtures/schema/0.5.8/image-operation-create.json
+++ b/tests/fixtures/schema/0.5.8/image-operation-create.json
@@ -29,6 +29,7 @@
     "width" : 400
   },
   "date" : "2016-04-02T12:02:00+00:00",
+  "submit_date" : "2016-04-02T12:02:01+00:00",
   "operation" : "insert",
   "organization_id" : "PW5TIZPZINHXBPNQTAJRSIS123",
   "type" : "image-operation",
diff --git a/tests/fixtures/schema/0.5.8/story-fixture-good.json b/tests/fixtures/schema/0.5.8/story-fixture-good.json
index a4b0e68..c186cc5 100644
--- a/tests/fixtures/schema/0.5.8/story-fixture-good.json
+++ b/tests/fixtures/schema/0.5.8/story-fixture-good.json
@@ -326,7 +326,7 @@
       "_id": "659876643210",
       "type": "correction",
       "correction_type": "clarification",
-      "text": "An earlier version of this article attributed the above quote to David Foster Wallace."
+      "content": "An earlier version of this article attributed the above quote to David Foster Wallace."
     },
 
     {
@@ -409,12 +409,12 @@
     {
       "type": "correction",
       "correction_type": "clarification",
-      "text": "What I said before was not exactly true."
+      "content": "What I said before was not exactly true."
     },
     {
       "type": "correction",
       "correction_type": "correction",
-      "text": "What I said before was false and not true."
+      "content": "What I said before was false and not true."
     }
   ],
 
diff --git a/tests/fixtures/schema/0.5.8/story-fixture-tiny-house.json b/tests/fixtures/schema/0.5.8/story-fixture-tiny-house.json
index 8f47cd7..a6beac3 100644
--- a/tests/fixtures/schema/0.5.8/story-fixture-tiny-house.json
+++ b/tests/fixtures/schema/0.5.8/story-fixture-tiny-house.json
@@ -123,7 +123,7 @@
       "content": "But there’s one big drawback: Many municipalities haven’t made room literally or legislatively for tiny residences. It’s a challenge to find a place to park a tiny house if you don’t own land. And they often fall into a legal limbo. “Tiny houses exist in sort of a legal gray area, neither explicitly allowed nor expressly forbidden,” says tiny-home owner Jay Austin of Northeast Washington. Though the District recently banned “camping” in tiny-house-like structures, Austin says he has been told the provision is unenforceable."
     },
     {
-      "type": "table_02",
+      "type": "table",
       "_id": "0987654321",
       "subtype": "special_table",
       "channels": [ "all" ],
@@ -132,7 +132,7 @@
       },
 
       "header": {
-        "type": "table_row_02",
+        "type": "table_row",
         "_id": "A",
         "subtype": "special_row",
         "channels": [ "web" ],
@@ -142,13 +142,13 @@
 
         "cells": [
           {
-            "type": "table_cell_02",
+            "type": "table_cell",
             "content_elements": [
               { "_id": "a", "type": "text",  "content": "Header Y = 1" }
             ]
           },
           {
-            "type": "table_cell_02",
+            "type": "table_cell",
             "content_elements": [
               { "_id": "b", "type": "text",  "content": "Header Y = 1" }
             ]
@@ -158,7 +158,7 @@
 
       "rows": [
         {
-          "type": "table_row_02",
+          "type": "table_row",
           "_id": "B",
           "subtype": "special_row",
           "channels": [ "web" ],
@@ -168,7 +168,7 @@
 
           "cells": [
             {
-              "type": "table_cell_02",
+              "type": "table_cell",
               "_id": "B1",
 
               "subtype": "special_cell",
@@ -183,7 +183,7 @@
 
             },
             {
-              "type": "table_cell_02",
+              "type": "table_cell",
               "content_elements": [
                 { "_id": "2", "type": "text",  "content": "X = 2, Y = 1" }
               ]
@@ -193,16 +193,16 @@
 
         {
           "_id": "C",
-          "type": "table_row_02",
+          "type": "table_row",
           "cells": [
             {
-              "type": "table_cell_02",
+              "type": "table_cell",
               "content_elements": [
                 { "_id": "1", "type": "text",  "content": "X = 1, Y = 1" }
               ]
             },
             {
-              "type": "table_cell_02",
+              "type": "table_cell",
               "content_elements": [
                 { "_id": "2", "type": "text",  "content": "X = 2, Y = 1" }
               ]
diff --git a/tests/fixtures/schema/0.5.8/table-fixture-good.json b/tests/fixtures/schema/0.5.8/table-fixture-good.json
index 9f52f40..c8f7111 100644
--- a/tests/fixtures/schema/0.5.8/table-fixture-good.json
+++ b/tests/fixtures/schema/0.5.8/table-fixture-good.json
@@ -1,7 +1,91 @@
 {
-  "_id": "0987654321",
   "type": "table",
-  "header": [ { "_id": "a", "type": "text",  "content": "Header Y = 1" }, { "_id": "b", "type": "text",  "content": "Header Y = 1" } ],
-  "rows": [ [ { "_id": "1", "type": "text",  "content": "X = 1, Y = 1" }, { "_id": "2", "type": "text",  "content": "X = 2, Y = 1" } ],
-            [ { "_id": "3", "type": "text",  "content": "X = 2, Y = 1" }, { "_id": "4", "type": "text",  "content": "X = 2, Y = 2" } ] ]
+  "_id": "0987654321",
+  "subtype": "special_table",
+  "channels":  [ "web" ],
+  "additional_properties": {
+    "goodbye": "birdie"
+  },
+
+  "header": {
+    "type": "table_row",
+    "_id": "A",
+    "subtype": "special_row",
+    "channels": [ "web" ],
+    "additional_properties": {
+      "x": "y"
+    },
+
+    "cells": [
+      {
+        "type": "table_cell",
+        "content_elements": [
+          { "_id": "a", "type": "text",  "content": "Header Y = 1" }
+        ]
+      },
+      {
+        "type": "table_cell",
+        "content_elements": [
+          { "_id": "b", "type": "text",  "content": "Header Y = 1" }
+        ]
+      }
+    ]
+  },
+
+  "rows": [
+    {
+      "type": "table_row",
+      "_id": "B",
+      "subtype": "special_row",
+      "channels": [ "web" ],
+      "additional_properties": {
+        "x": "y"
+      },
+
+      "cells": [
+        {
+          "type": "table_cell",
+          "_id": "B1",
+
+          "subtype": "special_cell",
+          "channels": [ "phone" ],
+          "additional_properties": {
+            "hi": "mom"
+          },
+
+          "content_elements": [
+            { "_id": "1", "type": "text",  "content": "X = 1, Y = 1" }
+          ]
+
+        },
+        {
+          "type": "table_cell",
+          "content_elements": [
+            { "_id": "2", "type": "text",  "content": "X = 2, Y = 1" }
+          ]
+        }
+      ]
+    },
+
+    {
+      "_id": "C",
+      "type": "table_row",
+      "cells": [
+        {
+          "type": "table_cell",
+          "content_elements": [
+            { "_id": "1", "type": "text",  "content": "X = 1, Y = 1" }
+          ]
+        },
+        {
+          "type": "table_cell",
+          "content_elements": [
+            { "_id": "2", "type": "text",  "content": "X = 2, Y = 1" }
+          ]
+        }
+      ]
+    }
+
+  ]
+
 }
diff --git a/tests/fixtures/schema/0.5.8/table_02-fixture-good.json b/tests/fixtures/schema/0.5.8/table_02-fixture-good.json
deleted file mode 100644
index 75b0c81..0000000
--- a/tests/fixtures/schema/0.5.8/table_02-fixture-good.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "type": "table_02",
-  "_id": "0987654321",
-  "subtype": "special_table",
-  "channels":  [ "web" ],
-  "additional_properties": {
-    "goodbye": "birdie"
-  },
-
-  "header": {
-    "type": "table_row_02",
-    "_id": "A",
-    "subtype": "special_row",
-    "channels": [ "web" ],
-    "additional_properties": {
-      "x": "y"
-    },
-
-    "cells": [
-      {
-        "type": "table_cell_02",
-        "content_elements": [
-          { "_id": "a", "type": "text",  "content": "Header Y = 1" }
-        ]
-      },
-      {
-        "type": "table_cell_02",
-        "content_elements": [
-          { "_id": "b", "type": "text",  "content": "Header Y = 1" }
-        ]
-      }
-    ]
-  },
-
-  "rows": [
-    {
-      "type": "table_row_02",
-      "_id": "B",
-      "subtype": "special_row",
-      "channels": [ "web" ],
-      "additional_properties": {
-        "x": "y"
-      },
-
-      "cells": [
-        {
-          "type": "table_cell_02",
-          "_id": "B1",
-
-          "subtype": "special_cell",
-          "channels": [ "phone" ],
-          "additional_properties": {
-            "hi": "mom"
-          },
-
-          "content_elements": [
-            { "_id": "1", "type": "text",  "content": "X = 1, Y = 1" }
-          ]
-
-        },
-        {
-          "type": "table_cell_02",
-          "content_elements": [
-            { "_id": "2", "type": "text",  "content": "X = 2, Y = 1" }
-          ]
-        }
-      ]
-    },
-
-    {
-      "_id": "C",
-      "type": "table_row_02",
-      "cells": [
-        {
-          "type": "table_cell_02",
-          "content_elements": [
-            { "_id": "1", "type": "text",  "content": "X = 1, Y = 1" }
-          ]
-        },
-        {
-          "type": "table_cell_02",
-          "content_elements": [
-            { "_id": "2", "type": "text",  "content": "X = 2, Y = 1" }
-          ]
-        }
-      ]
-    }
-
-  ]
-
-}
diff --git a/tests/schema-tests-05.js b/tests/schema-tests-05.js
index 9cbb207..2f5d20c 100644
--- a/tests/schema-tests-05.js
+++ b/tests/schema-tests-05.js
@@ -430,7 +430,7 @@ var validate = function(version, schemaName, fixture, expected) {
 };
 
 var validateIfFixtureExists = function(version, schemaName, fixture, expected) {
-  if(_.has(fixtures, fixture) && _.has(loadedSchemas, version + schemaName)) {
+  if(_.has(fixtures, fixture)) {
     validate(version, schemaName, fixture, expected);
   }
 };
@@ -746,7 +746,7 @@ describe("Schema: ", function() {
           });
           it("should allow platform pitch event status containing spaces", function() {
             validateIfFixtureExists(version, '/traits/trait_platform_pitch_event.json', 'trait-pitch-event-fixture-space-in-status', true);
-          });
+          });          
           it("should reject publication pitch event status containing numeric characters", function() {
             validateIfFixtureExists(version, '/traits/trait_publication_pitch_event.json', 'trait-pitch-event-fixture-numeric-status', false);
           });
@@ -755,7 +755,7 @@ describe("Schema: ", function() {
           });
           it("should allow publication pitch event status containing spaces", function() {
             validateIfFixtureExists(version, '/traits/trait_publication_pitch_event.json', 'trait-pitch-event-fixture-space-in-status', true);
-          });
+          });             
         });
 
         describe("Workflow (0.5.8+)", function() {
@@ -884,15 +884,6 @@ describe("Schema: ", function() {
             });
           });
 
-          describe("Table 2", function() {
-            it("should validate a table 2 element", function() {
-              validateIfFixtureExists(version, type_prefix + '/table_02.json', 'table_02-fixture-good');
-            });
-
-            it("should not validate a table 1 element", function() {
-              validateIfFixtureExists(version, type_prefix + '/table_02.json', 'table-fixture-good', false);
-            });
-          });
 
           describe("Interstitial Link", function() {
             it("should validate a interstitial link", function () {
diff --git a/tests/transform-tests.js b/tests/transform-tests.js
index 15c3028..2fe329b 100644
--- a/tests/transform-tests.js
+++ b/tests/transform-tests.js
@@ -611,10 +611,10 @@ describe("Transformations: ", function() {
       describe("Corrections", function() {
         it("should preserve corrections", function() {
           var result = transforms.upvert(fixtures['0.5.7']['story-fixture-good'], '0.5.8');
-          result.corrections[0].text.should.eql("This document is a fabrication by the author and is false.");
+          result.corrections[0].content.should.eql("This document is a fabrication by the author and is false.");
           result.corrections[1].additional_properties.foo.should.eql("bar");
-          result.corrections[2].text.should.eql("");
-          result.corrections[3].text.should.eql("An earlier version of this document mis-spelled the name of George Walker Bush.");
+          result.corrections[2].content.should.eql("An earlier version of this document mis-spelled the name of William Jefferson Clinton.");
+          result.corrections[3].content.should.eql("An earlier version of this document mis-spelled the name of George Walker Bush.");
           result.corrections[3].additional_properties.foo.should.eql("bar");
           result.corrections[3].additional_properties.content.should.eql("An earlier version of this document mis-spelled the name of William Jefferson Clinton.");
           result.corrections[3]._id.should.eql("correction_4");