rakuten_web_service 1.4.1 → 1.4.2

data/spec/rakuten_web_service/ichiba/genre_spec.rb

@@ -7,9 +7,9 @@ describe RakutenWebService::Ichiba::Genre do
   let(:genre_id) { 0 }
   let(:expected_query) do
     {
-      :affiliateId => affiliate_id,
-      :applicationId => application_id,
-      :genreId => genre_id
+      affiliateId: affiliate_id,
+      applicationId: application_id,
+      genreId: genre_id
     }
   end
   let(:expected_json) do
@@ -18,8 +18,8 @@ describe RakutenWebService::Ichiba::Genre do
 
   before do
     @expected_request = stub_request(:get, endpoint).
-      with(:query => expected_query).
-      to_return(:body => fixture('ichiba/genre_search.json'))
+      with(query: expected_query).
+      to_return(body: fixture('ichiba/genre_search.json'))
 
     RakutenWebService.configure do |c|
       c.affiliate_id = affiliate_id
@@ -30,7 +30,7 @@ describe RakutenWebService::Ichiba::Genre do
   describe '.search' do
 
     before do
-      @genre = RakutenWebService::Ichiba::Genre.search(:genreId => genre_id).first
+      @genre = RakutenWebService::Ichiba::Genre.search(genreId: genre_id).first
     end
 
     subject { @genre }
@@ -50,8 +50,8 @@ describe RakutenWebService::Ichiba::Genre do
   end
 
   describe '.new' do
-    before do 
-      RakutenWebService::Ichiba::Genre.search(:genreId => genre_id).first
+    before do
+      RakutenWebService::Ichiba::Genre.search(genreId: genre_id).first
     end
 
     context 'given genre_id' do
@@ -76,15 +76,14 @@ describe RakutenWebService::Ichiba::Genre do
         let(:new_genre_id) { 1981 }
         before do
           @expected_request = stub_request(:get, endpoint).
-            with(:query => { 
-                 :affiliateId => affiliate_id,
-                 :applicationId => application_id,
-                 :genreId => new_genre_id }).
-            to_return(:body => {:current => 
-                                  { :genreId => new_genre_id,
-                                    :genreName => 'DummyGenre',
-                                    :genreLevel => 3 }
-                               }.to_json)
+            with(query: {
+                                  affiliateId: affiliate_id,
+                                  applicationId: application_id,
+                                  genreId: new_genre_id }).
+            to_return(body: {current: { genreId: new_genre_id,
+                                                                                          genreName: 'DummyGenre',
+                                                                                          genreLevel: 3 }
+                                                     }.to_json)
 
           @genre = RakutenWebService::Ichiba::Genre.new(new_genre_id)
         end
@@ -121,14 +120,14 @@ describe RakutenWebService::Ichiba::Genre do
 
       before do
         @additional_request = stub_request(:get, endpoint).
-          with(:query => {
-               :affiliateId => affiliate_id,
-               :applicationId => application_id,
-               :genreId => target_genre['genreId']
-          }).to_return(:body => {
-            :current => target_genre,
-            :children => []
-          }.to_json)
+          with(query: {
+                              affiliateId: affiliate_id,
+                              applicationId: application_id,
+                              genreId: target_genre['genreId']
+                         }).to_return(body: {
+                                   current: target_genre,
+                                   children: []
+                                 }.to_json)
       end
 
       subject { root_genre.children.first }
@@ -164,12 +163,12 @@ describe RakutenWebService::Ichiba::Genre do
     let(:genre) { RakutenWebService::Ichiba::Genre.new(genre_id) }
 
     before do
-      stub_request(:get, endpoint).with(:query => expected_query).
-        to_return(:body => fixture('ichiba/genre_search.json'))
+      stub_request(:get, endpoint).with(query: expected_query).
+        to_return(body: fixture('ichiba/genre_search.json'))
     end
 
     specify "should call RankingItem's search with genre_id option" do
-      expect(RakutenWebService::Ichiba::RankingItem).to receive(:search).with(:genre_id => genre_id)
+      expect(RakutenWebService::Ichiba::RankingItem).to receive(:search).with(genre_id: genre_id)
       expect { genre.ranking }.to_not raise_error
     end
     specify "should call RankingItem's search with genre_id and given options" do
@@ -182,12 +181,12 @@ describe RakutenWebService::Ichiba::Genre do
     let(:genre) { RakutenWebService::Ichiba::Genre.new(genre_id) }
 
     before do
-      stub_request(:get, endpoint).with(:query => expected_query).
-        to_return(:body => fixture('ichiba/genre_search.json'))
+      stub_request(:get, endpoint).with(query: expected_query).
+        to_return(body: fixture('ichiba/genre_search.json'))
     end
 
     specify "should call Product search with genre_id option" do
-      expect(RakutenWebService::Ichiba::Product).to receive(:search).with(:genre_id => genre_id)
+      expect(RakutenWebService::Ichiba::Product).to receive(:search).with(genre_id: genre_id)
       expect { genre.products }.to_not raise_error
     end
   end

data/spec/rakuten_web_service/ichiba/item_spec.rb

@@ -6,9 +6,9 @@ describe RakutenWebService::Ichiba::Item do
   let(:application_id) { 'dummy_application_id' }
   let(:expected_query) do
     {
-      :affiliateId => affiliate_id,
-      :applicationId => application_id,
-      :keyword => 'Ruby'
+      affiliateId: affiliate_id,
+      applicationId: application_id,
+      keyword: 'Ruby'
     }
   end
 
@@ -23,20 +23,20 @@ describe RakutenWebService::Ichiba::Item do
     before do
       response = JSON.parse(fixture('ichiba/item_search_with_keyword_Ruby.json'))
       @expected_request = stub_request(:get, endpoint).
-        with(:query => expected_query).to_return(:body => response.to_json)
+        with(query: expected_query).to_return(body: response.to_json)
 
       response['page'] = 2
       response['first'] = 31
       response['last'] = 60
       response['pageCount'] = 2
       @second_request = stub_request(:get, endpoint).
-        with(:query => expected_query.merge(:page => 2)).
-        to_return(:body => response.to_json)
+        with(query: expected_query.merge(page: 2)).
+        to_return(body: response.to_json)
     end
 
     context 'just call the search method' do
       before do
-        @items = RakutenWebService::Ichiba::Item.search(:keyword => 'Ruby')
+        @items = RakutenWebService::Ichiba::Item.search(keyword: 'Ruby')
       end
 
       specify 'endpoint should not be called' do
@@ -55,7 +55,7 @@ describe RakutenWebService::Ichiba::Item do
         specify 'shoud be access by key' do
           expect(subject['itemName']).to eq(expected_json['itemName'])
           expect(subject['item_name']).to eq(expected_json['itemName'])
-        end 
+        end
 
         describe '#name' do
           subject { super().name }
@@ -79,7 +79,7 @@ describe RakutenWebService::Ichiba::Item do
 
       context 'chain calling' do
         before do
-          @items2 = @items.search(:keyword => 'Go')
+          @items2 = @items.search(keyword: 'Go')
         end
 
         specify "2 search resutls should be independent" do
@@ -111,7 +111,7 @@ describe RakutenWebService::Ichiba::Item do
       end
 
       context 'When TooManyRequest error raised' do
-        let(:client) do 
+        let(:client) do
           c = double('client')
           allow(c).to receive(:get).and_raise(RWS::TooManyRequests)
           c
@@ -133,22 +133,22 @@ describe RakutenWebService::Ichiba::Item do
     before do
       response = JSON.parse(fixture('ichiba/item_search_with_keyword_Ruby.json'))
       @expected_request = stub_request(:get, endpoint).
-        with(:query => expected_query).to_return(:body => response.to_json)
+        with(query: expected_query).to_return(body: response.to_json)
 
       response['page'] = 2
       response['first'] = 31
       response['last'] = 60
       response['pageCount'] = 2
       @second_request = stub_request(:get, endpoint).
