reynard 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95ca8eb7744c1550bfcf705a92d97331d9c558b08dec5f2369b166b285b38edc
-  data.tar.gz: a140a0dbe5f74c95f43d2aa785dd3c96a322eab2893b2d8a629abd3b9859724e
+  metadata.gz: bb3f70f5fd68cbe19747d08687715165595d29a6b81da3329a975cac30bd3cbe
+  data.tar.gz: 73020e57c19507af7ac13b9bc509d3a4b7ac3ae9b74866d7f783cc816436039f
 SHA512:
-  metadata.gz: 77148ca6897e1e7b0479348cfe536ff94afc5c1741b6fe59afea7940b442d7c46a71914868f572f3588b7d85d95f38446bd8d28885a22a032c91a86e71e3da28
-  data.tar.gz: eab59f1738c99af0f2c8fba6a4fb09f15a5a26f31f86de91125d9f299d2d50844060bd3c13db33b260f267a82e269175e0c69d2cdeb4f32d397e99bca74e9694
+  metadata.gz: d5289ec587b945a0a858537569a4543e9bbfb3daa6dcb8e11cc409d620b89c1d85406d4a1fa0d20dcccc4c00eddcc6ff4b03f5ae24feff865f4cb62661f09638
+  data.tar.gz: af30bf905849a2589e091b0b9655e52375db08ea00f0b28365029900b4101c5d4b94822b30a17b3a1b8e35329886b61cf857fa6d8de1ff6a16fd56ca0dc2a904

data/lib/reynard/http/response.rb

@@ -46,7 +46,7 @@ class Reynard
 
       def build_object_without_media_type
         # Try to parse the response as JSON and give up otherwise.
-        OpenStruct.new(MultiJson.load(@http_response.body))
+        Reynard::Model.new(MultiJson.load(@http_response.body))
       rescue StandardError
         @http_response.body
       end

data/lib/reynard/object_builder.rb

@@ -15,7 +15,7 @@ class Reynard
       if @media_type.schema_name
         self.class.model_class(@media_type.schema_name, @schema.object_type)
       else
-        OpenStruct
+        Reynard::Model
       end
     end
 
@@ -23,7 +23,7 @@ class Reynard
       if @schema.item_schema_name
         self.class.model_class(@schema.item_schema_name, 'object')
       else
-        OpenStruct
+        Reynard::Model
       end
     end
 

data/lib/reynard/specification.rb

@@ -5,6 +5,8 @@ require 'rack'
 class Reynard
   # Wraps the YAML representation of an OpenAPI specification.
   class Specification
+    VERBS = %w[get put post delete options head patch trace].freeze
+
     def initialize(filename:)
       @filename = filename
       @data = read
@@ -32,7 +34,15 @@ class Reynard
     def build_grouped_params(operation_node, params)
       return {} unless params
 
-      GroupedParameters.new(dig(*operation_node, 'parameters'), params).to_h
+      GroupedParameters.new(
+        [
+          # Parameters can be shared between methods on a path or be specific to an operation. The
+          # parameters on the operation level override those at the path level.
+          dig(*operation_node, 'parameters'),
+          dig(*operation_node[..-2], 'parameters')
+        ].compact.flatten,
+        params
+      ).to_h
     end
 
     # Returns a serialized body instance to serialize a request body and figure out the request
@@ -43,7 +53,7 @@ class Reynard
 
     def operation(operation_name)
       dig('paths').each do |path, operations|
-        operations.each do |verb, operation|
+        operations.slice(*VERBS).each do |verb, operation|
           return Operation.new(node: ['paths', path, verb]) if operation_name == operation['operationId']
         end
       end

data/lib/reynard/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Reynard
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reynard
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Manfred Stienstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json