thoughtbot-clearance 0.1.8 → 0.1.9

data/README.textile

@@ -55,6 +55,12 @@ In test/unit/user_test.rb:
       include Clearance::UserTest
     end
 
+In test/unit/user_mailer_test.rb: 
+
+    class UserMailerTest < Test::Unit::TestCase
+      include Clearance::UserMailerTest
+    end
+
 In test/functional/sessions_controller_test.rb: 
 
     class SessionsControllerTest < ActionController::TestCase
@@ -93,23 +99,18 @@ h2. User Model
 In app/models/user.rb:
 
     class User < ActiveRecord::Base
-      include Clearance::Model
+      include Clearance::Models::User
     end
 
-h2. Mailer
+h2. User Mailer
 
-In app/models/mailer.rb:
+In app/models/user_mailer.rb:
 
-    class Mailer < ActionMailer::Base
+    class UserMailer < ActionMailer::Base
 
 		  default_url_options[:host] = HOST
 
-		  def change_password(user)
-		    from       "donotreply@example.com"
-		    recipients user.email
-		    subject    "[YOUR APP] Request to change your password"
-		    body       :user => user
-		  end
+		  include Clearance::Mailers::User
 
 		end
 
@@ -196,7 +197,7 @@ h2. Authors
 
 * thoughtbot, inc.
 * Dan Croak
+* Jason Morrison
+* Mike Burns
 * Josh Nichols
 * Mike Breen
-* Mike Burns
-* Jason Morrison

data/clearance.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "clearance"
-  s.version = "0.1.8"
-  s.date = "2008-10-09"
+  s.version = "0.1.9"
+  s.date = "2008-10-10"
   s.summary = "Simple, complete Rails authentication."
   s.email = "dcroak@thoughtbot.com"
   s.homepage = "http://github.com/thoughtbot/clearance"
@@ -11,7 +11,8 @@ Gem::Specification.new do |s|
     "clearance.gemspec",
     "lib/clearance.rb",
     "lib/clearance/app/controllers/application_controller.rb",
-    "lib/clearance/app/models/model.rb",
+    "lib/clearance/app/models/user.rb",
+    "lib/clearance/app/models/user_mailer.rb",
     "lib/clearance/app/controllers/sessions_controller.rb",
     "lib/clearance/test/functionals/sessions_controller_test.rb",
     "lib/clearance/test/test_helper.rb",

data/lib/clearance/app/models/user.rb

@@ -0,0 +1,80 @@
+module Clearance
+  module Models
+    module User
+    
+      def self.included(base)
+        base.class_eval do
+        
+          attr_accessible :email, :password, :password_confirmation
+          attr_accessor :password, :password_confirmation
+
+          validates_presence_of     :email
+          validates_presence_of     :password, :if => :password_required?
+          validates_confirmation_of :password, :if => :password_required?
+          validates_uniqueness_of   :email
+
+          before_save :initialize_salt, :encrypt_password
+        
+          extend ClassMethods
+          include InstanceMethods
+        
+        protected
+
+          include ProtectedInstanceMethods
+        
+        end
+      end
+    
+      module ClassMethods
+        def authenticate(email, password)
+          user = find_by_email email
+          user && user.authenticated?(password) ? user : nil
+        end
+      end
+    
+      module InstanceMethods
+        def authenticated?(password)
+          crypted_password == encrypt(password)
+        end
+
+        def encrypt(password)
+          Digest::SHA1.hexdigest "--#{salt}--#{password}--"
+        end
+
+        def remember_token?
+          remember_token_expires_at && Time.now.utc < remember_token_expires_at
+        end
+
+        def remember_me!
+          remember_me_until 2.weeks.from_now.utc
+        end
+
+        def remember_me_until(time)
+          self.update_attribute :remember_token_expires_at, time
+          self.update_attribute :remember_token, encrypt("#{email}--#{remember_token_expires_at}")
+        end
+
+        def forget_me!
+          self.update_attribute :remember_token_expires_at, nil
+          self.update_attribute :remember_token, nil
+        end
+      end
+    
+      module ProtectedInstanceMethods
+        def initialize_salt
+          self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
+        end
+
+        def encrypt_password
+          return if password.blank?
+          self.crypted_password = encrypt(password)
+        end
+
+        def password_required?
+          crypted_password.blank? || !password.blank?
+        end
+      end
+  
+    end
+  end
+end

data/lib/clearance/app/models/user_mailer.rb

@@ -0,0 +1,23 @@
+module Clearance
+  module Mailers
+    module User
+    
+      def self.included(base)
+        base.class_eval do
+        
+          include InstanceMethods
+        
+        end
+      end
+    
+      module InstanceMethods
+        def change_password(user)
+          from       "donotreply@example.com"
+          recipients user.email
+          subject    "[YOUR APP] Request to change your password"
+          body       :user => user
+        end
+      end
+    end
+  end
+end

data/lib/clearance.rb

@@ -2,7 +2,8 @@ require 'clearance/app/controllers/application_controller'
 require 'clearance/app/controllers/sessions_controller'
 require 'clearance/app/controllers/users_controller'
 require 'clearance/app/controllers/passwords_controller'
-require 'clearance/app/models/model'
+require 'clearance/app/models/user'
+require 'clearance/app/models/user_mailer'
 require 'clearance/test/test_helper'
 require 'clearance/test/functionals/sessions_controller_test'
 require 'clearance/test/functionals/users_controller_test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-09 00:00:00 -07:00
+date: 2008-10-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -31,7 +31,8 @@ files:
 - clearance.gemspec
 - lib/clearance.rb
 - lib/clearance/app/controllers/application_controller.rb
-- lib/clearance/app/models/model.rb
+- lib/clearance/app/models/user.rb
+- lib/clearance/app/models/user_mailer.rb
 - lib/clearance/app/controllers/sessions_controller.rb
 - lib/clearance/test/functionals/sessions_controller_test.rb
 - lib/clearance/test/test_helper.rb

data/lib/clearance/app/models/model.rb

@@ -1,78 +0,0 @@
-module Clearance
-  module Model
-    
-    def self.included(base)
-      base.class_eval do
-        
-        attr_accessible :email, :password, :password_confirmation
-        attr_accessor :password, :password_confirmation
-
-        validates_presence_of     :email
-        validates_presence_of     :password, :if => :password_required?
-        validates_confirmation_of :password, :if => :password_required?
-        validates_uniqueness_of   :email
-
-        before_save :initialize_salt, :encrypt_password
-        
-        extend ClassMethods
-        include InstanceMethods
-        
-      protected
-
-        include ProtectedInstanceMethods
-        
-      end
-    end
-    
-    module ClassMethods
-      def authenticate(email, password)
-        user = find_by_email email
-        user && user.authenticated?(password) ? user : nil
-      end
-    end
-    
-    module InstanceMethods
-      def authenticated?(password)
-        crypted_password == encrypt(password)
-      end
-
-      def encrypt(password)
-        Digest::SHA1.hexdigest "--#{salt}--#{password}--"
-      end
-
-      def remember_token?
-        remember_token_expires_at && Time.now.utc < remember_token_expires_at
-      end
-
-      def remember_me!
-        remember_me_until 2.weeks.from_now.utc
-      end
-
-      def remember_me_until(time)
-        self.update_attribute :remember_token_expires_at, time
-        self.update_attribute :remember_token, encrypt("#{email}--#{remember_token_expires_at}")
-      end
-
-      def forget_me!
-        self.update_attribute :remember_token_expires_at, nil
-        self.update_attribute :remember_token, nil
-      end
-    end
-    
-    module ProtectedInstanceMethods
-      def initialize_salt
-        self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
-      end
-
-      def encrypt_password
-        return if password.blank?
-        self.crypted_password = encrypt(password)
-      end
-
-      def password_required?
-        crypted_password.blank? || !password.blank?
-      end
-    end
-  
-  end
-end