rspotify 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b0804e1886e1ffa8bb5d5df377e8d25ddfeb50
-  data.tar.gz: 462a1211c106279de90490fa58ef1c7340122019
+  metadata.gz: 4b8f239c93e7f8445a6ab7963b82551dae8d2fa5
+  data.tar.gz: 0201d9d38995ffcd8b7d218402e5ef047898b890
 SHA512:
-  metadata.gz: b1d02142eacd40743e3681e7b87858f4390738e12a2fc3383f48dcf977ca705f985ac101195de3411f6627a609f308b523e787b54e9010910fadd09e9ad9526c
-  data.tar.gz: 4819abd8af5a198e89c4fce6f781d33c2051b25817f8f2122d50976e31b1d44017ef026dd9099bf574d4dbea331a69bd448174e8304569ee30e8459ce8196883
+  metadata.gz: 318e529c2896ad7563d85c64b74833df356d2987a78fabb1f207f9ba7eb8ecd8f2a94d78797f1eb316c46964a48c110d7a35723c4db8a633e90c0fd29133f3b7
+  data.tar.gz: 0433cdf3d380e6d945ba3b3ee7357111a127b2d2d1f2d043f9f498e9ca14646f065116994e6823491b1c5cdcd7e3738418615c8668f240714155af45c165ed8c

data/README.md

@@ -145,14 +145,25 @@ class UsersController < ApplicationController
     spotify_user = RSpotify::User.new(request.env['omniauth.auth'])
     # Now you can create playlists for the user and much more!
 
-    spotify_user.create_playlist!('my-awesome-playlist') 
-    # Directly creates playlist in user's Spotify account
+    playlist = spotify_user.create_playlist!('my-awesome-playlist')
+    # Directly creates playlist in user's Spotify account and returns it
+
+    tracks = RSpotify::Track.search('Know')
+
+    playlist.add_tracks!(tracks)
+    # user's Spotify account now has a playlist with songs containing "Know" in the name
+
+    playlist.tracks.first.name #=> "Somebody That I Used To Know"
   end
 end
 ```
 
 **Note**: You might also like to add `RSpotify::authenticate("<your_client_id>", "<your_client_secret>")` to your `config/application.rb`. This will allow extra calls to be made.
 
+## Notes
+
+If you'd like to use OAuth outside rails, have a look [here](https://developer.spotify.com/web-api/authorization-guide/#authorization_code_flow) for the requests that need to be made. You should be able to pass the response to RSpotify::User.new just as well, and from there easily create playlists and more for your user.
+
 ## Contributing
 
 1. Fork it ( https://github.com/guilhermesad/rspotify/fork )

data/lib/rspotify.rb

@@ -7,7 +7,7 @@ module RSpotify
   API_URI       = 'https://api.spotify.com/v1/'
   AUTHORIZE_URI = 'https://accounts.spotify.com/authorize'
   TOKEN_URI     = 'https://accounts.spotify.com/api/token'
-  VERBS         = %w(get post put delete)
+  VERBS         = %w(get post)
 
   autoload :Album,    'rspotify/album'
   autoload :Artist,   'rspotify/artist'
@@ -21,7 +21,7 @@ module RSpotify
     authorization = Base64.strict_encode64 "#{client_id}:#{client_secret}"
     headers = { 'Authorization' => "Basic #{authorization}" }
     response = RestClient.post(TOKEN_URI, request_body, headers)
-    @access_token = JSON.parse(response)['access_token']
+    @client_token = JSON.parse(response)['access_token']
     true
   end
 
@@ -29,11 +29,11 @@ module RSpotify
     define_singleton_method verb do |path, *params|
       url = API_URI + path
       response = RestClient.send(verb, url, *params)
-      JSON.parse response
+      JSON.parse response unless response.empty?
     end
 
     define_singleton_method "auth_#{verb}" do |path, *params|
-      auth_header = { 'Authorization' => "Bearer #{@access_token}" }
+      auth_header = { 'Authorization' => "Bearer #{@client_token}" }
       params << auth_header
       send(verb, path, *params)
     end

data/lib/rspotify/playlist.rb

@@ -50,6 +50,21 @@ module RSpotify
       super(options)
     end
 
+    #TODO doc
+    def add_tracks!(tracks, position: nil)
+      if tracks.size > 100
+        warn 'Too many tracks requested. Maximum: 100'
+        return false
+      end
+
+      track_uris = tracks.map(&:uri).join(',')
+      url = "users/#{@owner.id}/playlists/#{@id}/tracks?uris=#{track_uris}"
+      url << "&position=#{position}" if position
+      
+      RSpotify.post(url, {}, User.send(:oauth_headers, @owner.id))
+      @tracks = nil
+    end
+
     # When an object is obtained undirectly, Spotify usually returns a simplified version of it.
     # This method updates it into a full object, with all attributes filled.
     # 
@@ -61,7 +76,15 @@ module RSpotify
     #           playlist.complete!
     #           playlist.instance_variable_get("@description") #=> "Iconic soundtracks..."
     def complete!
-      initialize RSpotify.auth_get("users/#{@owner.id}/playlists/#{@id}")
+      url = "users/#{@owner.id}/playlists/#{@id}"
+      credentials_defined = User.class_variable_defined?('@@users_credentials')
+      credentials = (credentials_defined ? User.class_variable_get('@@users_credentials') : nil)
+
+      if credentials && credentials[@owner.id]
+        initialize RSpotify.get(url, User.send(:oauth_headers, @owner.id))
+      else
+        initialize RSpotify.auth_get(url)
+      end
     end
   end
 end

data/lib/rspotify/user.rb

@@ -21,9 +21,17 @@ module RSpotify
       false
     end
 
+    def self.oauth_headers(user_id)
+      { 
+        'Authorization' => "Bearer #{@@users_credentials[user_id]['token']}",
+        'Content-Type'  => 'application/json'
+      }
+    end
+    private_class_method :oauth_headers
+
     def initialize(options = {})
-      @credentials ||= options['credentials']
-      options = options['info'] if options['info']
+      credentials = options['credentials']
+      options     = options['info'] if options['info']
 
       @country      ||= options['country']
       @display_name ||= options['display_name']
@@ -32,16 +40,18 @@ module RSpotify
       @product      ||= options['product']
 
       super(options)
+
+      if credentials
+        @@users_credentials ||= {}
+        @@users_credentials[@id] = credentials
+      end
     end
 
+    #TODO doc
     def create_playlist!(name, public: true)
-      headers  = { 
-        'Authorization' => "Bearer #{@credentials['token']}",
-        'Content-Type'  => 'application/json'
-      }
+      url = "users/#{@id}/playlists"
       request_data = %Q({"name":"#{name}", "public":#{public}})
-
-      RSpotify.post("users/#{@id}/playlists", request_data, headers)
+      Playlist.new RSpotify.post(url, request_data, User.send(:oauth_headers, @id))
     end
 
     # Returns all playlists from user

data/lib/rspotify/version.rb

@@ -1,3 +1,3 @@
 module RSpotify
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspotify
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Guilherme Sad