rspotify 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdb5d05c82ca5e425422843ec89590e50eeda168
-  data.tar.gz: e3178dcd15a55d6efff239aa384b4a2c48a2f721
+  metadata.gz: 05b5d7bcfb1b191a1903769408ddde7388cda19d
+  data.tar.gz: 7328f0da8b45ef1de56633000277a14fb17bc085
 SHA512:
-  metadata.gz: fb4206df7dd0b654bd9186488027f047ceba828b7db72a870f8775b8f068b668cf8d722a2af2ceb4dc701f710e98fdb990d1c8739436c30401f5e17e5e02519e
-  data.tar.gz: f83a6ee536693dd4616811a1fcc965f788680ca4b6c09296667e5f5c8a6c7e80c9e10b4cf45f5e29bef683b42629d84e7116f0cdda54c9730a4c4c76f747190b
+  metadata.gz: 738620a4ff34654d856df9b0655e7e0f9fade0b76711ef8eabd2c0400e5cbc9bbe0ee26b91d3deade850f6c4952cf553c5e0990821f8b6ad1d3b9ed089e627f7
+  data.tar.gz: 3ece009096ddd3a2c36cfe3c090ba425d41a565ef611b65b262305969a4135a1f2a129accc6b09dc3a58704715fc6fa37c88e79d45f246d6141ed728a18ba5fb

data/lib/rspotify/connection.rb

@@ -3,10 +3,11 @@ require 'json'
 require 'restclient'
 
 module RSpotify
+  class MissingAuthentication < StandardError; end
 
-  API_URI       = 'https://api.spotify.com/v1/'
-  AUTHORIZE_URI = 'https://accounts.spotify.com/authorize'
-  TOKEN_URI     = 'https://accounts.spotify.com/api/token'
+  API_URI       = 'https://api.spotify.com/v1/'.freeze
+  AUTHORIZE_URI = 'https://accounts.spotify.com/authorize'.freeze
+  TOKEN_URI     = 'https://accounts.spotify.com/api/token'.freeze
   VERBS         = %w(get post put delete)
 
   class << self
@@ -64,22 +65,23 @@ module RSpotify
         response = RestClient.send(verb, url, *params)
       rescue RestClient::Unauthorized => e
         raise e if request_was_user_authenticated?(*params)
-        if @client_token
-          authenticate(@client_id, @client_secret)
 
-          headers = get_headers(params)
-          headers['Authorization'] = "Bearer #{@client_token}"
+        raise MissingAuthentication unless @client_token
 
-          response = retry_connection verb, url, params
-        end
+        authenticate(@client_id, @client_secret)
+
+        headers = get_headers(params)
+        headers['Authorization'] = "Bearer #{@client_token}"
+
+        response = retry_connection(verb, url, params)
       end
 
       return response if raw_response
-      JSON.parse response unless response.nil? || response.empty?
+      JSON.parse(response) unless response.nil? || response.empty?
     end
 
     # Added this method for testing
-    def retry_connection verb, url, params
+    def retry_connection(verb, url, params)
       RestClient.send(verb, url, *params)
     end
 
@@ -90,23 +92,23 @@ module RSpotify
 
       headers = get_headers(params)
       if users_credentials
-        creds = users_credentials.map{|user_id, creds| "Bearer #{creds['token']}"}
+        creds = users_credentials.map{|_user_id, creds| "Bearer #{creds['token']}"}
 
         if creds.include?(headers['Authorization'])
           return true
         end
       end
-      return false
+
+      false
     end
 
     def auth_header
-      authorization = Base64.strict_encode64 "#{@client_id}:#{@client_secret}"
+      authorization = Base64.strict_encode64("#{@client_id}:#{@client_secret}")
       { 'Authorization' => "Basic #{authorization}" }
     end
 
     def get_headers(params)
       params.find{|param| param.is_a?(Hash) && param['Authorization']}
     end
-
   end
 end

data/lib/rspotify/player.rb

@@ -98,7 +98,7 @@ module RSpotify
     end
 
     def seek(position_ms)
-      url = "/me/player/seek?position_ms=#{position_ms}"
+      url = "me/player/seek?position_ms=#{position_ms}"
       User.oauth_put(@user.id, url, {})
     end
   end

data/lib/rspotify/user.rb

@@ -70,7 +70,7 @@ module RSpotify
       params[-1] = oauth_header(user_id).merge(custom_headers)
       RSpotify.send(:send_request, verb, path, *params)
     end
-    private_class_method :oauth_header
+    private_class_method :oauth_send
 
     RSpotify::VERBS.each do |verb|
       define_singleton_method "oauth_#{verb}" do |user_id, path, *params|

data/lib/rspotify/version.rb

@@ -1,3 +1,3 @@
 module RSpotify
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspotify
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Guilherme Sad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2