playlyfe 0.2.1 → 0.2.2

data/lib/access_token.rb

@@ -3,6 +3,10 @@ module OAuth2
     attr_reader :client, :token, :expires_in, :expires_at, :params
     attr_accessor :options, :refresh_token
 
+    def self.from_hash(client, hash)
+      new(client, hash.delete('access_token') || hash.delete(:access_token), hash)
+    end
+
     class << self
       # Initializes an AccessToken from a Hash
       #

data/lib/client.rb

@@ -126,7 +126,7 @@ module OAuth2
     # @param [Hash] access token options, to pass to the AccessToken object
     # @param [Class] class of access token for easier subclassing OAuth2::AccessToken
     # @return [AccessToken] the initalized AccessToken
-    def get_token(params, access_token_opts = {}, access_token_class = AccessToken)
+    def get_token(params, access_token_opts = {})
       opts = {:raise_errors => options[:raise_errors], :parse => params.delete(:parse)}
       if options[:token_method] == :post
         headers = params.delete(:headers)
@@ -139,7 +139,9 @@ module OAuth2
       response = request(options[:token_method], token_url, opts)
       error = Error.new(response)
       fail(error) if options[:raise_errors] && !(response.parsed.is_a?(Hash) && response.parsed['access_token'])
-      AccessToken.from_hash(self, response.parsed.merge(access_token_opts))
+      hash = response.parsed.merge(access_token_opts)
+      AccessToken.new(self, hash.delete('access_token') || hash.delete(:access_token), hash)
+      #AccessToken.from_hash(self, response.parsed.merge(access_token_opts))
       #access_token_class.from_hash(self, response.parsed.merge(access_token_opts))
     end
 

data/test/test.rb

@@ -8,7 +8,7 @@ class PlaylyfeTest < Test::Unit::TestCase
       client_id: "NjZlZWFiMWEtN2ZiOC00YmVmLTk2YWMtNDEyYTNmMjQ5NDBl",
       client_secret: "NGRhMWJlYzUtODJiNS00ZTdkLTgzNTctMTQyMGEzNTljN2MwMTU2MGM3NTAtZjZiZS0xMWUzLTgxZjYtNmZhMGYyMzRkZGU3"
     )
-    puts Playlyfe.token
+    puts Playlyfe.token.to_hash
 
     players = Playlyfe.get(url: '/players')
     assert_not_nil players["data"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playlyfe
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: