clientele 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f931acbaba3e45fdd2a8d439bd83b3b634ad4ce5
-  data.tar.gz: 88740b5de27c38468065f86137e3f13324d244ba
+  metadata.gz: 6582c99553295f93676db28a306f47c12a618c24
+  data.tar.gz: 981a484ad7dda1988ec60df5a2cd1c6a1f82d992
 SHA512:
-  metadata.gz: ea94dc080c1fb7e8008dd4d6a53b50d411a3a6f2aa7661f1d93eda728a0f2cf75feb6396ec7b30083b16d02cc7809659070fb8b10b3994aff41b4997791c4c39
-  data.tar.gz: 9778ad711a7e4ea3058bfea8560941ff08c050224760cca1ec27b33305dc74a5a667fec8e6e45691b0ee80f89141d00304025c428eac8f2e3f0d46f87f6c5f3b
+  metadata.gz: f63be792b186af675a00945ff1e999813dfabfd4e8c6bbcf09a98f901b2ae8081971061a4da5adb29f74fd6764c0d58c445048ae062c7c9db78b534d4eba1f94
+  data.tar.gz: 7524c40b6373d57b3745e423f5fd9afead437495fab9d5356b580b33c54a80a6a445358caca7df0b2dafac32303f683b80c12a676847a6125db131f9c0983767

data/lib/clientele/api.rb

@@ -44,6 +44,10 @@ module Clientele
         self.resources = resources.merge(klass.method_name.to_sym => klass)
       end
 
+      def has_resource?(resource)
+        resources.keys.include? resource.to_s
+      end
+
       def reset_global_client!
         @client = nil
       end

data/lib/clientele/request.rb

@@ -74,8 +74,6 @@ module Clientele
       )
     end
 
-    def paginateable?; false; end
-
   private
 
     def result
@@ -98,7 +96,7 @@ module Clientele
         conn.request  :url_encoded
 
         conn.response :rashify
-        conn.response :logger
+        conn.response :logger, options[:logger], bodies: true
         conn.response :json, content_type: options[:hashify_content_type], preserve_raw: true
 
         conn.adapter options[:adapter] if options[:adapter]

data/lib/clientele/request_builder.rb

@@ -6,7 +6,6 @@ module Clientele
     include Clientele::Utils
     include Enumerable
     attr_accessor :stack, :client
-    alias_method :to_a, :stack
 
     def initialize(*request_components, client: API.client)
       @stack = request_components.flatten
@@ -52,28 +51,44 @@ module Clientele
       merge_paths(stack.map(&:path))
     end
 
-    def paginateable?; false; end
-
   private
 
     def method_missing(method_name, *args, &block)
-      if stack.last.respond_to? method_name, false
-        tap { |builder| builder.stack = builder.stack[0..-2] << builder.stack.last.send(method_name, *args, &block) }
-      elsif client.resources.keys.include? method_name.to_s
-        tap { |builder| builder.stack << client.resources[method_name.to_s] }
-      elsif stack.last.paginateable? and enumberable_methods.include? method_name
-        stack.last.send :each, build, &block
+      if chain.respond_to? method_name, :public
+        chain_method method_name, *args, &block
+      elsif client.has_resource? method_name
+        chain_resource method_name
+      elsif should_paginate? method_name
+        chain.send :each, build, &block
       else; super; end
     end
 
     def respond_to_missing?(method_name, include_private=false)
-      stack.last.respond_to?(method_name, include_private) \
-        or API::resources.keys.include?(method_name) \
+      chain.respond_to? method_name, :public \
+        or client.has_resource? method_name \
+        or should_paginate? method_name \
         or super
     end
 
+    def chain
+      stack.last
+    end
+
+    def chain_method(method_name, *args, &block)
+      stack << stack.pop.send(method_name, *args, &block) and self
+    end
+
+    def chain_resource(resource_name)
+      stack << client.resources[method_name.to_s] and self
+    end
+
+    def should_paginate?(method_name)
+      chain.instance_variable_get :@paginateable \
+        and enumberable_methods.include? method_name
+    end
+
     def enumberable_methods
-      Enumerable.instance_methods - Module.instance_methods
+      Enumerable.instance_methods - Module.instance_methods << :each
     end
 
   end

data/lib/clientele/resource.rb

@@ -66,6 +66,10 @@ module Clientele
         @nested_plural_key || plural_key
       end
 
+      def nested_plural_key
+        @nested_plural_key || plural_key
+      end
+
       def build(data, client: nil, response: nil)
         new(
           catch(:build) do
@@ -89,8 +93,6 @@ module Clientele
         end
       end
 
-      def paginateable?; false; end
-
     private
 
       def inherited(base)

data/lib/clientele/resource/pagination.rb

@@ -23,16 +23,16 @@ module Clientele
         Proc.new do
 
           def next_page(request)
-            request.query[:page] ||= 0
+            request.query[:page] ||= 1
             request.query[:page]  += 1
           end
 
-          def total(response)
-            response.headers.fetch('x-total-count', Float::INFINITY).to_f
+          def total(result)
+            Integer(result.response.headers['x-total-count']) or Float::INFINITY
           end
 
-          def pages(response)
-            response
+          def pages(result)
+            result
           end
 
         end
@@ -40,7 +40,7 @@ module Clientele
 
       module Iterator
 
-        def paginateable?; true; end
+        @paginateable = true
 
         def each(request = self.to_request)
           return enum_for(:each, request) unless block_given?
@@ -50,9 +50,10 @@ module Clientele
 
           until counter == total(current_response) do
             if pages(current_response).empty?
-              current_response = request.tap do |builder|
+              current_response = request.tap do |request|
                 next_page(request)
               end.call
+
             else
               counter +=1
               yield pages(current_response).shift

data/lib/clientele/version.rb

@@ -1,3 +1,3 @@
 module Clientele
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clientele
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Chris Keele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday