rakuten_web_service 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 415917a50517faaba6319b58c399fa8b52685d3116725e32152592a87f6e89ea
-  data.tar.gz: c6fd00ef38214d6008dd2db3417dccf066cdf4ae1f1243a9249413e4d3dac1e0
+  metadata.gz: ed9f7ae4ab29a8e7fbfc3ffd5fe037dbe1d4f136766ec20b6ded70546ae70025
+  data.tar.gz: 0e43fe72a9805aff0b60ce70c3eca8a072fafbcc537ac8cf2dca56250dfdd579
 SHA512:
-  metadata.gz: 070ae2ea7f6ca3c0877d4ec36d4f13012ba0c7b990dfd4591694d5e278f83352be927966e91714378da1140b8538eadcdcf9e8b1ebfc8aefb32456849f397780
-  data.tar.gz: 7911a4ca4d7927477e683290948316e49290de31cc7fd02380437564f38ebbe7af3c05d47b92316e5fb91e5ff3f0488ad6f4d71d1dfbfd2c5ae2f08b7145928f
+  metadata.gz: 5c613c66feb43d62f5ad0515c72a93bbcf0b7df98f1da0a6a3eb3a3e53c75fd4917f19d07ace63f440c4c9e93558c2409330569f0dcf6a0f6ef6e1fe241b80b3
+  data.tar.gz: da198c232b7be05b180eef34e9a5c278618e7e2eba9405d437b70aed65f938f3af79a1c00c808c3be9d2cc3c2821017f7a25c4421e204fb95c82cd997d9433f5

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.3.6
   - 2.4.3
   - 2.5.0
   - 2.6.0
@@ -32,10 +31,10 @@ matrix:
   allow_failures:
   - rvm: ruby-head
   exclude:
-  - rvm: 2.3.6
-    env: INTEGRATION=yes
   - rvm: 2.4.3
     env: INTEGRATION=yes
+  - rvm: 2.5.0
+    env: INTEGRATION=yes
   - rvm: ruby-head
     env: INTEGRATION=yes
 

data/CHANGELOG.md

@@ -1,168 +1,176 @@
-# v1.10.0
+# CHANGELOG
 
