more for 'confirmable' and 'invitable' options to 'devise' recipe

CHANGELOG.textile

@@ -5,6 +5,7 @@ h2. 1.1.5 unreleased
 * add 'confirmable' and 'invitable' options to 'devise' recipe
 * change prompt for 'guard' recipe
 * add 'rake db:test:prepare' to 'seed_database' recipe
+* remove 'add_user_name' recipe (replaced by 'add_user' recipe)
 
 h2. 1.1.4 February 21, 2012
 

recipes/add_user.rb

@@ -20,13 +20,9 @@
     # Generate models and routes for a User
     generate 'devise user'
 
-    if recipes.include? 'devise-confirmable'
-      gsub_file 'app/models/user.rb', /:registerable,/, ":registerable, :confirmable,"
-      generate 'migration AddConfirmableToUsers confirmation_token:string confirmed_at:datetime confirmation_sent_at:datetime unconfirmed_email:string'
-    end
-
     # Add a 'name' attribute to the User model
     if recipes.include? 'mongoid'
+      # for mongoid
       gsub_file 'app/models/user.rb', /end/ do
   <<-RUBY
   field :name
@@ -40,6 +36,9 @@
       # for ActiveRecord
       # Devise created a Users database, we'll modify it
       generate 'migration AddNameToUsers name:string'
+      if recipes.include? 'devise-confirmable'
+        generate 'migration AddConfirmableToUsers confirmation_token:string confirmed_at:datetime confirmation_sent_at:datetime unconfirmed_email:string'
+      end
       # Devise created a Users model, we'll modify it
       gsub_file 'app/models/user.rb', /attr_accessible :email/, 'attr_accessible :name, :email'
       inject_into_file 'app/models/user.rb', :before => 'validates_uniqueness_of' do
@@ -48,8 +47,14 @@
       gsub_file 'app/models/user.rb', /validates_uniqueness_of :email/, 'validates_uniqueness_of :name, :email'
     end
 
+    # needed for both mongoid and ActiveRecord
+    if recipes.include? 'devise-confirmable'
+      gsub_file 'app/models/user.rb', /:registerable,/, ":registerable, :confirmable,"
+      gsub_file 'app/models/user.rb', /:remember_me/, ':remember_me, :confirmed_at'
+    end
+
     unless recipes.include? 'haml'
-      
+
       # Generate Devise views (unless you are using Haml)
       run 'rails generate devise:views'
 

recipes/cucumber.rb

@@ -37,6 +37,9 @@
         get 'https://raw.github.com/RailsApps/rails3-devise-rspec-cucumber/master/features/step_definitions/user_steps.rb', 'features/step_definitions/user_steps.rb'
         remove_file 'features/support/paths.rb'
         get 'https://raw.github.com/RailsApps/rails3-devise-rspec-cucumber/master/features/support/paths.rb', 'features/support/paths.rb'
+        if recipes.include? 'devise-confirmable'
+          gsub_file 'features/step_definitions/user_steps.rb', /Welcome! You have signed up successfully./, "A message with a confirmation link has been sent to your email address."
+        end
       rescue OpenURI::HTTPError
         say_wizard "Unable to obtain Cucumber example files from the repo"
       end

recipes/seed_database.rb

@@ -38,6 +38,9 @@
 puts 'New user created: ' << user.name
 FILE
     end
+    if recipes.include? 'devise-confirmable'
+      gsub_file 'db/seeds.rb', /:password_confirmation => 'please'/, ":password_confirmation => 'please', :confirmed_at => DateTime.now"
+    end
   end
 
   run 'bundle exec rake db:seed'