rspec-rails-swagger 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a2b47ce191c99f44fb347b30d0f008598b12333
-  data.tar.gz: ef2a2ba21b5ae8205d5fef54ba82f41433da7315
+  metadata.gz: 0a916826de8e3e0b5f89296dcd78ca114356c106
+  data.tar.gz: e709fb01df49194a494f20e6b26a47958ae5d409
 SHA512:
-  metadata.gz: 8c6b22a14ed9e8500c79079b2df7752466ee655c6e68b12219538da0ded969bd3ed4025a912f3e2177c9ab6fcc66b25cc76abfb57fc97df470abafdd061900e5
-  data.tar.gz: 6ab205147771de49993331072bd1961ec81fe8a766b01adaffa7f4e13153f695900451fbffd192b906babcb798370c4a6c21a4df461a10b00e3f611e0f921b8b
+  metadata.gz: daca2e677f67f13e83259c5cfae1046c033a6bb3dd82853f2d0f6455c5d49de8ea57026531692d98d9988914c8752bf8daf36869494c33bd2353c0b6e16357ce
+  data.tar.gz: cc2bcb1103465c99da748a33b0b18a3bf17745a15ecaef02e40a92905a1918f132d53f3e16ea687a492a47da5df69c6f60e02147422cadac18b4089e3d923ef2

data/lib/rspec/rails/swagger/document.rb

@@ -12,6 +12,8 @@ module RSpec
           data[value]
         end
 
+        ##
+        # Look up parameter or definition references.
         def resolve_ref(ref)
           unless %r{#/(?<location>parameters|definitions)/(?<name>.+)} =~ ref
             raise ArgumentError, "Invalid reference: #{ref}"

data/lib/rspec/rails/swagger/helpers.rb

@@ -204,13 +204,14 @@ module RSpec
                 method = builder.method
                 path = [builder.path, builder.query].join
                 headers = builder.headers
+                env = builder.env
                 body = builder.body
 
                 # Run the request
                 if ::Rails::VERSION::MAJOR >= 5
-                  self.send(method, path, {params: body, headers: headers})
+                  self.send(method, path, {params: body, headers: headers, env: env})
                 else
-                  self.send(method, path, body, headers)
+                  self.send(method, path, body, headers.merge(env))
                 end
 
                 if example.metadata[:capture_examples]

data/lib/rspec/rails/swagger/request_builder.rb

@@ -4,10 +4,17 @@ module RSpec
       class RequestBuilder
         attr_reader :metadata, :instance
 
+        ##
+        # Creates a new RequestBuilder from the Example class's +metadata+ hash
+        # and a test +instance+ that we can use to populate the parameter
+        # values.
         def initialize(metadata, instance)
           @metadata, @instance = metadata, instance
         end
 
+        ##
+        # Finds the Document associated with this request so things like schema
+        # and parameter references can be resolved.
         def document
           @document ||= begin
             name = metadata[:swagger_document]
@@ -27,6 +34,10 @@ module RSpec
           Array(metadata[:swagger_operation][:consumes]).presence || Array(document[:consumes])
         end
 
+        ##
+        # Returns parameters defined in the operation and path item. Providing
+        # a +location+ will filter the parameters to those with a matching +in+
+        # value.
         def parameters location = nil
           path_item = metadata[:swagger_path_item] || {}
           operation = metadata[:swagger_operation] || {}
@@ -39,12 +50,10 @@ module RSpec
         end
 
         def parameter_values location
-          # Don't bother looking at the full parameter bodies since all we need
-          # are location and name which are in the key.
-          values = parameters(location)
-            .keys
-            .map{ |k| k.split('&').last }
-            .map{ |name| [name, instance.send(name)] }
+          values = parameters(location).
+            map{ |_, p| p['$ref'] ? document.resolve_ref(p['$ref']) : p }.
+            select{ |p| p[:required] || instance.respond_to?(p[:name]) }.
+            map{ |p| [p[:name], instance.send(p[:name])] }
           Hash[values]
         end
 
@@ -62,6 +71,15 @@ module RSpec
           headers
         end
 
+        ##
+        # If +instance+ defines an +env+ method this will return those values
+        # for inclusion in the Rack env hash.
+        def env
+          return {} unless instance.respond_to? :env
+
+          instance.env
+        end
+
         def path
           base_path = document[:basePath] || ''
           # Find params in the path and replace them with values defined in

data/lib/rspec/rails/swagger/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Swagger.
     module Swagger
       module Version
-        STRING = '0.1.2'
+        STRING = '0.1.3'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails-swagger
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - andrew morton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails