authlogic_email_token 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82c6ebcef382eeba4a9db915cc926f4dbf250b6f
-  data.tar.gz: 13fda182503d9ea91e6d9a2971165ca9c2050560
+  metadata.gz: 57a2824d5e5150536475eedf6d5307381d851dbd
+  data.tar.gz: 45b526b5dbf9e00ba96773ac3f1a54b708356b0e
 SHA512:
-  metadata.gz: 8dba7244d2f51afeaa34616aeb2f5df29f921803fc9f48d1e38b3887ef893ef777839452c27750e1cd17ee7528c73f35d346c1fcdb7c6d8af71be03b9d712281
-  data.tar.gz: ada7d45d51568a5893da5966eda865c7d179c86662aa497714d0b5be7a2c79a5bad6f55e4e68b9af122f4b8ec34266d2a6033adc18f96177ead8b5e4ed03fd0e
+  metadata.gz: f2d3a5f2de18520957d3efe718879c72fa64cb78684f1b71a011f63b0ab56fe95293c3b0e029e03443279704f34e9d9d20f1405330afaa3473646e755f7bebcb
+  data.tar.gz: dacab199324c87d1c0d7b33c0a2dc971fc5da3dc73bf44a369a7a0dc6680c2ea11457b491eb49a67a3f8c6a26f96cbd1b51f26cab28d0f4056d85c9b2c69d2e6

data/lib/authlogic/acts_as_authentic/email_token/confirmation.rb

@@ -4,7 +4,7 @@
 # Include this module in your +User+ model and add a +new_email+ column to the +users+
 # table:
 # 
-#   add_column :users, :new_email, :string, null: true, after: :email
+#   add_column :users, :new_email, :string, after: :email
 # 
 # You can then use the +new_email+ attribute in your account settings form like so:
 # 
@@ -25,7 +25,6 @@
 # 
 
 module Authlogic::ActsAsAuthentic::EmailToken::Confirmation
-  
   # Call this when you have verified the user's email address. (Typically, as a result of
   # the user clicking the link in a confirmation email.)
   # 
@@ -42,7 +41,7 @@ module Authlogic::ActsAsAuthentic::EmailToken::Confirmation
   # +activation_method+.)
   def confirm_email
     send(self.class.activation_method) if respond_to?(self.class.activation_method)
-    if new_email.present?
+    if read_attribute(:new_email).present?
       self.email = new_email
       self.new_email = nil
     end
@@ -84,6 +83,13 @@ module Authlogic::ActsAsAuthentic::EmailToken::Confirmation
   #     MyOtherMailer.whatever_message(user).deliver
   #   end
   # 
+  # Or, instead of providing a block, you can override the default names like so:
+  # 
+  #   acts_as_authentic do |c|
+  #     c.confirmation_mailer_class = :MyOtherMailer
+  #     c.confirmation_mailer_method = :whatever_message
+  #   end
+  # 
   # Recommended usage looks something like this:
   #
   #   class UsersController < ApplicationController
@@ -115,7 +121,11 @@ module Authlogic::ActsAsAuthentic::EmailToken::Confirmation
       if block_given?
         yield
       else
-        UserMailer.email_confirmation(self, controller).deliver
+        name = self.class.confirmation_mailer_class.to_s
+        klass = name.split('::').inject(Object) do |mod, klass|
+          mod.const_get klass
+        end
+        klass.send(self.class.confirmation_mailer_method, self, controller).deliver
       end
       true
     else

data/lib/authlogic/acts_as_authentic/email_token.rb

@@ -30,16 +30,33 @@ module Authlogic::ActsAsAuthentic::EmailToken
       rw_config(:activation_method, value, :activate)
     end
     alias_method :activation_method=, :activation_method
+    
+    # Configures the name of the confirmation mailer class.
+    # +Authlogic::ActsAsAuthentic::EmailToken::maybe_deliver_email_confirmation!+
+    # for more info.
+    def confirmation_mailer_class(value = nil)
+      rw_config(:confirmation_mailer_class, value, :UserMailer)
+    end
+    alias_method :confirmation_mailer_class=, :confirmation_mailer_class
+    
+    # Configures the name of the confirmation mailer method.
+    # +Authlogic::ActsAsAuthentic::EmailToken::maybe_deliver_email_confirmation!+
+    # for more info.
+    def confirmation_mailer_method(value = nil)
+      rw_config(:confirmation_mailer_method, value, :email_confirmation)
+    end
+    alias_method :confirmation_mailer_method=, :confirmation_mailer_method
   end
   
   module Methods
     def self.included(klass)
       # Do nothing if the email_token column is missing. If the email_token column
       # is present but not email_token_updated_at, raise.
-      if !klass.column_names.include? 'email_token'
+      if !klass.column_names.map(&:to_s).include? 'email_token'
         return
-      elsif !klass.column_names.include? 'email_token_updated_at'
+      elsif !klass.column_names.map(&:to_s).include? 'email_token_updated_at'
         raise(
+          ::Authlogic::ActsAsAuthentic::EmailToken::DBStructureError,
           "#{klass.name} has an email_token column but not email_token_updated_at. " +
           " You must add the latter. (Should be :datetime, null: false.)"
         )
@@ -80,6 +97,8 @@ module Authlogic::ActsAsAuthentic::EmailToken
         age = age.to_i
         
         # Authlogic builds its SQL by hand, but I prefer Arel. The logic is the same.
+        # No need to add an IS NOT NULL clause, because above, we return if the given
+        # token is blank.
         t = arel_table
         conditions = t[:email_token].eq(token)
         if age > 0
@@ -104,7 +123,7 @@ module Authlogic::ActsAsAuthentic::EmailToken
         self.email_token_updated_at = Time.now
         self.email_token = Authlogic::Random.friendly_token
       end
-  
+      
       # Same as reset_email_token, but then saves the record afterwards.
       def reset_email_token!
         reset_email_token
@@ -112,4 +131,6 @@ module Authlogic::ActsAsAuthentic::EmailToken
       end
     end
   end
+  
+  class DBStructureError < StandardError; end
 end

data/lib/authlogic_email_token.rb

@@ -1,3 +1,4 @@
+require 'authlogic'
 require 'authlogic/acts_as_authentic/email_token'
 require 'authlogic/acts_as_authentic/email_token/confirmation'
 require 'authlogic/acts_as_authentic/email_token/railtie' if defined?(Rails)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: authlogic_email_token
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Jarrett Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Adds email_token and email_token_updated_at columns. Works like Authlogic's
   perishable_token, but doesn't reset on every request. Designed primarily for verifying
   users' email addresses.