Merge pull request #25 from apiaryio/pksunkara/fixes

Bug Squashing and Updating Protagonist & Boutique

Author: zdne

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafter",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "author": "Apiary.io <support@apiary.io>",
   "description": "Snow Crash parser harness",
   "license": "MIT",
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "async": "~0.9.0",
-    "boutique": "~0.1.4",
+    "boutique": "~0.1.5",
     "deep-equal": "1.0.x",
     "deepcopy": "0.4.x",
-    "protagonist": "~0.19.1",
+    "protagonist": "~0.19.3",
     "yargs": "~1.3.3"
   },
   "devDependencies": {

src/rules/mson-inheritance.coffee

@@ -8,7 +8,6 @@ module.exports =
 
   # Expand dataStructure element
   dataStructure: (element) ->
-    superType = element.typeDefinition.name
     typeName = element.name
 
     if not typeName
@@ -63,8 +62,12 @@ module.exports =
         dataStructure.sections.push memberTypeSection
         dataStructure.typeDefinition.typeSpecification.nestedTypes = []
 
+    # If super type is null, it is an implicit object
+    if superType is null
+      dataStructure.typeDefinition.typeSpecification.name = 'object'
+
     # Make sure super type is valid
-    if superType is null or typeof superType isnt 'object' or not superType?.literal or not @dataStructures[superType.literal]
+    if typeof superType isnt 'object' or not superType?.literal or not @dataStructures[superType.literal]
       return @expanded[name] = true
 
     # Expand the super type first

src/rules/mson-member-type-name.coffee

@@ -8,7 +8,6 @@ module.exports =
 
   # Expand dataStructure element
   dataStructure: (element) ->
-    superType = element.typeDefinition.name
     typeName = element.name
 
     if not typeName
@@ -57,7 +56,7 @@ module.exports =
 
     # Check for member type name
     for section in dataStructure.sections
-      if section['class'] is 'memberType'
+      if section['class'] is 'memberType' and section.content?
 
         @diveIntoElements section.content
 

src/rules/mson-mixin.coffee

@@ -8,7 +8,6 @@ module.exports =
 
   # Expand dataStructure element
   dataStructure: (element) ->
-    superType = element.typeDefinition.name
     typeName = element.name
 
     if not typeName
@@ -60,7 +59,7 @@ module.exports =
 
     # Check for mixin
     for section in dataStructure.sections
-      if section['class'] is 'memberType'
+      if section['class'] is 'memberType' and section.content?
 
         # New content for the section
         memberTypeSection =

src/rules/rule.coffee

@@ -8,7 +8,7 @@ module.exports =
     return if not dataStructure or not memberTypeSection
 
     for section in dataStructure.sections
-      if section['class'] is 'memberType'
+      if section['class'] is 'memberType' and section.content?
 
         for member in section.content
           memberTypeSection.content.push member

test/fixtures/dataStructures.apib

@@ -15,7 +15,8 @@ A coupon contains information about a percent-off or amount-off discount you mig
         The ID of the desired coupon.
 
 + Attributes (Coupon Base)
-    + id: 250FF (string)
+    + Properties
+        + id: 250FF (string)
 
 ### Retrieve a Coupon [GET]
 Retrieves the coupon with the given ID.
@@ -57,7 +58,7 @@ Unix timestamp as an integer
 + created_at (Timestamp)
 + updated_at (Timestamp)
 
-## Timestamps (object)
+## Timestamps
 This object contains the following unix timestamps
 
 + created - Denoting the time when the object is created

test/fixtures/dataStructures.ast.json

@@ -1532,7 +1532,7 @@
           },
           "typeDefinition": {
             "typeSpecification": {
-              "name": "object",
+              "name": null,
               "nestedTypes": []
             },
             "attributes": []
@@ -1917,7 +1917,7 @@
           },
           "typeDefinition": {
             "typeSpecification": {
-              "name": null,
+              "name": "object",
               "nestedTypes": []
             },
             "attributes": []
@@ -2594,7 +2594,7 @@
           },
           "typeDefinition": {
             "typeSpecification": {
-              "name": null,
+              "name": "object",
               "nestedTypes": []
             },
             "attributes": []

test/smoke/typing-test.coffee

@@ -4,7 +4,7 @@ fs = require 'fs'
 
 Drafter = require '../../src/drafter'
 
-KNOWN_PROBLEMATIC_LENGTHS = [631, 632, 633, 1464]
+KNOWN_PROBLEMATIC_LENGTHS = []
 
 describe 'Typing test', ->
   blueprint = fs.readFileSync './test/fixtures/dataStructures.apib', 'utf8'

test/unit/drafter-test.coffee

@@ -35,11 +35,10 @@ describe 'Drafter Class', ->
     '''
 
     drafter.make blueprint, (error, result) ->
-      assert.isNull error
-      assert.ok result.ast
+      assert.isUndefined result
       done()
 
-  it 'parses correctly when super type of a type is not found', (done) ->
+  it 'parses correctly when super type of a type in action attributes is not found', (done) ->
     drafter = new Drafter
 
     blueprint = '''
@@ -66,8 +65,7 @@ describe 'Drafter Class', ->
     '''
 
     drafter.make blueprint, (error, result) ->
-      assert.isNull error
-      assert.ok result.ast
+      assert.isUndefined result
       done()
 
   it 'parses correctly when named type in a mixin is a primitive type', (done) ->
@@ -99,3 +97,42 @@ describe 'Drafter Class', ->
       assert.isNull error
       assert.ok result.ast
       done()
+
+  it 'implicitly resolves base type to an object', (done) ->
+    drafter = new Drafter
+
+    blueprint = '''
+    # Root [/]
+    ## Retrieve the Entry Point [GET]
+    + Response 200 (application/json)
+        + Attributes
+            + Properties
+                + hello: 42 (string)
+                + nested (Question)
+
+    ## Group Question
+    ## Question [/questions/{question_id}]
+    + Attributes
+        + question
+        + url
+    '''
+
+    drafter.make blueprint, (error, result) ->
+      assert.isNull error
+      assert.ok result.ast
+
+      assert.equal result.ast.content[1].content[0].element, 'resource'
+
+      dataStructure = result.ast.content[1].content[0].content[0]
+
+      assert.equal dataStructure.element, 'dataStructure'
+      assert.equal dataStructure.name.literal, 'Question'
+      assert.isNull dataStructure.typeDefinition.typeSpecification.name
+
+      dataStructure = result.ast.content[1].content[0].content[1]
+
+      assert.equal dataStructure.element, 'resolvedDataStructure'
+      assert.equal dataStructure.name.literal, 'Question'
+      assert.equal dataStructure.typeDefinition.typeSpecification.name, 'object'
+
+      done()