-## Enhancements
+## v1.11.0 (2019/07/11)
+
+### Improvements
+
+* Drop ruby 2.3 from supported ruby versions. [#104](https://github.com/rakuten-ws/rws-ruby-sdk/pull/104)
+* Fixes some issues reported by CoceClimate [#108](https://github.com/rakuten-ws/rws-ruby-sdk/pull/108)
+* `RWS.configuration` no longer accepsts block [#107](https://github.com/rakuten-ws/rws-ruby-sdk/pull/107)
+
+## v1.10.0 (2019/03/11)
+
+### Enhancements
 
 * Starts Support of two Travel APIs: SimpleHotelSearch and GetAreaClass. [#91](https://github.com/rakuten-ws/rws-ruby-sdk/pull/91)
 
-# v1.9.2 (2018/12/28)
+## v1.9.2 (2018/12/28)
 
-## Enhancements
+### Enhancements
 
 * Ruby 2.6 has been released :tada: this version joined the supported versions! [#100](https://github.com/rakuten-ws/rws-ruby-sdk/pull/100)
 
-# v1.9.1 (2018/03/30)
+## v1.9.1 (2018/03/30)
 
-## Improvements
+### 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)
+## v1.9.0 (2018/01/04)
 
-## Enhancements
+### Enhancements
 
 * Update supported API versions. [#87](https://github.com/rakuten-ws/rws-ruby-sdk/pull/87)
 
-# v1.8.0 (2017/12/30)
+## v1.8.0 (2017/12/30)
 
-## Enhancements
+### Enhancements
 
 * Add `RWS::Resource#attributes` method. [#85](https://github.com/rakuten-ws/rws-ruby-sdk/pull/85)
 
-## Improvements
+### Improvements
 
 * Start supporting Ruby 2.5 and drop 2.1 from supported versions. [#83](https://github.com/rakuten-ws/rws-ruby-sdk/pull/83)
 * Update outdated gems. [#84](https://github.com/rakuten-ws/rws-ruby-sdk/pull/84)
 
-# v1.7.0 (2017/09/17)
+## v1.7.0 (2017/09/17)
 
-## Enhancements
+### Enhancements
 
 * Add Helpers for pagination. [#78](https://github.com/rakuten-ws/rws-ruby-sdk/pull/78)
 
-## Improvements
+### Improvements
 
 * Minor fix for README.ja.md [#77](https://github.com/rakuten-ws/rws-ruby-sdk/pull/77)
 * Suppressing installing gems required for debugging with VSCode in CI. [#79](https://github.com/rakuten-ws/rws-ruby-sdk/pull/79)
 
-## Thanks
+### Thanks
 
 I'm pleasured to say thanks to @jinco13. He fixed wrong method names and links in README.ja.md.
 
-# v1.6.1 (2017/08/21)
+## v1.6.1 (2017/08/21)
 
-## Bug Fix
+### Bug Fix
 
 * `RakutenWebService::Ichiba::Genre#brothers` always returns an empty array. [#75](https://github.com/rakuten-ws/rws-ruby-sdk/pull/75)
 
-# v1.6.0 (2017/08/16)
+## v1.6.0 (2017/08/16)
 
-## Improvements
+### Improvements
 
 * Added `RakutenWebService::BaseGenre#brothers`. [#74](https://github.com/rakuten-ws/rws-ruby-sdk/pull/74)
 
-# v1.5.0 (2017/03/31)
+## v1.5.0 (2017/03/31)
 
-## Improvements
+### Improvements
 
 * Allows to call `RakutenWebService::Recipe.ranking` without `category_id`. [#70](https://github.com/rakuten-ws/rws-ruby-sdk/pull/70)
 
-## Thanks
+### Thanks
 
 I'm pleasured to say thanks to @kakakakakku. His work has made the usage of `RWS::Recipe.raning` easy to get the ranking in all genres.
 Thanks!
 
-# v1.4.2 (2017/01/22)
+## v1.4.2 (2017/01/22)
 
-## Bug Fixes
+### Bug Fixes
 
 * `Net::HTTP` is NOT `reuquire`d anywhere in the codebase. [#67](https://github.com/rakuten-ws/rws-ruby-sdk/pull/67)
 
    The version 1.4.1 or earlier of this gem doesn't `require 'net/http'` by itself.
    @gouf found the bug report in [teratail](https://teratail.com/questions/62804) and made a pull-request to fix it. Thanks!
 
-## Improvements
+### Improvements
 
 * `debug_mode` has come again! if you want to see responses from Rakuten Web Service APIs, you can see the ones by set `debug_mode` `true`. [#56](https://github.com/rakuten-ws/rws-ruby-sdk/pull/56)
 * Refactoring: use new Hash syntax as supporting ruby 1.9 series has been stopped already. [#60](https://github.com/rakuten-ws/rws-ruby-sdk/pull/60)
 
-# v1.4.1 (2016/11/22)
+## v1.4.1 (2016/11/22)
 
-## Bug Fix
+### Bug Fix
 
 * Fixed: `WrongParameter` raises when giving any `sort` option to `RakutenWebService::Resource.serch`. [#54](https://github.com/rakuten-ws/rws-ruby-sdk/pull/54)
 
-## Thanks
+### Thanks
 
 I'm pleased to say thanks to @sho-yamane since he reported the bug #53. If he didn't do it, I would find the bug much later.
 Thanks, @sho-yamane.
 
+## v1.4.0 (2016/11/11)
 
-# v1.4.0 (2016/11/11)
-
-## Enhancements
+### Enhancements
 
 * Raise RuntimeError if required option `application_id` is not set when generating parameters. [#51](https://github.com/rakuten-ws/rws-ruby-sdk/pull/51)
 
+## v1.3.0 (2016/11/08)
 
-# v1.3.0 (2016/11/08)
-
-## Enhancements
+### Enhancements
 
 * Loads Application ID and Affiliate ID from environment varaibles `RWS_APPLICATION_ID` and `RWS_AFFILIATE_ID` respectively. [#47](https://github.com/rakuten-ws/rws-ruby-sdk/pull/47)
 
-## Improvements
+### Improvements
 
 * Upgraded `codeclimate-test-reporter`. [#48](https://github.com/rakuten-ws/rws-ruby-sdk/pull/48)
 
-# v1.2.0 (2016/10/25)
+## v1.2.0 (2016/10/25)
 
-## Ehancements
+### Ehancements
 
 * Started supporting GenreInformation. [#45](https://github.com/rakuten-ws/rws-ruby-sdk/pull/45)
 * `RakutenWebService::BaseGenre#parent` returns Genre object of the parent genre. [#44](https://github.com/rakuten-ws/rws-ruby-sdk/pull/44)
 
-# v1.1.1 (2016/09/12)
+## v1.1.1 (2016/09/12)
 
-## Bug Fix
+### Bug Fix
 
 * Fixed `RakutenWebService::Ichiba::Genre#ranking` ignores given options to be passed to Ichiba Ranking API. [#43](https://github.com/rakuten-ws/rws-ruby-sdk/pull/43)
 
-# v1.1.0 (2016/09/12)
+## v1.1.0 (2016/09/12)
 
-## Enhancements
+### Enhancements
 
 * Remove the dependency on faraday, using `Net::HTTP`. [#39](https://github.com/rakuten-ws/rws-ruby-sdk/pull/39)
 * Allows users to rescue any exception with `RakutenWebService::Error` which is a superclass of all the error class like `RakutenWebService::NotFound`. [#41](https://github.com/rakuten-ws/rws-ruby-sdk/pull/41)
 
-# v1.0.0 (2016/07/29)
+## v1.0.0 (2016/07/29)
 
-## Enhancements
+### Enhancements
 
 * Upgrade the version of RSpec and refactoring the configuration. [#36](https://github.com/rakuten-ws/rws-ruby-sdk/pull/36) and [#37](https://github.com/rakuten-ws/rws-ruby-sdk/pull/36)
 
-# v1.0.0.rc1
+## v1.0.0.rc1
 
-## Enhancements
+### Enhancements
 
 * Started supporting Gora APIs by @kamatama41 .[#29](https://github.com/rakuten-ws/rws-ruby-sdk/pull/29)
 * Started supporting Recipe APIs. [#31](https://github.com/rakuten-ws/rws-ruby-sdk/pull/31)
 * Updated versions of supported Rakuten Web Service APIs.
 
-## Compatibility Changes
+### Compatibility Changes
 
 * Updated supported Ruby versions to 2.1.0 or later
 * Any resource's `search` such as `RakutenWebService::Ichiba::Item` returns Enumerator which provides resources fetched at one page.
   It used to provide all resources by auto-pagerize. From this version provides methods for pagerizing. Please refer to [the sample in README](https://github.com/rakuten-ws/rws-ruby-sdk/blob/master/README.md#pagerizing).
 * Deprecated calling `RakutenWebService.configuration` with a block, recommending to use `RakutenWebService.configure`.
 
-## Thanks
+### Thanks
 
 At first, I should appreciate all users of the gems.
 One of the enhancements, supporting Gora APIs, is realized by @kamatama41 's seminal work.
 Thank you for your contribution!
 
-# v0.6.3 (2015/07/03)
+## v0.6.3 (2015/07/03)
 
 * Update a gem dependency by @45deg
 * Fix typo by @45deg

data/README.md

@@ -57,12 +57,12 @@ If you have not got it, register your application [here](https://webservice.raku
 
 ### Configuration
 
-At first, you have to specify your application's key. And you can tell the client your afiiliate id with `RakutenWebService.configuration`.
+At first, you have to specify your application's key. And you can tell the client your afiiliate id with `RakutenWebService.configure`.
 
 #### In Your Code
 
 ```ruby
-  RakutenWebService.configuration do |c|
+  RakutenWebService.configure do |c|
     # (Required) Appliction ID for your application.
     c.application_id = 'YOUR_APPLICATION_ID'
 

data/lib/rakuten_web_service.rb

@@ -1,6 +1,22 @@
 # frozen_string_literal: true
 
-module RakutenWebService; end
+require 'rakuten_web_service/configuration'
+
+module RakutenWebService
+  def configure(&block)
+    raise ArgumentError, 'Block is required' unless block
+    raise ArgumentError, 'Block is required to have one argument' if block.arity != 1
+    yield configuration
+
+    configuration
+  end
+
+  def configuration
+    @configuration ||= Configuration.new
+  end
+
+  module_function :configure, :configuration
+end
 RWS = RakutenWebService
 
 require 'rakuten_web_service/ichiba'

data/lib/rakuten_web_service/configuration.rb

@@ -41,20 +41,4 @@ module RakutenWebService
       end
     end
   end
-
-  def configure(&block)
-    @configuration ||= Configuration.new
-    if block
-      raise ArgumentError, 'Block is required to have one argument' if block.arity != 1
-      yield @configuration
-    end
-    @configuration
-  end
-
-  def configuration(&block)
-    warn 'Warning: RakutenWebService.configuration is deprecated. Use RakutenWebService.configure.' if block_given?
-    configure(&block)
-  end
-
-  module_function :configure, :configuration
 end

data/lib/rakuten_web_service/travel/area_class.rb

@@ -3,7 +3,7 @@ require 'rakuten_web_service/travel/resource'
 module RakutenWebService
   module Travel
     module AreaClass
-      def search(options={})
+      def search(options = {})
         Base.search(options)
       end
 
@@ -14,13 +14,7 @@ module RakutenWebService
           DetailClass[class_code]
       end
       module_function :search, :[]
-    end
-  end
-end
 
-module RakutenWebService
-  module Travel
-    module AreaClass
       class Base < RakutenWebService::Travel::Resource
         endpoint 'https://app.rakuten.co.jp/services/api/Travel/GetAreaClass/20131024'
 
@@ -66,22 +60,23 @@ module RakutenWebService
 
         attr_reader :parent, :children
 
-        def initialize(data, parent=nil)
+        def initialize(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?) and !(children.empty?)
-            children_class = children.keys.map { |k| k[/\A(\w*)Classes\Z/, 1] }.first rescue data.tapp
-            @params["#{children_class}Classes"] = children["#{children_class}Classes"].map do |child_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["#{children_class}Classes"]
+            @children = @params[class_name]
           else
             @children = []
           end
@@ -105,7 +100,7 @@ module RakutenWebService
           query
         end
 
-        def search(params={})
+        def search(params = {})
           params = to_query.merge(params)
 
           Hotel.search(params)

data/lib/rakuten_web_service/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RakutenWebService
-  VERSION = '1.10.0'.freeze
+  VERSION = '1.11.0'.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.3.0'
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 12.3.0'

data/spec/rakuten_web_service/configuration_spec.rb

@@ -23,58 +23,6 @@ describe RakutenWebService::Configuration do
     end
   end
 
-  describe '.configure' do
-    context 'given block has one arity' do
-      before do
-        RakutenWebService.configure do |c|
-          c.affiliate_id = 'dummy_affiliate_id'
-          c.application_id = 'dummy_application_id'
-        end
-      end
-
-      subject { RakutenWebService.configuration }
-
-      describe '#affiliate_id' do
-        subject { super().affiliate_id }
-        it { is_expected.to eq('dummy_affiliate_id') }
-      end
-
-      describe '#application_id' do
-        subject { super().application_id }
-        it { is_expected.to eq('dummy_application_id') }
-      end
-    end
-
-    context 'given block has more or less one arity' do
-      specify 'raise ArgumentError' do
-        expect do
-          RakutenWebService.configure do
-          end
-        end.to raise_error(ArgumentError)
-
-        expect do
-          RakutenWebService.configure do |c, _|
-            c.affiliate_id = 'dummy_affiliate_id'
-            c.application_id = 'dummy_application_id'
-          end
-        end.to raise_error(ArgumentError)
-      end
-    end
-  end
-
-  describe '.configuration' do
-    context 'When calling with a block' do
-      specify 'should show warning message' do
-        $stderr = StringIO.new
-        RakutenWebService.configuration do |c|
-          c.application_id = 'dummy_affiliate_id'
-        end
-        expect($stderr.string).to match(/Warning: /)
-        $stderr = STDERR
-      end
-    end
-  end
-
   describe '#debug_mode?' do
     let(:configuration) { RakutenWebService.configuration }
 

data/spec/rakuten_web_service_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe RakutenWebService do
+  describe '.configure' do
+    context 'given block has one arity' do
+      before do
+        RakutenWebService.configure do |c|
+          c.affiliate_id = 'dummy_affiliate_id'
+          c.application_id = 'dummy_application_id'
+        end
+      end
+
+      subject { RakutenWebService.configuration }
+
+      describe '#affiliate_id' do
+        subject { super().affiliate_id }
+        it { is_expected.to eq('dummy_affiliate_id') }
+      end
+
+      describe '#application_id' do
+        subject { super().application_id }
+
+        it { is_expected.to eq('dummy_application_id') }
+      end
+    end
+
+    context 'given block has more or less one arity' do
+      specify 'raise ArgumentError' do
+        expect do
+          RakutenWebService.configure do
+          end
+        end.to raise_error(ArgumentError)
+
+        expect do
+          RakutenWebService.configure do |c, _|
+            c.affiliate_id = 'dummy_affiliate_id'
+            c.application_id = 'dummy_application_id'
+          end
+        end.to raise_error(ArgumentError)
+      end
+    end
+    context 'call without block' do
+      specify 'raise ArgumentError' do
+        expect { RakutenWebService.configure }.to raise_error(ArgumentError)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rakuten_web_service
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Tatsuya Sato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,6 +220,7 @@ files:
 - spec/rakuten_web_service/travel/open_struct_spec.rb
 - spec/rakuten_web_service/travel/search_result_spec.rb
 - spec/rakuten_web_service/travel/simple_hotel_search_spec.rb
+- spec/rakuten_web_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_suppot.rb
 homepage: http://webservice.rakuten.co.jp/
@@ -234,14 +235,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby Client for Rakuten Web Service
@@ -301,5 +302,6 @@ test_files:
 - spec/rakuten_web_service/travel/open_struct_spec.rb
 - spec/rakuten_web_service/travel/search_result_spec.rb
 - spec/rakuten_web_service/travel/simple_hotel_search_spec.rb
+- spec/rakuten_web_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_suppot.rb