loyal_devise 2.2.5 → 2.2.6

data/lib/devise/models/confirmable.rb

@@ -24,8 +24,8 @@ module Devise
     #
     # == Examples
     #
-    #   User.find(1).confirm!      # returns true unless it's already confirmed
-    #   User.find(1).confirmed?    # true/false
+    #   User.find(1).email_confirm!      # returns true unless it's already confirmed
+    #   User.find(1).email_confirmed?    # true/false
     #   User.find(1).send_confirmation_instructions # manually send instructions
     #
     module Confirmable
@@ -33,7 +33,7 @@ module Devise
       include ActionView::Helpers::DateHelper
 
       included do
-        before_create :generate_confirmation_token, :if => :confirmation_required?
+        before_create :generate_confirmation_token, :if => :email_confirmation_required?
         after_create  :send_on_create_confirmation_instructions, :if => :send_confirmation_notification?
         before_update :postpone_email_change_until_confirmation, :if => :postpone_email_change?
         after_update  :send_confirmation_instructions, :if => :reconfirmation_required?
@@ -55,7 +55,7 @@ module Devise
       # Confirm a user by setting it's confirmed_at to actual time. If the user
       # is already confirmed, add an error to email field. If the user is invalid
       # add errors
-      def confirm!
+      def email_confirm!
         pending_any_confirmation do
           if confirmation_period_expired?
             self.errors.add(:email, :confirmation_period_expired,
@@ -80,7 +80,7 @@ module Devise
       end
 
       # Verifies whether a user is confirmed or not
-      def confirmed?
+      def email_confirmed?
         !!confirmed_at
       end
 
@@ -112,12 +112,12 @@ module Devise
       # is already confirmed, it should never be blocked. Otherwise we need to
       # calculate if the confirm time has not expired for this user.
       def active_for_authentication?
-        super && (!confirmation_required? || confirmed? || confirmation_period_valid?)
+        super && (!email_confirmation_required? || email_confirmed? || confirmation_period_valid?)
       end
 
       # The message to be shown if the account is inactive.
       def inactive_message
-        !confirmed? ? :unconfirmed : super
+        !email_confirmed? ? :unconfirmed : super
       end
 
       # If you don't want confirmation to be sent on create, neither a code
@@ -148,8 +148,8 @@ module Devise
         end
 
         # Callback to overwrite if confirmation is required or not.
-        def confirmation_required?
-          !confirmed?
+        def email_confirmation_required?
+          !email_confirmed?
         end
 
         # Checks if the confirmation for the user is within the limit time.
@@ -196,7 +196,7 @@ module Devise
 
         # Checks whether the record requires any confirmation.
         def pending_any_confirmation
-          if (!confirmed? || pending_reconfirmation?)
+          if (!email_confirmed? || pending_reconfirmation?)
             yield
           else
             self.errors.add(:email, :already_confirmed)
@@ -217,7 +217,7 @@ module Devise
 
         def after_password_reset
           super
-          confirm! unless confirmed?
+          email_confirm! unless email_confirmed?
         end
 
         def postpone_email_change_until_confirmation
@@ -237,7 +237,7 @@ module Devise
         end
 
         def send_confirmation_notification?
-          confirmation_required? && !@skip_confirmation_notification
+          email_confirmation_required? && !@skip_confirmation_notification
         end
 
       module ClassMethods
@@ -260,7 +260,7 @@ module Devise
         # Options must have the confirmation_token
         def confirm_by_token(confirmation_token)
           confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_token)
-          confirmable.confirm! if confirmable.persisted?
+          confirmable.email_confirm! if confirmable.persisted?
           confirmable
         end
 

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "2.2.5".freeze
+  VERSION = "2.2.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loyal_devise
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loyal_warden
@@ -212,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3598321413958373019
+      hash: 126468515477557902
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3598321413958373019
+      hash: 126468515477557902
 requirements: []
 rubyforge_project: loyal_devise
 rubygems_version: 1.8.25