rspotify 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7a369b00096dcefd7060c3d6d802dbd84c47891
-  data.tar.gz: 72766cf26e96b3cb2fe24df568b70a64d5683021
+  metadata.gz: 1e6de26af3763d772cfac6dcaa7af1872f33eb58
+  data.tar.gz: c2068bee7e831a418081238f086823a0dfddf416
 SHA512:
-  metadata.gz: b0b1c1b3a0e4651cb1fdf10c158f1ce89276450294dd18799fd72ed7006598c12f39b9220cf0a985a8e92752f37d2815ff2567f0fa7c85f5d5caa709716fe838
-  data.tar.gz: 8c15b7aa0844acd020380670247505ae83bff813062c12918cab4a43a1595c85921dc1f3ee711eab3575b9dc744bcb6873138e62cfb7362fbd098a42cc7f2907
+  metadata.gz: b5da292e7de162c2525f35da9443dea08dbca5160c091b9046ca3f2b61bbad35a6667396b2afa6e62ae54e32c3413878615828760acbade35db925ef6afc1cd9
+  data.tar.gz: 1d7b6e62548385c7d88ef98fe74deb7efd533e848fab72450fab9487ad719c0ce7cd5fdbb7a208b54da1ac0a3da3f2be995733cdf0630a4ff251fea4e0f8f3e7

data/README.md

@@ -211,6 +211,15 @@ 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:
+
+```ruby
+RSpotify.raw_response = true
+RSpotify::Artist.search('Cher') #=> (String with raw json response)
+```
+
 ## 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.

data/lib/rspotify/album.rb

@@ -45,6 +45,8 @@ module RSpotify
       url = "browse/new-releases?limit=#{limit}&offset=#{offset}"
       url << "&country=#{country}" if country
       response = RSpotify.get(url)
+
+      return response if RSpotify.raw_response
       response['albums']['items'].map { |i| Album.new i }
     end
 
@@ -100,14 +102,18 @@ module RSpotify
     #           album.tracks.first.name #=> "Do I Wanna Know?"
     def tracks(limit: 50, offset: 0)
       last_track = offset + limit - 1
-      if @tracks_cache && last_track < 50
+      if @tracks_cache && last_track < 50 && !RSpotify.raw_response
         return @tracks_cache[offset..last_track]
       end
 
       url = "albums/#{@id}/tracks?limit=#{limit}&offset=#{offset}"
       response = RSpotify.get(url)
-      tracks = response['items'].map { |i| Track.new i }
+      json = RSpotify.raw_response ? JSON.parse(response) : response
+
+      tracks = json['items'].map { |i| Track.new i }
       @tracks_cache = tracks if limit == 50 && offset == 0
+      return response if RSpotify.raw_response
+
       tracks
     end
   end

data/lib/rspotify/artist.rb

@@ -73,6 +73,7 @@ module RSpotify
       end
 
       response = RSpotify.get(url)
+      return response if RSpotify.raw_response
       response['items'].map { |i| Album.new i }
     end
 
@@ -87,8 +88,10 @@ module RSpotify
     #           related_artists.size       #=> 20
     #           related_artists.first.name #=> "Miles Kane"
     def related_artists
-      return @related_artists unless @related_artists.nil?
+      return @related_artists unless @related_artists.nil? || RSpotify.raw_response
       response = RSpotify.get("artists/#{@id}/related-artists")
+
+      return response if RSpotify.raw_response
       @related_artists = response['artists'].map { |a| Artist.new a }
     end
 
@@ -103,8 +106,10 @@ module RSpotify
     #           top_tracks.size        #=> 10
     #           top_tracks.first.class #=> RSpotify::Track
     def top_tracks(country)
-      return @top_tracks[country] unless @top_tracks[country].nil?
+      return @top_tracks[country] unless @top_tracks[country].nil? || RSpotify.raw_response
       response = RSpotify.get("artists/#{@id}/top-tracks?country=#{country}")
+
+      return response if RSpotify.raw_response
       @top_tracks[country] = response['tracks'].map { |t| Track.new t }
     end
   end

data/lib/rspotify/base.rb

@@ -40,7 +40,9 @@ module RSpotify
     def self.find_many(ids, type)
       type_class = RSpotify.const_get(type.capitalize)
       path = "#{type}s?ids=#{ids.join ','}"
+
       response = RSpotify.get path
+      return response if RSpotify.raw_response
       response["#{type}s"].map { |t| type_class.new t }
     end
     private_class_method :find_many
@@ -48,7 +50,9 @@ module RSpotify
     def self.find_one(id, type)
       type_class = RSpotify.const_get(type.capitalize)
       path = "#{type}s/#{id}"
+
       response = RSpotify.get path
+      return response if RSpotify.raw_response
       type_class.new response
     end
     private_class_method :find_one
@@ -97,6 +101,8 @@ module RSpotify
         RSpotify.get(url)
       end
 
+      return response if RSpotify.raw_response
+
       types = types.split(',')
       result = types.flat_map do |type|
         type_class = RSpotify.const_get(type.capitalize)

data/lib/rspotify/category.rb

@@ -30,6 +30,7 @@ module RSpotify
       end
 
       response = RSpotify.get(url)
+      return response if RSpotify.raw_response
       Category.new response
     end
 
@@ -50,7 +51,9 @@ module RSpotify
       options.each do |option, value|
         url << "&#{option}=#{value}"
       end
+
       response = RSpotify.get(url)
+      return response if RSpotify.raw_response
       response['categories']['items'].map { |i| Category.new i }
     end
 
