rspotify 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 099ef6df09a9e5e69ec2765409c9d4262f4e5e30
-  data.tar.gz: 9f00aa8931f67d946b158391c7afa99e05fad61b
+  metadata.gz: 1d036fdc4740624c2fbb316884229f8e36910b12
+  data.tar.gz: 10ac95732e3035d833761359d7315bc6ee262fbf
 SHA512:
-  metadata.gz: 451f177d91bcf3cb1025cac3d448b0a69a0216faf51c0f6285a0499ce36435fc6aa04b5d1de6890617339f3f50164e0c71ffaa9697430eb2429e0f8e05d98e9e
-  data.tar.gz: 759310516f92db6b07e71e8afd8ca4b4da649376fff85580d19ea394d0f0d6b34245e68dd1e5bafb27abd55950eee5c3ee32f3e3258802af5f8a025bef91ea1c
+  metadata.gz: 81c76cb23d53a4fa2f5fac2a08533301656e3c54c07df43c9339bef21b25384e2bec3770a7672db67eb076a53a0c3319f46ea14be6cd79fe000702cda798c61a
+  data.tar.gz: bf69b0fa697e50e686c57beb3c4375e53684219ddbd9ad87086ff8c5b8bf36bfca961602bf2e03ce3e1acd240866f01e40e7325e134ee3815af5d3b188cb2e30

data/lib/rspotify.rb

@@ -1,44 +1,12 @@
-require 'base64'
-require 'json'
-require 'restclient'
+require 'rspotify/connection'
+require 'rspotify/oauth'
+require 'rspotify/version'
 
 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)
-
   autoload :Album,    'rspotify/album'
   autoload :Artist,   'rspotify/artist'
   autoload :Base,     'rspotify/base'
   autoload :Playlist, 'rspotify/playlist'
   autoload :Track,    'rspotify/track'
   autoload :User,     'rspotify/user'
-
-  def self.authenticate(client_id, client_secret)
-    request_body = { grant_type: 'client_credentials' }
-    authorization = Base64.strict_encode64 "#{client_id}:#{client_secret}"
-    headers = { 'Authorization' => "Basic #{authorization}" }
-    response = RestClient.post(TOKEN_URI, request_body, headers)
-    @client_token = JSON.parse(response)['access_token']
-    true
-  end
-
-  VERBS.each do |verb|
-    define_singleton_method verb do |path, *params|
-      url = API_URI + path
-      response = RestClient.send(verb, url, *params)
-      JSON.parse response unless response.empty?
-    end
-
-    define_singleton_method "auth_#{verb}" do |path, *params|
-      auth_header = { 'Authorization' => "Bearer #{@client_token}" }
-      params << auth_header
-      send(verb, path, *params)
-    end
-  end
 end
-
-require 'rspotify/oauth'
-require 'rspotify/version'

data/lib/rspotify/artist.rb

@@ -1,9 +1,9 @@
 module RSpotify
 
-  # @attr [Array<String>] genres     A list of the genres used to classify the album. If not yet classified, the array is empty.
-  # @attr [Array<Hash>]   images     The cover art for the album in various sizes, widest first
-  # @attr [String]        name       The name of the album
-  # @attr [Integer]       popularity The popularity of the album. The value will be between 0 and 100, with 100 being the most popular
+  # @attr [Array<String>] genres     A list of the genres the artist is associated with. If not yet classified, the array is empty
+  # @attr [Array<Hash>]   images     Images of the artist in various sizes, widest first
+  # @attr [String]        name       The name of the artist
+  # @attr [Integer]       popularity The popularity of the artist. The value will be between 0 and 100, with 100 being the most popular
   class Artist < Base
 
     # Returns Artist object(s) with id(s) provided

data/lib/rspotify/connection.rb

