rspotify 1.19.1 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca4b04de3b3895c1f1177fa8605555c8194d8afd
-  data.tar.gz: 14a9d725d5eaecb027d663423e6dbee7941c82c9
+  metadata.gz: 6a0c24d5567ae501a2521c15ef19a34175dde046
+  data.tar.gz: 25b8e50e446cce78cfb8f98f232353220454ee0b
 SHA512:
-  metadata.gz: 2031354beb1320777591b3dc11e231c49a35bc177b5582611347ee302a7d3c3297c04e150db82206156e1e15a37832e1e98bf47fc54e93281f00ae212fac27f3
-  data.tar.gz: d58ee19c8da18ac3a4a57235c2576f5636774c9ae47788bea1f4bf24294f8f889b6d429868f6db2d25864eb3e3ea5081c350eead84d376c2eeabb518f7ab1c01
+  metadata.gz: dd7117cec0764a99ec287d42e913bec0634bccd480b53efa4c9418b7e5782785dc81c59b875dafd53f2637ff8e7ec86ecca4a5b743002abf51ab1eb577ab198e
+  data.tar.gz: 504222a7bb2eb95b18e0e6abf5b1961c789b07411245ed23d1914b7c2de45415224baabeeb015f9dadd0e278c4a2b29c22f3b803dfc89200e5805559bc01914c

data/lib/rspotify/playlist.rb

@@ -42,15 +42,17 @@ module RSpotify
     #
     # @param user_id [String]
     # @param id [String]
+    # @param market [String] Optional. An {https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 ISO 3166-1 alpha-2 country code}. Provide this parameter if you want to apply Track Relinking
     # @return [Playlist]
     #
     # @example
     #           playlist = RSpotify::Playlist.find('wizzler', '00wHcTN0zQiun4xri9pmvX')
     #           playlist.class #=> RSpotify::Playlist
     #           playlist.name  #=> "Movie Soundtrack Masterpieces"
-    def self.find(user_id, id)
+    def self.find(user_id, id, market: nil)
       url = "users/#{user_id}/"
       url << (id == 'starred' ? id : "playlists/#{id}")
+      url << "?market=#{market}" if market
 
       response = RSpotify.resolve_auth_request(user_id, url)
       return response if RSpotify.raw_response
@@ -226,18 +228,20 @@ module RSpotify
     #
     # @param limit  [Integer] Maximum number of tracks to return. Maximum: 100. Default: 100.
     # @param offset [Integer] The index of the first track to return. Use with limit to get the next set of objects. Default: 0.
+    # @param market [String] Optional. An {https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 ISO 3166-1 alpha-2 country code}. Provide this parameter if you want to apply Track Relinking
     # @return [Array<Track>]
     #
     # @example
     #           playlist = RSpotify::Playlist.find('wizzler', '00wHcTN0zQiun4xri9pmvX')
     #           playlist.tracks.first.name #=> "Main Theme from Star Wars - Instrumental"
-    def tracks(limit: 100, offset: 0)
+    def tracks(limit: 100, offset: 0, market: nil)
       last_track = offset + limit - 1
       if @tracks_cache && last_track < 100 && !RSpotify.raw_response
         return @tracks_cache[offset..last_track]
       end
 
       url = "#{@path}/tracks?limit=#{limit}&offset=#{offset}"
+      url << "&market=#{market}" if market
       response = RSpotify.resolve_auth_request(@owner.id, url)
 
       json = RSpotify.raw_response ? JSON.parse(response) : response

data/lib/rspotify/user.rb

@@ -38,6 +38,8 @@ 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']
+    rescue RestClient::BadRequest => e
+      raise e if e.response !~ /Refresh token revoked/
     end
     private_class_method :refresh_token
 
@@ -68,7 +70,9 @@ module RSpotify
 
     def initialize(options = {})
       credentials = options['credentials']
+      extra       = options['extra'].to_h
       options     = options['info'] if options['info']
+      options.merge!(extra['raw_info'].to_h)
 
       @birthdate    ||= options['birthdate']
       @country      ||= options['country']

data/lib/rspotify/version.rb

@@ -1,3 +1,3 @@
 module RSpotify
-  VERSION = '1.19.1'
+  VERSION = '1.20.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspotify
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 1.20.0
 platform: ruby
 authors:
 - Guilherme Sad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-11 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2