omniauth-tumblr 1.0 → 1.1

data/lib/omniauth-tumblr/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Tumblr
-    VERSION = "1.0"
+    VERSION = "1.1"
   end
 end

data/lib/omniauth/strategies/tumblr.rb

@@ -8,21 +8,21 @@ module OmniAuth
       option :name, 'tumblr'
       option :client_options, {:site => 'http://www.tumblr.com'}
 
-      uid { user['name'] }
+      uid { raw_info['name'] }
 
       info do
         {
-          'nickname' => user['name'],
-          'name' => user['title'],
-          'image' => user['avatar_url'],
-          'urls' => {
-            'website' => user['url'],
-          }
+          :nickname => raw_info['name'],
+          :name => raw_info['name'],
+          :blogs => raw_info['blogs'].map do |b|
+            { :name => b['name'], :url => b['url'], :title => b['title'] }
+          end,
+          :avatar => avatar_url
         }
       end
 
       extra do
-        {'user_hash' => user}
+        { :raw_info => raw_info.merge({ :avatar => avatar_url }) }
       end
 
       def user
@@ -34,10 +34,16 @@ module OmniAuth
         end
       end
 
-      def user_hash
-        url = "http://www.tumblr.com/api/authenticate"
-        @user_hash ||= Hash.from_xml(@access_token.get(url).body)
+      def raw_info
+        url = 'http://api.tumblr.com/v2/user/info'
+        @raw_info ||= MultiJson.decode(access_token.get(url).body)['response']['user']
+      end
+
+      def avatar_url
+        url = "http://api.tumblr.com/v2/blog/#{ raw_info['blogs'].first['url'].sub(%r|^https?://|, '').sub(%r|/?$|, '') }/avatar"
+        res = access_token.get(url).body
+        @avatar_url ||= MultiJson.decode(res)['response']['avatar_url']
       end
     end
   end
-end
+end

metadata

@@ -1,46 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: omniauth-tumblr
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: '1.1'
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  version: "1.0"
 platform: ruby
-authors: 
+authors:
 - Jamie Wilkinson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: omniauth-oauth
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: OmniAuth strategy for Tumblr
-email: 
+email:
 - jamie@jamiedubs.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - README.md
 - lib/omniauth-tumblr.rb
@@ -49,38 +42,27 @@ files:
 - omniauth-tumblr.gemspec
 homepage: https://github.com/jamiew/omniauth-tumblr
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OmniAuth strategy for Tumblr
 test_files: []
-
+has_rdoc: