openapi_rspec 0.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 748ba53aceac0ac02c274be192c1fadb895df66212e38da8bf9f88f80943f504
-  data.tar.gz: d2ab4b53ae116da4daf0bdaec48e2c8ff4d54b8ff98e1e4dc05bfd2d0d4c6dfc
+  metadata.gz: ed454989937d48a4eeef30f34682c4bff0f7e2a40da349eea0eeb8b5a19afb8d
+  data.tar.gz: 4df1828cf06d45281a58b9f3f90c2a8f8d89ca1271303611087e0c90d17d5d2d
 SHA512:
-  metadata.gz: 1a89fcf6b169fddf3ade6b8032354460046e5be264b38ba4b6fd164a2c5caaa1fc10a5369599701aa9b03bd347a6dbff313a3b7ca36e48e12ac2557fde4ca6e4
-  data.tar.gz: 15d575f392ac9ba39e2e5e11aa1732596f8ca9eaf43cbba72cf76ef036901d5bdd06ed40f8e5c7f5ff45afcd1038b2552c266e1bd420b0703642322c08ce2bde
+  metadata.gz: 667444e7e303fbb92082a8c1a1dd796633cafaf532bdfdecae27521c1c5f3e2b70a70816e63c460ec75f414a9a869b834d1864829bd6958e34d3e1f9885e8765
+  data.tar.gz: 3f4328e0214bf15036c8f628bc034dadf497fab685737122cb6f5e80330024ca8328baa832b8b91716a5c80ba0da83c974ae47a2c6fe2c17b95578e7d893e6f3

data/README.md

@@ -1,12 +1,9 @@
 [gem]: https://rubygems.org/gems/openapi_rspec
-[travis]: https://travis-ci.org/medsolutions/openapi_rspec
-[codeclimate]: https://codeclimate.com/github/medsolutions/openapi_rspec
+[codeclimate]: https://codeclimate.com/github/skryukov/openapi_rspec
 
 # openapi_rspec
 [![Gem Version](https://badge.fury.io/rb/openapi_rspec.svg)][gem]
-[![Build Status](https://travis-ci.org/medsolutions/openapi_rspec.svg?branch=master)][travis]
-[![Code Climate](https://codeclimate.com/github/medsolutions/openapi_rspec/badges/gpa.svg)][codeclimate]
-[![Test Coverage](https://codeclimate.com/github/medsolutions/openapi_rspec/badges/coverage.svg)][codeclimate]
+[![Build](https://github.com/skryukov/openapi_rspec/workflows/Build/badge.svg)](https://github.com/skryukov/openapi_rspec/actions)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
 
 Test your API against OpenApi v3 documentation
@@ -266,7 +263,7 @@ This will raise an error if any of the documented paths are not validated.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/medsolutions/openapi_rspec.
+Bug reports and pull requests are welcome on GitHub at https://github.com/skryukov/openapi_rspec.
 
 ## License
 

data/lib/openapi_rspec/helpers.rb

@@ -5,25 +5,21 @@ module OpenapiRspec
     def request_params(metadata)
       path = defined?(uri) ? uri : metadata[:uri]
       method = defined?(http_method) ? http_method : metadata[:method]
-      params = if openapi_rspec_params.is_a?(Hash)
-        path_params(path).merge!(openapi_rspec_params)
-      else
-        openapi_rspec_params
-      end
 
       {
         method: method,
         path: path,
-        params: params,
+        params: openapi_rspec_params,
+        path_params: path_params(path),
         headers: openapi_rspec_headers,
         query: openapi_rspec_query,
-        media_type: openapi_rspec_media_type,
+        media_type: openapi_rspec_media_type
       }
     end
 
     def path_params(path)
       path_params = {}
-      path.scan(/\{([^\}]*)\}/).each do |param|
+      path.scan(/\{([^}]*)\}/).each do |param|
         key = param.first.to_sym
         path_params[key] = public_send(key) if respond_to?(key)
       end

data/lib/openapi_rspec/module_helpers.rb

@@ -7,7 +7,7 @@ module OpenapiRspec
         metadata = example.metadata[:openapi_rspec]
         validator = RequestValidator.new(**request_params(metadata), code: code)
         expect(subject).to validator
-        instance_exec validator, &block if block_given?
+        instance_exec validator, &block if block
       end
     end
 

data/lib/openapi_rspec/request_validator.rb

@@ -13,6 +13,7 @@ module OpenapiRspec
     option :method
     option :code
     option :media_type
+    option :path_params
     option :params
     option :query
     option :headers
@@ -46,31 +47,31 @@ module OpenapiRspec
 
     private
 
+    def perform_request(doc)
+      headers.each do |key, value|
+        header key, value
+      end
+      request(request_uri(doc), method: method, **request_params)
+      @response = last_response
+    end
+
     def request_uri(doc)
-      path.scan(/\{([^\}]*)\}/).each do |param|
+      path.scan(/\{([^}]*)\}/).each do |param|
         key = param.first.to_sym
-        if params && params[key]
-          @path = path.gsub "{#{key}}", params.delete(key).to_s
+        if path_params && path_params[key]
+          @path = path.gsub "{#{key}}", path_params[key].to_s
         else
-          raise URI::InvalidURIError, "No substitution data found for {#{key}}"\
+          raise URI::InvalidURIError, "No substitution data found for {#{key}}" \
             " to test the path #{path}."
         end
       end
       "#{doc.api_base_path}#{path}?#{URI.encode_www_form(query)}"
     end
 
-    def perform_request(doc)
-      headers.each do |key, value|
-        header key, value
-      end
-      request(request_uri(doc), method: method, **request_params)
-      @response = last_response
-    end
-
     def request_params
       {
         headers: headers,
-        params: params,
+        params: params
       }
     end
   end

data/lib/openapi_rspec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenapiRspec
-  VERSION = "0.5"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_rspec
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.6.0
 platform: ruby
 authors:
 - Svyatoslav Kryukov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Test your API against OpenApi v3 documentation