reynard 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1655a999a92e83993f4fdba62a9eedc870b18ada0339278d1c899e24f087b3bc
-  data.tar.gz: 926420c57d99767386d9aea1ef50b5bda317ea437a11dc3646bf3a5cc8a902be
+  metadata.gz: 73e8e17f725539aac5739311c093ac8ff851eab5c9bc3016cdd3839b29cdcc8b
+  data.tar.gz: a8fc3ba0731ad45a5f92324d819d84b7bf5fb418d8f4eb3751b5a7b2814b6a19
 SHA512:
-  metadata.gz: 6c9834fae550aae2557a6833e4491eed9d426c9fdb5b6c2cf31ff5c9fe80569a00070affdfb76e9c90611400f959df5a7e377dfe906a813655e6b28bc3ced4ac
-  data.tar.gz: a22f676bb82b37d6bceb87028aeae10a78f2fd394cdef990eea7661842d1b0a2644ac20e5188f29730c62d54ab36498b1fe7112ebc1ffe872b3f3b6dfa848aff
+  metadata.gz: e6b03cde95bd0bf69a03f860d3eaa57bf9d39f1deb6c9abfd719d4fdbaec728f1c8d5a2485493e5b403cdd0b57a80784c3dd48c02eef5d957eaf7638cacf91b0
+  data.tar.gz: f56a52f52d041ce58b69e1d799072510131a4f471560a908b24bb1e01630ef1e971d07e1b88845fae298e90e1d9f6f6dc1ad7990375c35d9c0ae357c69644a0c

data/lib/reynard.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'net/http/persistent'
 require 'forwardable'
 require 'multi_json'
 require 'rack'
@@ -32,6 +33,14 @@ class Reynard
     @specification = Specification.new(filename: filename)
   end
 
+  def self.http
+    @http ||= begin
+      http = Net::HTTP::Persistent.new(name: 'Reynard')
+      http.debug_output = $stderr if ENV['DEBUG']
+      http
+    end
+  end
+
   private
 
   def build_context

data/lib/reynard/context.rb

@@ -53,7 +53,7 @@ class Reynard
       media_type = @specification.media_type(
         @request_context.operation.node,
         http_response.code,
-        http_response['Content-Type'].split(';').first
+        http_response.content_type
       )
       ObjectBuilder.new(
         media_type: media_type,

data/lib/reynard/http/request.rb

@@ -15,7 +15,7 @@ class Reynard
       end
 
       def perform
-        build_http.request(build_request)
+        Reynard.http.request(uri, build_request)
       end
 
       private
@@ -29,12 +29,6 @@ class Reynard
         end
       end
 
-      def build_http
-        http = Net::HTTP.new(uri.hostname, uri.port)
-        http.set_debug_output($stderr) if ENV['DEBUG']
-        http
-      end
-
       def build_http_get
         Net::HTTP::Get.new(uri, @request_context.headers)
       end

data/lib/reynard/model.rb

@@ -16,10 +16,14 @@ class Reynard
     # Until we can set accessors based on the schema
     def method_missing(attribute_name, *)
       instance_variable_get("@#{attribute_name}")
+    rescue NameError
+      raise NoMethodError, "undefined method `#{attribute_name}' for #{inspect}"
     end
 
     def respond_to_missing?(attribute_name, *)
-      !!instance_variable_get("@#{attribute_name}")
+      !instance_variable_get("@#{attribute_name}").nil?
+    rescue NameError
+      false
     end
   end
 end

data/lib/reynard/object_builder.rb

@@ -11,28 +11,52 @@ class Reynard
       @http_response = http_response
     end
 
-    # Object.const_set(@media_type.schema_name, Class.new(Reynard::Model))
     def object_class
       if @media_type.schema_name
-        self.class.model_class(@media_type.schema_name)
+        self.class.model_class(@media_type.schema_name, @schema.object_type)
+      else
+        OpenStruct
+      end
+    end
+
+    def item_object_class
+      if @schema.item_schema_name
+        self.class.model_class(@schema.item_schema_name, 'object')
       else
         OpenStruct
       end
     end
 
     def call
-      case @media_type.media_type
-      when 'application/json'
-        object_class.new(MultiJson.load(@http_response.body))
+      if @schema.object_type == 'array'
+        array = object_class.new
+        data.each { |attributes| array << item_object_class.new(attributes) }
+        array
       else
-        FailedRequest.new
+        object_class.new(data)
       end
     end
 
-    def self.model_class(name)
+    def data
+      @data ||= MultiJson.load(@http_response.body)
+    end
+
+    def self.model_class(name, object_type)
+      model_class_get(name) || model_class_set(name, object_type)
+    end
+
+    def self.model_class_get(name)
       Reynard::Models.const_get(name)
     rescue NameError
-      Reynard::Models.const_set(name, Class.new(Reynard::Model))
+      nil
+    end
+
+    def self.model_class_set(name, object_type)
+      if object_type == 'array'
+        Reynard::Models.const_set(name, Class.new(Array))
+      else
+        Reynard::Models.const_set(name, Class.new(Reynard::Model))
+      end
     end
   end
 end

data/lib/reynard/schema.rb

@@ -3,11 +3,12 @@
 class Reynard
   # Holds reference and object type for a schema in the API specification.
   class Schema
-    attr_reader :node, :object_type
+    attr_reader :node, :object_type, :item_schema_name
 
-    def initialize(node:, object_type:)
+    def initialize(node:, object_type:, item_schema_name:)
       @node = node
       @object_type = object_type
+      @item_schema_name = item_schema_name
     end
   end
 end

data/lib/reynard/specification.rb

@@ -45,7 +45,7 @@ class Reynard
     def media_type(operation_node, response_code, media_type)
       responses = dig(*operation_node, 'responses')
       response_code = responses.key?(response_code) ? response_code : 'default'
-      response = responses.dig(response_code, 'content', media_type)
+      response, media_type = media_type_response(responses, response_code, media_type)
       return unless response
 
       MediaType.new(
@@ -54,11 +54,29 @@ class Reynard
       )
     end
 
+    def media_type_response(responses, response_code, media_type)
+      responses.dig(response_code, 'content').each do |expression, response|
+        return response, expression if self.class.media_type_matches?(media_type, expression)
+      end
+      nil
+    end
+
     def schema(media_type_node)
       schema = dig(*media_type_node, 'schema')
       return unless schema
 
-      Schema.new(node: [*media_type_node, 'schema'], object_type: schema['type'])
+      Schema.new(
+        node: [*media_type_node, 'schema'],
+        object_type: schema['type'],
+        item_schema_name: item_schema_name(schema)
+      )
+    end
+
+    def self.media_type_matches?(media_type, expression)
+      return true unless media_type
+      return true if expression == media_type
+
+      false
     end
 
     private
@@ -89,6 +107,11 @@ class Reynard
       ref&.split('/')&.last
     end
 
+    def item_schema_name(schema)
+      ref = schema.dig('items', '$ref')
+      ref&.split('/')&.last
+    end
+
     def object_name(_schema)
       'Book'
     end

data/lib/reynard/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reynard
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Manfred Stienstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
     Reynard is an OpenAPI client for Ruby. It operates directly on the OpenAPI specification without
     the need to generate any source code.