-        with(:query => expected_query.merge(:page => 2)).
-        to_return(:body => response.to_json)
+        with(query: expected_query.merge(page: 2)).
+        to_return(body: response.to_json)
     end
 
     context 'When givne a block' do
       specify '' do
-        expect { |b| RWS::Ichiba::Item.all({:keyword => 'Ruby'}, &b) }.to yield_control.exactly(60).times
+        expect { |b| RWS::Ichiba::Item.all({keyword: 'Ruby'}, &b) }.to yield_control.exactly(60).times
 
-        expect { |b| RWS::Ichiba::Item.all({:keyword => 'Ruby'}, &b) }.to yield_successive_args(*([RakutenWebService::Ichiba::Item] * 60))
+        expect { |b| RWS::Ichiba::Item.all({keyword: 'Ruby'}, &b) }.to yield_successive_args(*([RakutenWebService::Ichiba::Item] * 60))
       end
     end
   end
@@ -175,14 +175,14 @@ describe RakutenWebService::Ichiba::Item do
     let(:response) { JSON.parse(fixture('ichiba/item_search_with_keyword_Ruby.json')) }
 
     before do
-      stub_request(:get, endpoint).with(:query => expected_query).
-        to_return(:body => response.to_json)
+      stub_request(:get, endpoint).with(query: expected_query).
+        to_return(body: response.to_json)
 
       expected_item = response['Items'][0]['Item']
-      expect(RakutenWebService::Ichiba::Genre).to receive('new').with(expected_item['genreId']) 
+      expect(RakutenWebService::Ichiba::Genre).to receive('new').with(expected_item['genreId'])
     end
 
-    subject { RakutenWebService::Ichiba::Item.search(:keyword => 'Ruby').first.genre }
+    subject { RakutenWebService::Ichiba::Item.search(keyword: 'Ruby').first.genre }
 
     specify 'respond Genre object' do
       expect { subject }.to_not raise_error
@@ -194,12 +194,12 @@ describe RakutenWebService::Ichiba::Item do
     let(:expected_item) { response['Items'][0]['Item'] }
 
     before do
-      stub_request(:get, endpoint).with(:query => expected_query).
-        to_return(:body => response.to_json)
+      stub_request(:get, endpoint).with(query: expected_query).
+        to_return(body: response.to_json)
     end
 
     subject do
-      RakutenWebService::Ichiba::Item.search(:keyword => 'Ruby').first.shop
+      RakutenWebService::Ichiba::Item.search(keyword: 'Ruby').first.shop
     end
 
     specify 'responds Shop object' do
@@ -212,13 +212,13 @@ describe RakutenWebService::Ichiba::Item do
 
   describe '#order' do
     specify 'convert sort parameter' do
-      query = RakutenWebService::Ichiba::Item.search(:keyword => 'Ruby').order(affiliate_rate: :desc)
+      query = RakutenWebService::Ichiba::Item.search(keyword: 'Ruby').order(affiliate_rate: :desc)
 
       expect(query.params[:sort]).to eq('-affiliateRate')
     end
 
     specify 'reproduces new SearchResult object' do
-      first_query = RakutenWebService::Ichiba::Item.search(:keyword => 'Ruby')
+      first_query = RakutenWebService::Ichiba::Item.search(keyword: 'Ruby')
       second_query = first_query.order(affiliate_rate: :desc)
 
       expect(first_query.params[:sort]).to be_nil

data/spec/rakuten_web_service/ichiba/product_search_spec.rb

@@ -6,9 +6,9 @@ describe RakutenWebService::Ichiba::Product do
   let(:application_id) { 'dummy_application_id' }
   let(:expected_query) do
     {
-      :affiliateId => affiliate_id,
-      :applicationId => application_id,
-      :keyword => 'Ruby'
+      affiliateId: affiliate_id,
+      applicationId: application_id,
+      keyword: 'Ruby'
     }
   end
 
@@ -23,18 +23,18 @@ describe RakutenWebService::Ichiba::Product do
     before do
       response = JSON.parse(fixture('ichiba/product_search.json'))
       @expected_request = stub_request(:get, endpoint).
-        with(:query => expected_query).to_return(:body => response.to_json)
+        with(query: expected_query).to_return(body: response.to_json)
 
       response['page'] = 2
       response['first'] = 31
       response['last'] = 60
       response['pageCount'] = 2
       @second_request = stub_request(:get, endpoint).
-        with(:query => expected_query.merge(:page => 2)).
-        to_return(:body => response.to_json)
+        with(query: expected_query.merge(page: 2)).
+        to_return(body: response.to_json)
     end
 
-    subject { RakutenWebService::Ichiba::Product.search(:keyword => 'Ruby') }
+    subject { RakutenWebService::Ichiba::Product.search(keyword: 'Ruby') }
 
     specify '' do
       expect(subject.count).to eq(30)
@@ -44,7 +44,7 @@ describe RakutenWebService::Ichiba::Product do
       let(:expected_product) do
         JSON.parse(fixture('ichiba/product_search.json'))['Products'].first['Product']
       end
-      let(:product) { RakutenWebService::Ichiba::Product.search(:keyword => 'Ruby').first }
+      let(:product) { RakutenWebService::Ichiba::Product.search(keyword: 'Ruby').first }
 
       specify 'should have methods to respond keys following with "product"' do
         expect(product.id).to eq(expected_product['productId'])

data/spec/rakuten_web_service/ichiba/ranking_spec.rb

@@ -7,14 +7,14 @@ describe RakutenWebService::Ichiba::RankingItem do
   let(:application_id) { 'application_id' }
   let(:expected_query) do
     {
-      :affiliateId => affiliate_id, :applicationId => application_id
+      affiliateId: affiliate_id, applicationId: application_id
     }
   end
 
-  before do 
+  before do
     response = JSON.parse(fixture('ichiba/ranking_search.json'))
     @expected_request = stub_request(:get, endpoint).
-      with(:query => expected_query).to_return(:body => response.to_json)
+      with(query: expected_query).to_return(body: response.to_json)
 
     RakutenWebService.configure do |c|
       c.affiliate_id = affiliate_id
@@ -28,7 +28,7 @@ describe RakutenWebService::Ichiba::RankingItem do
       response['Items'][0]['Item']
     end
 
-    before do 
+    before do
       @ranking_item = RakutenWebService::Ichiba::RankingItem.search({}).first
     end
 

data/spec/rakuten_web_service/ichiba/shop_spec.rb

@@ -40,7 +40,7 @@ describe RakutenWebService::Ichiba::Shop do
 
     before do
       @expected_request = stub_request(:get, endpoint).
-        with(:query => expected_query).to_return(:body => response.to_json)
+        with(query: expected_query).to_return(body: response.to_json)
     end
 
     specify 'call the endpoint with the shopCode' do

data/spec/rakuten_web_service/kobo/ebook_spec.rb

@@ -6,9 +6,9 @@ describe RakutenWebService::Kobo::Ebook do
   let(:application_id) { 'dummy_application_id' }
   let(:expected_query) do
     {
-      :affiliateId => affiliate_id,
-      :applicationId => application_id,
-      :title => 'Ruby'
+      affiliateId: affiliate_id,
+      applicationId: application_id,
+      title: 'Ruby'
     }
   end
 
@@ -23,11 +23,11 @@ describe RakutenWebService::Kobo::Ebook do
     before do
       response = JSON.parse(fixture('kobo/ebook_search_with_Ruby.json'))
       @expected_request = stub_request(:get, endpoint).
-        with(:query => expected_query).to_return(:body => response.to_json)
+        with(query: expected_query).to_return(body: response.to_json)
     end
 
     specify 'call endpoint when accessing results' do
-      ebooks = RakutenWebService::Kobo::Ebook.search(:title => 'Ruby')
+      ebooks = RakutenWebService::Kobo::Ebook.search(title: 'Ruby')
       expect(@expected_request).to_not have_been_made
 
       ebook = ebooks.first
