clientele 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe8ff228c3ad2cc5110ea5c04c4e2d8ef5f92009
-  data.tar.gz: b3074fad509bd6cc2984ab69fb04a71908e0b570
+  metadata.gz: 45e24ef28f790a89e16cb53f0c44c4fc9176b539
+  data.tar.gz: 5b257efae30faacb896f40d135fa19bd085ff7a8
 SHA512:
-  metadata.gz: e31ad4f9101ed1f39e614948be25f7b115bd2f4c34a0bb33cb4378e0a47af29ed0297bf5f74fbadd509eda4e5df1e182ec45f4294aed8897de22e955d2d91f18
-  data.tar.gz: 807e1c399c6b41d3429ab14e5ad2978d488d0979ad79aaf3cb8f1a0d287193cc5c903bd2fab69e49fe43f5e697f128493d06280d1be32890038cb50faa1a12ed
+  metadata.gz: 0dde13065d7d012d0ab9650baaaba73379bba2572629a97ee3f26efff0f3292f7f99c6fa4dfe8ce66b9f450fed2cff2e5c01fad6e333686ae4a82390c9f1ed88
+  data.tar.gz: b2889a68bc5cc46834faa32fcd40cf2477f9882c1855648c4096f4ce4c3e3763ceb4d84456ac40a0bbc38b303d8e982fdc92c0c50ca111c79236f68500db45b6

data/lib/clientele/api.rb

@@ -7,6 +7,7 @@ require 'clientele/configuration'
 require 'clientele/request_builder'
 require 'clientele/request'
 require 'clientele/resource'
+require 'clientele/response'
 
 module Clientele
   class API
@@ -18,7 +19,7 @@ module Clientele
     def_delegator :configuration, :logger
 
     class_attribute :resources, instance_predicate: false
-    self.resources = {}
+    self.resources = Hashie::Rash.new
 
     class << self
 
@@ -39,9 +40,18 @@ module Clientele
       end
 
       def resource(klass)
+        klass.client = self
         self.resources = resources.merge(klass.method_name.to_sym => klass)
       end
 
+      def reset_global_client!
+        @client = nil
+      end
+
+      def reconfigure_global_client!(opts={})
+        reset_global_client! and client(opts)
+      end
+
     private
 
       def autoconfigure!
@@ -68,6 +78,8 @@ module Clientele
       self.configuration.load_hash opts
     end
 
+    def client; self; end
+
   private
 
     def respond_to_missing?(method_name, include_private=false)

data/lib/clientele/request.rb

@@ -5,12 +5,25 @@ require 'faraday_middleware'
 require 'rash'
 
 require 'clientele/utils'
+require 'clientele/response'
 
 module Clientele
-  class Request < Struct.new(:verb, :path, :query, :body, :headers, :options, :callback, :resource)
+  class Request < Struct.new(*%i[
+      verb
+      path
+      query
+      body
+      headers
+      options
+      callback
+      resource
+      client
+    ])
+
     include Clientele::Utils
 
-    VERBS = %i[get post put patch delete]
+    VERBS = Faraday::Connection::METHODS
+
     VERBS.each do |verb|
       define_singleton_method verb do |path = '', opts = {}, &callback|
         new(
@@ -43,7 +56,8 @@ module Clientele
     end
 
     def call
-      callback ? callback.call(response) : response
+      options.deep_merge! client.configuration.to_hash if client
+      callback ? callback.call(result) : result
     end
 
     def + other
@@ -56,11 +70,18 @@ module Clientele
         options:  options.merge(other.options),
         callback: other.callback || callback,
         resource: other.resource || resource,
+        client:   client || other.client,
       )
     end
 
+    def paginateable?; false; end
+
   private
 
+    def result
+      Response.new response, client: client, resource: resource
+    end
+
     def response
       faraday_client.send(verb, ensure_trailing_slash(path)) do |request|
         request.headers = options.fetch(:headers, {}).merge(headers)
@@ -80,7 +101,7 @@ module Clientele
         conn.response :logger
         conn.response :json, content_type: options[:hashify_content_type], preserve_raw: true
 
-        conn.adapter options[:adapter]
+        conn.adapter options[:adapter] if options[:adapter]
       end
     end
 
@@ -95,6 +116,7 @@ module Clientele
           options:  {},
           callback: nil,
           resource: nil,
+          client:   nil,
         }
       end
     end

data/lib/clientele/request_builder.rb

@@ -20,7 +20,7 @@ module Clientele
   protected
 
     def build
-      stack.map(&:to_request).inject(:+).to_request(client.configuration.to_hash)
+      stack.map(&:to_request).inject(:+).to_request(client: client)
     end
 
     # Compare values only, class doesn't matter
@@ -52,6 +52,8 @@ module Clientele
       merge_paths(stack.map(&:path))
     end
 
+    def paginateable?; false; end
+
   private
 
     def method_missing(method_name, *args, &block)
@@ -59,8 +61,8 @@ module Clientele
         tap { |builder| builder.stack = builder.stack[0..-2] << builder.stack.last.send(method_name, *args, &block) }
       elsif client.resources.keys.include? method_name
         tap { |builder| builder.stack << client.resources[method_name] }