@@ -0,0 +1,41 @@
+require 'base64'
+require 'json'
+require 'restclient'
+
+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)
+
+  def self.auth_header
+    authorization = Base64.strict_encode64 "#{@client_id}:#{@client_secret}"
+    { 'Authorization' => "Basic #{authorization}" }
+  end
+  private_class_method :auth_header
+
+  def self.authenticate(client_id, client_secret)
+    @client_id, @client_secret = client_id, client_secret
+    request_body = { grant_type: 'client_credentials' }
+    response = RestClient.post(TOKEN_URI, request_body, auth_header)
+    @client_token = JSON.parse(response)['access_token']
+    true
+  end
+
+  VERBS.each do |verb|
+    # RSpotify::{get,post}
+    define_singleton_method verb do |path, *params|
+      url = API_URI + path
+      response = RestClient.send(verb, url, *params)
+      JSON.parse response unless response.empty?
+    end
+
+    # RSpotify::auth_{get,post}
+    define_singleton_method "auth_#{verb}" do |path, *params|
+      auth_header = { 'Authorization' => "Bearer #{@client_token}" }
+      params << auth_header
+      send(verb, path, *params)
+    end
+  end
+end

data/lib/rspotify/playlist.rb

@@ -77,7 +77,7 @@ module RSpotify
       url = "users/#{@owner.id}/playlists/#{@id}/tracks?uris=#{track_uris}"
       url << "&position=#{position}" if position
       
-      RSpotify.post(url, {}, User.send(:oauth_headers, @owner.id))
+      RSpotify.post(url, {}, User.send(:oauth_header, @owner.id))
       @tracks = nil
     end
 
@@ -97,7 +97,7 @@ module RSpotify
       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))
+        initialize RSpotify.get(url, User.send(:oauth_header, @owner.id))
       else
         initialize RSpotify.auth_get(url)
       end

data/lib/rspotify/user.rb

@@ -1,6 +1,7 @@
 module RSpotify
 
   # @attr [String] country      The country of the user, as set in the user's account profile. An {http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 ISO 3166-1 alpha-2 country code}. This field is only available when the current user has granted access to the *user-read-private* scope.
+  # @attr [Hash]   credentials  The credentials generated for the user with OAuth. Includes access token, token type, token expiration time and refresh token. This field is only available when the current user has granted access to any scope.
   # @attr [String] display_name The name displayed on the user's profile. This field is only available when the current user has granted access to the *user-read-private* scope.
   # @attr [String] email        The user's email address. This field is only available when the current user has granted access to the *user-read-email* scope.
   # @attr [Array]  images       The user's profile image. This field is only available when the current user has granted access to the *user-read-private* scope.
@@ -26,13 +27,13 @@ module RSpotify
       false
     end
 
-    def self.oauth_headers(user_id)
+    def self.oauth_header(user_id)
       { 
         'Authorization' => "Bearer #{@@users_credentials[user_id]['token']}",
         'Content-Type'  => 'application/json'
       }
     end
-    private_class_method :oauth_headers
+    private_class_method :oauth_header
 
     def initialize(options = {})
       credentials = options['credentials']
@@ -49,6 +50,7 @@ module RSpotify
       if credentials
         @@users_credentials ||= {}
         @@users_credentials[@id] = credentials
+        @credentials = @@users_credentials[@id]
       end
     end
 
@@ -70,7 +72,7 @@ module RSpotify
     def create_playlist!(name, public: true)
       url = "users/#{@id}/playlists"
       request_data = %Q({"name":"#{name}", "public":#{public}})
-      Playlist.new RSpotify.post(url, request_data, User.send(:oauth_headers, @id))
+      Playlist.new RSpotify.post(url, request_data, User.send(:oauth_header, @id))
     end
 
     # Returns all playlists from user
@@ -86,5 +88,14 @@ module RSpotify
       playlists = RSpotify.auth_get("users/#{@id}/playlists")['items']
       playlists.map { |p| Playlist.new p }
     end
+
+    # Returns a hash containing all user attributes
+    def to_hash
+      hash = {}
+      instance_variables.each do |var|
+        hash[var.to_s.delete('@')] = instance_variable_get(var)
+      end
+      hash
+    end
   end
 end

data/lib/rspotify/version.rb

@@ -1,3 +1,3 @@
 module RSpotify
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspotify
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Guilherme Sad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -126,6 +126,7 @@ files:
 - lib/rspotify/album.rb
 - lib/rspotify/artist.rb
 - lib/rspotify/base.rb
+- lib/rspotify/connection.rb
 - lib/rspotify/oauth.rb
 - lib/rspotify/playlist.rb
 - lib/rspotify/track.rb
@@ -171,4 +172,3 @@ test_files:
 - spec/lib/rspotify/user_spec.rb
 - spec/lib/rspotify_spec.rb
 - spec/spec_helper.rb
-has_rdoc: