Merge pull request #81 from apiaryio/pksunkara/fixes

Final update for refract adapter
apiaryio · Feb 14, 2017 · 66f7c0b · 66f7c0b
2 parents ef844e6 + 3cce927
commit 66f7c0b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Metamorphoses Changelog
 
+## 0.13.7
+
+### Bug Fixes
+
+- Fixes the duplication of metadata in refract adapter during certain cases.
+
+- Fixes the parameter type to be enum in refract adapter to align with the AST adapter.
+
 ## 0.13.6
 
 ### Bug Fixes

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apiaryio/metamorphoses",
-  "version": "0.13.6",
+  "version": "0.13.7",
   "description": "Transforms API Blueprint AST or legacy Apiary Blueprint AST into Apiary Application AST",
   "main": "./lib/metamorphoses",
   "scripts": {

diff --git a/src/adapters/refract-adapter.coffee b/src/adapters/refract-adapter.coffee
@@ -42,6 +42,7 @@ transformAst = (element, sourcemap, options) ->
       else
         {name, value}
     ).compact()
+    .uniqBy('name')
     .value()
 
   # description

diff --git a/src/adapters/refract/getUriParameters.coffee b/src/adapters/refract/getUriParameters.coffee
@@ -48,9 +48,6 @@ getUriParameters = (hrefVariables, options) ->
     if not lodash.isArray(memberContentValueContent.value())
       exampleValue = memberContentValueContent.value()?.toString() or ''
     else
-      if type is 'enum'
-        type = memberContentValueContent.first().get('element', 'enum').value()
-
       values = memberContentValueContent.map((element) ->
         elementContent = lodash(element).content()
 

diff --git a/test/fixtures/refract-parse-result-metadata.json b/test/fixtures/refract-parse-result-metadata.json
@@ -46,6 +46,24 @@
                 "content": "https://example.com"
               }
             }
+          },
+          {
+            "element": "member",
+            "meta": {
+              "classes": [
+                "user"
+              ]
+            },
+            "content": {
+              "key": {
+                "element": "string",
+                "content": "FORMAT"
+              },
+              "value": {
+                "element": "string",
+                "content": "1A"
+              }
+            }
           }
         ]
       },

diff --git a/test/getUriParameters-test.coffee b/test/getUriParameters-test.coffee
@@ -104,7 +104,7 @@ describe('Transformation • Refract • getUriParameters' , ->
           {
             'key': 'page',
             'description': '',
-            'type': 'number',
+            'type': 'enum',
             'required': false,
             'default': '1',
             'example': '2',