rspec-openapi 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 880f187fffd674c1abc266390cb70acedd726d09e947042286ce01b93b42f1f1
-  data.tar.gz: f602dbac30374bd4efa06806f505b8a867172b6ea493bf6d3e3ce8b156ce8455
+  metadata.gz: cd7d2eb0e69e2e60405a7d71d10acd3b2edf2d4db0358297a900200a0a69012e
+  data.tar.gz: 577545384d404ba11382ab4425e0bd40abeeb3e58db922e82d923f0d6d6ae8e9
 SHA512:
-  metadata.gz: 1a8b1611dea768d2bf7fa3c884d666d2635fec945dccda28ce8314e6557fe33b1c6315c8994953639f92ed181c61323a4c0a169670c2e47808aa9348f88a88a3
-  data.tar.gz: 82602c1729a8299fb128bd3f31b9449369e4eef7744bf60da1a54f1de148b9eb36b1e7b2e85b423695e36e3b6a3c1de7fa2710b5bae2e194ba23371b719f29ac
+  metadata.gz: 5f60ee2cf93946405e3e151786965b3a0f68e53ad147a6d7613f59f46f834efd9a641d0f878943af934879d2f5e27e8c8d4cd55dac5288d62a85dc2b77009ddb
+  data.tar.gz: 7dc56150dfb4a8a5b526d7ec626b4ebc9c0680878cd1f976213490a489a598dfe2a285f01029e5a17cdbbe0d8b492fe79a2e51148ac24df94d532c404b0231fd

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.3.18
+
+* Support nested query parameters
+  [#29](https://github.com/k0kubun/rspec-openapi/pull/29)
+
 ## v0.3.17
 
 * Rescue NotImplementedError in the after suite hook as well

data/lib/rspec/openapi/schema_builder.rb

@@ -50,7 +50,7 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
 
     record.path_params.each do |key, value|
       parameters << {
-        name: key.to_s,
+        name: build_parameter_name(key, value),
         in: 'path',
         required: true,
         schema: build_property(try_cast(value)),
@@ -60,7 +60,7 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
 
     record.query_params.each do |key, value|
       parameters << {
-        name: key.to_s,
+        name: build_parameter_name(key, value),
         in: 'query',
         schema: build_property(try_cast(value)),
         example: (try_cast(value) if example_enabled?),
@@ -71,6 +71,16 @@ class << RSpec::OpenAPI::SchemaBuilder = Object.new
     parameters
   end
 
+  def build_parameter_name(key, value)
+    key = key.to_s
+    if value.is_a?(Hash) && (value_keys = value.keys).size == 1
+      value_key = value_keys.first
+      build_parameter_name("#{key}[#{value_key}]", value[value_key])
+    else
+      key
+    end
+  end
+
   def build_request_body(record)
     return nil if record.request_content_type.nil?
     return nil if record.request_params.empty?

data/lib/rspec/openapi/schema_merger.rb

@@ -30,6 +30,13 @@ class << RSpec::OpenAPI::SchemaMerger = Object.new
         deep_reverse_merge!(base[key], value)
       elsif !base.key?(key)
         base[key] = value
+      elsif base[key].is_a?(Array) && value.is_a?(Array)
+        if key == "parameters"
+          # merge arrays
+          base[key] |= value
+        end
+      else
+        # no-op
       end
     end
     base

data/lib/rspec/openapi/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module OpenAPI
-    VERSION = '0.3.17'
+    VERSION = '0.3.18'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openapi
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Takashi Kokubun
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -75,7 +75,7 @@ metadata:
   homepage_uri: https://github.com/k0kubun/rspec-openapi
   source_code_uri: https://github.com/k0kubun/rspec-openapi
   changelog_uri: https://github.com/k0kubun/rspec-openapi/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,8 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Generate OpenAPI schema from RSpec request specs
 test_files: []