rakuten_web_service 1.12.0 → 1.13.0

data/lib/rakuten_web_service/travel/hotel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rakuten_web_service/travel/resource'
 
 module RakutenWebService
@@ -5,7 +7,7 @@ module RakutenWebService
     class Hotel < RakutenWebService::Travel::Resource
       endpoint 'https://app.rakuten.co.jp/services/api/Travel/SimpleHotelSearch/20170426'
 
-      set_parser do |response|
+      parser do |response|
         response['hotels'].map do |hotel_info|
           Hotel.new(hotel_info)
         end

data/lib/rakuten_web_service/travel/search_result.rb

@@ -16,7 +16,7 @@ module RakutenWebService
         end
       end
 
-      def has_next_page?
+      def next_page?
         (page < page_count)
       end
 

data/lib/rakuten_web_service/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RakutenWebService
-  VERSION = '1.12.0'.freeze
+  VERSION = '1.13.0'.freeze
 end

data/rakuten_web_service.gemspec

@@ -15,12 +15,14 @@ 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.4.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
+  spec.add_dependency 'json', '~> 2.3'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '~> 12.3.0'
-  spec.add_development_dependency 'rspec', '~> 3.8.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rexml', '~> 3.2'
+  spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'tapp', '~> 1.5.1'
   spec.add_development_dependency 'terminal-table', '~> 1.8.0'
-  spec.add_development_dependency 'webmock', '~> 3.5.0'
+  spec.add_development_dependency 'webmock', '~> 3.9'
 end

data/spec/rakuten_web_service/genre_spec.rb

@@ -42,7 +42,7 @@ describe RakutenWebService::BaseGenre do
 
     Class.new(RakutenWebService::BaseGenre) do
       endpoint "https://api.example.com/dummy_genre"
-      set_resource_name 'dummy_genre'
+      self.resource_name = 'dummy_genre'
       root_id 0
       attribute :dummyGenreId, :dummyGenreName, :genreLevel
     end

data/spec/rakuten_web_service/ichiba/tag_spec.rb

@@ -15,4 +15,21 @@ describe RakutenWebService::Ichiba::Tag do
       expect(tag['parentTagId']).to eq(1)
     end
   end
+
+  describe '#search' do
+    context 'When no given additional parameters' do
+      specify 'it calls Ichiba::Item.search with its tag id' do
+        expect(RWS::Ichiba::Item).to receive(:search).with({tagId: params['tagId']}).and_return([])
+
+        tag.search
+      end
+    end
+    context 'When given required parameter' do
+      specify 'it calls Ichiba::Item.search with the given parameters and its tag id' do
+        expect(RWS::Ichiba::Item).to receive(:search).with({keyword: 'Ruby', tagId: params['tagId']}).and_return([])
+
+        tag.search(keyword: 'Ruby')
+      end
+    end
+  end
 end

data/spec/rakuten_web_service/resource_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe RakutenWebService::Resource do
   let(:resource_class) do
     Class.new(RakutenWebService::Resource) do
-      set_resource_name 'Dummy'
+      self.resource_name = 'Dummy'
 
       attribute :name, :dummySampleAttribute
     end
@@ -23,7 +23,7 @@ describe RakutenWebService::Resource do
     context 'When some resources are inherited from other resource' do
       let(:other_resource_class) do
         Class.new(resource_class) do
-          set_resource_name 'NestedResource'
+          self.resource_name = 'NestedResource'
 
           attribute :name, :someOtherAttribute
         end

data/spec/rakuten_web_service/response_spec.rb

@@ -14,9 +14,9 @@ describe RakutenWebService::Response do
         }
       end
 
-      it { is_expected.to have_next_page }
+      it { is_expected.to be_next_page }
       it { is_expected.to_not be_last_page }
-      it { is_expected.to_not have_previous_page }
+      it { is_expected.to_not be_previous_page }
       it { is_expected.to be_first_page }
     end
     context "When page is equal to pageCount" do
@@ -26,9 +26,9 @@ describe RakutenWebService::Response do
         }
       end
 
-      it { is_expected.to_not have_next_page }
+      it { is_expected.to_not be_next_page }
       it { is_expected.to be_last_page }
-      it { is_expected.to have_previous_page }
+      it { is_expected.to be_previous_page }
       it { is_expected.to_not be_first_page }
     end
     context "When current page is in pages" do
@@ -38,10 +38,10 @@ describe RakutenWebService::Response do
         }
       end
 
-      it { is_expected.to have_next_page }
+      it { is_expected.to be_next_page }
       it { is_expected.to_not be_last_page }
-      it { is_expected.to have_previous_page }
+      it { is_expected.to be_previous_page }
       it { is_expected.to_not be_last_page }
     end
   end
-end
+end

data/spec/rakuten_web_service/travel/search_result_spec.rb

@@ -10,7 +10,7 @@ describe RakutenWebService::Travel::SearchResult do
     RakutenWebService::Travel::SearchResult.new({}, resource_class)
   end
 
-  describe '#has_next_page?' do
+  describe '#next_page?' do
     let(:response) do
       double().tap do |d|
         allow(d).to receive('[]').with('pagingInfo').and_return(pagingInfo)
@@ -27,7 +27,7 @@ describe RakutenWebService::Travel::SearchResult do
       end
 
       it 'should have next page' do
-        expect(search_result).to have_next_page
+        expect(search_result).to be_next_page
       end
     end
     context 'when current page reaches at the last page' do
@@ -36,7 +36,7 @@ describe RakutenWebService::Travel::SearchResult do
       end
 
       it 'should not have next page' do
-        expect(search_result).to_not have_next_page
+        expect(search_result).to_not be_next_page
       end
     end
   end
@@ -68,4 +68,4 @@ describe RakutenWebService::Travel::SearchResult do
       expect(search_result.search({})).to be_a(RakutenWebService::Travel::SearchResult)
     end
   end
-end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rakuten_web_service
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Tatsuya Sato
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -30,28 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: tapp
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.9'
 description: Ruby Client for Rakuten Web Service
 email:
 - tatsuya.b.sato@mail.rakuten.com
@@ -102,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".travis.yml"
 - ".vscode/launch.json"
@@ -119,6 +148,7 @@ files:
 - examples/books_item_search.rb
 - examples/gora_search.rb
 - examples/ichiba_item_search.rb
+- examples/recipe_search.rb
 - examples/travel_apis.rb
 - lib/rakuten_web_service.rb
 - lib/rakuten_web_service/all_proxy.rb
@@ -191,7 +221,6 @@ files:
 - spec/fixtures/recipe/ranking.json
 - spec/fixtures/travel/area_class.json
 - spec/fixtures/travel/simple_hotel_search.json
-- spec/integration/integration_spec.rb
 - spec/rakuten_web_service/books/book_spec.rb
 - spec/rakuten_web_service/books/cd_spec.rb
 - spec/rakuten_web_service/books/dvd_spec.rb
@@ -232,7 +261,7 @@ homepage: http://webservice.rakuten.co.jp/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -240,15 +269,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Ruby Client for Rakuten Web Service
 test_files:
@@ -276,7 +305,6 @@ test_files:
 - spec/fixtures/recipe/ranking.json
 - spec/fixtures/travel/area_class.json
 - spec/fixtures/travel/simple_hotel_search.json
-- spec/integration/integration_spec.rb
 - spec/rakuten_web_service/books/book_spec.rb
 - spec/rakuten_web_service/books/cd_spec.rb
 - spec/rakuten_web_service/books/dvd_spec.rb

data/spec/integration/integration_spec.rb

@@ -1,81 +0,0 @@
-require 'spec_helper'
-
-describe 'Call all APIs', type: 'integration' do
-  describe RakutenWebService::Ichiba do
-    it do
-       expect { RWS::Ichiba::Item.search(keyword: 'Ruby').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Ichiba::Genre.search(genre_id: 559887).first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Ichiba::Product.search(keyword: 'Ruby').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Ichiba::RankingItem.search(age: 30, sex: 0).first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Ichiba::TagGroup.search(tagId: 1000317).first.tags }.not_to raise_error
-    end
-  end
-
-  describe RakutenWebService::Books do
-    it do
-      expect { RWS::Books::Total.search(keyword: 'Ruby').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Books::Book.search(title: 'Ruby').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Books::CD.search(title: 'Ruby').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Books::DVD.search(title: 'Ruby').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Books::ForeignBook.search(title: 'Ruby').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Books::Magazine.search(title: 'Ruby').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Books::Game.search(title: 'Ruby').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Books::Software.search(title: 'Ruby').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Books::Genre.search(books_genre_id: '001005').first }.not_to raise_error
-    end
-  end
-
-  describe RakutenWebService::Recipe do
-    it do
-      expect { RWS::Recipe.categories('large') }.not_to raise_error
-    end
-    it do
-      expect { RWS::Recipe.categories('large').first.ranking.first }.not_to raise_error
-    end
-  end
-
-  describe RakutenWebService::Kobo do
-    it do
-      expect { RWS::Kobo::Ebook.search(keyword: 'Ruby').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Kobo::Genre.search(kobo_genre_id: 101).first }.not_to raise_error
-    end
-  end
-
-  describe RakutenWebService::Gora do
-    it do
-      expect { RWS::Gora::Course.search(keyword: 'セグウェイ').first }.not_to raise_error
-    end
-    it do
-      expect { RWS::Gora::CourseDetail.search(golf_course_id: 80004).first }.not_to raise_error
-    end
-    xit do
-      expect { RWS::Gora::Plan.search(playDate: '2017-01-11', areaCode: 0).first }.not_to raise_error
-    end
-  end
-end