openapi_parameters 0.8.0 → 0.9.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee2751342867fef145f12b7b8cd681cca155ba396a89c69f6c476d5566967cff
-  data.tar.gz: 7f00815807f40d26a66b9aac7c58565ad568adb4a7d91b497805168d9b4e9def
+  metadata.gz: 333fd99034d125536a4a747d4c611e474ba8f2c41aa84d9c983f0cd7425b13cb
+  data.tar.gz: '067223459914938a710d91de39125b4e8c7a7dc820b637fa5c3fa2bc1502465e'
 SHA512:
-  metadata.gz: 27e43f8835d7759baef4deb7969a6517fedcf6e7456916369c4d6aeae4ff624ce77eaff7968c5ab01f36edbcd92b1bbc9388d3af14170d8c0130c874621f882d
-  data.tar.gz: 107e3ffa3b290342b68ae3a6228a4b780e2cbd7be26c12ee42aa276d1be0128a4f024b724424f6e2330578d833995644a23e0f9907b3cf145f1978f8916acb4b
+  metadata.gz: 653a7d0631784ed6ce34187307a973f08fee2560dceb93390d4d509f49c68acb6101d4cd1a274eb009df9020a81a0081089c24af4aeb6f64be43f4f46a9bdbfc
+  data.tar.gz: e458b12c372881a3e2503e891348da76ad735fc197f66343c6ff74fd1dd8107d2054c553b246959c7ef3a793e52b4432ca2e3c2d955ef7b66d6f59968f2bd1ab

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## [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.

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,7 +12,6 @@ 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
@@ -35,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)
@@ -51,22 +47,43 @@ module OpenapiParameters
       end
     end
 
+    def build_properties_schema(parameter)
+      schema = parameter.schema
+      return unless schema
+
+      props = schema['properties']
+      return props if props
+
+      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
+    end
+
+    DEEP_PROP = '\[([\w-]+)\]$'
+    private_constant :DEEP_PROP
+
     def parse_deep_object(parameter, parsed_query)
-      schema_props = parameter.schema['properties'] || {}
       name = parameter.name
-      schema_props.each.with_object({}) do |(prop, schema), result|
-        key = "#{name}[#{prop}]"
+      prop_regx = /^#{name}#{DEEP_PROP}/
+      parsed_query.each.with_object({}) do |(key, value), result|
         next unless parsed_query.key?(key)
 
-        value = explode_value(parsed_query[key], parameter, schema)
-        result[prop] = value
+        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 explode_value(value, parameter, schema)
-      type = schema['type']
+    def explode_value(value, parameter, is_array)
       value = Array(value).map! { |v| Rack::Utils.unescape(v) }
-      if type == 'array'
+      if is_array
         return value if parameter.explode?
 
         return [value.last]

data/lib/openapi_parameters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenapiParameters
-  VERSION = '0.8.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.8.0
+  version: 0.9.0.beta1
 platform: ruby
 authors:
 - Andreas Haller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-17 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: