thoughtbot-clearance 0.8.0 → 0.8.1

data/CHANGELOG.textile

@@ -1,3 +1,8 @@
+h2. 0.8.1 (08/31/2009)
+
+* Removed unnecessary remember_token_expires_at column and the
+remember? and forget_me! user instance methods. (Dan Croak)
+
 h2. 0.8.0 (08/31/2009)
 
 * Always remember me. Replaced session-and-remember-me authentication with

data/Rakefile

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

data/app/controllers/clearance/sessions_controller.rb

@@ -28,7 +28,7 @@ class Clearance::SessionsController < ApplicationController
   end
 
   def destroy
-    sign_out(current_user)
+    sign_out
     flash_success_after_destroy
     redirect_to(url_after_destroy)
   end

data/generators/clearance/templates/migrations/create_users.rb

@@ -6,7 +6,6 @@ class ClearanceCreateUsers < ActiveRecord::Migration
       t.string   :salt,               :limit => 128
       t.string   :confirmation_token, :limit => 128
       t.string   :remember_token,     :limit => 128
-      t.datetime :remember_token_expires_at
       t.boolean  :email_confirmed, :default => false, :null => false
       t.timestamps
     end

data/generators/clearance/templates/migrations/update_users.rb

@@ -8,7 +8,6 @@ class ClearanceUpdateUsers < ActiveRecord::Migration
         [:salt, 't.string :salt, :limit => 128'],
         [:confirmation_token, 't.string :confirmation_token, :limit => 128'],
         [:remember_token, 't.string :remember_token, :limit => 128'],
-        [:remember_token_expires_at, 't.datetime :remember_token_expires_at'],
         [:email_confirmed, 't.boolean :email_confirmed, :default => false, :null => false']
       ].delete_if {|c| existing_columns.include?(c.first.to_s)}
 -%>

data/lib/clearance/authentication.rb

@@ -51,21 +51,17 @@ module Clearance
           user.remember_me!
           cookies[:remember_token] = {
             :value   => user.remember_token,
-            :expires => user.remember_token_expires_at
+            :expires => 1.year.from_now.utc
           }
         end
       end
 
       # Sign user out of cookie.
       #
-      # @param [User]
-      #
       # @example
-      #   sign_out(@user)
-      def sign_out(user)
-        user.forget_me! if user
+      #   sign_out
+      def sign_out
         cookies.delete(:remember_token)
-        reset_session
       end
 
       # Store the current location.
@@ -83,8 +79,7 @@ module Clearance
 
       def user_from_cookie
         if token = cookies[:remember_token]
-          return nil  unless user = ::User.find_by_remember_token(token)
-          return user if     user.remember?
+          ::User.find_by_remember_token(token)
         end
       end
 
@@ -94,7 +89,9 @@ module Clearance
       end
 
       def store_location
-        session[:return_to] = request.request_uri if request.get?
+        if request.get?
+          session[:return_to] = request.request_uri
+        end
       end
 
       def redirect_back_or(default)

data/lib/clearance/user.rb

@@ -101,17 +101,6 @@ module Clearance
         encrypted_password == encrypt(password)
       end
 
-      # Am I remembered?
-      #
-      # @return [true, false]
-      # @example
-      #   user.remember?
-      def remember?
-        remember_token &&
-        remember_token_expires_at &&
-        Time.now.utc < remember_token_expires_at
-      end
-
       # Remember me for a year.
       #
       # @example
@@ -121,16 +110,7 @@ module Clearance
       #     :expires => user.remember_token_expires_at
       #   }
       def remember_me!
-        remember_me_until! 1.year.from_now.utc
-      end
-
-      # Forget me.
-      #
-      # @example
-      #   user.forget_me!
-      def forget_me!
-        self.remember_token            = nil
-        self.remember_token_expires_at = nil
+        self.remember_token = encrypt("--#{Time.now.utc}--#{password}--")
         save(false)
       end
 
@@ -200,12 +180,6 @@ module Clearance
       def password_required?
         encrypted_password.blank? || !password.blank?
       end
-
-      def remember_me_until!(time)
-        self.remember_token_expires_at = time
-        self.remember_token = encrypt("--#{time}--#{password}--")
-        save(false)
-      end
     end
 
     module ClassMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Dan Croak
@@ -115,6 +115,8 @@ files:
 - rails/init.rb
 has_rdoc: true
 homepage: http://github.com/thoughtbot/clearance
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -135,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Rails authentication with email & password.