openapi_parameters 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b798ca1e80a551797f19f1b1f2242b7785af3158446c898d9b0aadaa9c520777
-  data.tar.gz: d8540ac316847320ace7b8379395514c5f2deee2b711ab097e8b73c22b2de14f
+  metadata.gz: '079a687acb19dfb87815260d6cf7ea39a8cfe176f3ee9e3ebfd345dde517ea08'
+  data.tar.gz: 9dd609bda36de57a3d8c3c526ffd4c707c4cbbfb0f62f83d9f47ecab640ac8a5
 SHA512:
-  metadata.gz: c8c9011ca61153e8fb20f375aa3bda9f11f69a4bac614726cff883f1811e219eece7a4cad2ee384ead8d0688a6f327783ed1c156cc94505ad791341e22d0fc97
-  data.tar.gz: 1e5fe939d22288b0196ea0a85a7152f022f2f3e96a2f5ac65329f97cb7448517b1df0b13926cf0d4ef227346ca4f002e2727bc8a2e5ceacfadca857b9ffa3dbf
+  metadata.gz: 45d3a59bba22cb4b864db2472b6993d8aa3fe4a70a47af5183cc2d65b8d57e0684c9401782be84e04c79ee133aa714cfa87fa3e0436ec7d629e0dac6844681b1
+  data.tar.gz: 4f71f9ba3187ff382a9bbf53af7e5c543ffe51d6a5a4a7d02828b8380e7d1a31a60b7bfeffef163eac716a230e9a50021086631049a3a1132cba977a07395522

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.6.1] - 2025-06-23
+
+- Fix converting items of array paramters
+
 ## [0.6.0] - 2025-06-23
 
 - Array parameters without a value ("?ids=" or "?ids") return an empty array instead of nil or an empty string.

data/lib/openapi_parameters/array_converter.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module OpenapiParameters
+  # @visibility private
+  class ArrayConverter
+    def initialize(schema)
+      @schema = schema
+    end
+
+    attr_reader :schema
+
+    def call(value)
+      return [] if value.nil? || value.empty?
+
+      convert_array(value)
+    end
+
+    private
+
+    def convert_array(array)
+      return array unless array.is_a?(Array)
+
+      item_schema = schema['items']
+      prefix_schemas = schema['prefixItems']
+      return convert_array_with_prefixes(array, prefix_schemas, item_schema) if prefix_schemas
+
+      array.map { |item| Converter.convert(item, item_schema) }
+    end
+
+    def convert_array_with_prefixes(array, prefix_schemas, item_schema)
+      prefixes =
+        array
+        .slice(0, prefix_schemas.size)
+        .each_with_index
+        .map { |item, index| Converter.convert(item, prefix_schemas[index]) }
+      array =
+        array[prefix_schemas.size..].map! do |item|
+          Converter.convert(item, item_schema)
+        end
+      prefixes + array
+    end
+  end
+end

data/lib/openapi_parameters/converter.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
+require_relative 'array_converter'
+
 module OpenapiParameters
   # Tries to convert a request parameter value (string) to the type specified in the JSON Schema.
   # @visibility private
   module Converter
     class << self
-      ##
       # @param value [String, Hash, Array] the value to convert
       # @param schema [Hash] the schema to use for conversion.
       def convert(value, schema) # rubocop:disable Metrics
@@ -34,7 +35,7 @@ module OpenapiParameters
         when 'object'
           convert_object(value, schema)
         when 'array'
-          convert_array(value, schema)
+          ArrayConverter.new(schema).call(value)
         else
           if schema['properties']
             convert_object(value, schema)
@@ -48,7 +49,7 @@ module OpenapiParameters
         return value unless value.is_a?(Hash)
 
         value.each_with_object({}) do |(key, val), hsh|
-          hsh[key] = convert(val, schema['properties']&.fetch(key, nil))
+          hsh[key] = Converter.convert(val, schema['properties']&.fetch(key, nil))
         end
       end
 
@@ -57,29 +58,6 @@ module OpenapiParameters
       def type(schema)
         schema && schema['type']
       end
-
-      def convert_array(array, schema)
-        return array unless array.is_a?(Array)
-
-        item_schema = schema['items']
-        prefix_schemas = schema['prefixItems']
-        return convert_array_with_prefixes(array, prefix_schemas, item_schema) if prefix_schemas
-
-        array.map { |item| convert(item, item_schema) }
-      end
-
-      def convert_array_with_prefixes(array, prefix_schemas, item_schema)
-        prefixes =
-          array
-          .slice(0, prefix_schemas.size)
-          .each_with_index
-          .map { |item, index| convert(item, prefix_schemas[index]) }
-        array =
-          array[prefix_schemas.size..].map! do |item|
-            convert(item, item_schema)
-          end
-        prefixes + array
-      end
     end
   end
 end

data/lib/openapi_parameters/converters.rb

@@ -15,6 +15,8 @@ module OpenapiParameters
       def [](schema)
         type = schema && schema['type']
         converters.fetch(type) do
+          return ArrayConverter.new(schema) if type == 'array'
+
           ->(value) { Converter.convert(value, schema) }
         end
       end
@@ -26,12 +28,6 @@ module OpenapiParameters
       value
     end)
 
-    register('array', lambda do |value|
-      break [] if value.nil? || value.empty?
-
-      value
-    end)
-
     register('number', lambda do |value|
       Float(value)
     rescue StandardError

data/lib/openapi_parameters/query.rb

@@ -47,19 +47,5 @@ module OpenapiParameters
         raise Rack::Utils::InvalidParameterError, e.message
       end
     end
-
-    def convert_primitive(value, parameter)
-      return value unless @convert
-      return value if value == ''
-
-      Converter.convert_primitive(value, parameter.schema)
-    end
-
-    def convert(value, parameter)
-      return value unless @convert
-      return value if value == ''
-
-      Converter.convert(value, parameter.schema)
-    end
   end
 end

data/lib/openapi_parameters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenapiParameters
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openapi_parameters
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Andreas Haller
@@ -35,6 +35,7 @@ files:
 - CHANGELOG.md
 - README.md
 - lib/openapi_parameters.rb
+- lib/openapi_parameters/array_converter.rb
 - lib/openapi_parameters/converter.rb
 - lib/openapi_parameters/converters.rb
 - lib/openapi_parameters/cookie.rb