swagger-blocks 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f409735a8d6654efde3de5cf5f67283739973aec
-  data.tar.gz: 74e1cec936cca1fb9495eb068e37599ce2d02da0
+  metadata.gz: 2873ec48557e17844d3484479b9bf11a32305299
+  data.tar.gz: c37cefb45dd5ba969c60d36fd841673a2b5675c3
 SHA512:
-  metadata.gz: 2bc8eb83e7033f17cdbe6be14e4b2dbd4086d202b1e064078561402da876cb5a3d9cdf8f35fd6d5332a77f7399e1810f91ec585194230a2ec8521be863f37b23
-  data.tar.gz: 6f9f559471c11ea85917140b0b116bf0e97174564d08ab5eb8648ae824d64110c48e8280e7cc06a0e1423827658fbf7d230aa4763e61e158f518036d5a377ae8
+  metadata.gz: 9f0e29229dedb44d9b17629417ed2a959f6ef33103c1a33db1d99ba769ef3221b8f02fb7149c98f13510a37b6e69f8129416bc6265cf87b7b27beaf06a6b68eb
+  data.tar.gz: 86d62c052a3e4934756c51e33b68e50611365cc7e6dcc1cb591495c37749176bef911af487d16747830bc12662c725959918e64d174d217c1bd47a06da4d8c79

data/README.md

@@ -413,6 +413,7 @@ Throw a ★ on it! :)
 
 ## Release notes
 
+* v1.3.3: Bugfix to allow `parameter` inside `swagger_path`.
 * v1.3.2: Bugfix to allow `property` inside `items` for rare extended schema uses.
 * v1.3.1: Bugfix to allow nested objects via `property` nested in `property`.
 * v1.3.0: Added support for condensed syntax via inline keys on every block.

data/lib/swagger/blocks.rb

@@ -499,6 +499,11 @@ module Swagger
         raise ArgumentError.new("#{name} not in #{OPERATION_TYPES}") if !OPERATION_TYPES.include?(op)
         self.data[op] = Swagger::Blocks::OperationNode.call(version: version, inline_keys: inline_keys, &block)
       end
+
+      def parameter(inline_keys = nil, &block)
+        self.data[:parameters] ||= []
+        self.data[:parameters] << Swagger::Blocks::ParameterNode.call(version: version, inline_keys: inline_keys, &block)
+      end
     end
 
     # v1.2: http://goo.gl/PvwUXj#523-operation-object

data/lib/swagger/blocks/version.rb

@@ -1,5 +1,5 @@
 module Swagger
   module Blocks
-    VERSION = '1.3.2'
+    VERSION = '1.3.3'
   end
 end

data/spec/lib/swagger_v2_api_declaration.json

@@ -133,6 +133,16 @@
       }
     },
     "/pets/{id}": {
+      "parameters": [
+        {
+          "name": "id",
+          "in": "path",
+          "description": "ID of pet",
+          "required": true,
+          "type": "integer",
+          "format": "int64"
+        }
+      ],
       "get": {
         "description": "Returns a user based on a single ID, if the user does not have access to the pet",
         "operationId": "findPetById",
@@ -142,16 +152,6 @@
           "text/xml",
           "text/html"
         ],
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "description": "ID of pet to fetch",
-            "required": true,
-            "type": "integer",
-            "format": "int64"
-          }
-        ],
         "responses": {
           "200": {
             "description": "pet response",
@@ -181,16 +181,6 @@
       "delete": {
         "description": "deletes a single pet based on the ID supplied",
         "operationId": "deletePet",
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "description": "ID of pet to delete",
-            "required": true,
-            "type": "integer",
-            "format": "int64"
-          }
-        ],
         "responses": {
           "204": {
             "description": "pet deleted"

data/spec/lib/swagger_v2_blocks_spec.rb

@@ -121,6 +121,14 @@ class PetControllerV2
   end
 
   swagger_path '/pets/{id}' do
+    parameter do
+      key :name, :id
+      key :in, :path
+      key :description, 'ID of pet'
+      key :required, true
+      key :type, :integer
+      key :format, :int64
+    end
     operation :get do
       key :description, 'Returns a user based on a single ID, if the user does not have access to the pet'
       key :operationId, 'findPetById'
@@ -130,14 +138,6 @@ class PetControllerV2
         'text/xml',
         'text/html',
       ]
-      parameter do
-        key :name, :id
-        key :in, :path
-        key :description, 'ID of pet to fetch'
-        key :required, true
-        key :type, :integer
-        key :format, :int64
-      end
       response 200 do
         key :description, 'pet response'
         schema do
@@ -158,14 +158,6 @@ class PetControllerV2
     operation :delete do
       key :description, 'deletes a single pet based on the ID supplied'
       key :operationId, 'deletePet'
-      parameter do
-        key :name, :id
-        key :in, :path
-        key :description, 'ID of pet to delete'
-        key :required, true
-        key :type, :integer
-        key :format, :int64
-      end
       response 204 do
         key :description, 'pet deleted'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagger-blocks
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Mike Fotinakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Define and serve live-updating Swagger JSON for Ruby apps.
@@ -121,4 +121,3 @@ test_files:
 - spec/lib/swagger_v2_api_declaration.json
 - spec/lib/swagger_v2_blocks_spec.rb
 - spec/spec_helper.rb
-has_rdoc: