authentasaurus 0.6.12 → 0.6.14

data/lib/active_record/authenticatable.rb

@@ -17,18 +17,18 @@ module ActiveRecord::Authenticatable
       validates_format_of :username, :with => /^[a-z0-9^ ]*([a-z0-9]{4})+[a-z0-9^ ]*$/ # alpha-numeric only and at least 4 characters
       validates_format_of :email, :with => %r{[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}}
       # password validations
-      validates_confirmation_of :password, :on => :create
-      validates_presence_of :password, :on => :create
-      validates_length_of :password, :minimum => 6, :on => :create
+      validates_confirmation_of :password, :on => :create, :if => Proc.new {|user| user.hashed_password.nil? || user.password_seed.nil? }
+      validates_presence_of :password, :on => :create, :if => Proc.new {|user| user.hashed_password.nil? || user.password_seed.nil? }
+      validates_length_of :password, :minimum => 6, :on => :create, :if => Proc.new {|user| user.hashed_password.nil? || user.password_seed.nil? }
       # new password
       validates_confirmation_of :new_password, :on => :update, :unless => :new_password_blank?
       validates_length_of :new_password, :minimum => 6, :on => :update, :unless => :new_password_blank?
       # format of password
       if args.include?(:strong_password)
-        validates_format_of :password, :with => %r{[a-z]}, :on => :create, :message => :"authenticatable.lower_case_password"
-        validates_format_of :password, :with => %r{[A-Z]}, :on => :create, :message => :"authenticatable.upper_case_password"
-        validates_format_of :password, :with => %r{[0-9]}, :on => :create, :message => :"authenticatable.digit_password"
-        validates_format_of :password, :with => %r{[@$%!&]}, :on => :create, :message => :"authenticatable.symbol_password"
+        validates_format_of :password, :with => %r{[a-z]}, :on => :create, :message => :"authenticatable.lower_case_password", :if => Proc.new {|user| user.hashed_password.nil? || user.password_seed.nil? }
+        validates_format_of :password, :with => %r{[A-Z]}, :on => :create, :message => :"authenticatable.upper_case_password", :if => Proc.new {|user| user.hashed_password.nil? || user.password_seed.nil? }
+        validates_format_of :password, :with => %r{[0-9]}, :on => :create, :message => :"authenticatable.digit_password", :if => Proc.new {|user| user.hashed_password.nil? || user.password_seed.nil? }
+        validates_format_of :password, :with => %r{[@$%!&]}, :on => :create, :message => :"authenticatable.symbol_password", :if => Proc.new {|user| user.hashed_password.nil? || user.password_seed.nil? }
         # new password
         validates_format_of :new_password, :with => %r{[a-z]}, :on => :update, :message => :"authenticatable.lower_case_password", :unless => :new_password_blank?
         validates_format_of :new_password, :with => %r{[A-Z]}, :on => :update, :message => :"authenticatable.upper_case_password", :unless => :new_password_blank?

data/lib/active_resource/acts_as_authenticatable.rb

@@ -25,10 +25,10 @@ module ActiveResource::ActsAsAuthenticatable
             last_update_datetime = (last_update.kind_of?(String)) ? (DateTime.parse(last_update)) : (last_update)
             
             if local_user.updated_at < last_update_datetime
-              
-              local_user.update_attributes user.attributes            
+              local_user.update_attributes user.attributes
             end
           else
+            local_user.attributes.merge(self.sync_to.try(:DEFAULT_DATA) || {})
             local_user.save
           end
         end
@@ -47,6 +47,7 @@ module ActiveResource::ActsAsAuthenticatable
         unless local_user.new_record?
           local_user.update_attributes user.attributes            
         else
+          local_user.attributes.merge(self.sync_to.try(:DEFAULT_DATA) || {})
           local_user.save
         end
       else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authentasaurus
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 6
-  - 12
-  version: 0.6.12
+  - 14
+  version: 0.6.14
 platform: ruby
 authors: 
 - Omar Mekky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +02:00
+date: 2010-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: []