@@ -92,6 +95,7 @@ module RSpotify
       end
 
       response = RSpotify.get(url)
+      return response if RSpotify.raw_response
       response['playlists']['items'].map { |i| Playlist.new i }
     end
   end

data/lib/rspotify/connection.rb

@@ -10,6 +10,7 @@ module RSpotify
   VERBS         = %w(get post put delete)
 
   class << self
+    attr_accessor :raw_response
 
     # Authenticates access to restricted data. Requires {https://developer.spotify.com/my-applications user credentials}
     #
@@ -52,6 +53,7 @@ module RSpotify
 
     def send_request(verb, path, *params)
       url = path.start_with?("http") ? path : API_URI + path
+
       begin
         response = RestClient.send(verb, url, *params)
       rescue RestClient::Unauthorized
@@ -60,6 +62,8 @@ module RSpotify
           response = RestClient.send(verb, url, *params)
         end
       end
+
+      return response if raw_response
       JSON.parse response unless response.empty?
     end
 

data/lib/rspotify/playlist.rb

@@ -32,7 +32,9 @@ module RSpotify
       options.each do |option, value|
         url << "&#{option}=#{value}"
       end
+
       response = RSpotify.get(url)
+      return response if RSpotify.raw_response
       response['playlists']['items'].map { |i| Playlist.new i }
     end
 
@@ -52,7 +54,9 @@ module RSpotify
       else
         "users/#{user_id}/playlists/#{id}"
       end
+
       response = RSpotify.resolve_auth_request(user_id, url)
+      return response if RSpotify.raw_response
       Playlist.new response
     end
 
@@ -131,10 +135,15 @@ module RSpotify
       url << "&position=#{position}" if position
 
       response = User.oauth_post(@owner.id, url, {})
-      @snapshot_id = response['snapshot_id']
-
       @total += tracks.size
       @tracks_cache = nil
+
+      if RSpotify::raw_response
+        @snapshot_id = JSON.parse(response)['snapshot_id']
+        return response
+      end
+
+      @snapshot_id = json['snapshot_id']
       tracks
     end
 
@@ -219,13 +228,15 @@ module RSpotify
     #           playlist.tracks.first.name #=> "Main Theme from Star Wars - Instrumental"
     def tracks(limit: 100, offset: 0)
       last_track = offset + limit - 1
-      if @tracks_cache && last_track < 100
+      if @tracks_cache && last_track < 100 && !RSpotify.raw_response
         return @tracks_cache[offset..last_track]
       end
 
       url = "#{@href}/tracks?limit=#{limit}&offset=#{offset}"
       response = RSpotify.resolve_auth_request(@owner.id, url)
-      tracks = response['items'].select { |i| i['track'] }
+
+      json = RSpotify.raw_response ? JSON.parse(response) : response
+      tracks = json['items'].select { |i| i['track'] }
 
       @tracks_added_at = hash_for(tracks, 'added_at') do |added_at|
         Time.parse added_at
@@ -241,6 +252,7 @@ module RSpotify
 
       tracks.map! { |t| Track.new t['track'] }
       @tracks_cache = tracks if limit == 100 && offset == 0
+      return response if RSpotify.raw_response
       tracks
     end
 
@@ -312,7 +324,9 @@ module RSpotify
       }.merge options
 
       response = User.oauth_put(@owner.id, url, data.to_json)
-      @snapshot_id = response['snapshot_id']
+      json = RSpotify.raw_response ? JSON.parse(response) : response
+
+      @snapshot_id = json['snapshot_id']
       @tracks_cache = nil
       self
     end

data/lib/rspotify/user.rb

@@ -105,7 +105,10 @@ module RSpotify
     def create_playlist!(name, public: true)
       url = "users/#{@id}/playlists"
       request_data = { name: name, public: public }.to_json
-      Playlist.new User.oauth_post(@id, url, request_data)
+
+      response = User.oauth_post(@id, url, request_data)
+      return response if RSpotify.raw_response
+      Playlist.new response
     end
 
     # Add the current user as a follower of one or more artists, other Spotify users or a playlist. Following artists or users require the *user-follow-modify*
@@ -164,6 +167,7 @@ module RSpotify
       url << "&after=#{after}" if after
 
       response = User.oauth_get(@id, url)
+      return response if RSpotify.raw_response
       response["#{type}s"]['items'].map { |i| type_class.new i }
     end
 
@@ -203,6 +207,7 @@ module RSpotify
     def playlists(limit: 20, offset: 0)
       url = "users/#{@id}/playlists?limit=#{limit}&offset=#{offset}"
       response = RSpotify.resolve_auth_request(@id, url)
+      return response if RSpotify.raw_response
       response['items'].map { |i| Playlist.new i }
     end
 
@@ -256,12 +261,14 @@ module RSpotify
     def saved_tracks(limit: 20, offset: 0)
       url = "me/tracks?limit=#{limit}&offset=#{offset}"
       response = User.oauth_get(@id, url)
+      json = RSpotify.raw_response ? JSON.parse(response) : response
 
-      tracks = response['items'].select { |i| i['track'] }
+      tracks = json['items'].select { |i| i['track'] }
       @tracks_added_at = hash_for(tracks, 'added_at') do |added_at|
         Time.parse added_at
       end
 
+      return response if RSpotify.raw_response
       tracks.map { |t| Track.new t['track'] }
     end
 

data/lib/rspotify/version.rb

@@ -1,3 +1,3 @@
 module RSpotify
-  VERSION = '1.15.0'
+  VERSION = '1.15.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspotify
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Guilherme Sad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-19 00:00:00.000000000 Z
+date: 2015-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2