rspotify 2.9.0 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd4464a0bd9145130472ed8f8abe11c595e3e5065a44e083d7a41ef26a315dad
-  data.tar.gz: a81d26ab41cfb8ff340eb30a39f6d878503481378757ca4cc480db89c147bd07
+  metadata.gz: 112fc6b3765cf70d8156059ff328e0a4b9dd69a68f05e0aa6be910f020c5595a
+  data.tar.gz: c74a3c8a682fab80232e07db41afa74cca542ee1ffef217ccb49ebd4ab9617f0
 SHA512:
-  metadata.gz: 23d30c3094d7c243733190ca8e02231159968027a3d3b30eb72c0d8fb0694ecde85bb0b7c3327b86021a624bfa96890f33315d8acb134f67396124068c4bcee2
-  data.tar.gz: ec899b94e25402f6a22ba6e9ecca3be4ced60f763ed4108d3f206d6f054449ce3f6d3b3b1eab4b4cc47053532c3320756d382d5a11bc2c41b966c51fbaf6be3c
+  metadata.gz: 76095f5f8eef1e3cd6563adf8225d4736fe6503af82d230d2aa5b49a21b9ab98f4d3d314d92317322231ef695c9ff3a7c3dacf54c19bd0fded7e2372e22f4028
+  data.tar.gz: 1237be2afd7720291bc0a2752a2d5ea49fb17896405d2f3498e76093f8fa91de0340426214f10a1b17e1aa193e3e4d91a76e972cc62de001ee14fedf0679ad54

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://www.buymeacoffee.com/guilhermesad

data/README.md

@@ -217,7 +217,40 @@ class UsersController < ApplicationController
 end
 ```
 
-The user's access token is automatically refreshed by RSpotify when needed. This is specially useful if you persist the user data on a database: this way he only needs to log in to Spotify once in his entire use of your application.
+## Refreshing the access token
+
+The user's access token is automatically refreshed by RSpotify when needed. This is especially useful if you persist
+the user data on a database. This way, the user only need log in to Spotify once during the use of the application.
+
+Additionally, you can store a proc that is invoked when a new access token is generated. This give you the
+opportunity to persist the new access token for future use. The proc will be invoked with two arguments: the
+new access token and the lifetime of the token in seconds. For example, if lifetime value returned from
+Spotify is 3600, you know that the token will be good for one hour.
+
+In the sample code below, the credentials have been retrieved from some persistent store such as
+AWS SecretsManager.
+
+```ruby
+
+callback_proc = Proc.new { |new_access_token, token_lifetime |
+   now = Time.now.utc.to_i  # seconds since 1/1/1970, midnight UTC
+   deadline = now+token_lifetime
+   #puts("new access token will expire at #{Time.at(deadline).utc.to_s}")
+   self.save_new_access_token(new_access_token)
+ }
+
+spotify_user = RSpotify::User.new(
+  {
+    'credentials' => {
+       "token" => self.credentials["access_token"],
+       "refresh_token" => self.credentials["refresh_token"],
+       "access_refresh_callback" => callback_proc
+    } ,
+    'id' => self.credentials["user_id"]
+  })
+
+
+```
 
 RSpotify provides a way to facilitate persistence:
 
@@ -232,6 +265,7 @@ spotify_user = RSpotify::User.new(hash)
 spotify_user.create_playlist!('my_awesome_playlist') # automatically refreshes token
 ```
 
+
 ## Getting raw response
 
 To get the raw response from Spotify API requests, just toggle the `raw_response` variable:

data/lib/rspotify/connection.rb

@@ -67,7 +67,7 @@ module RSpotify
       rescue RestClient::Unauthorized => e
         raise e if request_was_user_authenticated?(*params)
 
-        raise MissingAuthentication unless @client_token
+        raise MissingAuthentication unless @client_id && @client_secret
 
         authenticate(@client_id, @client_secret)
 

data/lib/rspotify/oauth.rb

@@ -18,6 +18,11 @@ module OmniAuth
       def raw_info
         @raw_info ||= access_token.get('me').parsed
       end
+      
+      # Fix for: https://github.com/guilhermesad/rspotify/issues/189
+      def callback_url
+        full_host + script_name + callback_path
+      end
     end
   end
 end

data/lib/rspotify/player.rb

@@ -9,6 +9,8 @@ module RSpotify
       @progress               = options['progress_ms']
       @is_playing             = options['is_playing']
       @currently_playing_type = options['currently_playing_type']
+      @context_type           = options.dig('context', 'type')
+      @context_uri            = options.dig('context', 'uri')
 
       @track = if options['track']
         Track.new options['track']
@@ -71,6 +73,21 @@ module RSpotify
       User.oauth_put(@user.id, url, params.to_json)
     end
 
+    # Add an item to the end of the user’s current playback queue
+    # If `device_id` is not passed, the currently active spotify app will be triggered
+    # 
+    # @param [String] device_id the ID of the device to set the repeat state on.
+    # @param [String] uri       the spotify uri of the track to be queued
+    #
+    # @example
+    #           player = user.player
+    #           player.queue("spotify:track:4iV5W9uYEdYUVa79Axb7Rh")
+    def queue(device_id = nil, uri)
+      url = "me/player/queue?uri=#{uri}"
+      url = device_id.nil? ? url : "#{url}&device_id=#{device_id}"
+      User.oauth_post(@user.id, url, {})
+    end
+
     # Toggle the current user's player repeat status.
     # If `device_id` is not passed, the currently active spotify app will be triggered.
     # If `state` is not passed, the currently active context will be set to repeat.

data/lib/rspotify/playlist.rb

@@ -390,7 +390,7 @@ module RSpotify
     def replace_tracks!(tracks)
       track_uris = tracks.map(&:uri).join(',')
       url = "#{@path}/tracks?uris=#{track_uris}"
-      User.oauth_put(@owner.id, url, {})
+      User.oauth_put(@owner.id, url, {}.to_json)
 
       @total = tracks.size
       @tracks_cache = nil

data/lib/rspotify/user.rb

@@ -38,6 +38,16 @@ module RSpotify
       response = RestClient.post(TOKEN_URI, request_body, RSpotify.send(:auth_header))
       response = JSON.parse(response)
       @@users_credentials[user_id]['token'] = response['access_token']
+      access_refresh_proc = @@users_credentials[user_id]['access_refresh_callback']
+      # If the access token expires and a new one is granted via the refresh
+      # token, then this proc will be called with two parameters:
+      # new_access_token and token_lifetime (in seconds)
+      # The purpose is to allow the calling environment to invoke some action,
+      # such as persisting the new access token somewhere, when the new token
+      # is generated.
+      if (access_refresh_proc.respond_to? :call)
+        access_refresh_proc.call(response['access_token'], response['expires_in'])
+      end
     rescue RestClient::BadRequest => e
       raise e if e.response !~ /Refresh token revoked/
     end
@@ -139,7 +149,7 @@ module RSpotify
       url = "me/player"
       response = User.oauth_get(@id, url)
       return response if RSpotify.raw_response
-      response.present? ? Player.new(self, response) : nil
+      response ? Player.new(self, response) : Player.new(self)
     end
 
     # Get the current user’s recently played tracks. Requires the *user-read-recently-played* scope.

data/lib/rspotify/version.rb

@@ -1,3 +1,3 @@
 module RSpotify
-  VERSION = '2.9.0'.freeze
+  VERSION = '2.10.2'.freeze
 end

data/rspotify.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^spec\//)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'omniauth-oauth2', '~> 1.5.0'
+  spec.add_dependency 'omniauth-oauth2', '>= 1.6'
   spec.add_dependency 'rest-client', '~> 2.0.2'
   spec.add_dependency 'addressable', '~> 2.5.2'
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rspotify
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.2
 platform: ruby
 authors:
 - Guilherme Sad
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2021-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"