rspotify 1.22.0 → 1.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a7ce4a25d971ff2ecaed66fcf716dc165c015cd
-  data.tar.gz: f18c09b1dddd737eb59f33c2d408208b7f82d522
+  metadata.gz: c1f2cb1c508d26a9c6309cba7ca13a85e0f20388
+  data.tar.gz: 5d1f918f508b01cc1063c21950cb057c04fe580f
 SHA512:
-  metadata.gz: ebddd5cafe9200d6523c604fd88d3972e92bae5f70d34de9d316475dc2d57f4b574850128bc3090303cc886a5d44c6645e2bfa755376745fec70f6b1022d85f5
-  data.tar.gz: 93fc3eefd76fed937f9261004257c6efb2e29a627e1d92286867790a8b7b2959c2bdc31f4562f51c39478c419598c2261ae884d8acbedab4d1a6e82748f26642
+  metadata.gz: 8cce89b90a3c547666c6ecca34ebaff3a117fcf68a631faadd963382eeb4eb79472fe310d509597c868b50e08f61932680f89bc23b372daf09cee732890b7d15
+  data.tar.gz: 6adc0d88e9a2c75a6055671662696718d9bf353e7c78bfd459130ce399804f5ffccd6258f98ddb29edd42534669512258dc8cb2f854d9ec2fb3aded95e374ee3

data/lib/rspotify/connection.rb

@@ -63,13 +63,22 @@ module RSpotify
       rescue RestClient::Unauthorized
         if @client_token
           authenticate(@client_id, @client_secret)
-          response = RestClient.send(verb, url, *params)
+          
+          obj = params.find{|x| x.is_a?(Hash) && x['Authorization']}
+          obj['Authorization'] = "Bearer #{@client_token}"
+          
+          response = retry_connection verb, url, params
         end
       end
 
       return response if raw_response
       JSON.parse response unless response.empty?
     end
+    
+    # Added this method for testing
+    def retry_connection verb, url, params
+      RestClient.send(verb, url, *params)
+    end
 
     def auth_header
       authorization = Base64.strict_encode64 "#{@client_id}:#{@client_secret}"

data/lib/rspotify/version.rb

@@ -1,3 +1,3 @@
 module RSpotify
-  VERSION = '1.22.0'
+  VERSION = '1.22.1'
 end

data/spec/lib/rspotify/artist_spec.rb

@@ -111,5 +111,32 @@ describe RSpotify::Artist do
       expect(artists.size)        .to eq 20
       expect(artists.map(&:name)) .to include('Arctic Queen', 'Arctic Sleep')
     end
+    
+    
+    context 'when token is expired' do
+      it 'should resend token with new token' do
+        auth_response = {'access_token': 'token'}.to_json
+        new_auth_response = {'access_token': 'new_token'}.to_json
+        
+        expect(RestClient).to receive(:post)
+          .and_return(auth_response, new_auth_response)
+        
+        RSpotify.authenticate('client_id', 'client_secret')
+        
+        # When token is expired it returns 401 
+        expect(RestClient).to receive(:send).and_raise(RestClient::Unauthorized)
+          .with(anything, anything, {"Authorization" => "Bearer token"})
+        
+        retry_response = {
+          "artists" => { "items" => [] }
+        }.to_json
+        expect(RestClient).to receive(:send).and_return(retry_response)
+          .with(anything, anything, {"Authorization"  => "Bearer new_token"})
+        
+        artists = VCR.use_cassette('artist:search:Arctic') do 
+          RSpotify::Artist.search('Arctic')
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspotify
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.22.1
 platform: ruby
 authors:
 - Guilherme Sad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2