rakuten_web_service 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c4169e0d70507985294102d0f0db8bed893ba62f
-  data.tar.gz: ba7ef71f07923fc35b68f0dbad9395027604fc6b
+SHA256:
+  metadata.gz: fd60bf746130b97cac7b59e6a529457183b6eae42f3eb595b64c4aa820b2bbcd
+  data.tar.gz: e773d058c29619d931bda28e656f7fe7cea63816905c56e20fa55c7a84662d49
 SHA512:
-  metadata.gz: c0207c56e46c0be2d36dcf352d210774cb0e809362b723e6ea974c318477013780efd6d6c00c678bfc522b8a8f7d1151d6235f7590b8eb8f7356a678f5dc8426
-  data.tar.gz: 99c58dea96689887906f615a08d01198c03b5a3ce212d671971d47be0dbea57296d73983724cbd591b4340a99eafe91f328ff57eb519c73c5725aaa0b0f28af5
+  metadata.gz: a68b23e18568d9e7cc60213b2fc881d02085966f809f7dd7e3e503e8c7404096ee46ea5120b2740ad896f4699a915cd57cf53af892ee17cb47aafc7944bb8031
+  data.tar.gz: ce2b779f0eddebd1c9246dc041bc277b84a3047e3428f7150ccfd2c60ecc204fa73b89817f31380e80d5c393e09a382cbf765569871912387f2153e2ba6cbf95

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.2.9
   - 2.3.6
   - 2.4.3
   - 2.5.0
@@ -27,8 +26,6 @@ matrix:
   allow_failures:
   - rvm: ruby-head
   exclude:
-  - rvm: 2.2.9
-    env: INTEGRATION=yes
   - rvm: 2.3.6
     env: INTEGRATION=yes
   - rvm: 2.4.3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v1.9.1 (2018/03/30)
+
+## Improvements
+
+* Use the magic comment to frozen all string literals.[#93](https://github.com/rakuten-ws/rws-ruby-sdk/pull/93)
+* Drop ruby 2.2 from supported ruby versions since it goes to the EOL. [#95](https://github.com/rakuten-ws/rws-ruby-sdk/pull/95)
+
 # v1.9.0 (2018/01/04)
 
 ## Enhancements

data/lib/rakuten_web_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakutenWebService; end
 RWS = RakutenWebService
 

data/lib/rakuten_web_service/all_proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakutenWebService
   class AllProxy
     include Enumerable

data/lib/rakuten_web_service/books.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/version'
 require 'rakuten_web_service/configuration'
 

data/lib/rakuten_web_service/books/book.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/books/resource'
 
 module RakutenWebService

data/lib/rakuten_web_service/books/cd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/books/resource'
 
 module RakutenWebService

data/lib/rakuten_web_service/books/dvd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/books/resource'
 
 module RakutenWebService

data/lib/rakuten_web_service/books/foreign_book.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/resource'
 
 module RakutenWebService

data/lib/rakuten_web_service/books/game.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/books/resource'
 
 module RakutenWebService

data/lib/rakuten_web_service/books/genre.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/genre'
 
 module RakutenWebService
@@ -11,9 +13,9 @@ module RakutenWebService
 
       root_id '000'
 
-      def search(params={})
-        params = params.merge(booksGenreId: self.id)
-        resource = Books::Resource.find_resource_by_genre_id(self.id)
+      def search(params = {})
+        params = params.merge(booksGenreId: id)
+        resource = Books::Resource.find_resource_by_genre_id(id)
         resource.search(params)
       end
     end

data/lib/rakuten_web_service/books/magazine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/books/resource'
 
 module RakutenWebService

data/lib/rakuten_web_service/books/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/resource'
 require 'rakuten_web_service/books/genre'
 
@@ -5,7 +7,7 @@ module RakutenWebService
   module Books
     class Resource < RakutenWebService::Resource
       set_parser do |response|
-        response['Items'].map { |item| self.new(item) }
+        response['Items'].map { |item| new(item) }
       end
 
       def self.find_resource_by_genre_id(genre_id)
@@ -25,7 +27,7 @@ module RakutenWebService
       end
 
       def genre
-        @genre ||= self.books_genre_id.split('/').map do |id|
+        @genre ||= books_genre_id.split('/').map do |id|
           Books::Genre.new(id)
         end
       end
@@ -34,10 +36,11 @@ module RakutenWebService
       def get_attribute(name)
         name = name.to_s
         update_params unless @params[name]
-        @params[name] 
+        @params[name]
       end
 
       private
+
       def update_params
         item = self.class.search(update_key => self[update_key]).first
         @params = item.params
@@ -48,6 +51,7 @@ module RakutenWebService
       end
 
       protected
+
       def params
         @params.dup
       end

data/lib/rakuten_web_service/books/software.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/books/resource'
 
 module RakutenWebService

data/lib/rakuten_web_service/books/total.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/books/resource'
 
 module RakutenWebService

data/lib/rakuten_web_service/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'net/http'
 require 'cgi'
@@ -21,12 +23,12 @@ module RakutenWebService
 
       if Net::HTTPSuccess === response
         return RakutenWebService::Response.new(@resource_class, body)
-      else
-        raise RakutenWebService::Error.repository[response.code.to_i], body['error_description']
       end
+      raise RakutenWebService::Error.repository[response.code.to_i], body['error_description']
     end
 
     private
+
     def request(path, params)
       http = Net::HTTP.new(@url.host, @url.port)
       http.use_ssl = true

data/lib/rakuten_web_service/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakutenWebService
   class Configuration
     attr_accessor :application_id, :affiliate_id, :max_retries, :debug
@@ -13,7 +15,7 @@ module RakutenWebService
     end
 
     def default_parameters
-      raise "Application ID is not defined" unless has_required_options?
+      raise 'Application ID is not defined' unless has_required_options?
       { application_id: application_id, affiliate_id: affiliate_id, format_version: '2' }
     end
 
@@ -22,10 +24,11 @@ module RakutenWebService
     end
 
     def debug_mode?
-      ENV.has_key?('RWS_SDK_DEBUG') || debug
+      ENV.key?('RWS_SDK_DEBUG') || debug
     end
 
     private
+
     def convert_snake_key_to_camel_key(params)
       params.inject({}) do |h, (k, v)|
         k = k.to_s.gsub(/([a-z]{1})_([a-z]{1})/) { "#{$1}#{$2.capitalize}" }
@@ -38,17 +41,15 @@ module RakutenWebService
   def configure(&block)
     @configuration ||= Configuration.new
     if block
-      if block.arity != 1
-        raise ArgumentError, 'Block is required to have one argument' 
-      end
-      block.call(@configuration)
+      raise ArgumentError, 'Block is required to have one argument' if block.arity != 1
+      yield @configuration
     end
-    return @configuration
+    @configuration
   end
 
   def configuration(&block)
-    $stderr.puts "Warning: RakutenWebService.configuration is deprecated. Use RakutenWebService.configure." if block_given?
-    self.configure(&block)
+    warn 'Warning: RakutenWebService.configuration is deprecated. Use RakutenWebService.configure.' if block_given?
+    configure(&block)
   end
 
   module_function :configure, :configuration

data/lib/rakuten_web_service/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakutenWebService
   class Error < StandardError
     def self.register(status_code, error)

data/lib/rakuten_web_service/genre.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/resource'
 
 module RakutenWebService
@@ -5,13 +7,10 @@ module RakutenWebService
     def self.inherited(klass)
       klass.set_parser do |response|
         current = response['current']
-        children = Array(response['children']).map { |child| klass.new(child) }
-        current.merge!('children' => children)
-        parents = Array(response['parents']).map { |parent| klass.new(parent) }
-        current.merge!('parents' => parents)
-        brothers = Array(response['brothers']).map { |brother| klass.new(brother) }
-        current.merge!('brothers' => brothers)
-
+        %w[children parents brothers].each do |type|
+          elements = Array(response[type]).map { |e| klass.new(e) }
+          current.merge!(type => elements)
+        end
         genre = klass.new(current)
         [genre]
       end
@@ -20,11 +19,8 @@ module RakutenWebService
     def self.new(params)
       case params
       when Integer, String
-        unless repository[params.to_s].nil?
-          self.new(repository[params.to_s])
-        else
-          search(genre_id_key => params.to_s).first
-        end
+        return new(repository[params.to_s]) unless repository[params.to_s].nil?
+        search(genre_id_key => params.to_s).first
       when Hash
         super
       end
@@ -34,16 +30,16 @@ module RakutenWebService
       :"#{resource_name}_id"
     end
 
-    def self.root_id(id=nil)
+    def self.root_id(id = nil)
       @root_id = id || @root_id
     end
 
     def self.root
-      self.new(root_id)
+      new(root_id)
     end
 
     def self.[](id)
-      self.new(repository[id.to_s] || id)
+      new(repository[id.to_s] || id)
     end
 
     def self.[]=(id, genre)
@@ -56,19 +52,19 @@ module RakutenWebService
 
     def initialize(params)
       super
-      self.class[self.id.to_s] = @params.reject { |k, _| k == 'itemCount' }
+      self.class[id.to_s] = @params.reject { |k, _| k == 'itemCount' }
     end
 
     def children
-      @params['children'] ||= self.class.search(self.class.genre_id_key => self.id).first.children
+      @params['children'] ||= self.class.search(self.class.genre_id_key => id).first.children
     end
 
     def brothers
-      @params['brothers'] ||= self.class.search(self.class.genre_id_key => self.id).first.brothers
+      @params['brothers'] ||= self.class.search(self.class.genre_id_key => id).first.brothers
     end
 
     def parents
-      @params['parents'] ||= self.class.search(self.class.genre_id_key => self.id).first.parents
+      @params['parents'] ||= self.class.search(self.class.genre_id_key => id).first.parents
     end
   end
 end

data/lib/rakuten_web_service/genre_information.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakutenWebService
   class GenreInformation
     attr_reader :parent, :current, :children

data/lib/rakuten_web_service/gora.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/gora/course'
 require 'rakuten_web_service/gora/course_detail'
 require 'rakuten_web_service/gora/plan'

data/lib/rakuten_web_service/gora/course.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/resource'
 
 module RakutenWebService
@@ -6,7 +8,7 @@ module RakutenWebService
       endpoint 'https://app.rakuten.co.jp/services/api/Gora/GoraGolfCourseSearch/20170623'
 
       set_parser do |response|
-        response['Items'].map { |item| self.new(item) }
+        response['Items'].map { |item| new(item) }
       end
 
       attribute :golfCourseId, :golfCourseName, :golfCourseAbbr, :golfCourseNameKana, :golfCourseCaption,

data/lib/rakuten_web_service/gora/course_detail.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/resource'
 
 module RakutenWebService
@@ -5,14 +7,14 @@ module RakutenWebService
     class CourseDetail < Resource
       class << self
         def find(golf_course_id)
-          search({golfCourseId: golf_course_id}).first
+          search(golfCourseId: golf_course_id).first
         end
       end
 
       endpoint 'https://app.rakuten.co.jp/services/api/Gora/GoraGolfCourseDetail/20170623'
 
       set_parser do |response|
-        [self.new(response['Item'])]
+        [new(response['Item'])]
       end
 
       attribute :carrier, :golfCourseId, :golfCourseName, :golfCourseAbbr, :golfCourseNameKana, :golfCourseCaption,
@@ -25,11 +27,11 @@ module RakutenWebService
                 :meal, :course, :costperformance, :distance, :fairway, :reserveCalUrl, :voiceUrl, :layoutUrl, :routeMapUrl
 
       def ratings
-        get_attribute('ratings').map {|rating| Rating.new(rating)}
+        get_attribute('ratings').map { |rating| Rating.new(rating) }
       end
 
       def new_plans
-        get_attribute('newPlans').map {|plan| Plan.new(plan)}
+        get_attribute('newPlans').map { |plan| Plan.new(plan) }
       end
 
       class Rating < Resource

data/lib/rakuten_web_service/gora/plan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/resource'
 
 module RakutenWebService
@@ -6,7 +8,7 @@ module RakutenWebService
       endpoint 'https://app.rakuten.co.jp/services/api/Gora/GoraPlanSearch/20170623'
 
       set_parser do |response|
-        response['Items'].map { |item| self.new(item) }
+        response['Items'].map { |item| new(item) }
       end
 
       attribute :golfCourseId, :golfCourseName, :golfCourseAbbr, :golfCourseNameKana, :golfCourseCaption,
@@ -14,7 +16,7 @@ module RakutenWebService
                 :golfCourseImageUrl, :evaluation
 
       def plan_info
-        get_attribute('planInfo').map {|plan| PlanInfo.new(plan['plan'])}
+        get_attribute('planInfo').map { |plan| PlanInfo.new(plan['plan']) }
       end
 
       class PlanInfo < Resource

data/lib/rakuten_web_service/ichiba.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/version'
 require 'rakuten_web_service/configuration'
 

data/lib/rakuten_web_service/ichiba/genre.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/genre'
 require 'rakuten_web_service/ichiba/ranking'
 require 'rakuten_web_service/ichiba/product'
@@ -11,13 +13,13 @@ module RakutenWebService
 
       root_id 0
 
-      def ranking(options={})
-        options = options.merge(genre_id: self.id)
+      def ranking(options = {})
+        options = options.merge(genre_id: id)
         RakutenWebService::Ichiba::RankingItem.search(options)
       end
 
-      def products(options={})
-        options = options.merge(genre_id: self.id)
+      def products(options = {})
+        options = options.merge(genre_id: id)
         RakutenWebService::Ichiba::Product.search(options)
       end
     end

data/lib/rakuten_web_service/ichiba/item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/resource'
 
 module RakutenWebService
@@ -35,16 +37,16 @@ module RakutenWebService
                 :genreId
 
       def genre
-        Genre.new(self.genre_id)
+        Genre.new(genre_id)
       end
 
       def shop
-        Shop.new({
-          'shopName' => self.shop_name,
-          'shopCode' => self.shop_code,
-          'shopUrl' => self.shop_url,
-          'shopAffiliateUrl' => self.shop_affiliate_url
-        })
+        Shop.new(
+          'shopName' => shop_name,
+          'shopCode' => shop_code,
+          'shopUrl' => shop_url,
+          'shopAffiliateUrl' => shop_affiliate_url
+        )
       end
     end
   end

data/lib/rakuten_web_service/ichiba/product.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/resource'
 require 'rakuten_web_service/ichiba/genre'
 
@@ -27,7 +29,7 @@ module RakutenWebService
         :ProductDetails
 
       def genre
-        RakutenWebService::Ichiba::Genre.new(self.genre_id)
+        RakutenWebService::Ichiba::Genre.new(genre_id)
       end
     end
   end

data/lib/rakuten_web_service/ichiba/ranking.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/ichiba/item'
 
 module RakutenWebService

data/lib/rakuten_web_service/ichiba/shop.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/resource'
 require 'rakuten_web_service/ichiba/item'
 
@@ -6,8 +8,8 @@ module RakutenWebService
     class Shop < Resource
       attribute :shopName, :shopCode, :shopUrl, :shopAffiliateUrl
 
-      def items(options={})
-        options = options.merge(shop_code: self.code)
+      def items(options = {})
+        options = options.merge(shop_code: code)
         RakutenWebService::Ichiba::Item.search(options)
       end
     end

data/lib/rakuten_web_service/kobo.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/kobo/ebook'
 require 'rakuten_web_service/kobo/genre'

data/lib/rakuten_web_service/kobo/ebook.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/resource'
 
 module RakutenWebService
@@ -15,7 +17,7 @@ module RakutenWebService
         :koboGenreId
 
       set_parser do |response|
-        response['Items'].map { |i| self.new(i) }
+        response['Items'].map { |i| new(i) }
       end
 
       def self.genre_class
@@ -23,7 +25,7 @@ module RakutenWebService
       end
 
       def genre
-        Kobo::Genre.new(self.kobo_genre_id)
+        Kobo::Genre.new(kobo_genre_id)
       end
     end
   end

data/lib/rakuten_web_service/kobo/genre.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/genre'
 
 module RakutenWebService
@@ -11,8 +13,8 @@ module RakutenWebService
 
       attribute :koboGenreId, :koboGenreName, :genreLevel, :itemCount
 
-      def search(options={})
-        options = options.merge(self.class.genre_id_key => self.id)
+      def search(options = {})
+        options = options.merge(self.class.genre_id_key => id)
         RWS::Kobo::Ebook.search(options)
       end
     end

data/lib/rakuten_web_service/recipe.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/configuration'
 
 require 'rakuten_web_service/recipe/category'
@@ -19,8 +21,8 @@ module RakutenWebService
 
     def self.ranking(category_id = nil)
       params = {}
-      params.merge!(category_id: category_id) unless category_id.nil?
-      self.search(params)
+      params = params.merge(category_id: category_id) unless category_id.nil?
+      search(params)
     end
 
     class << self

data/lib/rakuten_web_service/recipe/category.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakutenWebService
   class Recipe < Resource
 
@@ -35,7 +37,7 @@ 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 { |c| c.id.to_i == parent_category_id.to_i }
       end
 
       def absolute_category_id
@@ -47,14 +49,13 @@ module RakutenWebService
       end
 
       private
-        def parent_category_type
-          case type
-          when 'small' then 'medium'
-          when 'medium' then 'large'
-          else
-            nil
-          end
+
+      def parent_category_type
+        case type
+        when 'small' then 'medium'
+        when 'medium' then 'large'
         end
+      end
     end
   end
 end

data/lib/rakuten_web_service/resource.rb

@@ -1,25 +1,26 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/client'
 require 'rakuten_web_service/search_result'
 
 module RakutenWebService
   class Resource
+    attr_reader :params
+
     class << self
       def attribute(*attributes)
         attributes.each do |attribute|
-          method_name = attribute.to_s.gsub(/([a-z]+)([A-Z]{1})/) do |_|
-            "#{$1}_#{$2}"
-          end.downcase
-          method_name = method_name.sub(/^#{resource_name}_(\w+)$/) { $1 }
+          method_name = attribute.to_s.gsub(/([a-z]+)([A-Z]{1})/, '\1_\2').downcase
+          method_name = method_name.sub(/^#{resource_name}_(\w+)$/, '\1')
           instance_eval do
             define_method method_name do
               get_attribute(attribute.to_s)
             end
           end
-          if method_name =~ /(.+)_flag$/
-            instance_eval do
-              define_method "#{$1}?" do
-                get_attribute(attribute.to_s) == 1
-              end
+          next if method_name !~ /(.+)_flag$/
+          instance_eval do
+            define_method "#{$1}?" do
+              get_attribute(attribute.to_s) == 1
             end
           end
         end
@@ -38,14 +39,14 @@ module RakutenWebService
       end
 
       def resource_name
-        @resource_name ||= self.name.split('::').last.downcase
+        @resource_name ||= name.split('::').last.downcase
       end
 
       def set_resource_name(name)
         @resource_name = name
       end
 
-      def endpoint(url=nil)
+      def endpoint(url = nil)
         @endpoint = url || @endpoint
       end
 
@@ -66,7 +67,8 @@ module RakutenWebService
     end
 
     def [](key)
-      camel_key = key.gsub(/([a-z]+)_(\w{1})/) { "#{$1}#{$2.capitalize}" }
+      camel_key = key.split('_').map(&:capitalize).join
+      camel_key[0] = camel_key[0].downcase
       @params[key] || @params[camel_key]
     end
 
@@ -78,17 +80,12 @@ module RakutenWebService
       params.keys
     end
 
-    def ==(genre)
-      raise ArgumentError unless genre.is_a?(RakutenWebService::Resource)
+    def ==(other)
+      raise ArgumentError unless other.is_a?(RakutenWebService::Resource)
 
-      self.params.keys.all? do |k|
-        @params[k] == genre.params[k]
+      params.keys.all? do |k|
+        @params[k] == other.params[k]
       end
     end
-
-    protected
-      def params
-        @params
-      end
   end
 end

data/lib/rakuten_web_service/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakutenWebService
   class Response
     include Enumerable

data/lib/rakuten_web_service/search_result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/all_proxy'
 require 'rakuten_web_service/genre_information'
 
@@ -24,11 +26,8 @@ module RakutenWebService
 
     def all(&block)
       proxy = AllProxy.new(self)
-      if block
-        proxy.each(&block)
-      else
-        return proxy
-      end
+      proxy.each(&block) if block
+      proxy
     end
 
     def params
@@ -38,7 +37,7 @@ module RakutenWebService
     def order(options)
       new_params = params.dup
       if options.is_a? Hash
-        key, sort_order = *(options.to_a.last)
+        key, sort_order = *options.to_a.last
         key = camelize(key.to_s)
         new_params[:sort] = case sort_order.to_s.downcase
                             when 'desc'
@@ -88,25 +87,19 @@ module RakutenWebService
     end
 
     private
-    def ensure_retries(max_retries=RakutenWebService.configuration.max_retries)
-      begin
-        yield
-      rescue RWS::TooManyRequests => e
-        if max_retries > 0
-          max_retries -= 1
-          sleep 1
-          retry
-        else
-          raise e
-        end
-      end
+
+    def ensure_retries(max_retries = RakutenWebService.configuration.max_retries)
+      yield
+    rescue RWS::TooManyRequests => e
+      raise e if max_retries <= 0
+      max_retries -= 1
+      sleep 1
+      retry
     end
 
     def camelize(str)
       str = str.downcase
-      str = str.gsub(/([a-z]+)_([a-z]+)/) do
-        "#{$1.capitalize}#{$2.capitalize}"
-      end
+      str = str.split('_').map(&:capitalize).join
       str[0] = str[0].downcase
       str
     end

data/lib/rakuten_web_service/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakutenWebService
-  VERSION = '1.9.0'.freeze
+  VERSION = '1.9.1'.freeze
 end

data/rakuten_web_service.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 12.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rakuten_web_service
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Tatsuya Sato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ruby Client for Rakuten Web Service