omniauth-flickr 0.0.3 → 0.0.4

data/lib/omniauth-flickr/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Flickr
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/omniauth/strategies/flickr.rb

@@ -19,20 +19,37 @@ module OmniAuth
       }
       
       info do 
-        user_info
+        {
+          :username => access_token.params['username'],
+          :fullname => access_token.params['fullname'],
+          :ispro => user_info["ispro"],
+          :iconserver => user_info["iconserver"],
+          :iconfarm => user_info["iconfarm"],
+          :path_alias => user_info["path_alias"],
+          :photosurl => user_info["photosurl"],
+          :mbox_sha1sum => user_info["mbox_sha1sum"],
+          :location => user_info["location"],
+          :image => "http://farm#{user_info["iconfarm"]}.static.flickr.com/#{user_info["iconserver"]}/buddyicons/#{uid}.jpg"
+        }
       end
       
       extra do
-        {}
+ 	{
+          :raw_info => raw_info
+	}
+      end
+
+      def raw_info
+        # This is a public API and does not need signing or authentication
+        url = "/services/rest/?api_key=#{options.consumer_key}&format=json&method=flickr.people.getInfo&nojsoncallback=1&user_id=#{uid}"
+        @raw_info ||= Net::HTTP.get(options.client_options[:site].gsub(/.*:\/\//, ""), url)
       end
       
       def user_info
-        if @user_info.blank?
+        unless @user_info
           @user_info = {}
-          # This is a public API and does not need signing or authentication
-          url = "/services/rest/?api_key=#{options.consumer_key}&format=json&method=flickr.people.getInfo&nojsoncallback=1&user_id=#{uid}"
-          response = Net::HTTP.get(options.client_options[:site].gsub(/.*:\/\//, ""), url)
-          @user_info ||= MultiJson.decode(response.body) if response
+          info = MultiJson.decode(raw_info)
+          @user_info = info["person"] unless info.nil?
         end
         @user_info
       rescue ::Errno::ETIMEDOUT

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-flickr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth
-  requirement: &70123939761240 !ruby/object:Gem::Requirement
+  requirement: &70199307090160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123939761240
+  version_requirements: *70199307090160
 description: OmniAuth strategy for Flickr
 email:
 - tim@sbrew.com