rspec-openapi 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bf318171323fbd3fa8d664a4f34ec1fe5af39a4d39ab5ee7b020b3871a31cb4
-  data.tar.gz: 610173247f3b9c99c7f5d2461bad49ae1d9000d7c8f63dfc4ac884472830c005
+  metadata.gz: 78fd09cf0ef8419c47bd5b9f8f225260b83f700fcfcb23a2515c50e341832961
+  data.tar.gz: f1895433af3d0a5ee6b065f1e4bbc92bdd4707749480a95b307b685132206bc3
 SHA512:
-  metadata.gz: 4b8c0402fe94dbcc43353c210acb1c9c4b182331020670bb8955dc4abf17a18732852fc4b191a3d1ded1d3613ef5e0059aa79e09084eb23bd9ce7ca5beec9e25
-  data.tar.gz: 6c4cd49edbaea41dfc1c2b17c89ec85dac8e1063612ff29f3c63dccde9dacd7a19eb276253363f1091a19976e0e6a20d40dc32f5deae36fa291e17f054b22eaf
+  metadata.gz: ae459f44e0471afec512959b999b47fa23b3144efd9272d140a47af6a65ec4f40c234b1f317d197610952263225e247505f8febca1901fe094ebd74b5c8e27b4
+  data.tar.gz: a74f8c5a3121ecbff640c40eccd0f420ae2869b676fdb592411c13e7fddfbfb13fd31c96b9d1ea1e73578c9007c3e78f34dda9bcb820ae4f67b9db5d209fbad7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.4.4
+
+- De-duplicate parameters by a combination of `name` and `in`
+  [#39](https://github.com/k0kubun/rspec-openapi/pull/39)
+
 ## v0.4.3
 
 * Allow customizing `schema`, `description`, and `tags` through `:openapi` metadata

data/lib/rspec/openapi/schema_merger.rb

@@ -21,9 +21,12 @@ class << RSpec::OpenAPI::SchemaMerger = Object.new
     end
   end
 
-  # Not doing `base.replace(deep_merge(base, spec))` to preserve key orders
+  # Not doing `base.replace(deep_merge(base, spec))` to preserve key orders.
+  # Also this needs to be aware of OpenAPI details unlike an ordinary deep_reverse_merge
+  # because a Hash-like structure may be an array whose Hash elements have a key name.
+  #
   # TODO: Perform more intelligent merges like rerouting edits / merging types
-  # Should we probably force-merge `summary` regardless of manual modifications?
+  # TODO: Should we probably force-merge `summary` regardless of manual modifications?
   def deep_reverse_merge!(base, spec)
     spec.each do |key, value|
       if base[key].is_a?(Hash) && value.is_a?(Hash)
@@ -31,9 +34,10 @@ class << RSpec::OpenAPI::SchemaMerger = Object.new
       elsif !base.key?(key)
         base[key] = value
       elsif base[key].is_a?(Array) && value.is_a?(Array)
-        if key == "parameters"
-          # merge arrays
+        # parameters need to be merged as if `name` and `in` were the Hash keys.
+        if key == 'parameters'
           base[key] |= value
+          base[key].uniq! { |param| param.slice('name', 'in') }
         end
       else
         # no-op

data/lib/rspec/openapi/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module OpenAPI
-    VERSION = '0.4.3'
+    VERSION = '0.4.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openapi
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack