shuber-authentication 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+2009-01-24 - Sean Huber (shuber@huberry.com)
+  * Move InstanceMethods and ClassMethods modules under ModelMethods
+
 2009-01-09 - Sean Huber (shuber@huberry.com)
   * Add authentication_options cattr_accessor
   * Update README

data/lib/huberry/authentication/model_methods.rb

@@ -25,62 +25,62 @@ module Huberry
         
         alias_method_chain :reload, :authentication
       end
-    end
-    
-    module ClassMethods
-      def authenticate(login, password)
-        user = send("find_by_#{self.authentication_options[:login_field]}", login)
-        user && user.authenticated?(password) ? user : false
-      end
-      
-      def digest(str)
-        Digest::SHA256.hexdigest(str.to_s)
-      end
-    end
-    
-    module InstanceMethods
-      def authenticated?(password)
-        send(self.class.authentication_options[:hashed_password_field]) == self.class.digest(password.to_s + send(self.class.authentication_options[:salt_field]).to_s)
-      end
-      
-      def password_changed?
-        !!@password_changed
-      end
-      
-      def reload_with_authentication(*args)
-        reload_without_authentication(*args)
-        @password_changed = false
-      end
-      
-      def reset_password(new_password = nil)
-        new_password = generate_salt[0..7] if new_password.blank?
-        send("#{self.class.authentication_options[:salt_field]}=", nil)
-        send("#{self.class.authentication_options[:password_field]}=", new_password)
-        send("#{self.class.authentication_options[:password_field]}_confirmation=", new_password)
-        @password_changed = true
-      end
       
-      def reset_password!(new_password = nil)
-        reset_password(new_password)
-        save
+      module ClassMethods
+        def authenticate(login, password)
+          user = send("find_by_#{self.authentication_options[:login_field]}", login)
+          user && user.authenticated?(password) ? user : false
+        end
+
+        def digest(str)
+          Digest::SHA256.hexdigest(str.to_s)
+        end
       end
-      
-      protected
-        
-        def generate_salt
-          self.class.digest("--#{Time.now}--#{rand}--")
+
+      module InstanceMethods
+        def authenticated?(password)
+          send(self.class.authentication_options[:hashed_password_field]) == self.class.digest(password.to_s + send(self.class.authentication_options[:salt_field]).to_s)
         end
-        
-        def hash_password
-          if password_changed? || password_required?
-            send("#{self.class.authentication_options[:salt_field]}=", generate_salt) if send("#{self.class.authentication_options[:salt_field]}").blank?
-            send("#{self.class.authentication_options[:hashed_password_field]}=", self.class.digest(send(self.class.authentication_options[:password_field]).to_s + send(self.class.authentication_options[:salt_field]).to_s))
-          end
+
+        def password_changed?
+          !!@password_changed
         end
-        
-        def password_required?
-          send(self.class.authentication_options[:hashed_password_field]).blank? || !send(self.class.authentication_options[:password_field]).blank?
+
+        def reload_with_authentication(*args)
+          reload_without_authentication(*args)
+          @password_changed = false
+        end
+
+        def reset_password(new_password = nil)
+          new_password = generate_salt[0..7] if new_password.blank?
+          send("#{self.class.authentication_options[:salt_field]}=", nil)
+          send("#{self.class.authentication_options[:password_field]}=", new_password)
+          send("#{self.class.authentication_options[:password_field]}_confirmation=", new_password)
+          @password_changed = true
+        end
+
+        def reset_password!(new_password = nil)
+          reset_password(new_password)
+          save
         end
+
+        protected
+
+          def generate_salt
+            self.class.digest("--#{Time.now}--#{rand}--")
+          end
+
+          def hash_password
+            if password_changed? || password_required?
+              send("#{self.class.authentication_options[:salt_field]}=", generate_salt) if send("#{self.class.authentication_options[:salt_field]}").blank?
+              send("#{self.class.authentication_options[:hashed_password_field]}=", self.class.digest(send(self.class.authentication_options[:password_field]).to_s + send(self.class.authentication_options[:salt_field]).to_s))
+            end
+          end
+
+          def password_required?
+            send(self.class.authentication_options[:hashed_password_field]).blank? || !send(self.class.authentication_options[:password_field]).blank?
+          end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shuber-authentication
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Sean Huber
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 00:00:00 -08:00
+date: 2009-01-24 00:00:00 -08:00
 default_executable: 
 dependencies: []