omniauth-lastfm 0.0.2 → 0.0.3

data/lib/omniauth-lastfm/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Lastfm
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/omniauth/strategies/lastfm.rb

@@ -14,7 +14,8 @@ module OmniAuth
       option :name, "lastfm"
       option :client_options, {
         :authorize_path => "/api/auth",
-        :site           => "http://www.last.fm"
+        :site           => "http://www.last.fm",
+        :api_url        => "http://ws.audioscrobbler.com/2.0/",
       }
 
       attr_reader :json
@@ -29,38 +30,60 @@ module OmniAuth
       end
 
       def callback_phase
+        @json = {}
         token = request.params["token"]
-        params = { :api_key => options.api_key }
-        params[:token] = token
-        params[:api_sig] = signature(token)
-        params[:method] = "auth.getSession"
-        params[:format] = "json"
-        response = RestClient.get("http://ws.audioscrobbler.com/2.0/", { :params => params })
-        @json = MultiJson.decode(response.to_s)
+        begin
+          params = { :api_key => options.api_key,
+                     :token   => token,
+                     :api_sig =>  signature(token),
+                     :method  => "auth.getSession",
+                     :format  => 'json'}
+          response = RestClient.get(options.client_options.api_url, { :params => params })
+          session = MultiJson.decode(response.to_s)
+          @json.merge!(session)
+
+          params = {:api_key  => options.api_key,
+                    :user     => @json['session']['name'],
+                    :method   => 'user.getInfo',
+                    :format   => 'json'}
+          response = RestClient.get(options.client_options.api_url, { :params => params })
+          user = MultiJson.decode(response.to_s)
+          @json.merge!(user)
+        rescue ::RestClient::Exception
+          raise ::Timeout::Error
+        end
         super
       end
 
-      uid { raw_info["name"] }
+      uid do
+        @json['session']['name']
+      end
 
       info do
-        { :name => raw_info["name"] }
+        {
+          :nickname =>  @json['user']['name'],
+          :name     =>  @json['user']['realname'],
+          :url      =>  @json['user']['url'],
+          :image    =>  @json['user']['image'].instance_of?(Array) ? @json['user']['image'].last['#text'] :  @json['user']['image'],
+          :country  =>  @json['user']['country'],
+          :age      =>  @json['user']['age'],
+          :gender   =>  @json['user']['age'],
+        }
       end
 
       extra do
-        { :raw_info => raw_info }
+        { :raw_info => @json['user'] }
       end
 
       credentials do
-        { :token => raw_info["key"] }
-      end
-
-      def raw_info
-        @raw_info ||= @json["session"]
-      rescue ::RestClient::Exception
-        raise ::Timeout::Error
+        {
+          :token => @json['session']['key'],
+          :name  => @json['session']['name'],
+        }
       end
 
       protected
+
       def signature(token)
         sign = "api_key#{options.api_key}methodauth.getSessiontoken#{token}#{options.secret_key}"
         Digest::MD5.hexdigest(sign)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-lastfm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70181137236140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70181137236140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70181137235280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181137235280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70181137234260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181137234260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70181137233520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181137233520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth
-  requirement: &70181137232920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70181137232920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70181137232220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +101,12 @@ dependencies:
         version: 1.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *70181137232220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.6
 description: OmniAuth strategy for Last.fm
 email:
 - claudio@audiobox.fm
@@ -111,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: omniauth-lastfm
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OmniAuth strategy for Last.fm