rakuten_web_service 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7bf83276b1e14274a89e838b6e2905d7624966e
-  data.tar.gz: 47dc5c14d88984c92a574541f2e6a80c80ff86cd
+  metadata.gz: 1e64f47f1cefec66d96a51660fc6dae7bdc21d8b
+  data.tar.gz: 2d5f161d80bb6c3430a4e49f3d5ee24800f2e2eb
 SHA512:
-  metadata.gz: cdf6daa1da7d1dc16c6f7cc5dcf3f66d8e8a22473e7a67bbe064eb3eada58a953aa58bb82f576ff10b3ee10ba4346248798a875448b77e3fb0cfee003866c7bd
-  data.tar.gz: 3e92ef4587d84890c9556140d40cda7d6709d4feb0f2ae377130610e35eeac67e4f5bf6bfd5c41aaebf18f79cd4bd4f59dd5cb03bb5a76ea11425814259c26b4
+  metadata.gz: 715943fd5be6a9f8444802de80c8a76fd44ac88b95edb314812ad0daeaf326c324992c9471967191dda865dec13b34eb541037becdb4ac1cc9f25c8b6df06644
+  data.tar.gz: 28db488e9f73ff71be9690669107181aa8ed36757688754ce7843d3ab3cb4dd492a4cf4a6f9aeda08a2a16ec6d6ccd806fff464f544bdf29f76f3a8a5ccc8c9a

data/lib/rakuten_web_service/client.rb

@@ -1,6 +1,8 @@
 require 'faraday'
 require 'faraday_middleware'
 
+require 'rakuten_web_service/response'
+
 module RakutenWebService
   class WrongParameter < StandardError; end
   class NotFound < StandardError; end
@@ -11,8 +13,9 @@ module RakutenWebService
   class Client
     attr_reader :url, :path
 
-    def initialize(endpoint)
-      url = URI.parse(endpoint)
+    def initialize(resource_class)
+      @resource_class = resource_class
+      url = URI.parse(@resource_class.endpoint)
       @url = "#{url.scheme}://#{url.host}"
       @path = url.path
     end
@@ -23,7 +26,7 @@ module RakutenWebService
       response = connection.get(path, query)
       case response.status
       when 200
-        return response
+        return RakutenWebService::Response.new(@resource_class, response.body)
       when 400
         raise WrongParameter, response.body['error_description']
       when 404

data/lib/rakuten_web_service/response.rb

@@ -0,0 +1,39 @@
+module RakutenWebService
+  class Response
+    include Enumerable
+
+    def initialize(resource_class, json)
+      @resource_class = resource_class
+      @json = json.dup
+    end
+
+    def [](key)
+      @json[key]
+    end
+
+    def each
+      resources.each do |resource|
+        yield resource
+      end
+    end
+
+    %w[count hits page first last carrier pageCount].each do |name|
+      method_name = name.gsub(/([a-z])([A-Z]{1})/) { "#{$1}_#{$2.downcase}" }
+      define_method method_name do
+        self[name]
+      end
+    end
+
+    def resources
+      @resources ||= @resource_class.parse_response(@json)
+    end
+
+    def has_next_page?
+      page && (not last_page?)
+    end
+
+    def last_page?
+      page >= page_count
+    end
+  end
+end

data/lib/rakuten_web_service/search_result.rb

@@ -5,26 +5,23 @@ module RakutenWebService
     def initialize(params, resource_class)
       @params = params.dup
       @resource_class = resource_class
-      @client = RakutenWebService::Client.new(@resource_class.endpoint)
+      @client = RakutenWebService::Client.new(resource_class)
     end
 
     def fetch_result
-      response = query
-      @resource_class.parse_response(response.body)
+      query
     end
 
     def each
       params = @params
       response = query
-      begin
-        resources = @resource_class.parse_response(response.body)
-        resources.each do |resource|
+      loop do
+        response.each do |resource|
           yield resource
         end
-
-        break unless has_next_page?
-        response = query(params.merge('page' => response.body['page'] + 1))
-      end while(response) 
+        break unless response.has_next_page?
+        response = query(params.merge('page' => response.page + 1))
+      end
     end
 
     def params
@@ -32,10 +29,6 @@ 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

data/lib/rakuten_web_service/version.rb

@@ -1,3 +1,3 @@
 module RakutenWebService
-  VERSION = "0.6.0".freeze
+  VERSION = "0.6.1".freeze
 end

data/spec/rakuten_web_service/client_spec.rb

@@ -3,7 +3,10 @@ require 'rakuten_web_service'
 
 describe RakutenWebService::Client do
   let(:endpoint) { 'http://api.example.com/resources' }
-  let(:client) { RakutenWebService::Client.new(endpoint) }
+  let(:resource_class) do
+    double('resource_class', endpoint: endpoint)
+  end
+  let(:client) { RakutenWebService::Client.new(resource_class) }
   let(:application_id) { 'default_application_id' }
   let(:affiliate_id) { 'default_affiliate_id' }
   let(:expected_query) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rakuten_web_service
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tatsuya Sato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -148,6 +148,7 @@ files:
 - lib/rakuten_web_service/kobo/ebook.rb
 - lib/rakuten_web_service/kobo/genre.rb
 - lib/rakuten_web_service/resource.rb
+- lib/rakuten_web_service/response.rb
 - lib/rakuten_web_service/search_result.rb
 - lib/rakuten_web_service/version.rb
 - rakuten_web_service.gemspec