-      elsif stack.last.respond_to? :each_with_builder and method_name == :each
-        stack.last.each_with_builder(self, &block)
+      elsif stack.last.paginateable? and enumberable_methods.include? method_name
+        stack.last.send :each, build, &block
       else; super; end
     end
 
@@ -70,5 +72,9 @@ module Clientele
         or super
     end
 
+    def enumberable_methods
+      Enumerable.instance_methods - Module.instance_methods
+    end
+
   end
 end

data/lib/clientele/resource/pagination.rb

@@ -1,11 +1,12 @@
 module Clientele
-  class Resource
+  class Resource < SimpleDelegator
     module Pagination
 
       def paginate(method_name, &implementation)
         mixin = Module.new do
            define_method method_name do |*args, &block|
             super(*args, &block).tap do |request|
+              request.extend(Enumerable) unless request.kind_of? Enumerable
               request.extend(Iterator)
               request.class_eval(&default_implementation)
               request.class_eval(&implementation) if implementation
@@ -31,7 +32,7 @@ module Clientele
           end
 
           def pages(response)
-            response.body.values.first
+            response
           end
 
         end
@@ -39,16 +40,18 @@ module Clientele
 
       module Iterator
 
-        def each_with_builder(builder)
-          return enum_for(:each_with_builder) unless block_given?
+        def paginateable?; true; end
+
+        def each(request = self.to_request)
+          return enum_for(:each, request) unless block_given?
 
           counter = 0
-          current_response = builder.call
+          current_response = request.call
 
           until counter == total(current_response) do
             if pages(current_response).empty?
-              current_response = builder.tap do |builder|
-                next_page(builder.stack.last)
+              current_response = request.tap do |builder|
+                next_page(request)
               end.call
             else
               counter +=1

data/lib/clientele/resource.rb

@@ -1,15 +1,19 @@
 require 'clientele/request'
+require 'clientele/response'
 require 'clientele/utils'
 require 'clientele/resource/pagination'
 
 require 'active_support/core_ext/string/inflections'
 
 module Clientele
-  class Resource
+  class Resource < SimpleDelegator
     include Clientele::Utils
 
     @subclasses = []
 
+    class_attribute :client, instance_predicate: false
+    self.client = nil
+
     class << self
       include Clientele::Utils
 
@@ -17,8 +21,12 @@ module Clientele
 
       Request::VERBS.each do |verb|
         define_method verb do |path_segment = '', opts = {}, &callback|
-          path_segment, opts = opts[:path].to_s, path_segment if path_segment.is_a? Hash
-          Request.new(opts.merge(path: merge_paths(path, path_segment || opts[:path].to_s)), &callback)
+          path_segment, opts = opts[:path].to_s, path_segment.merge(opts) if path_segment.is_a? Hash
+          Request.new(opts.merge(
+            path: merge_paths(path, path_segment || opts[:path].to_s),
+            resource: self,
+            client: client.client
+          ), &callback)
         end
       end
 
@@ -26,8 +34,8 @@ module Clientele
         send verb, path, opts, &callback
       end
 
-      def to_request(options={}, &callback)
-        get options: options, &callback
+      def to_request(opts={}, &callback)
+        get opts, &callback
       end
 
       def default_path
@@ -42,6 +50,22 @@ module Clientele
         @method_name || path
       end
 
+      def build(data, client: nil)
+        if data.kind_of? Array
+          data.map do |dataset|
+            build dataset, client: client
+          end
+        elsif data.kind_of? Hash and data.keys.map(&:to_s).include? method_name.to_s
+          build data.send method_name, client: client
+        else
+          new(data).tap do |instance|
+            instance.instance_variable_set :@client, client if client
+          end
+        end
+      end
+
+      def paginateable?; false; end
+
     private
 
       def inherited(base)

data/lib/clientele/response.rb

@@ -0,0 +1,34 @@
+require 'delegate'
+
+require 'faraday/response'
+
+module Clientele
+
+  class Response < SimpleDelegator
+
+    attr_reader :response
+    def initialize(response, client: nil, resource: nil)
+      @response = response
+      super(
+        if resource
+          resource.build response.body, client: client
+        else
+          response.body
+        end
+      )
+    end
+
+    def respond_to_missing?(method_name, include_private=false)
+      @response.respond_to?(method_name, include_private) or super
+    end
+
+    def method_missing(method_name, *args, &block)
+      begin
+        super
+      rescue NoMethodError
+        @response.send method_name, *args, &block
+      end
+    end
+
+  end
+end

data/lib/clientele/version.rb

@@ -1,3 +1,3 @@
 module Clientele
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clientele
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Keele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -160,6 +160,7 @@ files:
 - lib/clientele/request_builder.rb
 - lib/clientele/resource.rb
 - lib/clientele/resource/pagination.rb
+- lib/clientele/response.rb
 - lib/clientele/utils.rb
 - lib/clientele/version.rb
 homepage: https://github.com/christhekeele/clientele