rakuten_web_service 1.12.0 → 1.13.0

data/lib/rakuten_web_service/books/genre.rb

@@ -5,7 +5,7 @@ require 'rakuten_web_service/genre'
 module RakutenWebService
   module Books
     class Genre < RakutenWebService::BaseGenre
-      set_resource_name 'books_genre'
+      self.resource_name = 'books_genre'
 
       endpoint 'https://app.rakuten.co.jp/services/api/BooksGenre/Search/20121128'
 

data/lib/rakuten_web_service/books/resource.rb

@@ -6,7 +6,7 @@ require 'rakuten_web_service/books/genre'
 module RakutenWebService
   module Books
     class Resource < RakutenWebService::Resource
-      set_parser do |response|
+      parser do |response|
         response['Items'].map { |item| new(item) }
       end
 

data/lib/rakuten_web_service/books/total.rb

@@ -7,7 +7,7 @@ module RakutenWebService
     class Total < Books::Resource
       endpoint 'https://app.rakuten.co.jp/services/api/BooksTotal/Search/20170404'
 
-      set_parser do |response|
+      parser do |response|
         response['Items'].map do |item|
           resource_class = find_resource_by_genre_id(item['booksGenreId'])
           resource_class.new(item)

data/lib/rakuten_web_service/client.rb

@@ -9,6 +9,8 @@ require 'rakuten_web_service/error'
 
 module RakutenWebService
   class Client
+    USER_AGENT = "RakutenWebService SDK for Ruby v#{RWS::VERSION}(ruby-#{RUBY_VERSION} [#{RUBY_PLATFORM}])".freeze
+
     attr_reader :url
 
     def initialize(resource_class)
@@ -20,25 +22,23 @@ module RakutenWebService
       params = RakutenWebService.configuration.generate_parameters(params)
       response = request(url.path, params)
       body = JSON.parse(response.body)
-
-      if Net::HTTPSuccess === response
-        return RakutenWebService::Response.new(@resource_class, body)
+      unless response.is_a?(Net::HTTPSuccess)
+        raise RakutenWebService::Error.for(response)
       end
-      raise RakutenWebService::Error.repository[response.code.to_i], body['error_description']
+
+      RakutenWebService::Response.new(@resource_class, body)
     end
 
     private
 
     def request(path, params)
-      http = Net::HTTP.new(@url.host, @url.port)
+      http = Net::HTTP.new(url.host, url.port)
       http.use_ssl = true
       if RakutenWebService.configuration.debug_mode?
         http.set_debug_output($stderr)
       end
-      path = "#{path}?#{params.map { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')}"
-      header = {
-        'User-Agent' => "RakutenWebService SDK for Ruby v#{RWS::VERSION}(ruby-#{RUBY_VERSION} [#{RUBY_PLATFORM}])"
-      }
+      path = "#{path}?#{URI.encode_www_form(params)}"
+      header = { 'User-Agent' => USER_AGENT }
       http.get(path, header)
     end
   end

data/lib/rakuten_web_service/error.rb

@@ -6,6 +6,11 @@ module RakutenWebService
       repository[status_code] = error
     end
 
+    def self.for(response)
+      error_class = repository[response.code.to_i]
+      error_class.new(JSON.parse(response.body)['error_description'])
+    end
+
     def self.repository
       @repository ||= {}
     end

data/lib/rakuten_web_service/genre.rb

@@ -7,7 +7,7 @@ module RakutenWebService
     def self.inherited(klass)
       super
 
-      klass.set_parser do |response|
+      klass.parser do |response|
         current = response['current']
         %w[children parents brothers].each do |type|
           elements = Array(response[type]).map { |e| klass.new(e) }

data/lib/rakuten_web_service/gora/course.rb

@@ -7,7 +7,7 @@ module RakutenWebService
     class Course < Resource
       endpoint 'https://app.rakuten.co.jp/services/api/Gora/GoraGolfCourseSearch/20170623'
 
-      set_parser do |response|
+      parser do |response|
         response['Items'].map { |item| new(item) }
       end
 

data/lib/rakuten_web_service/gora/course_detail.rb

@@ -13,7 +13,7 @@ module RakutenWebService
 
       endpoint 'https://app.rakuten.co.jp/services/api/Gora/GoraGolfCourseDetail/20170623'
 
-      set_parser do |response|
+      parser do |response|
         [new(response['Item'])]
       end
 

data/lib/rakuten_web_service/gora/plan.rb

@@ -7,7 +7,7 @@ module RakutenWebService
     class Plan < Resource
       endpoint 'https://app.rakuten.co.jp/services/api/Gora/GoraPlanSearch/20170623'
 
-      set_parser do |response|
+      parser do |response|
         response['Items'].map { |item| new(item) }
       end
 

data/lib/rakuten_web_service/ichiba/item.rb

@@ -17,7 +17,7 @@ module RakutenWebService
 
       endpoint 'https://app.rakuten.co.jp/services/api/IchibaItem/Search/20170706'
 
-      set_parser do |response|
+      parser do |response|
         response['Items'].map { |item| Item.new(item) }
       end
 

data/lib/rakuten_web_service/ichiba/product.rb

@@ -8,7 +8,7 @@ module RakutenWebService
     class Product < Resource
       endpoint 'https://app.rakuten.co.jp/services/api/Product/Search/20170426'
 
-      set_parser do |response|
+      parser do |response|
         (response['Products'] || []).map { |prod| Product.new(prod) }
       end
 

data/lib/rakuten_web_service/ichiba/ranking.rb

@@ -7,7 +7,7 @@ module RakutenWebService
     class RankingItem < RakutenWebService::Ichiba::Item
       endpoint 'https://app.rakuten.co.jp/services/api/IchibaItem/Ranking/20170628'
 
-      set_parser do |response|
+      parser do |response|
         response['Items'].map { |item| RankingItem.new(item) }
       end
 

data/lib/rakuten_web_service/ichiba/tag.rb

@@ -6,6 +6,11 @@ module RakutenWebService
   module Ichiba
     class Tag < Resource
       attribute :tagId, :tagName, :parentTagId
+
+      def search(params = {})
+        params = params.merge(tagId: id)
+        RakutenWebService::Ichiba::Item.search(params)
+      end
     end
   end
 end

data/lib/rakuten_web_service/ichiba/tag_group.rb

@@ -7,7 +7,7 @@ module RakutenWebService
     class TagGroup < Resource
       endpoint 'https://app.rakuten.co.jp/services/api/IchibaTag/Search/20140222'
 
-      set_parser do |response|
+      parser do |response|
         response['tagGroups'].map { |tag_group| TagGroup.new(tag_group) }
       end
 
@@ -15,11 +15,7 @@ module RakutenWebService
 
       def tags
         get_attribute('tags').map do |tag|
-          Tag.new(
-            'tagId' => tag['tagId'],
-            'tagName' => tag['tagName'],
-            'parentTagId' => tag['parentTagId']
-          )
+          Tag.new(tag)
         end
       end
     end

data/lib/rakuten_web_service/kobo/ebook.rb

@@ -16,7 +16,7 @@ module RakutenWebService
         :reviewCount, :reviewAverage,
         :koboGenreId
 
-      set_parser do |response|
+      parser do |response|
         response['Items'].map { |i| new(i) }
       end
 

data/lib/rakuten_web_service/kobo/genre.rb

@@ -5,7 +5,7 @@ require 'rakuten_web_service/genre'
 module RakutenWebService
   module Kobo
     class Genre < RakutenWebService::BaseGenre
-      set_resource_name :kobo_genre
+      self.resource_name = :kobo_genre
 
       root_id '101'
 

data/lib/rakuten_web_service/recipe.rb

@@ -15,7 +15,7 @@ module RakutenWebService
       :recipeIndication, :recipeCost,
       :recipePublishday, :rank
 
-    set_parser do |response|
+    parser do |response|
       response['result'].map { |r| Recipe.new(r) }
     end
 

data/lib/rakuten_web_service/recipe/category.rb

@@ -37,7 +37,9 @@ module RakutenWebService
 
       def parent_category
         return nil if parent_category_type.nil?
-        Recipe.categories(parent_category_type).find { |c| c.id.to_i == parent_category_id.to_i }
+        Recipe.categories(parent_category_type).find do |c|
+          c.id.to_i == parent_category_id.to_i
+        end
       end
 
       def absolute_category_id

data/lib/rakuten_web_service/resource.rb

@@ -12,6 +12,8 @@ module RakutenWebService
     using RakutenWebService::StringSupport
 
     class << self
+      attr_writer :resource_name
+
       def inherited(subclass)
         @@subclasses ||= []
         @@subclasses.push(subclass)
@@ -24,20 +26,11 @@ module RakutenWebService
       def attribute(*attribute_names)
         attribute_names.each do |attribute_name|
           attribute_name = attribute_name.to_s
-          method_name = attribute_name.to_snake
-          method_name = method_name.sub(/^#{resource_name}_(\w+)$/, '\1')
-
-          instance_eval do
-            define_method method_name do
-              get_attribute(attribute_name)
-            end
-          end
-          next if method_name !~ /(.+)_flag$/
-          instance_eval do
-            define_method "#{$1}?" do
-              get_attribute(attribute_name) == 1
-            end
-          end
+
+          define_getter_for_attribute(attribute_name)
+          next unless attribute_name.end_with?('Flag')
+
+          define_asking_method_for_attribute(attribute_name)
         end
       end
 
@@ -57,19 +50,36 @@ module RakutenWebService
         @resource_name ||= name.split('::').last.downcase
       end
 
-      def set_resource_name(name)
-        @resource_name = name
-      end
-
       def endpoint(url = nil)
         @endpoint = url || @endpoint
       end
 
-      def set_parser(&block)
+      def parser(&block)
         instance_eval do
           define_singleton_method :parse_response, block
         end
       end
+
+      private
+
+      def define_getter_for_attribute(attribute_name)
+        method_name = attribute_name.to_snake
+        method_name.sub!(/^#{resource_name}_(\w+)$/, '\1')
+
+        define_method method_name do
+          get_attribute(attribute_name)
+        end
+      end
+
+      def define_asking_method_for_attribute(attribute_name)
+        method_name = attribute_name.to_snake
+        method_name.sub!(/^#{resource_name}_(\w+)$/, '\1')
+        method_name.sub!(/(.+)_flag$/, '\1')
+
+        define_method "#{method_name}?" do
+          get_attribute(attribute_name) == 1
+        end
+      end
     end
 
     def initialize(params)
@@ -79,7 +89,6 @@ module RakutenWebService
 
     def [](key)
       camel_key = key.to_camel
-      # camel_key[0] = camel_key[0].downcase
       @params[key] || @params[camel_key]
     end
 

data/lib/rakuten_web_service/response.rb

@@ -33,6 +33,7 @@ module RakutenWebService
     def genre_information
       return unless @resource_class.respond_to?(:genre_class)
       return if self['GenreInformation'].empty?
+
       RWS::GenreInformation.new(self['GenreInformation'][0], @resource_class.genre_class)
     end
 
@@ -40,12 +41,12 @@ module RakutenWebService
       @resources ||= @resource_class.parse_response(@json)
     end
 
-    def has_next_page?
-      page && (not last_page?)
+    def next_page?
+      page && !last_page?
     end
 
-    def has_previous_page?
-      page && (not first_page?)
+    def previous_page?
+      page && !first_page?
     end
 
     def first_page?

data/lib/rakuten_web_service/search_result.rb

@@ -43,20 +43,19 @@ module RakutenWebService
 
     def order(options)
       new_params = params.dup
-      if options.is_a? Hash
-        key, sort_order = *options.to_a.last
-        key = key.to_s.to_camel
-        new_params[:sort] = case sort_order.to_s.downcase
-                            when 'desc'
-                              "-#{key}"
-                            when 'asc'
-                              "+#{key}"
-                            end
-      elsif options.to_s == 'standard'
+      if options.to_s == 'standard'
         new_params[:sort] = 'standard'
-      else
+        return self.class.new(new_params, @resource_class)
+      end
+      unless options.is_a? Hash
         raise ArgumentError, "Invalid Sort Option: #{options.inspect}"
       end
+
+      key, sort_order = *options.to_a.last
+      case sort_order.to_s.downcase
+      when 'desc' then new_params[:sort] = "-#{key}".to_camel
+      when 'asc' then new_params[:sort] = "+#{key}".to_camel
+      end
       self.class.new(new_params, @resource_class)
     end
 
@@ -69,16 +68,16 @@ module RakutenWebService
       @response ||= query
     end
 
-    def has_next_page?
-      response.has_next_page?
+    def next_page?
+      response.next_page?
     end
 
     def next_page
       search(page: response.page + 1)
     end
 
-    def has_previous_page?
-      response.has_previous_page?
+    def previous_page?
+      response.previous_page?
     end
 
     def previous_page

data/lib/rakuten_web_service/travel/area_class.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/travel/resource'
 
 module RakutenWebService
@@ -8,9 +10,9 @@ module RakutenWebService
       end
 
       def [](class_code)
-        LargeClass[class_code] or
-          MiddleClass[class_code] or
-          SmallClass[class_code] or
+        LargeClass[class_code] ||
+          MiddleClass[class_code] ||
+          SmallClass[class_code] ||
           DetailClass[class_code]
       end
       module_function :search, :[]
@@ -18,7 +20,7 @@ module RakutenWebService
       class Base < RakutenWebService::Travel::Resource
         endpoint 'https://app.rakuten.co.jp/services/api/Travel/GetAreaClass/20131024'
 
-        set_parser do |response|
+        parser do |response|
           response['areaClasses']['largeClasses'].map do |data|
             LargeClass.new(data)
           end
@@ -60,26 +62,17 @@ module RakutenWebService
 
         attr_reader :parent, :children
 
-        def initialize(data, parent = nil)
+        def initialize(class_data, parent = nil)
           @parent = parent
-          class_data = data
-          @params, @children = *(case class_data
-                                 when Array
-                                   class_data.first(2)
-                                 when Hash
-                                   [class_data, nil]
-                                 end)
-
-          if !children.nil? && !children.empty?
-            children_class = children.keys.first[/\A(\w*)Classes\Z/, 1]
-            class_name = "#{children_class}Classes"
-            @params[class_name] = children[class_name].map do |child_data|
-              Base.area_classes[children_class].new(child_data["#{children_class}Class"], self)
-            end
-            @children = @params[class_name]
-          else
-            @children = []
+          case class_data
+          when Array
+            @params = class_data.shift
+            @children = class_data.shift
+          when Hash
+            @params = class_data
+            @children = nil
           end
+          parse_children_attributes
         end
 
         def area_level
@@ -105,6 +98,19 @@ module RakutenWebService
 
           Hotel.search(params)
         end
+
+        private
+
+        def parse_children_attributes
+          return @children = [] if children.nil? || children.empty?
+
+          children_class = children.keys.first[/\A(\w*)Classes\Z/, 1]
+          class_name = "#{children_class}Classes"
+          params[class_name] = children[class_name].map do |child_data|
+            Base.area_classes[children_class].new(child_data["#{children_class}Class"], self)
+          end
+          @children = params[class_name]
+        end
       end
 
       class LargeClass < Base