esi 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1d7139866bf6408889132991fc7a0de63bdd024
-  data.tar.gz: 7876fa78a888c60ce74628b9e9f7e1fa19739b90
+  metadata.gz: ff611fd04267a5b4e29486f6d69f0f3894a23cd9
+  data.tar.gz: 6449c39160dbe9d1f35098e07a1167be92adf969
 SHA512:
-  metadata.gz: 2e775911db17e7679f86a21b526bd53bae9402c341258efb34f6691766fa027b03fdd3a8068ca73afeb243c958efaef927ebe28b4821de49d2597a5d379f35ea
-  data.tar.gz: 437dac54b79c67420cd0ff20dbd2294e642996c8549860970d0555b0bd01f6b65ffe14ec171b721919293dc37218e3459b19c9b20773220159efd37f7b026bef
+  metadata.gz: 0feccab7a6b84be7c6d1805c45e0d87c7dc7c3f121466ec87fdd98d91a33d56fe2f124b61f14b088d7224db74839b574cfa0eda40c930002915f5ac788e37f89
+  data.tar.gz: c6237a76a7d66b8e20d272526d50ade2c0324de9b996aaea60610ad319ec317d63a4ae904aba2146fb704aa3f1b40ea4254839772ddbfd488ad366ae5b6aa5d6

data/lib/esi/client.rb

@@ -53,23 +53,30 @@ module Esi
     end
 
     def request_paginated(call, &block)
-      items = []
+      response = nil
       page = 1
 
       ActiveSupport::Notifications.instrument('esi.client.request.paginated') do
         loop do
           call.page = page
-          response = request(call, &block)
-          break if response.data.blank?
-          items += response.data
+          page_response = request(call, &block)
+
+          if page_response.data.blank?
+            break
+          elsif response
+            response.merge(page_response)
+          else
+            response = page_response
+          end
+
           page += 1
         end
       end
 
-      items
+      response
     end
 
-    def request(call, url=nil, &block)
+    def request(call, &block)
       response = nil
       last_ex = nil
       options = { timeout: Esi.config.timeout }
@@ -128,10 +135,10 @@ module Esi
       if last_ex
         logger.error "Request failed with #{last_ex.class}"
         raise ApiRequestError.new(last_ex)
-      else
-        debug "Request successful"
       end
 
+      debug "Request successful"
+
       ActiveSupport::Notifications.instrument('esi.client.response.initialize') do
         response = Response.new(response)
       end

data/lib/esi/response.rb

@@ -4,32 +4,30 @@ module Esi
   class Response
     extend Forwardable
 
-    attr_reader :original_response, :json
+    attr_reader :original_response, :data
     def_delegators :original_response, :status, :body, :headers
     def_delegators :data, :each
 
     def initialize(response)
       @original_response = response
-      @json = MultiJson.load(body, symbolize_keys: true) rescue {}
-      @json = normalize_keys(@json) if @json.is_a?(Hash)
+      @data = normalize_results
     end
 
-    def data
-      @data ||= begin
-        if @json.is_a?(Array)
-          @json[0].is_a?(Hash) ? @json.map { |e| RecursiveOpenStruct.new(e, recurse_over_arrays: true) } : @json
-        else
-          RecursiveOpenStruct.new(@json, recurse_over_arrays: true)
-        end
-      end
+    def merge(other_response)
+      @data += other_response.data
+      self
     end
 
-    def to_s
-      MultiJson.dump(json, pretty: true)
+    def to_json(pretty: true)
+      MultiJson.dump(data, pretty: pretty)
     end
 
     def cached_until
-      original_response.headers[:expires] ? Time.parse(original_response.headers[:expires]) : nil
+      @cached_until ||= headers[:expires] ? Time.parse(headers[:expires]) : nil
+    end
+
+    def response_json
+      @response_json ||= MultiJson.load(body, symbolize_keys: true) rescue {}
     end
 
     def method_missing(method, *args, &block)
@@ -42,9 +40,12 @@ module Esi
 
     private
 
-    def normalize_keys(data)
-      data.dup.each_key { |k| data[underscore(k).to_sym] = data.delete(k) }
-      data
+    def normalize_results
+      response_json.is_a?(Hash) ? normalize_entry(response_json) : response_json.map { |e| normalize_entry(e) }
+    end
+
+    def normalize_entry(entry)
+      entry.is_a?(Hash) ? RecursiveOpenStruct.new(entry.transform_keys { |k| underscore(k).to_sym }, recurse_over_arrays: true) : entry
     end
 
     def underscore(str)

data/lib/esi/version.rb

@@ -1,3 +1,3 @@
 module Esi
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esi
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Danny Hiemstra