thoughtbot-clearance 0.6.0 → 0.6.1

data/CHANGELOG.textile

@@ -1,3 +1,8 @@
+h1. 0.6.1 (04/21/2009)
+* Scope operators are necessary to keep Rails happy. Reverting the original
+revert so they're back in the library now for constants referenced inside of
+the gem. (Nick Quaranto)
+
 h1. 0.6.0 (04/21/2009)
 
 * Converted Clearance to a Rails engine. (Dan Croak & Joe Ferris)

data/README.textile

@@ -4,46 +4,25 @@ Rails authentication with email & password.
 
 "We have clearance, Clarence.":http://www.youtube.com/v/mNRXJEE3Nz8
 
-h2. Engine
-
-Clearance is a Rails engine. It works with versions of Rails greater than 2.3.
-
 h2. Wiki
 
 Most information regarding Clearance is on the "Github Wiki":http://wiki.github.com/thoughtbot/clearance.
 
-h2. Integration with Suspenders
-
-Clearance is based on the same conventions and tools as "Suspenders":http://github.com/thoughtbot/suspenders If you use it, you already have some configuration mentioned below.
+h2. Engine
 
-h2. Gem installation
+Clearance is a Rails engine. It works with versions of Rails greater than 2.3.
 
 In config/environment.rb:
 
     config.gem "thoughtbot-clearance", 
       :lib     => 'clearance', 
       :source  => 'http://gems.github.com', 
-      :version => '0.6.0'
-
-In config/environments/test.rb:
-
-    config.gem 'thoughtbot-shoulda',
-      :lib     => 'shoulda',
-      :source  => "http://gems.github.com", 
-      :version => '2.10.1'
-    config.gem 'thoughtbot-factory_girl',
-      :lib     => 'factory_girl',
-      :source  => "http://gems.github.com", 
-      :version => '1.2.1'
+      :version => '0.6.1'
 
-Then:
+Vendor the gem:
 
     rake gems:install
     rake gems:unpack
-    rake gems:install RAILS_ENV=test
-    rake gems:unpack  RAILS_ENV=test
-
-h2. The generator
 
 Make sure the development database exists and run the generator:
 
@@ -53,13 +32,52 @@ A number of files will be created and instructions will be printed.
 
 You may already have some of these files. Don't worry. You'll be asked if you want to overwrite them.
 
-h2. Features
+h2. Environment
+
+Define a HOST constant in your environment files.
+In config/environments/test.rb and config/environments/development.rb it can be:
+
+    HOST = "localhost"
+
+In production.rb it must be the actual host your application is deployed to.
+The constant is used by mailers to generate URLs in emails.
+
+In config/environment.rb:
+
+    DO_NOT_REPLY = "donotreply@example.com"
+
+Define root_url to *something* in your config/routes.rb:
+
+    map.root :controller => 'home'
+
+h2. Cucumber Features
+
+As your app evolves, you want to know that authentication still works. Clearance's opinion is that you should test its integration with your app using "Cucumber":http://cukes.info/.
+
+In config/environments/test.rb:
+
+    config.gem 'webrat',
+      :version => '= 0.4.4'
+    config.gem 'nokogiri',
+      :version => '= 1.2.3'
+    config.gem 'cucumber',
+      :version => '= 0.3.0'
+    config.gem 'thoughtbot-factory_girl',
+      :lib     => 'factory_girl',
+      :source  => "http://gems.github.com", 
+      :version => '1.2.1'
+
+Vendor the gems:
+
+    rake gems:install RAILS_ENV=test
+    rake gems:unpack  RAILS_ENV=test
 
-If you are using Cucumber on your application Clearance comes with a feature generator:
+Run the Cucumber generator (if you haven't already) and Clearance's feature generator:
 
+    script/generate cucumber
     script/generate clearance_features
 
-All of the files generated should be new with the exception of the features/support/paths.rb file.  If you have not modified your paths.rb then you will be okay to replace it with this one.  If you need to keep your paths.rb file then you will need to add these locations in your paths.rb manually:
+All of the files generated should be new with the exception of the features/support/paths.rb file. If you have not modified your paths.rb then you will be okay to replace it with this one. If you need to keep your paths.rb file then add these locations in your paths.rb manually:
 
     def path_to(page_name)
       case page_name
@@ -77,7 +95,7 @@ h2. Authors
 
 Clearance was extracted out of "Hoptoad":http://hoptoadapp.com. We merged the authentication code from two of thoughtbot's client's Rails apps. The following people have made significant contributions, suggestions, and generally improved the library. Thank you!
 
-Dan Croak, Mike Burns, Jason Morrison, Joe Ferris, Eugene Bolshakov, Josh Nichols, Mike Breen, Marcel Görner, Bence Nagy, Ben Mabey, Eloy Duran, Tim Pope, Mihai Anca, & Mark Cornick.
+Dan Croak, Mike Burns, Jason Morrison, Joe Ferris, Eugene Bolshakov, Nick Quaranto, Josh Nichols, Mike Breen, Marcel Görner, Bence Nagy, Ben Mabey, Eloy Duran, Tim Pope, Mihai Anca, & Mark Cornick.
 
 h2. Questions?
 

data/Rakefile

@@ -51,16 +51,16 @@ task :default => ['test:all', 'test:features']
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name        = "clearance"
-  gem_spec.version     = "0.6.0"
-  gem_spec.summary     = "Rails authentication for developers who write tests."
+  gem_spec.version     = "0.6.1"
+  gem_spec.summary     = "Rails authentication with email & password."
   gem_spec.email       = "support@thoughtbot.com"
   gem_spec.homepage    = "http://github.com/thoughtbot/clearance"
-  gem_spec.description = "Simple, complete Rails authentication scheme."
-  gem_spec.authors     = ["thoughtbot, inc.", "Dan Croak", "Mike Burns", 
-                          "Jason Morrison", "Eugene Bolshakov", "Josh Nichols",
-                          "Mike Breen", "Joe Ferris", "Bence Nagy", 
-                          "Marcel Görner", "Ben Mabey", "Tim Pope", 
-                          "Eloy Duran", "Mihai Anca", "Mark Cornick"]
+  gem_spec.description = "Rails authentication with email & password."
+  gem_spec.authors     = ["Dan Croak", "Mike Burns", "Jason Morrison",
+                          "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto",
+                          "Josh Nichols", "Mike Breen", "Marcel Görner",
+                          "Bence Nagy", "Ben Mabey", "Eloy Duran",
+                          "Tim Pope", "Mihai Anca", "Mark Cornick"]
   gem_spec.files       = FileList["[A-Z]*", "{app,config,generators,lib,shoulda_macros,rails}/**/*"]
 end
 

data/app/controllers/clearance/confirmations_controller.rb

@@ -11,7 +11,7 @@ class Clearance::ConfirmationsController < ApplicationController
   end
 
   def create
-    @user = User.find_by_id_and_token(params[:user_id], params[:token])
+    @user = ::User.find_by_id_and_token(params[:user_id], params[:token])
     @user.confirm_email!
 
     sign_user_in(@user)
@@ -22,7 +22,7 @@ class Clearance::ConfirmationsController < ApplicationController
   private
 
   def forbid_confirmed_user
-    user = User.find_by_id(params[:user_id])
+    user = ::User.find_by_id(params[:user_id])
     if user && user.email_confirmed?
       raise ActionController::Forbidden, "confirmed user"
     end
@@ -35,7 +35,7 @@ class Clearance::ConfirmationsController < ApplicationController
   end
 
   def forbid_non_existent_user
-    unless User.find_by_id_and_token(params[:user_id], params[:token])
+    unless ::User.find_by_id_and_token(params[:user_id], params[:token])
       raise ActionController::Forbidden, "non-existent user"
     end
   end

data/app/controllers/clearance/passwords_controller.rb

@@ -10,7 +10,7 @@ class Clearance::PasswordsController < ApplicationController
   end
 
   def create
-    if user = User.find_by_email(params[:password][:email])
+    if user = ::User.find_by_email(params[:password][:email])
       user.forgot_password!
       ClearanceMailer.deliver_change_password user
       flash[:notice] = "You will receive an email within the next few minutes. " <<
@@ -23,12 +23,12 @@ class Clearance::PasswordsController < ApplicationController
   end
 
   def edit
-    @user = User.find_by_id_and_token(params[:user_id], params[:token])
+    @user = ::User.find_by_id_and_token(params[:user_id], params[:token])
     render :template => 'passwords/edit'
   end
 
   def update
-    @user = User.find_by_id_and_token(params[:user_id], params[:token])
+    @user = ::User.find_by_id_and_token(params[:user_id], params[:token])
 
     if @user.update_password(params[:user][:password], 
                              params[:user][:password_confirmation])
@@ -49,7 +49,7 @@ class Clearance::PasswordsController < ApplicationController
   end
 
   def forbid_non_existent_user
-    unless User.find_by_id_and_token(params[:user_id], params[:token])
+    unless ::User.find_by_id_and_token(params[:user_id], params[:token])
       raise ActionController::Forbidden, "non-existent user"
     end
   end

data/app/controllers/clearance/sessions_controller.rb

@@ -9,7 +9,7 @@ class Clearance::SessionsController < ApplicationController
   end
 
   def create
-    @user = User.authenticate(params[:session][:email],
+    @user = ::User.authenticate(params[:session][:email],
                               params[:session][:password])
     if @user.nil?
       flash.now[:notice] = "Bad email or password."

data/app/controllers/clearance/users_controller.rb

@@ -5,12 +5,12 @@ class Clearance::UsersController < ApplicationController
   filter_parameter_logging :password
 
   def new
-    @user = User.new(params[:user])
+    @user = ::User.new(params[:user])
     render :template => 'users/new'
   end
 
   def create
-    @user = User.new params[:user]
+    @user = ::User.new params[:user]
     if @user.save
       ClearanceMailer.deliver_confirmation @user
       flash[:notice] = "You will receive an email within the next few minutes. " <<

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
-- thoughtbot, inc.
 - Dan Croak
 - Mike Burns
 - Jason Morrison
+- Joe Ferris
 - Eugene Bolshakov
+- Nick Quaranto
 - Josh Nichols
 - Mike Breen
-- Joe Ferris
-- Bence Nagy
 - "Marcel G\xC3\xB6rner"
+- Bence Nagy
 - Ben Mabey
-- Tim Pope
 - Eloy Duran
+- Tim Pope
 - Mihai Anca
 - Mark Cornick
 autorequire: 
@@ -27,7 +27,7 @@ date: 2009-04-20 21:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Simple, complete Rails authentication scheme.
+description: Rails authentication with email & password.
 email: support@thoughtbot.com
 executables: []
 
@@ -123,6 +123,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Rails authentication for developers who write tests.
+summary: Rails authentication with email & password.
 test_files: []