fleakr 0.7.0 → 0.7.1

data/lib/fleakr/objects/authentication_token.rb

@@ -1,9 +1,9 @@
 module Fleakr
   module Objects # :nodoc:
-    
+
     # = AuthenticationToken
     #
-    # This class represents an authentication token used for API calls that 
+    # This class represents an authentication token used for API calls that
     # require authentication before they can be used
     #
     # == Attributes
@@ -12,53 +12,53 @@ module Fleakr
     # [permissions] The permissions granted to this application (read / write / delete)
     #
     class AuthenticationToken
-      
+
       include Fleakr::Support::Object
-      
+
       flickr_attribute :value, :from => 'auth/token'
       flickr_attribute :permissions, :from => 'auth/perms'
       flickr_attribute :user_id, :from => 'auth/user@nsid'
-      flickr_attribute :user_name, :from => 'auth/user@username' 
+      flickr_attribute :user_name, :from => 'auth/user@username'
       flickr_attribute :full_name, :from => 'auth/user@fullname'
-      
+
       # Retrieve a full authentication token from the supplied mini-token (e.g. 123-456-789)
       #
       def self.from_mini_token(mini_token)
         from :mini_token, mini_token
       end
-      
+
       # Retrieve a full authentication token from the supplied auth_token string
       # (e.g. 45-76598454353455)
-      # 
+      #
       def self.from_auth_token(auth_token)
         from :auth_token, auth_token
       end
-      
+
       # Retrieve a full authentication token from the supplied frob
       def self.from_frob(frob)
         from :frob, frob
       end
-      
+
       def self.from(thing, value) # :nodoc:
         api_methods = {
           :mini_token => 'getFullToken',
           :auth_token => 'checkToken',
           :frob       => 'getToken'
         }
-        
+
         method = "auth.#{api_methods[thing]}"
-        
+
         parameters = {thing => value, :authenticate? => false}
         response = Fleakr::Api::MethodRequest.with_response!(method, parameters)
-        
+
         self.new(response.body)
       end
-      
+
       def user
-        User.find_by_id(user_id)
+        User.find_by_id(user_id, :auth_token => value)
       end
-      
+
     end
-    
+
   end
 end

data/lib/fleakr/version.rb

@@ -3,7 +3,7 @@ module Fleakr
 
     MAJOR = 0
     MINOR = 7
-    TINY  = 0
+    TINY  = 1
 
     def self.to_s
       [MAJOR, MINOR, TINY].join('.')

data/test/unit/fleakr/objects/authentication_token_test.rb

@@ -44,8 +44,9 @@ module Fleakr::Objects
       should "have an associated user" do
         token = AuthenticationToken.new
         token.stubs(:user_id).with().returns('1')
+        token.stubs(:value).with().returns('auth_token')
 
-        User.expects(:find_by_id).with('1').returns('user')
+        User.expects(:find_by_id).with('1', :auth_token => 'auth_token').returns('user')
 
         token.user.should == 'user'
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -07:00
+date: 2011-01-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency