Merge pull request #293 from apiaryio/pksunkara/286

Parameters refract should behave same as attributes refract
apiaryio · Apr 13, 2016 · 4f25f00 · 4f25f00
2 parents f07914d + 7a04646
commit 4f25f00
Show file tree

Hide file tree

Showing 6 changed files with 137 additions and 20 deletions.
diff --git a/src/RefractAPI.cc b/src/RefractAPI.cc
@@ -120,7 +120,6 @@ namespace drafter {
     {
         refract::ArrayElement* element = CollectionToRefract<refract::ArrayElement>(MAKE_NODE_INFO(parameter, values), LiteralToRefract<T>, SerializeKey::Enum, refract::IElement::rDefault);
 
-        // FIXME: nearly duplicit code in ExtractParameter()
         // Add sample value
         if (!parameter.node->exampleValue.empty()) {
             refract::ArrayElement* samples = new refract::ArrayElement;
@@ -142,7 +141,13 @@ namespace drafter {
         refract::IElement* element = NULL;
 
         if (parameter.node->values.empty()) {
-            element = LiteralToRefract<T>(MAKE_NODE_INFO(parameter, exampleValue));
+            if (parameter.node->exampleValue.empty()) {
+                typedef typename refract::ElementTypeSelector<T>::ElementType ElementType;
+                element = new ElementType;
+            }
+            else {
+                element = LiteralToRefract<T>(MAKE_NODE_INFO(parameter, exampleValue));
+            }
 
             if (!parameter.node->defaultValue.empty()) {
                 element->attributes[SerializeKey::Default] = PrimitiveToRefract(MAKE_NODE_INFO(parameter, defaultValue));

diff --git a/test/fixtures/api/action-parameters.apib b/test/fixtures/api/action-parameters.apib
@@ -2,12 +2,15 @@
 
 # Group Users
 
-## User [/users/{id}]
+## User [/users/{id}{?country,active,votes}]
 
 ### Retrieve User [GET]
 
 + Parameters
     + id: pavan (string, required) - Username
+    + country
+    + active (boolean)
+    + votes (number)
 
 + Response 200 (application/json)
 

diff --git a/test/fixtures/api/action-parameters.json b/test/fixtures/api/action-parameters.json
@@ -25,7 +25,7 @@
                 "title": "User"
               },
               "attributes": {
-                "href": "/users/{id}"
+                "href": "/users/{id}{?country,active,votes}"
               },
               "content": [
                 {
@@ -57,6 +57,42 @@
                               "content": "pavan"
                             }
                           }
+                        },
+                        {
+                          "element": "member",
+                          "content": {
+                            "key": {
+                              "element": "string",
+                              "content": "country"
+                            },
+                            "value": {
+                              "element": "string"
+                            }
+                          }
+                        },
+                        {
+                          "element": "member",
+                          "content": {
+                            "key": {
+                              "element": "string",
+                              "content": "active"
+                            },
+                            "value": {
+                              "element": "boolean"
+                            }
+                          }
+                        },
+                        {
+                          "element": "member",
+                          "content": {
+                            "key": {
+                              "element": "string",
+                              "content": "votes"
+                            },
+                            "value": {
+                              "element": "number"
+                            }
+                          }
                         }
                       ]
                     }

diff --git a/test/fixtures/api/action-parameters.sourcemap.json b/test/fixtures/api/action-parameters.sourcemap.json
@@ -63,7 +63,7 @@
                         "content": [
                           [
                             27,
-                            23
+                            46
                           ]
                         ]
                       }
@@ -82,13 +82,13 @@
                         "content": [
                           [
                             27,
-                            23
+                            46
                           ]
                         ]
                       }
                     ]
                   },
-                  "content": "/users/{id}"
+                  "content": "/users/{id}{?country,active,votes}"
                 }
               },
               "content": [
@@ -103,7 +103,7 @@
                             "element": "sourceMap",
                             "content": [
                               [
-                                50,
+                                73,
                                 25
                               ]
                             ]
@@ -128,7 +128,7 @@
                                     "element": "sourceMap",
                                     "content": [
                                       [
-                                        94,
+                                        117,
                                         40
                                       ]
                                     ]
@@ -152,7 +152,7 @@
                                     "element": "sourceMap",
                                     "content": [
                                       [
-                                        94,
+                                        117,
                                         40
                                       ]
                                     ]
@@ -169,7 +169,7 @@
                                     "element": "sourceMap",
                                     "content": [
                                       [
-                                        94,
+                                        117,
                                         40
                                       ]
                                     ]
@@ -179,6 +179,81 @@
                               "content": "pavan"
                             }
                           }
+                        },
+                        {
+                          "element": "member",
+                          "content": {
+                            "key": {
+                              "element": "string",
+                              "attributes": {
+                                "sourceMap": [
+                                  {
+                                    "element": "sourceMap",
+                                    "content": [
+                                      [
+                                        163,
+                                        8
+                                      ]
+                                    ]
+                                  }
+                                ]
+                              },
+                              "content": "country"
+                            },
+                            "value": {
+                              "element": "string"
+                            }
+                          }
+                        },
+                        {
+                          "element": "member",
+                          "content": {
+                            "key": {
+                              "element": "string",
+                              "attributes": {
+                                "sourceMap": [
+                                  {
+                                    "element": "sourceMap",
+                                    "content": [
+                                      [
+                                        177,
+                                        17
+                                      ]
+                                    ]
+                                  }
+                                ]
+                              },
+                              "content": "active"
+                            },
+                            "value": {
+                              "element": "boolean"
+                            }
+                          }
+                        },
+                        {
+                          "element": "member",
+                          "content": {
+                            "key": {
+                              "element": "string",
+                              "attributes": {
+                                "sourceMap": [
+                                  {
+                                    "element": "sourceMap",
+                                    "content": [
+                                      [
+                                        200,
+                                        15
+                                      ]
+                                    ]
+                                  }
+                                ]
+                              },
+                              "content": "votes"
+                            },
+                            "value": {
+                              "element": "number"
+                            }
+                          }
                         }
                       ]
                     }
@@ -198,7 +273,7 @@
                                     "element": "sourceMap",
                                     "content": [
                                       [
-                                        50,
+                                        73,
                                         25
                                       ]
                                     ]
@@ -221,7 +296,7 @@
                                     "element": "sourceMap",
                                     "content": [
                                       [
-                                        137,
+                                        218,
                                         33
                                       ]
                                     ]
@@ -235,7 +310,7 @@
                                 "element": "sourceMap",
                                 "content": [
                                   [
-                                    137,
+                                    218,
                                     33
                                   ]
                                 ]
@@ -252,7 +327,7 @@
                                         "element": "sourceMap",
                                         "content": [
                                           [
-                                            137,
+                                            218,
                                             33
                                           ]
                                         ]
@@ -287,7 +362,7 @@
                                     "element": "sourceMap",
                                     "content": [
                                       [
-                                        174,
+                                        255,
                                         7
                                       ]
                                     ]

diff --git a/test/fixtures/api/request-parameters.json b/test/fixtures/api/request-parameters.json
@@ -56,8 +56,7 @@
                               "element": "number",
                               "attributes": {
                                 "default": "20"
-                              },
-                              "content": 0
+                              }
                             }
                           }
                         }

diff --git a/test/fixtures/api/request-parameters.sourcemap.json b/test/fixtures/api/request-parameters.sourcemap.json
@@ -181,8 +181,7 @@
                                   },
                                   "content": "20"
                                 }
-                              },
-                              "content": 0
+                              }
                             }
                           }
                         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -181,8 +181,7 @@ @@
                                       },
                                       "content": "20"
                                     }
-                                  },
-                                  "content": 0
+                                  }
                                 }
                               }
                             }
@@ Expand Down @@