@@ -40,7 +40,7 @@ describe RakutenWebService::Kobo::Ebook do
     before do
       response = JSON.parse(fixture('kobo/ebook_search_with_Ruby.json'))
       stub_request(:get, endpoint).
-        with(:query => expected_query).to_return(:body => response.to_json)
+        with(query: expected_query).to_return(body: response.to_json)
     end
 
     subject { RakutenWebService::Kobo::Ebook.search(title: 'Ruby') }
@@ -63,13 +63,13 @@ describe RakutenWebService::Kobo::Ebook do
     let(:response) { JSON.parse(fixture('kobo/ebook_search_with_Ruby.json')) }
 
     specify 'respond Kobo::Genre object' do
-      stub_request(:get, endpoint).with(:query => expected_query).
-        to_return(:body => response.to_json)
+      stub_request(:get, endpoint).with(query: expected_query).
+        to_return(body: response.to_json)
 
       expected_item = response['Items'][0]['Item']
       expect(RakutenWebService::Kobo::Genre).to receive('new').with(expected_item['koboGenreId'])
 
-      RakutenWebService::Kobo::Ebook.search(:title => 'Ruby').first.genre
+      RakutenWebService::Kobo::Ebook.search(title: 'Ruby').first.genre
     end
   end
 end

data/spec/rakuten_web_service/kobo/genre_spec.rb

@@ -7,9 +7,9 @@ describe RWS::Kobo::Genre do
   let(:genre_id) { '101' }
   let(:expected_query) do
     {
-      :affiliateId => affiliate_id,
-      :applicationId => application_id,
-      :koboGenreId => genre_id
+      affiliateId: affiliate_id,
+      applicationId: application_id,
+      koboGenreId: genre_id
     }
   end
   let(:expected_json) do
@@ -18,8 +18,8 @@ describe RWS::Kobo::Genre do
 
   before do
     @expected_request = stub_request(:get, endpoint).
-      with(:query => expected_query).
-      to_return(:body => expected_json.to_json)
+      with(query: expected_query).
+      to_return(body: expected_json.to_json)
 
     RakutenWebService.configure do |c|
       c.affiliate_id = affiliate_id
@@ -29,7 +29,7 @@ describe RWS::Kobo::Genre do
 
   describe '.search' do
     before do
-      @genre = RWS::Kobo::Genre.search(:koboGenreId => genre_id).first
+      @genre = RWS::Kobo::Genre.search(koboGenreId: genre_id).first
     end
 
     specify 'call the endpoint once' do
@@ -39,8 +39,8 @@ describe RWS::Kobo::Genre do
 
   describe '#search' do
     before do
-      stub_request(:get, endpoint).with(:query => expected_query).
-        to_return(:body => expected_json.to_json)
+      stub_request(:get, endpoint).with(query: expected_query).
+        to_return(body: expected_json.to_json)
     end
 
     context 'Without arguments' do
@@ -53,7 +53,7 @@ describe RWS::Kobo::Genre do
     context 'With arguments' do
       specify 'should call RWS::Kobo::Ebook.search with given arguments and genre id' do
         options = { title: 'Ruby' }
-        expect(RWS::Kobo::Ebook).to receive(:search).with(:title => 'Ruby', RWS::Kobo::Genre.genre_id_key => genre_id)
+        expect(RWS::Kobo::Ebook).to receive(:search).with(title: 'Ruby', RWS::Kobo::Genre.genre_id_key => genre_id)
 
         RWS::Kobo::Genre.root.search(options)
       end

data/spec/rakuten_web_service/recipe/category_spec.rb

@@ -6,9 +6,9 @@ describe RakutenWebService::Recipe::Category do
   let(:application_id) { 'dummy_application_id' }
   let(:expected_query) do
     {
-      :affiliateId => affiliate_id,
-      :applicationId => application_id,
-      :categoryType => category_type
+      affiliateId: affiliate_id,
+      applicationId: application_id,
+      categoryType: category_type
     }
   end