openapi_parameters 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97605d112ff65a874f5fa63dc7ecd13d3ca37468e559dbf7980a1f6c55e37274
-  data.tar.gz: 280fe6bc55862118dc65e77a6e29c6a3f27ee3c3d07f1361003c9cbd52fdc660
+  metadata.gz: ef334fe7ee42e62490cabedbb2d5172c710299e736db3154450d23db23dc4247
+  data.tar.gz: faa2d9c99a2a4f59ebe38b2ff797bcaae165277cc606075168e8cf3191a3722e
 SHA512:
-  metadata.gz: e1cff00125ffb1ea81548a6e8f5bee73b1cedc29ccb2569296e0f869a9ac3412cc9c683afcba2f48bcc6cca06287a1fba251068b4c831e2d4933497268a58da8
-  data.tar.gz: 6177d8425f16f678af64f4059ecc1fecf70e954ce0edd95ce2e38a7b5bbd1efe801951fffb9ca8932d7d4d258100af0070623c5c04672d1e539caee1cbc8204e
+  metadata.gz: 6bfe90c227761100d238dec3c51d7f680ce20d39a834b149cdf1426163685e99209b0a4f5b131ff58a9362419d50f5fec966b86747d176609de524d94e17421d
+  data.tar.gz: ec587259898ef7c0004b97a0ab849fb97624de1dd464159dcbd5eeff549e2877465195d94b67cba3fbc5a2f6f245fb0a5863198048a9ba6c04a09324bb1b420e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
-## [0.1.0] - 2032-03-25
+## [0.2.0] - 2023-03-30
+
+- Breaking: Path parameters are unpacked from a hash, which is usually available from the used Rack web framework. This is much simpler and more performant.
+
+## [0.1.0] - 2023-03-25
 
 - Initial release

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    openapi_parameters (0.1.0)
+    openapi_parameters (0.2.0)
       rack (>= 2.2)
-      uri_template (>= 0.7, < 2.0)
       zeitwerk (~> 2.6)
 
 GEM
@@ -11,45 +10,47 @@ GEM
   specs:
     ast (2.4.2)
     diff-lcs (1.5.0)
-    json (2.6.2)
+    json (2.6.3)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
-    rack (3.0.0)
+    rack (3.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.1)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.39.0)
+    rubocop (1.48.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (2.3.0)
-    uri_template (0.7.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.1)
+      rubocop (~> 1.41)
+    rubocop-rspec (2.19.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (2.4.2)
     zeitwerk (2.6.7)
 
 PLATFORMS

data/README.md

@@ -28,9 +28,8 @@ query_string = env['QUERY_STRING'] # => 'ids=1&ids=2'
 query_parameters.unpack(query_string) # => { 'ids' => [1, 2] }
 query_parameters.unpack(query_string, convert: false) # => { 'ids' => ['1', '2'] }
 
-path_parameters = OpenapiParameters::Path.new(parameters, '/pets/ids')
-path_info = env['PATH_INFO'] # => '/pets/1,2,3'
-path_parameters.unpack(path_info) # => { 'ids' => [1, 2, 3] }
+path_parameters = OpenapiParameters::Path.new(parameters)
+path_parameters.unpack(route_params) # => { 'ids' => [1, 2, 3] }
 
 header_parameters = OpenapiParameters::Header.new(parameters)
 header_parameters.unpack_env(env)

data/lib/openapi_parameters/converter.rb

@@ -22,9 +22,7 @@ module OpenapiParameters
 
     private
 
-    require 'json'
-
-    def convert(value, schema)
+    def convert(value, schema) # rubocop:disable Metrics/*
       check_supported!(schema)
       return if value.nil?
       return value if schema.nil?
@@ -57,7 +55,7 @@ module OpenapiParameters
       end
     end
 
-    REF = '$ref'.freeze
+    REF = '$ref'
     private_constant :REF
 
     def check_supported!(schema)

data/lib/openapi_parameters/parameter.rb

@@ -86,11 +86,10 @@ module OpenapiParameters
     }.freeze
     private_constant :DEFAULT_STYLE
 
-
     VALID_LOCATIONS = Set.new(%w[query header path cookie]).freeze
     private_constant :VALID_LOCATIONS
 
-    REF = '$ref'.freeze
+    REF = '$ref'
     private_constant :REF
 
     def check_supported!(definition)

data/lib/openapi_parameters/path.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'uri_template'
+require 'rack'
 
 module OpenapiParameters
   # Parses OpenAPI path parameters from path template strings and the request path.
@@ -8,65 +8,67 @@ module OpenapiParameters
     # @param parameters [Array<Hash>] The OpenAPI path parameters.
     # @param path [String] The OpenAPI path template string.
     # @param convert [Boolean] Whether to convert the values to the correct type.
-    def initialize(parameters, path, convert: true)
+    def initialize(parameters, convert: true)
       @parameters = parameters
-      @path = path
       @convert = convert
     end
 
     attr_reader :parameters, :path
 
-    def unpack(path_info)
-      parsed_path = URITemplate.new(url_template).extract(path_info) || {}
-      parameters.each_with_object(parsed_path) do |param, result|
+    def unpack(path_params)
+      parameters.each_with_object({}) do |param, result|
         parameter = Parameter.new(param)
-        next unless parsed_path.key?(parameter.name)
+        next unless path_params.key?(parameter.name)
 
         result[parameter.name] = catch :skip do
-          value = unpack_parameter(parameter, result)
+          value = unpack_parameter(parameter, path_params)
           @convert ? Converter.call(value, parameter.schema) : value
         end
       end
     end
 
+    private
+
     def unpack_parameter(parameter, parsed_path)
       value = parsed_path[parameter.name]
-      if parameter.object? && value.is_a?(Array)
-        throw :skip, value if value.length.odd?
-        return Hash[*value]
-      end
-      value
+      return value if parameter.primitive? || value.nil?
+      return unpack_array(parameter, value) if parameter.array?
+      return unpack_object(parameter, value) if parameter.object?
     end
 
-    def url_template
-      @url_template ||=
-        begin
-          path = @path.dup
-          parameters.each do |p|
-            param = Parameter.new(p)
-            next unless param.array? || param.object?
-
-            path.gsub!(
-              "{#{param.name}}",
-              "{#{operator(param)}#{param.name}#{modifier(param)}}"
-            )
-          end
-          path
-        end
-    end
+    def unpack_array(parameter, value)
+      return value if value.empty?
+      return unpack_matrix(parameter, value) if parameter.style == 'matrix'
 
-    private
+      value = value[1..] if PREFIXED.key?(parameter.style)
+      value.split(ARRAY_DELIMITER[parameter.style])
+    end
 
-    LIST_OPS = { 'simple' => nil, 'label' => '.', 'matrix' => ';' }.freeze
-    private_constant :LIST_OPS
+    def unpack_matrix(parameter, value)
+      result = Rack::Utils.parse_query(value, ';')[parameter.name]
+      return result if parameter.explode?
 
-    def operator(param)
-      LIST_OPS[param.style]
+      result.split(',')
     end
 
-    def modifier(param)
-      return '*' if param.explode?
-      return if param.style == 'matrix' && !param.explode?
+    def unpack_object(parameter, value)
+      return Rack::Utils.parse_query(value, ',') if parameter.explode?
+
+      array = unpack_array(parameter, value)
+      throw :skip, value if array.length.odd?
+
+      Hash[*array]
     end
+
+    PREFIXED = {
+      'label' => '.',
+      'matrix' => ';'
+    }.freeze
+
+    ARRAY_DELIMITER = {
+      'label' => '.',
+      'simple' => ','
+    }.freeze
+    private_constant :ARRAY_DELIMITER
   end
 end

data/lib/openapi_parameters/version.rb

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

data/openapi_parameters.gemspec

@@ -38,7 +38,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rack', '>= 2.2'
-  spec.add_dependency 'uri_template', '>= 0.7', '< 2.0'
   spec.add_dependency 'zeitwerk', '~> 2.6'
 
   # For more information and examples about making a new gem, check out our

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_parameters
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andreas Haller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-25 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,26 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: uri_template
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement