openapi_parameters 0.7.0 → 0.9.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c8fe7a86aaad928b6277f62969502db824f37ff92624c6f33abfa43dad15454
-  data.tar.gz: f8b36c4416ff14775bf9cb7ca05c5d6ad45589a5a1a390a6bcaa395142027241
+  metadata.gz: 333fd99034d125536a4a747d4c611e474ba8f2c41aa84d9c983f0cd7425b13cb
+  data.tar.gz: '067223459914938a710d91de39125b4e8c7a7dc820b637fa5c3fa2bc1502465e'
 SHA512:
-  metadata.gz: f447c974255d4f21c3822c975b655ddb3f988a513bdb1684491a4bc0a60406f66d170378b8d5e2bc7d64eed5b94366716fdafa9f4074e90f5f1f1ad4567b0d2d
-  data.tar.gz: f3ac74f5faecfca7aa8513fe0e4ce901a5cca2ca42833e0f0c07e2b844e8e8ded7166ac99b492631d0d2173173cce438f4a8c37daa0b16491db0d7ddaf09aa1f
+  metadata.gz: 653a7d0631784ed6ce34187307a973f08fee2560dceb93390d4d509f49c68acb6101d4cd1a274eb009df9020a81a0081089c24af4aeb6f64be43f4f46a9bdbfc
+  data.tar.gz: e458b12c372881a3e2503e891348da76ad735fc197f66343c6ff74fd1dd8107d2054c553b246959c7ef3a793e52b4432ca2e3c2d955ef7b66d6f59968f2bd1ab

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+- Add basic support unpacking query paramters that use deepObject and oneOf
+
+## [0.8.0] - 2025-09-17
+
+- No longer parse more than one level of nested objects when parsing `deepObject` parameters. This is actually in line with what `deepObject` supports.
+
 ## [0.7.0] - 2025-09-12
 
 - Correctly handle `style:deepObject` with `explode: true` and parse into array

data/lib/openapi_parameters/parameter.rb

@@ -9,7 +9,6 @@ module OpenapiParameters
       @definition = definition
       @name = definition['name']
       @is_deep_object = style == 'deepObject'
-      @is_explode = explode?
       @converter = Converters[schema]
       check_supported!
     end

data/lib/openapi_parameters/query.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rack'
+require_relative 'converter'
 
 module OpenapiParameters
   # Query parses query parameters from a http query strings.
@@ -11,21 +12,14 @@ module OpenapiParameters
       @parameters = parameters.map { Parameter.new(_1) }
       @convert = convert
       @remove_array_brackets = rack_array_compat
-      @any_deep_object = @parameters.any?(&:deep_object?)
     end
 
-    def unpack(query_string) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    def unpack(query_string) # rubocop:disable Metrics/AbcSize
       parsed_query = parse_query(query_string)
-      parsed_nested_query = Rack::Utils.parse_nested_query(query_string) if any_deep_object?
       parameters.each_with_object({}) do |parameter, result|
         if parameter.deep_object?
-          next unless parsed_nested_query.key?(parameter.name)
-
-          value = if parameter.explode?
-                    handle_deep_object_explode(parameter, parsed_nested_query[parameter.name], parsed_query)
-                  else
-                    parsed_nested_query[parameter.name]
-                  end
+          value = parse_deep_object(parameter, parsed_query)
+          next if value.empty?
         else
           next unless parsed_query.key?(parameter.name)
 
@@ -41,14 +35,10 @@ module OpenapiParameters
     end
 
     attr_reader :parameters
-    private attr_reader :remove_array_brackets
+    private attr_reader :remove_array_brackets, :parameter_property_schemas
 
     private
 
-    def any_deep_object?
-      @any_deep_object
-    end
-
     def parse_query(query_string)
       Rack::Utils.parse_query(query_string) do |s|
         Rack::Utils.unescape(s)
@@ -57,31 +47,48 @@ module OpenapiParameters
       end
     end
 
-    def handle_deep_object_explode(parameter, value, parsed_query)
-      return value unless value.is_a?(Hash)
+    def build_properties_schema(parameter)
+      schema = parameter.schema
+      return unless schema
 
-      schema_props = parameter.schema['properties'] || {}
+      props = schema['properties']
+      return props if props
 
-      array_prop_values = find_prop_matches(parameter.name, schema_props, parsed_query)
+      combinations = schema.slice('allOf', 'oneOf', 'anyOf')
+      if combinations.any?
+        props = combinations.values.flat_map { |value| value.map { |sub| sub['properties'] }.compact }
+        return {}.merge(*props.compact)
+      end
 
-      schema_props.each_with_object(value) do |(prop, prop_schema), result|
-        next unless prop_schema['type'] == 'array'
+      schema
+    end
 
-        arr = array_prop_values[prop]
-        result[prop] = if arr.empty? && value.key?(prop)
-                         Array(value[prop])
-                       else
-                         arr
-                       end
+    DEEP_PROP = '\[([\w-]+)\]$'
+    private_constant :DEEP_PROP
+
+    def parse_deep_object(parameter, parsed_query)
+      name = parameter.name
+      prop_regx = /^#{name}#{DEEP_PROP}/
+      parsed_query.each.with_object({}) do |(key, value), result|
+        next unless parsed_query.key?(key)
+
+        prop_key = key.match(prop_regx)&.[](1)
+        next if prop_key.nil?
+
+        is_array = parameter.schema&.dig('properties', prop_key, 'type') == 'array'
+        value = explode_value(value, parameter, is_array)
+        result[prop_key] = value
       end
     end
 
-    def find_prop_matches(parameter_name, schema_props, parsed_query)
-      schema_props.each_key.with_object({}) do |prop, result|
-        key = "#{parameter_name}[#{prop}]"
-        value = Array(parsed_query[key])
-        result[prop] = value.map { |match| Rack::Utils.unescape(match) } if value.is_a?(Array)
+    def explode_value(value, parameter, is_array)
+      value = Array(value).map! { |v| Rack::Utils.unescape(v) }
+      if is_array
+        return value if parameter.explode?
+
+        return [value.last]
       end
+      value.last
     end
   end
 end

data/lib/openapi_parameters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenapiParameters
-  VERSION = '0.7.0'
+  VERSION = '0.9.0.beta1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_parameters
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0.beta1
 platform: ruby
 authors:
 - Andreas Haller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-12 00:00:00.000000000 Z
+date: 2025-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -67,9 +67,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.6
 signing_key: