clientele 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87bc7d61e47a39881cd03d0d2e1f4bb023bc6a77
-  data.tar.gz: ecf6d0bc7f9273140438fe915f7485bca663f489
+  metadata.gz: c007e157b3b34fbc7d0527566670837e910f33da
+  data.tar.gz: 7ed13ea38b32be707dee5ba56fe81a2166d33bae
 SHA512:
-  metadata.gz: fcd2499a0aa2d47f34b52129cc3db141be7012ef5c9607ed96c482b2f4a2a81e74518668beae10e771e6ac5c5981a05338b3c92ecfee3e081c7f2a286545ba15
-  data.tar.gz: 4eb4de1043f19967b2197df9e13977122f0ef1a0ed2bbba374925c288e8b760f825d747090a7384bcacc1b1971e087c6d96ea45a033afdf9f093f81918975a15
+  metadata.gz: 80785216d87f2da664a61cf762f22a788d7da55de2c09b762f7f2f369b0c011fa940a1f5cc18c801c988d87a71cb3025dab776125e7dcd441c6f3311bbc30ac9
+  data.tar.gz: 30d5360b2d15203a67692f1f43b8ffeaea271572ea7aee16c3c39158efba48f16fd90010cfc12ad339344ef033188d5a158c115584aa12cfd1fda2fdcf6d8a10

data/lib/clientele/request.rb

@@ -79,11 +79,11 @@ module Clientele
   private
 
     def result
-      Response.new response, client: client, resource: resource
+      Response.build(response, resource, client)
     end
 
     def response
-      faraday_client.send(verb, ensure_trailing_slash(path)) do |request|
+      @response ||= faraday_client.send(verb, ensure_trailing_slash(path)) do |request|
         request.headers = options.fetch(:headers, {}).merge(headers)
         request.params  = deep_camelize_keys(query)
         request.body    = JSON.dump(deep_camelize_keys(body))

data/lib/clientele/resource.rb

@@ -66,19 +66,26 @@ module Clientele
         @nested_plural_key || plural_key
       end
 
-      def build(data, client: nil, klass: nil)
-        if (klass or data).kind_of? Array
-          data.map do |dataset|
-            build dataset, client: client
-          end
-        elsif (klass or data).kind_of? Hash and data.keys.map(&:to_s).include? result_key.to_s
-          build data.send result_key, client: client
-        elsif (klass or data).kind_of? Hash and data.keys.map(&:to_s).include? plural_key.to_s
-          build data.send plural_key, client: client
-        else
-          new(data).tap do |instance|
-            instance.instance_variable_set :@client, client if client
+      def build(data, client: nil, response: nil)
+        new(
+          catch(:build) do
+            if data.kind_of? Hash
+              if data.keys.map(&:to_s).include? plural_key.to_s
+                build data.fetch(plural_key), client: client, response: response
+              elsif data.keys.map(&:to_s).include? result_key.to_s
+                throw :build, data.fetch(result_key)
+              else
+                throw :build, data
+              end
+            elsif data.respond_to? :map
+              data.map do |dataset|
+                build dataset, client: client, response: response
+              end
+            end
           end
+        ).tap do |instance|
+          instance.instance_variable_set :@client, client if client
+          instance.instance_variable_set :@response, response if response
         end
       end
 
@@ -92,5 +99,7 @@ module Clientele
 
     end
 
+    attr_accessor :response
+
   end
 end

data/lib/clientele/response.rb

@@ -6,28 +6,19 @@ module Clientele
 
   class Response < SimpleDelegator
 
-    attr_reader :response
-    def initialize(response, client: nil, resource: nil)
-      @response = response
-      super(
+    class << self
+      def build(response, resource, client)
         if resource
-          resource.build response.body, client: client, klass: response.body.class
+          resource.build(response.body, response: response, client: client)
         else
-          response.body
+          new response
         end
-      )
-    end
-
-    def respond_to_missing?(method_name, include_private=false)
-      @response.respond_to?(method_name, include_private) or super
+      end
     end
 
-    def method_missing(method_name, *args, &block)
-      begin
-        super
-      rescue NoMethodError
-        @response.send method_name, *args, &block
-      end
+    attr_reader :response
+    def initialize(response)
+      super @response = response
     end
 
   end

data/lib/clientele/version.rb

@@ -1,3 +1,3 @@
 module Clientele
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clientele
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Chris Keele