thoughtbot-clearance 0.6.5 → 0.6.6

data/CHANGELOG.textile

@@ -1,3 +1,8 @@
+h2. 0.6.6 (5/18/2009)
+
+* [#14] replaced class_eval in Clearance::User with modules. This was needed
+in a thoughtbot client app so we could write our own validations. (Dan Croak)
+
 h2. 0.6.5 (5/17/2009)
 
 * [#6] Make Clearance i18n aware. (Timur Vafin, Marcel Goerner, Eugene Bolshakov, Dan Croak)

data/Rakefile

@@ -51,7 +51,7 @@ task :default => ['test:all', 'test:features']
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name        = "clearance"
-  gem_spec.version     = "0.6.5"
+  gem_spec.version     = "0.6.6"
   gem_spec.summary     = "Rails authentication with email & password."
   gem_spec.email       = "support@thoughtbot.com"
   gem_spec.homepage    = "http://github.com/thoughtbot/clearance"

data/lib/clearance/user.rb

@@ -4,21 +4,49 @@ module Clearance
   module User
 
     def self.included(model)
-      model.extend ClassMethods
+      model.extend(ClassMethods)
+
       model.send(:include, InstanceMethods)
+      model.send(:include, AttrAccessible)
+      model.send(:include, AttrAccessor)
+      model.send(:include, Validations)
+      model.send(:include, Callbacks)
+    end
 
-      model.class_eval do
-        attr_accessible :email, :password, :password_confirmation
-        attr_accessor :password, :password_confirmation
+    module AttrAccessible
+      def self.included(model)
+        model.class_eval do
+          attr_accessible :email, :password, :password_confirmation
+        end
+      end
+    end
 
-        validates_presence_of     :email
-        validates_uniqueness_of   :email, :case_sensitive => false
-        validates_format_of       :email, :with => %r{.+@.+\..+}
+    module AttrAccessor
+      def self.included(model)
+        model.class_eval do
+          attr_accessor :password, :password_confirmation
+        end
+      end
+    end
+
+    module Validations
+      def self.included(model)
+        model.class_eval do
+          validates_presence_of     :email
+          validates_uniqueness_of   :email, :case_sensitive => false
+          validates_format_of       :email, :with => %r{.+@.+\..+}
 
-        validates_presence_of     :password, :if => :password_required?
-        validates_confirmation_of :password, :if => :password_required?
+          validates_presence_of     :password, :if => :password_required?
+          validates_confirmation_of :password, :if => :password_required?
+        end
+      end
+    end
 
-        before_save :initialize_salt, :encrypt_password, :initialize_token
+    module Callbacks
+      def self.included(model)
+        model.class_eval do
+          before_save :initialize_salt, :encrypt_password, :initialize_token
+        end
       end
     end
 

data/shoulda_macros/clearance.rb

@@ -14,7 +14,7 @@ module Clearance
     end
 
     def should_be_signed_in_and_email_confirmed_as(&block)
-      warn "[DEPRECATION] questionable usefulness"
+      warn "[DEPRECATION] should_be_signed_in_and_email_confirmed_as: questionable usefulness"
       should_be_signed_in_as &block
 
       should "have confirmed email" do
@@ -33,7 +33,7 @@ module Clearance
     end
 
     def should_deny_access_on(http_method, action, opts = {})
-      warn "[DEPRECATION] use a setup & should_deny_access(:flash => ?)"
+      warn "[DEPRECATION] should_deny_access_on: use a setup & should_deny_access(:flash => ?)"
       flash_message = opts.delete(:flash)
       context "on #{http_method} to #{action}" do
         setup do
@@ -67,7 +67,7 @@ module Clearance
     # CONTEXTS
 
     def signed_in_user_context(&blk)
-      warn "[DEPRECATION] creates a Mystery Guest, causes Obscure Test"
+      warn "[DEPRECATION] signed_in_user_context: creates a Mystery Guest, causes Obscure Test"
       context "A signed in user" do
         setup do
           @user = Factory(:user)
@@ -79,7 +79,7 @@ module Clearance
     end
 
     def public_context(&blk)
-      warn "[DEPRECATION] common case is no-op. call sign_out otherwise"
+      warn "[DEPRECATION] public_context: common case is no-op. call sign_out otherwise"
       context "The public" do
         setup { sign_out }
         merge_block(&blk)
@@ -89,7 +89,7 @@ module Clearance
     # CREATING USERS
 
     def should_create_user_successfully
-      warn "[DEPRECATION] not meant to be public, no longer used internally"
+      warn "[DEPRECATION] should_create_user_successfully: not meant to be public, no longer used internally"
       should_assign_to :user
       should_change 'User.count', :by => 1
 
@@ -134,7 +134,7 @@ module Clearance
     # VALIDATIONS
 
     def should_validate_confirmation_of(attribute, opts = {})
-      warn "[DEPRECATION] not meant to be public, no longer used internally"
+      warn "[DEPRECATION] should_validate_confirmation_of: not meant to be public, no longer used internally"
       raise ArgumentError if opts[:factory].nil?
 
       context "on save" do
@@ -144,7 +144,7 @@ module Clearance
     end
 
     def should_validate_confirmation_is_not_blank(factory, attribute, opts = {})
-      warn "[DEPRECATION] not meant to be public, no longer used internally"
+      warn "[DEPRECATION] should_validate_confirmation_is_not_blank: not meant to be public, no longer used internally"
       should "validate #{attribute}_confirmation is not blank" do
         model = Factory.build(factory, blank_confirmation_options(attribute))
         model.save
@@ -154,7 +154,7 @@ module Clearance
     end
 
     def should_validate_confirmation_is_not_bad(factory, attribute, opts = {})
-      warn "[DEPRECATION] not meant to be public, no longer used internally"
+      warn "[DEPRECATION] should_validate_confirmation_is_not_bad: not meant to be public, no longer used internally"
       should "validate #{attribute}_confirmation is different than #{attribute}" do
         model = Factory.build(factory, bad_confirmation_options(attribute))
         model.save
@@ -166,7 +166,7 @@ module Clearance
     # FORMS
 
     def should_display_a_password_update_form
-      warn "[DEPRECATION] not meant to be public, no longer used internally"
+      warn "[DEPRECATION] should_display_a_password_update_form: not meant to be public, no longer used internally"
       should "have a form for the user's token, password, and password confirm" do
         update_path = ERB::Util.h(
           user_password_path(@user, :token => @user.token)
@@ -181,7 +181,7 @@ module Clearance
     end
 
     def should_display_a_sign_up_form
-      warn "[DEPRECATION] not meant to be public, no longer used internally"
+      warn "[DEPRECATION] should_display_a_sign_up_form: not meant to be public, no longer used internally"
       should "display a form to sign up" do
         assert_select "form[action=#{users_path}][method=post]",
         true, "There must be a form to sign up" do
@@ -198,7 +198,7 @@ module Clearance
     end
 
     def should_display_a_sign_in_form
-      warn "[DEPRECATION] not meant to be public, no longer used internally"
+      warn "[DEPRECATION] should_display_a_sign_in_form: not meant to be public, no longer used internally"
       should 'display a "sign in" form' do
         assert_select "form[action=#{session_path}][method=post]",
           true, "There must be a form to sign in" do
@@ -235,19 +235,19 @@ module Clearance
       end
 
       def blank_confirmation_options(attribute)
-        warn "[DEPRECATION] not meant to be public, no longer used internally"
+        warn "[DEPRECATION] blank_confirmation_options: not meant to be public, no longer used internally"
         opts = { attribute => attribute.to_s }
         opts.merge("#{attribute}_confirmation".to_sym => "")
       end
 
       def bad_confirmation_options(attribute)
-        warn "[DEPRECATION] not meant to be public, no longer used internally"
+        warn "[DEPRECATION] bad_confirmation_options: not meant to be public, no longer used internally"
         opts = { attribute => attribute.to_s }
         opts.merge("#{attribute}_confirmation".to_sym => "not_#{attribute}")
       end
 
       def assert_confirmation_error(model, attribute, message = "confirmation error")
-        warn "[DEPRECATION] not meant to be public, no longer used internally"
+        warn "[DEPRECATION] assert_confirmation_error: not meant to be public, no longer used internally"
         assert model.errors.on(attribute).include?("doesn't match confirmation"),
           message
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - Dan Croak
@@ -24,7 +24,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-16 21:00:00 -07:00
+date: 2009-05-17 21:00:00 -07:00
 default_executable: 
 dependencies: []