conform to app generated by version 1.4.6 of rails_apps_composer

Author: DanielKehoe

Gemfile

@@ -8,7 +8,7 @@ group :assets do
 end
 gem 'jquery-rails'
 gem "rspec-rails", ">= 2.9.0.rc2", :group => [:development, :test]
-gem "factory_girl_rails", ">= 3.0.0", :group => [:development, :test]
+gem "factory_girl_rails", ">= 3.1.0", :group => [:development, :test]
 gem "email_spec", ">= 1.2.1", :group => :test
 gem "cucumber-rails", ">= 1.3.0", :group => :test
 gem "capybara", ">= 1.1.2", :group => :test

Gemfile.lock

@@ -47,7 +47,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
+    coffee-script-source (1.3.1)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -71,23 +71,25 @@ GEM
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    factory_girl (3.0.0)
+    factory_girl (3.1.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (3.0.0)
-      factory_girl (~> 3.0.0)
+    factory_girl_rails (3.1.0)
+      factory_girl (~> 3.1.0)
       railties (>= 3.0.0)
     ffi (1.0.11)
     gherkin (2.9.3)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
-    jquery-rails (2.0.1)
+    jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.6.6)
     launchy (2.1.0)
       addressable (~> 2.2.6)
+    libwebsocket (0.1.3)
+      addressable
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -127,23 +129,24 @@ GEM
       rspec-expectations (~> 2.9.0)
       rspec-mocks (~> 2.9.0)
     rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
     rspec-rails (2.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.9.0)
-    rubyzip (0.9.6.1)
+    rubyzip (0.9.7)
     sass (3.1.15)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.20.0)
+    selenium-webdriver (2.21.0)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
     sprockets (2.1.2)
@@ -157,7 +160,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.33)
     uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
@@ -176,7 +179,7 @@ DEPENDENCIES
   database_cleaner (>= 0.7.2)
   devise (>= 2.1.0.rc)
   email_spec (>= 1.2.1)
-  factory_girl_rails (>= 3.0.0)
+  factory_girl_rails (>= 3.1.0)
   jquery-rails
   launchy (>= 2.1.0)
   rails (= 3.2.3)

README.textile

@@ -83,28 +83,39 @@ The @$@ character indicates a shell prompt; don't include it when you run the co
 
 This creates a new Rails app (with the name @myapp@) on your computer.
 
-The application generator templates will ask you for various preferences:
-
-* Would you like to use "Haml":http://en.wikipedia.org/wiki/Haml instead of ERB?
-* Would you like to use "RSpec":http://rspec.info/ instead of TestUnit?
-* Would you like to use "factory_girl":https://github.com/thoughtbot/factory_girl for test fixtures with RSpec?
-* Would you like to use "machinist":https://github.com/notahat/machinist for test fixtures with RSpec?
-* Would you like to use "Cucumber":http://cukes.info/ for your BDD?
-* Would you like to use "Guard":http://intridea.com/posts/hire-a-guard-for-your-project to automate your workflow?
-* Would you like the app to use a Gmail account to send email?
+The application generator templates will ask you for various preferences.
+
+To reproduce the example application exactly as found in the repository, make the following selections:
+
+* Would you like to use "Haml":http://en.wikipedia.org/wiki/Haml instead of ERB? *no*
+* Would you like to use "RSpec":http://rspec.info/ instead of TestUnit? *yes*
+* Would you like to use "factory_girl":https://github.com/thoughtbot/factory_girl for test fixtures with RSpec? *yes*
+* Would you like to use "machinist":https://github.com/notahat/machinist for test fixtures with RSpec? *no*
+* Would you like to use "Cucumber":http://cukes.info/ for your BDD? *yes*
+* Would you like to use "Guard":http://intridea.com/posts/hire-a-guard-for-your-project to automate your workflow? *no*
+* Would you like the app to use a Gmail account to send email? *yes*
 * Would you like to use "Devise":http://github.com/plataformatec/devise for authentication?
 ## No
-## Devise with default modules
+## Devise with default modules *#2*
 ## Devise with Confirmable module
 ## Devise with Confirmable and Invitable modules
+* Would you like to manage authorization with CanCan & Rolify? *no*
 * Which front-end framework would you like for HTML5 and CSS3?
-## None
+## None *#1*
 ## "Zurb Foundation":http://foundation.zurb.com/
-## "Twitter Bootstrap":http://twitter.github.com/bootstrap/
+## "Twitter Bootstrap":http://twitter.github.com/bootstrap/ (less)
+## "Twitter Bootstrap":http://twitter.github.com/bootstrap/ (sass)
 ## "Skeleton":http://www.getskeleton.com/
 ## Normalize CSS for consistent styling
-* Would you like to use "rails-footnotes":https://github.com/josevalim/rails-footnotes during development?
-* Would you like to set a robots.txt file to ban spiders?
+* Which form gem would you like?
+## None *#1*
+## simple form
+## simple form (bootstrap)
+* Would you like to use "rails-footnotes":https://github.com/josevalim/rails-footnotes during development? *no*
+* Would you like to set a robots.txt file to ban spiders? *yes*
+* Would you like to add 'will_paginate' for pagination? *no*
+
+You can choose other selections if you don't care about matching the example application exactly.
 
 h4. Use "Recipes" to Customize an Application Template
 

app/controllers/users_controller.rb

@@ -1,8 +1,12 @@
 class UsersController < ApplicationController
   before_filter :authenticate_user!
 
+  def index
+    @users = User.all
+  end
+
   def show
     @user = User.find(params[:id])
-
   end
+
 end

app/views/users/index.html.erb

@@ -0,0 +1,9 @@
+<h1>Users#index</h1>
+<p>Find me in app/views/users/index.html.erb</p>
+<ul class="users">
+  <% @users.each do |user| %>
+    <li>
+      <%= link_to user.name, user %> signed up <%= user.created_at.to_date %>
+    </li>
+  <% end %>
+</ul>

config/routes.rb

@@ -4,5 +4,5 @@
   end
   root :to => "home#index"
   devise_for :users
-  resources :users, :only => :show
+  resources :users, :only => [:show, :index]
 end

db/seeds.rb

@@ -8,3 +8,5 @@
 puts 'SETTING UP DEFAULT USER LOGIN'
 user = User.create! :name => 'First User', :email => 'user@example.com', :password => 'please', :password_confirmation => 'please'
 puts 'New user created: ' << user.name
+user2 = User.create! :name => 'Second User', :email => 'user2@example.com', :password => 'please', :password_confirmation => 'please'
+puts 'New user created: ' << user2.name