rspotify 1.27.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9ea5b18ac0e9a38c03d231de16d8f0386178b09
-  data.tar.gz: 7599ceb37479b2a7fce0892090c0d27b1c03e0b3
+  metadata.gz: 3a560e9bc44938d7a54e6df175ee4f17f05e5bd5
+  data.tar.gz: df0f62eabdef80756d5733dcf8c2662991ab8620
 SHA512:
-  metadata.gz: c19a812dbdf2ffeca4a223d494082d8886c5b17839497d1e23d48851998d38efd4e7dc79479a69a2603a1728a99fb73fb53afc2a35d3588aad74013e1ceadfd9
-  data.tar.gz: 9b5e8a23eb7eb33d0812628a91edcc86b759351ec63d11f2e98ff866eb1ca211f48c82325be8e00e68edb3c9b717f1fad3454e7e1c339769b4f3c299fecde40f
+  metadata.gz: 1ab393b11f5dcfc668506b3d5765dd305da5cb6f623fe61c6d9e62bb8616055f2f622d412fb8c13b7caf4fe45aa98b6c30aedeffa376f8c64e7bb3efb03db48e
+  data.tar.gz: 3e1f2c2e6283dbebaeac0db621a785805d6e25cc2d5a1af0382bd612e236703809fb7d15fc4d3a14a75fed7789bfcf3a6d8cbb2ec06323e0df7bcebfec6c3e5b

data/lib/rspotify.rb

@@ -8,10 +8,11 @@ module RSpotify
   autoload :Base,               'rspotify/base'
   autoload :Category,           'rspotify/category'
   autoload :Device,             'rspotify/device'
-  autoload :TrackLink,          'rspotify/track_link'
+  autoload :Player,             'rspotify/player'
   autoload :Playlist,           'rspotify/playlist'
   autoload :Recommendations,    'rspotify/recommendations'
   autoload :RecommendationSeed, 'rspotify/recommendation_seed'
   autoload :Track,              'rspotify/track'
+  autoload :TrackLink,          'rspotify/track_link'
   autoload :User,               'rspotify/user'
 end

data/lib/rspotify/player.rb

@@ -0,0 +1,100 @@
+module RSpotify
+  class Player < Base
+
+    def initialize(user, options = {})
+      @user = user
+
+      @repeat_state  = options['repeat_state']
+      @shuffle_state = options['shuffle_state']
+      @progress      = options['progress_ms']
+      @is_playing    = options['is_playing']
+
+      @track = if options['track']
+                 Track.new options['track']
+               end
+
+      @device = if options['device']
+                  Device.new options['device']
+                end
+    end
+
+    def playing?
+      is_playing
+    end
+
+    # Allow user to play a specific context(albums, artists & playlists).
+    # If `device_id` is not passed, the currently active spotify app will be triggered
+    #
+    # @example
+    #           player = user.player
+    #           player.play_context(nil,"spotify:album:1Je1IMUlBXcx1Fz0WE7oPT")
+    def play_context(device_id=nil, uri)
+      params = {"context_uri": uri}
+      play(device_id, params)
+    end
+
+    # Allow user to play a list of tracks.
+    # If `device_id` is not passed, the currently active spotify app will be triggered
+    #
+    # @example
+    #           player = user.player
+    #           tracks_uris = ["spotify:track:4iV5W9uYEdYUVa79Axb7Rh", "spotify:track:1301WleyT98MSxVHPZCA6M"]
+    #           player.play_tracks(nil, tracks_uris)
+    def play_tracks(device_id=nil, uris)
+      params = {"uris": uris}
+      play(device_id, params)
+    end
+
+    # Allow browser to trigger playback in the user's currently active spotify app.
+     # If `device_id` is not passed, the currently active spotify app will be triggered
+    #
+    # @example
+    #           player = user.player
+    #           player.play_track(nil, "spotify:track:4iV5W9uYEdYUVa79Axb7Rh")
+    #           # User must be a premium subscriber for this feature to work.
+    def play_track(device_id=nil, uri)
+      params = {"uris": [uri]}
+      play(device_id, params)
+    end
+
+    # Play the user's currently active player or specific device
+    # If `device_id` is not passed, the currently active spotify app will be triggered
+    #
+    # @example
+    #           player = user.player
+    #           player.play
+    def play(device_id = nil, params = {})
+      url = "me/player/play"
+      url = device_id.nil? ? url : url+"?device_id=#{device_id}"
+
+      User.oauth_put(@user.id, url, params.to_json)
+    end
+
+    # Pause the user's currently active player
+    #
+    # @example
+    #           player = user.player
+    #           player.pause
+    def pause
+      url = 'me/player/pause'
+      User.oauth_put(@user.id, url, {})
+    end
+
+    # Update the user's currently active player volume
+    #
+    # @example
+    #           player = user.player
+    #           player.volume(50)
+    def volume(percent)
+      url = "me/player/volume?volume_percent=#{percent}"
+      User.oauth_put(@user.id, url, {})
+    end
+
+    def currently_playing
+      url = "me/player/currently-playing"
+      response = RSpotify.resolve_auth_request(@user.id, url)
+      return response if RSpotify.raw_response
+      Track.new response["item"]
+    end
+  end
+end

data/lib/rspotify/user.rb

@@ -115,48 +115,15 @@ module RSpotify
       Playlist.new response
     end
 
-    def currently_playing
-      url = "me/player/currently-playing"
-      response = RSpotify.resolve_auth_request(@id, url)
-      return response if RSpotify.raw_response
-      Track.new response["item"]
-    end
-
-    # Allow browser to trigger playback in the user's currently active spotify app.
-    # User must be a premium subscriber for this feature to work.
-    def play_track(song_uri)
-      url = "me/player/play"
-      params = {"uris": [song_uri]}
-      User.oauth_put(@id, url, params.to_json)
-    end
-
-    # Play the user's currently active player
-    #
-    # @example
-    #           player = user.player
-    #           player.play
-    def play
-      url = 'me/player/play'
-      User.oauth_put(@id, url, {})
-    end
-
-    # Pause the user's currently active player
-    #
-    # @example
-    #           player = user.player
-    #           player.pause
-    def pause
-      url = 'me/player/pause'
-      User.oauth_put(@id, url, {})
-    end
-
     # Get the current user’s player
     #
     # @example
     #           player = user.player
     def player
-      url = 'me/player'
-      User.oauth_get(@id, url)
+      url = "me/player"
+      response = User.oauth_get(@id, url)
+      return response if RSpotify.raw_response
+      response.present? ? Player.new(self, response) : nil
     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 = '1.27.0'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspotify
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Guilherme Sad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -146,6 +146,7 @@ files:
 - lib/rspotify/connection.rb
 - lib/rspotify/device.rb
 - lib/rspotify/oauth.rb
+- lib/rspotify/player.rb
 - lib/rspotify/playlist.rb
 - lib/rspotify/recommendation_seed.rb
 - lib/rspotify/recommendations.rb