clearance 0.9.0.rc5 → 0.9.0.rc6

data/README.md

@@ -76,7 +76,7 @@ and add your route in config/routes.rb:
 See config/routes.rb for all the routes Clearance provides.
 
 Actions that redirect (create, update, and destroy) in Clearance controllers
-can be overriden by re-defining url_after_(action) methods as seen above.
+can be overridden by re-defining url_after_(action) methods as seen above.
 
 Optional Cucumber features
 --------------------------
@@ -92,11 +92,11 @@ Run the Cucumber generator and Clearance feature generator:
 
 Edit your Gemfile to include:
 
-    gem 'factory_girl'
+    gem 'factory_girl_rails'
 
 Edit your config/enviroments/cucumber.rb to include the following:
 
-    ActionMailer::Base.default_url_options = { :host => 'localhost:3000' }
+    config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 
 Then run rake!
 
@@ -115,8 +115,8 @@ Authors
 -------
 
 Clearance was extracted out of [Hoptoad](http://hoptoadapp.com). We merged the
-authentication code from two of thoughtbot client Rails apps and have since
-used it each time we need authentication.
+authentication code from two of thoughtbot's client Rails apps and have since
+used it each time we needed authentication.
 
 The following people have improved the library. Thank you!
 

data/VERSION

@@ -1 +1 @@
-0.9.0.rc5
+0.9.0.rc6

data/config/routes.rb

@@ -1,30 +1,23 @@
-Rails.application.routes.draw do |map|
-  map.resources :passwords,
+Rails.application.routes.draw do
+  resources :passwords,
     :controller => 'clearance/passwords',
     :only       => [:new, :create]
 
-  map.resource  :session,
+  resource  :session,
     :controller => 'clearance/sessions',
     :only       => [:new, :create, :destroy]
 
-  map.resources :users, :controller => 'clearance/users' do |users|
-    users.resource :password,
+  resources :users, :controller => 'clearance/users' do
+    resource :password,
       :controller => 'clearance/passwords',
       :only       => [:create, :edit, :update]
 
-    users.resource :confirmation,
+    resource :confirmation,
       :controller => 'clearance/confirmations',
       :only       => [:new, :create]
   end
 
-  map.sign_up  'sign_up',
-    :controller => 'clearance/users',
-    :action     => 'new'
-  map.sign_in  'sign_in',
-    :controller => 'clearance/sessions',
-    :action     => 'new'
-  map.sign_out 'sign_out',
-    :controller => 'clearance/sessions',
-    :action     => 'destroy',
-    :method     => :delete
+  match 'sign_up'  => 'clearance/users#new', :as => 'sign_up'
+  match 'sign_in'  => 'clearance/sessions#new', :as => 'sign_in'
+  match 'sign_out' => 'clearance/sessions#destroy', :via => :delete, :as => 'sign_out'
 end

data/lib/rails/generators/clearance_generator.rb

@@ -62,7 +62,7 @@ class ClearanceGenerator < ActiveRecord::Generators::Base
   end
 
   def schema_version
-    IO.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).strip.gsub(/[^\d]/, '_')
+    IO.read(File.join(File.dirname(__FILE__), '..', '..', '..', 'VERSION')).strip.gsub(/[^\d]/, '_')
   end
 
   def upgrading_clearance_again?

data/test/test_helper.rb

@@ -11,7 +11,7 @@ begin
 rescue LoadError
 end
 
-require File.join(File.dirname(__FILE__), '..', 'shoulda_macros', 'clearance')
+require 'clearance/shoulda_macros'
 
 class ActiveSupport::TestCase
   self.use_transactional_fixtures = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: clearance
 version: !ruby/object:Gem::Version 
-  hash: 977940482
+  hash: 977940483
   prerelease: true
   segments: 
   - 0
   - 9
   - 0
-  - rc5
-  version: 0.9.0.rc5
+  - rc6
+  version: 0.9.0.rc6
 platform: ruby
 authors: 
 - Dan Croak
@@ -33,7 +33,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -05:00
+date: 2010-06-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency