lam_auth 0.1.3 → 0.1.4

data/lib/lam_auth/controller_extensions.rb

@@ -9,7 +9,7 @@ module LamAuth
       
       extend ClassMethods
       include InstanceMethods
-      protected :logged_in?, :current_user, :current_user=, :auth_token, :login_from_cookie, :login_required
+      protected :logged_in?, :current_user, :current_user=, :access_token, :login_from_cookie, :login_required
     end
     
     module ClassMethods
@@ -32,16 +32,16 @@ module LamAuth
         @current_user = new_user
       end
   
-      def auth_token
+      def access_token
         cookie = cookies[LamAuth.cookie_id]
-        @auth_token ||= LamAuth.valid_cookie?(cookie) && LamAuth.parse_cookie_to_hash(cookie)['access_token']
+        LamAuth.valid_cookie?(cookie) && LamAuth.parse_cookie_to_hash(cookie)['access_token']
       end
   
       def login_from_cookie
         if logged_in?
-          !auth_token && self.current_user = nil
+          !access_token && self.current_user = nil
         else
-          auth_token && self.current_user = self.class.user_model_class.find_by_auth_token(auth_token)
+          access_token && self.current_user = self.class.user_model_class.find_by_access_token(access_token)
         end
       end
   

data/lib/lam_auth/model.rb

@@ -10,12 +10,12 @@ module LamAuth
     end
     
     module ClassMethods
-      def find_by_auth_token(auth_token)
-        Rails.logger.info("Trying to authorize a token #{auth_token.inspect} ")
+      def find_by_access_token(access_token)
+        Rails.logger.info("Trying to authorize a token #{access_token.inspect} ")
 
         lam_uri = LamAuth.uri
         http = Net::HTTP.new(lam_uri.host, lam_uri.port)
-        response, body = http.get("#{lam_uri.path}/users/me", {'Authorization' => "Token token=\"#{auth_token}\""})
+        response, body = http.get("#{lam_uri.path}/users/me", {'Authorization' => "Token token=\"#{access_token}\""})
         if response.code == "200"
           data = ActiveSupport::JSON.decode(body)
           Rails.logger.info("...success: #{data.inspect}")

data/lib/lam_auth/version.rb

@@ -1,3 +1,3 @@
 module LamAuth
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lam_auth
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Max Macovsky
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-23 00:00:00 +04:00
+date: 2011-07-23 00:00:00 +04:00
 default_executable: 
 dependencies: []