diff --git a/package.json b/package.json index 5bcc5ed..729a159 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "boutique": "~0.1.3", "deep-equal": "1.0.x", "deepcopy": "0.4.x", - "protagonist-experimental": "~0.18.7", + "protagonist": "0.19.x", "yargs": "~1.3.3" }, "devDependencies": { diff --git a/src/drafter.coffee b/src/drafter.coffee index 3074dbf..08297f1 100644 --- a/src/drafter.coffee +++ b/src/drafter.coffee @@ -1,4 +1,4 @@ -protagonist = require 'protagonist-experimental' +protagonist = require 'protagonist' boutique = require 'boutique' options = require './options' fs = require 'fs' diff --git a/test/fixtures/blueprint.parseresult+sourcemap.json b/test/fixtures/blueprint.parseresult+sourcemap.json index c2aff13..f14c289 100644 --- a/test/fixtures/blueprint.parseresult+sourcemap.json +++ b/test/fixtures/blueprint.parseresult+sourcemap.json @@ -1,6 +1,6 @@ { "ast": { - "_version": "2.1", + "_version": "3.0", "metadata": [], "name": "", "description": "", @@ -23,6 +23,10 @@ "description": "", "method": "GET", "parameters": [], + "attributes": { + "relation": "", + "uriTemplate": "" + }, "content": [], "examples": [ { @@ -73,6 +77,10 @@ "description": "", "method": "GET", "parameters": [], + "attributes": { + "relation": "", + "uriTemplate": "" + }, "content": [], "examples": [ { @@ -139,6 +147,10 @@ ] ], "parameters": [], + "attributes": { + "relation": [], + "uriTemplate": [] + }, "examples": [ { "name": [], @@ -208,6 +220,10 @@ ] ], "parameters": [], + "attributes": { + "relation": [], + "uriTemplate": [] + }, "examples": [ { "name": [], diff --git a/test/fixtures/blueprint.parseresult.json b/test/fixtures/blueprint.parseresult.json index 70ec0a9..5050cbe 100644 --- a/test/fixtures/blueprint.parseresult.json +++ b/test/fixtures/blueprint.parseresult.json @@ -1,6 +1,6 @@ { "ast": { - "_version": "2.1", + "_version": "3.0", "metadata": [], "name": "", "description": "", @@ -23,6 +23,10 @@ "description": "", "method": "GET", "parameters": [], + "attributes": { + "relation": "", + "uriTemplate": "" + }, "content": [], "examples": [ { @@ -73,6 +77,10 @@ "description": "", "method": "GET", "parameters": [], + "attributes": { + "relation": "", + "uriTemplate": "" + }, "content": [], "examples": [ { diff --git a/test/fixtures/dataStructures.ast.json b/test/fixtures/dataStructures.ast.json index f0da241..7005149 100644 --- a/test/fixtures/dataStructures.ast.json +++ b/test/fixtures/dataStructures.ast.json @@ -1,5 +1,5 @@ { - "_version": "2.1", + "_version": "3.0", "metadata": [ { "name": "FORMAT", @@ -43,6 +43,10 @@ "description": "Retrieves the coupon with the given ID.\n\n", "method": "GET", "parameters": [], + "attributes": { + "relation": "", + "uriTemplate": "" + }, "content": [], "examples": [ { @@ -522,6 +526,10 @@ "values": [] } ], + "attributes": { + "relation": "", + "uriTemplate": "" + }, "content": [], "examples": [ { @@ -584,6 +592,10 @@ "description": "Creates a new Coupon.\n\n", "method": "POST", "parameters": [], + "attributes": { + "relation": "", + "uriTemplate": "" + }, "content": [ { "element": "dataStructure", @@ -2590,6 +2602,10 @@ "description": "Retrieves the coupon with the given ID.\n\n", "method": "GET", "parameters": [], + "attributes": { + "relation": "", + "uriTemplate": "" + }, "content": [], "examples": [ { @@ -3069,6 +3085,10 @@ "values": [] } ], + "attributes": { + "relation": "", + "uriTemplate": "" + }, "content": [], "examples": [ { @@ -3131,6 +3151,10 @@ "description": "Creates a new Coupon.\n\n", "method": "POST", "parameters": [], + "attributes": { + "relation": "", + "uriTemplate": "" + }, "content": [ { "element": "dataStructure",