rakuten_web_service 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea05eb23e2ac23b7a3498d463d5ad258e83a02ac
-  data.tar.gz: bdcbfbceb2961c96a35bc83d4bf692b1ff40678a
+  metadata.gz: 447bd3f0214fb7725a8df7ce8f3394a410404b8c
+  data.tar.gz: 6f9ea9cb5b717c91fd354fa449d686e3b347b963
 SHA512:
-  metadata.gz: 319d83fdfd80b0510cb23c6a6003bcb32b57f30e886a7af6a58b4cb8309e91ef5caa637339842d6a2d45566d971ad24f6211df088d513fe3fa3936b2aa742963
-  data.tar.gz: 259b56dd3e38712a54ccc88a32c90eaf2de3f40e7f84e6e614f025eb76d4ebbc6932db664f53ccf08e8c6f357934a7e93797b0f5d44d4be78865018a4ef821d6
+  metadata.gz: 9047d70a6e4e987acca0e86960337060e08654d11334bef714807f3d61a1f038e937c9ac2b94ddec066be3dae7e357b61a8775b50085a96fdd5d3fd4ff856f48
+  data.tar.gz: 54cfc3085669aad2165f5d8de9c39e42efc9d10140026662dcee750ed2bb28e155a92ec30b517ca825a1857a289f5d7217e7cff82bb7545024c7dc35e18dba50

data/lib/rakuten_web_service/configuration.rb

@@ -1,6 +1,10 @@
 module RakutenWebService
   class Configuration
-    attr_accessor :application_id, :affiliate_id
+    attr_accessor :application_id, :affiliate_id, :max_retries
+
+    def initialize
+      @max_retries = 5
+    end
 
     def generate_parameters
       { :application_id => application_id, :affiliate_id => affiliate_id }

data/lib/rakuten_web_service/resource.rb

@@ -26,7 +26,7 @@ module RakutenWebService
       end
 
       def search(options)
-        SearchResult.new(options, self, client)
+        SearchResult.new(options, self)
       end
 
       def resource_name

data/lib/rakuten_web_service/search_result.rb

@@ -2,35 +2,24 @@ module RakutenWebService
   class SearchResult
     include Enumerable
 
-    def initialize(params, resource_class, client)
+    def initialize(params, resource_class)
       @params = params.dup
       @resource_class = resource_class
-      @client = client
+      @client = RakutenWebService::Client.new(@resource_class.endpoint)
     end
 
     def each
-      if @results 
-        @results.each do |item|
-          yield item
+      params = @params
+      response = query
+      begin
+        resources = @resource_class.parse_response(response.body)
+        resources.each do |resource|
+          yield resource
         end
-      else
-        @results = []
-        params = @params
-        response = query
-        begin
-          resources = @resource_class.parse_response(response.body)
-          resources.each do |resource|
-            yield resource
-            @results << resource
-          end
 
-          if response.body['page'] && response.body['page'] < response.body['pageCount']
-            response = query(params.merge('page' => response.body['page'] + 1))
-          else 
-            response = nil
-          end
-        end while(response) 
-      end
+        break unless has_next_page?
+        response = query(params.merge('page' => response.body['page'] + 1))
+      end while(response) 
     end
 
     def params
@@ -38,6 +27,10 @@ module RakutenWebService
       @params.dup 
     end
 
+    def has_next_page?
+      @response.body['page'] && @response.body['page'] < @response.body['pageCount']
+    end
+
     def order(options)
       new_params = @params.dup
       if options.is_a? Hash
@@ -54,12 +47,24 @@ module RakutenWebService
       else 
         raise ArgumentError, "Invalid Sort Option: #{options.inspect}"
       end
-      self.class.new(new_params, @resource_class, @client)
+      self.class.new(new_params, @resource_class)
     end
 
     private
     def query(params=nil)
-      @client.get(params || @params)
+      retries = RakutenWebService.configuration.max_retries
+      begin 
+        @response = @client.get(params || @params)
+      rescue RWS::TooManyRequests => e
+        if retries > 0
+          retries -= 1
+          sleep 1
+          retry
+        else
+          raise e
+        end
+      end
+      @response
     end
 
     def camelize(str)

data/lib/rakuten_web_service/version.rb

@@ -1,3 +1,3 @@
 module RakutenWebService
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.1".freeze
 end

data/spec/rakuten_web_service/ichiba/item_spec.rb

@@ -74,6 +74,23 @@ describe RakutenWebService::Ichiba::Item do
           expect(@second_request).to have_been_made.once
         end
       end
+
+      context 'When TooManyRequest error raised' do
+        let(:client) do 
+          c = double('client')
+          c.stub(:get).and_raise(RWS::TooManyRequests)
+          c
+        end
+
+        before do
+          @items.instance_variable_set('@client', client)
+        end
+
+        specify 'retries automatically after sleeping 1 sec' do
+          expect(@items).to receive(:sleep).with(1).exactly(5).times.and_return(*([nil] * 5))
+          expect { @items.first.name }.to raise_error(RakutenWebService::TooManyRequests)
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rakuten_web_service
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Tatsuya Sato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday