rails3_devise_wizard 0.2.8 → 0.3.1

data/README.textile

@@ -71,7 +71,7 @@ $ rails3_devise_wizard new APP_NAME -r jquery haml
 To build the "rails3-mongoid-devise":http://github.com/fortuity/rails3-mongoid-devise/ example application, run the command:
 
 <pre>
-$ rails3_devise_wizard new APP_NAME -r jquery haml rspec cucumber mongoid action_mailer devise add_user_name home_page home_page_users seed_database users_page css_setup application_layout devise_navigation cleanup ban_spiders git
+$ rails3_devise_wizard new APP_NAME -r jquery haml rspec cucumber mongoid action_mailer devise add_user home_page home_page_users seed_database users_page css_setup application_layout devise_navigation cleanup ban_spiders git
 </pre>
 
 h2. Make Your Own Starter App with a Reusable Application Template
@@ -100,33 +100,122 @@ The rails3_devise_wizard gem creates an application template as an intermediate
 $ rake print --silent RECIPES=recipe1,recipe2 > ~/Desktop/template.txt
 </pre>
 
-To build a reusable application template for the "rails3-mongoid-devise":http://github.com/fortuity/rails3-mongoid-devise/ example application, run the command:
+If you don't include the @--silent@ option, the rake task will generate the application template with an extraneous first line. Open the template file and remove the first line if you encounter this problem.
+
+The rails3_devise_wizard gem creates an application template that can be used by the @rails new@ command with the @-m@ option. For example:
 
 <pre>
-$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,mongoid,action_mailer,devise,add_user_name,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,devise_navigation,cleanup,ban_spiders,git > ~/Desktop/template.txt
+$ rails new testapp -m ~/Desktop/template.txt
 </pre>
 
-h4. Edit the Application Template
+You can specify the @-T -O -J@ flags as needed to skip Test::Unit files, Active Record files, and Prototype files.
 
-If you don't include the @--silent@ option, the rake task will generate the application template with an extraneous first line. Open the template file and remove the first line if you encounter this problem.
+That's all it takes. You'll have a ready-to-customize Rails web application in minutes.
 
-h4. Generate an Application from an Application Template
+h4. Template for Rails 3 + Devise + RSpec + Cucumber
 
-The rails3_devise_wizard gem creates an application template that can be used by the @rails new@ command with the @-m@ option. For example:
+To build a reusable application template for the "rails3-devise-rspec-cucumber":http://github.com/fortuity/rails3-devise-rspec-cucumber/ example application, run the command:
 
 <pre>
-$ rails new testapp -m ~/Desktop/template.txt
+$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,devise_navigation,cleanup,ban_spiders,git > ~/Desktop/template.txt
 </pre>
 
-You can specify the @-T -O -J@ flags as needed to skip Test::Unit files, Active Record files, and Prototype files.
+Then generate the application using the @-T -J@ flags:
 
-Here's an example:
+<pre>
+$ rails new testapp -m ~/Desktop/template.txt -T -J
+</pre>
+
+h4. Template for Rails 3 + Mongoid + Devise
+
+To build a reusable application template for the "rails3-mongoid-devise":http://github.com/fortuity/rails3-mongoid-devise/ example application, run the command:
 
 <pre>
-$ rails new testapp -m ~/Desktop/recipe.txt -T -O -J
+$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,devise_navigation,cleanup,ban_spiders,git > ~/Desktop/template.txt
 </pre>
 
-That's all it takes. You'll have a ready-to-customize Rails web application in minutes.
+Then generate the application using the @-T -O -J@ flags:
+
+<pre>
+$ rails new testapp -m ~/Desktop/template.txt -T -O -J
+</pre>
+
+h4. Template for Rails 3 + Mongoid + OmniAuth
+
+To build a reusable application template for the "rails3-mongoid-omniauth":http://github.com/fortuity/rails3-mongoid-omniauth/ example application, run the command:
+
+<pre>
+$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,mongoid,seed_database,add_user,omniauth,home_page,home_page_users,css_setup,application_layout,navigation,users_page,omniauth_email,cleanup,ban_spiders,git > ~/Desktop/template.txt
+</pre>
+
+Then generate the application using the @-T -O -J@ flags:
+
+<pre>
+$ rails new testapp -m ~/Desktop/template.txt -T -O -J
+</pre>
+
+h2. The Recipes
+
+The following recipes are available.
+
+h4. Recipes for General Use
+
+|_. File                    |_.                                  |_. Dependencies     |_. Authors |
+| "action_mailer.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/action_mailer.rb          | Changes ActionMailer defaults             | none               | dkehoe |
+| "ban_spiders.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/ban_spiders.rb           | Ban spiders from your site by changing robots.txt | none | dkehoe |
+| "cleanup.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/cleanup.rb               | Remove unnecessary files, add READMEs | none | fnichol, dkehoe |
+| "git.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/git.rb                    | Add a gitignore file, initialize new Git repo | Git | fnichol, dkehoe |
+| "sample_readme.textile":https://github.com/fortuity/rails-template-recipes/raw/master/sample_readme.textile     | Placeholder text for a README file (textile markup) | none | dkehoe |
+| "sample_readme.txt":https://github.com/fortuity/rails-template-recipes/raw/master/sample_readme.txt         | Placeholder text for a README file (ASCII) | none | dkehoe |
+
+h4. Recipes for Testing and BDD
+
+|_. File                    |_.                                  |_. Dependencies     |_. Authors |
+| "rspec.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/rspec.rb          | Install RSpec | none | rbrooker, dkehoe |
+| "cucumber.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/cucumber.rb          | Install Cucumber | none | rbrooker, dkehoe |
+
+h4. Recipes for Mongoid
+
+|_. File                    |_.                                  |_. Dependencies     |_. Authors |
+| "mongoid.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/mongoid.rb        | Installs Mongoid with the bson_ext gem | Mongoid | dkehoe |
+
+h4. Recipes for jQuery
+
+|_. File                    |_.                                  |_. Dependencies     |_. Authors |
+| "jquery.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/jquery_fix.rb             | Installs jQuery | none | dkehoe |
+
+h4. Recipes for Devise
+
+|_. File                    |_.                                  |_. Dependencies     |_. Authors |
+| "devise.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/devise.rb          | Installs Devise  | none | dkehoe |
+
+h4. Recipes for OmniAuth
+
+|_. File                    |_.                                  |_. Dependencies     |_. Authors |
+| "omniauth.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/omniauth.rb        | OmniAuth for authentication | none | dkehoe |
+| "omniauth_email.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/omniauth_email.rb        | Requests a new uer's email address when authenticating with Twitter, etc. | OmniAuth | dkehoe |
+
+h4. Recipes for Haml
+
+|_. File                    |_.                                  |_. Dependencies     |_. Authors |
+| "haml.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/haml.rb          | Installs Haml | none | dkehoe |
+
+h4. Recipes for the Application Layout
+
+|_. File                    |_.                                  |_. Dependencies     |_. Authors |
+| "application_layout.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/application_layout.rb     | Adds application layout with flash messages | ERB or Haml      | dkehoe |
+| "css_setup.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/css_setup.rb              | Add a stylesheet with styles for a horizontal menu and flash messages | none | dkehoe |
+
+h4. Recipes for the Example Apps
+
+|_. File                    |_.                                  |_. Dependencies     |_. Authors |
+| "add_user.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/add_user.rb          | adds User model for use with OmniAuth or Devise | none | dkehoe |
+| "navigation.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/_navigation.rb      | Add navigation links to the default application layout | none | dkehoe |
+| "devise_navigation.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/devise_navigation.rb      | Add navigation links to the default application layout | Devise | dkehoe |
+| "home_page.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/home_page.rb              | Create a home controller, route, and simple view | ERB or Haml | dkehoe |
+| "home_page_users.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/home_page_users.rb        | Modify a home page to display a list of users | Home controller, User model, ERB or Haml | dkehoe |
+| "seed_database.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/seed_database.rb          | Adds a db/seeds.rb file to initialize a database | none | dkehoe |
+| "users_page.rb":https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/users_page.rb             | Add a home page containing links to User pages | User model, ERB or Haml | dkehoe |
 
 h2. Writing New Recipes
 

data/recipes/cucumber.rb

@@ -3,7 +3,7 @@
 
 if config['cucumber']
   gem 'cucumber-rails', ">= 0.4.1", :group => :test
-  gem 'capybara', ">= 1.0.0.beta1", :group => :test
+  gem 'capybara', ">= 0.4.1.2", :group => :test
   gem 'database_cleaner', '>= 0.6.7', :group => :test
   gem 'launchy', ">= 0.4.0", :group => :test
 else

data/recipes/devise.rb

@@ -35,20 +35,20 @@ if config['devise']
     say_wizard "Devise recipe running 'after everything'"
 
     if recipes.include? 'rspec'
-      say_wizard "Copying RSpec files from the rails3-mongoid-devise examples"
-      # copy all the RSpec specs files from the rails3-mongoid-devise example app
+      say_wizard "Copying RSpec files from the rails3-devise-rspec-cucumber examples"
+      # copy all the RSpec specs files from the rails3-devise-rspec-cucumber example app
       inside 'spec' do
-        get 'https://github.com/fortuity/rails3-mongoid-devise/raw/master/spec/factories.rb', 'factories.rb'
+        get 'https://github.com/fortuity/rails3-devise-rspec-cucumber/raw/master/spec/factories.rb', 'factories.rb'
       end
       remove_file 'spec/controllers/home_controller_spec.rb'
       remove_file 'spec/controllers/users_controller_spec.rb'
       inside 'spec/controllers' do
-        get 'https://github.com/fortuity/rails3-mongoid-devise/raw/master/spec/controllers/home_controller_spec.rb', 'home_controller_spec.rb'
-        get 'https://github.com/fortuity/rails3-mongoid-devise/raw/master/spec/controllers/users_controller_spec.rb', 'users_controller_spec.rb'
+        get 'https://github.com/fortuity/rails3-devise-rspec-cucumber/raw/master/spec/controllers/home_controller_spec.rb', 'home_controller_spec.rb'
+        get 'https://github.com/fortuity/rails3-devise-rspec-cucumber/raw/master/spec/controllers/users_controller_spec.rb', 'users_controller_spec.rb'
       end
       remove_file 'spec/models/user_spec.rb'
       inside 'spec/models' do
-        get 'https://github.com/fortuity/rails3-mongoid-devise/raw/master/spec/models/user_spec.rb', 'user_spec.rb'
+        get 'https://github.com/fortuity/rails3-devise-rspec-cucumber/raw/master/spec/models/user_spec.rb', 'user_spec.rb'
       end
       remove_file 'spec/views/home/index.html.erb_spec.rb'
       remove_file 'spec/views/home/index.html.haml_spec.rb'

data/recipes/git.rb

@@ -2,10 +2,21 @@
 # https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/git.rb
 
 after_everything do
+  
   say_wizard "Git recipe running 'after everything'"
+  
   # Git should ignore some files
   remove_file '.gitignore'
   get "https://github.com/fortuity/rails3-gitignore/raw/master/gitignore.txt", ".gitignore"
+
+  if recipes.include? 'omniauth'
+    append_file '.gitignore' do <<-TXT
+# keep OmniAuth service provider secrets out of the Git repo
+config/initializers/omniauth.rb
+TXT
+    end
+  end
+
   # Initialize new Git repo
   git :init
   git :add => '.'

data/recipes/jquery.rb

@@ -2,41 +2,57 @@
 # https://github.com/fortuity/rails3_devise_wizard/blob/master/recipes/jquery.rb
 
 if config['jquery']
-  say_wizard "REMINDER: When creating a Rails app using jQuery..."
-  say_wizard "you should add the '-J' flag to 'rails new'"
-  after_bundler do
-    say_wizard "jQuery recipe running 'after bundler'"
-    # remove the Prototype adapter file
-    remove_file 'public/javascripts/rails.js'
-    # remove the Prototype files (if they exist)
-    remove_file 'public/javascripts/controls.js'
-    remove_file 'public/javascripts/dragdrop.js'
-    remove_file 'public/javascripts/effects.js'
-    remove_file 'public/javascripts/prototype.js'
-    # add jQuery files
-    inside "public/javascripts" do
-      get "https://github.com/rails/jquery-ujs/raw/master/src/rails.js", "rails.js"
-      get "http://code.jquery.com/jquery-1.6.min.js", "jquery.js"
+  if recipes.include? 'rails 3.0'
+    say_wizard "Replacing Prototype framework with jQuery for Rails 3.0."
+    after_bundler do
+      say_wizard "jQuery recipe running 'after bundler'"
+      # remove the Prototype adapter file
+      remove_file 'public/javascripts/rails.js'
+      # remove the Prototype files (if they exist)
+      remove_file 'public/javascripts/controls.js'
+      remove_file 'public/javascripts/dragdrop.js'
+      remove_file 'public/javascripts/effects.js'
+      remove_file 'public/javascripts/prototype.js'
+      # add jQuery files
+      inside "public/javascripts" do
+        get "https://github.com/rails/jquery-ujs/raw/master/src/rails.js", "rails.js"
+        get "http://code.jquery.com/jquery-1.6.min.js", "jquery.js"
+        if config['ui']
+          get "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.12/jquery-ui.min.js", "jqueryui.js"
+        end
+      end
+      # adjust the Javascript defaults
+      # first uncomment "config.action_view.javascript_expansions"
+      gsub_file "config/application.rb", /# config.action_view.javascript_expansions/, "config.action_view.javascript_expansions"
+      # then add "jquery rails" if necessary
+      gsub_file "config/application.rb", /= \%w\(\)/, "%w(jquery rails)"
+      # finally change to "jquery jqueryui rails" if necessary
       if config['ui']
-        get "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.12/jquery-ui.min.js", "jqueryui.js"
+        gsub_file "config/application.rb", /jquery rails/, "jquery jqueryui rails"
       end
     end
-    # adjust the Javascript defaults
+  elsif recipes.include? 'rails 3.1'
     if config['ui']
-      inject_into_file 'config/application.rb', "config.action_view.javascript_expansions[:defaults] = %w(jquery jqueryui rails)\n", :after => "config.action_view.javascript_expansions[:defaults] = %w()\n", :verbose => false
+      inside "app/assets/javascripts" do
+        get "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.12/jquery-ui.min.js", "jqueryui.js"
+      end
     else
-      inject_into_file 'config/application.rb', "config.action_view.javascript_expansions[:defaults] = %w(jquery rails)\n", :after => "config.action_view.javascript_expansions[:defaults] = %w()\n", :verbose => false
-    end  
-    gsub_file "config/application.rb", /config.action_view.javascript_expansions\[:defaults\] = \%w\(\)\n/, ""
+      say_wizard "jQuery installed by default in Rails 3.1."
+    end
+  else
+    say_wizard "Don't know what to do for Rails version #{Rails::VERSION::STRING}. jQuery recipe skipped."
   end
 else
+  if config['ui']
+    say_wizard "You said you didn't want jQuery. Can't install jQuery UI without jQuery."
+  end
   recipes.delete('jquery')
 end
 
 __END__
 
 name: jQuery
-description: "Use jQuery instead of Prototype."
+description: "Install jQuery (with jQuery UI option) for Rails 3.0 or 3.1."
 author: fortuity
 
 exclusive: javascript_framework
@@ -48,7 +64,7 @@ args: ["-J"]
 config:
   - jquery:
       type: boolean
-      prompt: Would you like to use jQuery instead of Prototype?
+      prompt: Would you like to use jQuery?
   - ui:
       type: boolean
       prompt: Would you like to use jQuery UI?

data/recipes/omniauth.rb

@@ -9,84 +9,81 @@ end
 
 if config['omniauth']
   after_bundler do
-    
-      create_file 'config/initializers/omniauth.rb', <<-RUBY
+
+    # Don't use single-quote-style-heredoc: we want interpolation.
+    create_file 'config/initializers/omniauth.rb' do <<-RUBY
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :provider, 'KEY', 'SECRET'
+  provider :#{config['provider']}, 'KEY', 'SECRET'
 end
 RUBY
-      end
+    end
 
-      append_file '.gitignore' do <<-TXT
-\n
-# keep OmniAuth service provider secrets out of the Git repo
-config/initializers/omniauth.rb
-TXT
-      end
+    route "match '/auth/failure' => 'sessions#failure'"
+    route "match '/signout' => 'sessions#destroy', :as => :signout"
+    route "match '/signin' => 'sessions#new', :as => :signin"
+    route "match '/auth/:provider/callback' => 'sessions#create'"
+    route "resources :users, :only => [ :show, :edit, :update ]"
+
+    inject_into_file 'app/models/user.rb', :before => 'end' do <<-RUBY
 
-      inject_into_file 'config/routes.rb', :before => 'end' do
-        "resources :users, :only => [ :show, :edit, :update ]\n"
-      end
-      inject_into_file 'config/routes.rb', :before => 'end' do
-        "match '/auth/:provider/callback' => 'sessions#create'\n"
-      end
-      inject_into_file 'config/routes.rb', :before => 'end' do
-        "match '/signout' => 'sessions#destroy', :as => :signout\n"
-      end
-      inject_into_file 'config/routes.rb', :before => 'end' do
-        "match '/signin' => 'sessions#new', :as => :signin\n"
-      end
-      inject_into_file 'config/routes.rb', :before => 'end' do
-        "match '/auth/failure' => 'sessions#failure'\n"
-      end
-      
-      inject_into_file 'app/models/user.rb', :before => 'end' do <<-RUBY
   def self.create_with_omniauth(auth)
-    create! do |user|
-      user.provider = auth['provider']
-      user.uid = auth['uid']
-      user.name = auth['user_info']['name'] if auth['user_info']['name'] # Twitter, Google, Yahoo, GitHub
-      user.email = auth['user_info']['email'] if auth['user_info']['email'] # Google, Yahoo, GitHub
-      user.name = auth['extra']['user_hash']['name'] if auth['extra']['user_hash']['name'] # Facebook
-      user.email = auth['extra']['user_hash']['email'] if auth['extra']['user_hash']['email'] # Facebook
+    begin
+      create! do |user|
+        user.provider = auth['provider']
+        user.uid = auth['uid']
+        if auth['user_info']
+          user.name = auth['user_info']['name'] if auth['user_info']['name'] # Twitter, Google, Yahoo, GitHub
+          user.email = auth['user_info']['email'] if auth['user_info']['email'] # Google, Yahoo, GitHub
+        end
+        if auth['extra']['user_hash']
+          user.name = auth['extra']['user_hash']['name'] if auth['extra']['user_hash']['name'] # Facebook
+          user.email = auth['extra']['user_hash']['email'] if auth['extra']['user_hash']['email'] # Facebook
+        end
+      end
+    rescue Exception
+      raise Exception, "cannot create user record"
     end
   end
+
 RUBY
-      end
+    end
 
-      create_file 'app/controllers/sessions_controller.rb', <<-RUBY
+    # We have to use single-quote-style-heredoc to avoid interpolation.
+    create_file 'app/controllers/sessions_controller.rb', do <<-'RUBY'
 class SessionsController < ApplicationController
-  
-  def new
-    redirect_to '/auth/provider}'
-  end
-  
+
   def create
     auth = request.env["omniauth.auth"]
     user = User.where(:provider => auth['provider'], 
                       :uid => auth['uid']).first || User.create_with_omniauth(auth)
     session[:user_id] = user.id
-    if !user.email
-      redirect_to edit_user_path(user), :alert => "Please enter your email address."
-    else
-      redirect_to root_url, :notice => 'Signed in!'
-    end
+    redirect_to root_url, :notice => 'Signed in!'
   end
-  
+
   def destroy
     session[:user_id] = nil
     redirect_to root_url, :notice => 'Signed out!'
   end
-  
+
   def failure
     redirect_to root_url, :alert => "Authentication error: #{params[:message].humanize}"
   end
-  
+
 end
 RUBY
-      end
+    end
+
+    # Don't use single-quote-style-heredoc: we want interpolation.
+    inject_into_class 'app/controllers/sessions_controller.rb', 'SessionsController' do <<-RUBY
+
+  def new
+    redirect_to '/auth/#{config['provider']}'
+  end
+
+RUBY
+    end
 
-      inject_into_file 'app/controllers/application_controller.rb', :before => 'end' do <<-RUBY
+    inject_into_file 'app/controllers/application_controller.rb', :before => 'end' do <<-RUBY
   helper_method :current_user
   helper_method :user_signed_in?
   helper_method :correct_user?
@@ -116,8 +113,9 @@ RUBY
         redirect_to root_url, :alert => 'You need to sign in for access to this page.'
       end
     end
+
 RUBY
-      end
+    end
 
   end
 end

data/recipes/omniauth_email.rb

@@ -9,11 +9,11 @@ after_bundler do
     # Modify a users controller
     #----------------------------------------------------------------------------
     inject_into_file 'app/controllers/users_controller.rb', :after => "before_filter :authenticate_user!\n" do <<-RUBY
-  before_filter :correct_user?\n
+  before_filter :correct_user?
 RUBY
     end
     
-    inject_into_file 'app/controllers/users_controller.rb', :before => 'end' do <<-RUBY
+    inject_into_file 'app/controllers/users_controller.rb', :before => 'def show' do <<-RUBY
   def edit
     @user = User.find(params[:id])
   end
@@ -26,6 +26,7 @@ RUBY
       render :edit
     end
   end
+\n
 RUBY
     end
 
@@ -62,10 +63,10 @@ ERB
     gsub_file 'app/controllers/sessions_controller.rb', /redirect_to root_url, :notice => 'Signed in!'/ do
   <<-RUBY
 if !user.email
-  redirect_to edit_user_path(user), :alert => "Please enter your email address."
-else
-  redirect_to root_url, :notice => 'Signed in!'
-end
+      redirect_to edit_user_path(user), :alert => "Please enter your email address."
+    else
+      redirect_to root_url, :notice => 'Signed in!'
+    end
 RUBY
     end
 

data/recipes/rspec.rb

@@ -25,16 +25,28 @@ if config['rspec']
   after_bundler do
     say_wizard "RSpec recipe running 'after bundler'"
     generate 'rspec:install'
-    
+
     say_wizard "Removing test folder (not needed for RSpec)"
     run 'rm -rf test/'
 
+    inject_into_file 'config/application.rb', :after => "Rails::Application\n" do <<-RUBY
+
+    # don't generate RSpec tests for views and helpers
+    config.generators do |g|
+      g.view_specs false
+      g.helper_specs false
+    end
+
+RUBY
+    end
+
+
     if recipes.include? 'mongoid'
-      
+
       # remove ActiveRecord artifacts
       gsub_file 'spec/spec_helper.rb', /config.fixture_path/, '# config.fixture_path'
       gsub_file 'spec/spec_helper.rb', /config.use_transactional_fixtures/, '# config.use_transactional_fixtures'
-      
+
       # reset your application database to a pristine state during testing
       inject_into_file 'spec/spec_helper.rb', :before => "\nend" do
       <<-RUBY

data/templates/layout.erb

@@ -20,11 +20,28 @@ Rails.application.config.generators do |g|
 end
 RUBY
 
-@recipes = <%= resolve_recipes.map(&:key).inspect %> 
+@recipes = <%= resolve_recipes.map(&:key).inspect %>
 
 <%= render "helpers" %>
 
+case Rails::VERSION::MAJOR.to_s
+when "3"
+  case Rails::VERSION::MINOR.to_s
+  when "1"
+    say_wizard "You are using Rails version #{Rails::VERSION::STRING}."
+    @recipes << 'rails 3.1'
+  when "0"
+    say_wizard "You are using Rails version #{Rails::VERSION::STRING}."
+    @recipes << 'rails 3.0'
+  else
+    say_wizard "You are using Rails version #{Rails::VERSION::STRING} which is not supported."
+  end
+else
+  say_wizard "You are using Rails version #{Rails::VERSION::STRING} which is not supported."
+end
+
 say_wizard "Checking configuration. Please confirm your preferences."
+
 <% resolve_recipes.each do |recipe| %>
 <%= render 'recipe', recipe.get_binding %>
 <% end %>
@@ -49,4 +66,4 @@ say_wizard "Running 'after everything' callbacks."
 @current_recipe = nil
 say_wizard "Finished running the rails3_devise_wizard app template."
 say_wizard "Your new Rails app is ready. Any problems?"
-say_wizard "See http://github.com/fortuity/rails3-mongoid-devise/issues"
+say_wizard "See http://github.com/fortuity/rails3_devise_wizard/issues"

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "0.2.8"
+  VERSION = "0.3.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: rails3_devise_wizard
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.8
+  version: 0.3.1
 platform: ruby
 authors: 
 - Daniel Kehoe
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 Z
+date: 2011-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
@@ -175,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2109356593565776162
+      hash: 2176637839049336499
       segments: 
       - 0
       version: "0"
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2109356593565776162
+      hash: 2176637839049336499
       segments: 
       - 0
       version: "0"