thoughtbot-clearance 0.2.3 → 0.2.4

data/README.textile

@@ -121,11 +121,6 @@ h2. Routes
       
       map.root :controller => 'sessions', :action => 'new'
       
-      map.with_options :controller => 'sessions'  do |m|
-        m.login  '/login',  :action => 'new'
-        m.logout '/logout', :action => 'destroy'
-      end
-      
     end
 
 h2. Environments

data/Rakefile

@@ -33,7 +33,9 @@ namespace :gemspec do
       f.write spec.to_ruby
     end
   end
-  
+end
+
+namespace :version do
   namespace :bump do
     desc "Bump the gemspec a major version."
     task :major do
@@ -51,8 +53,10 @@ end
       end
       
       spec.version = "#{major}.0.0"
+      puts "Version bumped to #{spec.version}"
+      
       Rake::Task["gemspec:write"].invoke
-      puts "Gem bumped to #{spec.version}"
+      puts "Gemspec updated"
     end
     
     desc "Bump the gemspec a minor version."
@@ -71,8 +75,10 @@ end
       end
       
       spec.version = "#{Clearance::Version::MAJOR}.#{minor}.0"
+      puts "Version bumped to #{spec.version}"
+      
       Rake::Task["gemspec:write"].invoke
-      puts "Gem bumped to #{spec.version}"
+      puts "Gemspec updated"
     end
     
     desc "Bump the gemspec a patch version."
@@ -91,8 +97,10 @@ end
       end
       
       spec.version = "#{Clearance::Version::MAJOR}.#{Clearance::Version::MINOR}.#{patch}"
+      puts "Version bumped to #{spec.version}"
+      
       Rake::Task["gemspec:write"].invoke
-      puts "Gem bumped to #{spec.version}"
+      puts "Gemspec updated"
     end
   end
 end

data/TODO.textile

@@ -4,7 +4,6 @@
 # sessions controller test is missing some tests
 # mailers should not hardcode example.com as from address
 # check to make sure attr_accessible doesn't override and w/ attr_protected
-# helpers and tests shouldn't depend on login/logout routes
 # move shoulda macros in test_helper to shoulda_macros folder
 # add shoulda and factory girl dependencies to gemspec
 # refactor Mailer default_url_options[:host] to something cleaner

data/lib/clearance/app/controllers/application_controller.rb

@@ -60,7 +60,7 @@ module Clearance
       end
 
       def deny_access(flash_message = nil, opts = {})
-        opts[:redirect] ||= login_url
+        opts[:redirect] ||= new_session_url
         store_location
         flash[:error] = flash_message if flash_message
         redirect_to opts[:redirect]

data/lib/clearance/app/controllers/passwords_controller.rb

@@ -22,7 +22,7 @@ module Clearance
           render :action => :new
         else
           UserMailer.deliver_change_password user
-          redirect_to login_path
+          redirect_to new_session_url
         end
       end
 

data/lib/clearance/app/controllers/sessions_controller.rb

@@ -66,7 +66,7 @@ module Clearance
       end
 
       def url_after_destroy
-        login_url
+        new_session_url
       end
     end
   end

data/lib/clearance/app/controllers/users_controller.rb

@@ -22,9 +22,9 @@ module Clearance
       def create
         @user = user_model.new params[:user]
         if @user.save
-          current_user = @user
-          flash[:notice] = "User created and logged in."
-          redirect_back_or root_url
+          UserMailer.deliver_confirmation @user
+          flash[:notice] = "You will receive an email within the next few minutes. It contains instructions to confirm your account."
+          redirect_to new_session_url
         else
           render :action => "new"
         end
@@ -34,7 +34,7 @@ module Clearance
     module PrivateInstanceMethods
 
       def url_after_create
-        root_url
+        new_session_url
       end
     end
 

data/lib/clearance/test/functionals/users_controller_test.rb

@@ -38,7 +38,7 @@ module Clearance
               }
             end
             
-            should_set_the_flash_to /created/i
+            should_set_the_flash_to /confirm/i
             should_redirect_to "@controller.send(:url_after_create)"
             should_assign_to :user
             should_change 'User.count', :by => 1

data/lib/clearance/version.rb

@@ -2,6 +2,6 @@ module Clearance
   module Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 3
+    PATCH = 4
   end
 end

data/test/rails_root/config/routes.rb

@@ -1,19 +1,14 @@
-    ActionController::Routing::Routes.draw do |map|
-    
-      map.resources :users
-      map.resource :session
-      
-      map.resources :users, :has_one => :password
-      map.resources :users, :has_one => :confirmation
-    
-      map.resources :passwords
-     
-      map.root :controller => 'sessions', :action => 'new'
-      
-      map.with_options :controller => 'sessions'  do |m|
-        m.login  '/login',  :action => 'new'
-        m.logout '/logout', :action => 'destroy'
-      end
-    
-    end
+ActionController::Routing::Routes.draw do |map|
+
+  map.resources :users
+  map.resource :session
+  
+  map.resources :users, :has_one => :password
+  map.resources :users, :has_one => :confirmation
+
+  map.resources :passwords
+ 
+  map.root :controller => 'sessions', :action => 'new'
+
+end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - thoughtbot, inc.