simple_auth 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/simple_auth/active_record.rb

@@ -1,6 +1,15 @@
 module SimpleAuth
   module ActiveRecord
     module InstanceMethods
+      def password=(password)
+        @password_changed = true
+        @password = password
+      end
+
+      def password_changed?
+        @password_changed == true
+      end
+
       private
         def encrypt_password
           self.password_salt = SimpleAuth::Config.salt.call(self)
@@ -10,10 +19,14 @@ module SimpleAuth
         def erase_password
           self.password = nil
           self.password_confirmation = nil
+
+          # Mark password as unchanged after erasing passwords,
+          # or it will be marked as changed anyway
+          @password_changed = false
         end
 
         def validate_password?
-          new_record? || password.present?
+          new_record? || password_changed?
         end
     end
 
@@ -62,7 +75,7 @@ module SimpleAuth
       #     end
       #   end
       def has_authentication(&block)
-        attr_accessor :password
+        attr_reader :password
         attr_accessor :password_confirmation
 
         SimpleAuth.setup(&block)

data/lib/simple_auth/version.rb

@@ -2,7 +2,7 @@ module SimpleAuth
   module Version
     MAJOR = "0"
     MINOR = "1"
-    PATCH = "3"
+    PATCH = "4"
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/simple_auth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_auth}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nando Vieira"]
-  s.date = %q{2010-01-25}
+  s.date = %q{2010-01-27}
   s.description = %q{When Authlogic & Devise are just too much.
 }
   s.email = %q{fnando.vieira@gmail.com}

data/spec/simple_auth/active_record_spec.rb

@@ -34,6 +34,22 @@ describe SimpleAuth::ActiveRecord do
       subject.password.should be_nil
       subject.password_confirmation.should be_nil
     end
+
+    it "should mark password as changed" do
+      subject = User.new(:password => "test")
+      subject.password_changed?.should be_true
+    end
+
+    it "should not mark password as changed" do
+      subject = User.new
+      subject.password_changed?.should be_false
+    end
+
+    it "should mark password as unchanged after saving" do
+      subject = User.new(:password => "test", :password_confirmation => "test")
+      subject.save(false)
+      subject.password_changed?.should be_false
+    end
   end
 
   context "existing record" do
@@ -56,11 +72,18 @@ describe SimpleAuth::ActiveRecord do
       subject.should be_valid
     end
 
-    it "should not require password confirmation when it has changed" do
+    it "should require password confirmation when it has changed" do
       subject.password = "newpass"
+      subject.should_not be_valid
       subject.should have(1).error_on(:password_confirmation)
     end
 
+    it "should require password when it has changed to blank" do
+      subject.password = nil
+      subject.should_not be_valid
+      subject.should have(1).error_on(:password)
+    end
+
     it "should authenticate using email" do
       User.authenticate("john@doe.com", "test").should == subject
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_auth
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Nando Vieira
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -02:00
+date: 2010-01-27 00:00:00 -02:00
 default_executable: 
 dependencies: []