suspenders 1.1.5 → 1.2.0

data/Gemfile.lock

@@ -1,39 +1,39 @@
 PATH
   remote: .
   specs:
-    suspenders (1.1.5)
+    suspenders (1.2.0)
       bundler (>= 1.1)
       hub (~> 1.10.2)
-      rails (= 3.2.8)
+      rails (= 3.2.12)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -42,9 +42,9 @@ GEM
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
-    builder (3.0.0)
-    childprocess (0.3.1)
-      ffi (~> 1.0.6)
+    builder (3.0.4)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -53,65 +53,66 @@ GEM
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ffi (1.0.11)
+    ffi (1.3.1)
     gherkin (2.9.3)
       json (>= 1.4.6)
     hike (1.2.1)
-    hub (1.10.2)
+    hub (1.10.4)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.6.6)
+    json (1.7.6)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.6)
+    mime-types (1.21)
+    multi_json (1.6.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.0.3)
+    rdoc (3.12.1)
       json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    sprockets (2.1.3)
+    rspec-mocks (2.12.1)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     term-ansicolor (1.0.7)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
-    treetop (1.4.11)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby

data/NEWS.md

@@ -1,3 +1,16 @@
+1.2.0 (February 13, 2013)
+
+* Upgrade Rails from 3.2.8 to 3.2.12 to keep pace with security patches.
+* Improve staging environment on Heroku with staging `ENV` variables and
+  overriding the recipient in staging email delivery.
+* Remove Flutie, use Bourbon.
+* Wrap all HTTP requests in a 5 second timeout.
+* Don't use `attr_accessible` whitelists. Instead, configure Strong Parameters.
+* Provide a `bin/setup` script.
+* Force RSpec's `expect` syntax.
+* Remove remaining references to Cucumber, complete RSpec + Capybara conversion.
+* Improve Foreman/`.env`/`Procfile` interactions.
+
 1.1.5 (October 22, 2012)
 
 * Ignore `.env`.
@@ -12,7 +25,7 @@
 * Use SimpleCov for C0 coverage.
 * Configure RSpec with `--profile` flag to find slow-running specs.
 
-1.1.4 (eptember 4, 2012)
+1.1.4 (September 4, 2012)
 
 * Always store UTC in the DB.
 * Use Rails 3.2.8.

data/README.md

@@ -15,35 +15,34 @@ Then run:
 
     suspenders projectname
 
-This will create a Rails 3.2 app in `projectname`. This script creates a new
+This will create a Rails 3.2 app in `projectname`. This script creates a
 new git repository. It is not meant to be used against an existing repo.
 
 Gemfile
 -------
 
 To see the latest and greatest gems, look at Suspenders'
-[template/Gemfile_additions](/thoughtbot/suspenders/blob/master/templates/Gemfile_additions),
+[templates/Gemfile_clean](templates/Gemfile_clean),
 which will be appended to the default generated projectname/Gemfile.
 
 It includes application gems like:
 
-* [Airbrake](/airbrake/airbrake) for exception notification
-* [Bourbon](/thoughtbot/bourbon) for Sass mixins
-* [Clearance](/thoughtbot/clearance) for authentication
-* [Flutie](/thoughtbot/flutie) for default CSS styles
-* [Formtastic](/justinfrench/formtastic) for form markup and style
-* [Paperclip](/thoughtbot/paperclip) for file uploads
+* [Airbrake](https://github.com/airbrake/airbrake) for exception notification
+* [Bourbon](https://github.com/thoughtbot/bourbon) for Sass mixins
+* [Simple Form](https://github.com/plataformatec/simple_form) for form markup and style
 
 And testing gems like:
 
-* [Bourne](/thoughtbot/bourne) and [Mocha](/freerange/mocha) for stubbing and
-  spying
-* [Capybara](/jnicklas/capybara) and
-  [Capybara Webkit](/thoughtbot/capybara-webkit) for integration testing
-* [Factory Girl](/thoughtbot/factory_girl) for test data
+* [Bourne](https://github.com/thoughtbot/bourne) and
+  [Mocha](https://github.com/freerange/mocha) for stubbing and spying
+* [Capybara](https://github.com/jnicklas/capybara) and
+  [Capybara Webkit](https://github.com/thoughtbot/capybara-webkit) for
+  integration testing
+* [Factory Girl](https://github.com/thoughtbot/factory_girl) for test data
 * [RSpec](https://github.com/rspec/rspec) for unit testing
-* [Shoulda Matchers](/thoughtbot/shoulda-matchers) for common RSpec matchers
-* [Timecop](/jtrupiano/timecop) for testing time
+* [Shoulda Matchers](https://github.com/thoughtbot/shoulda-matchers) for common
+  RSpec matchers
+* [Timecop](https://github.com/jtrupiano/timecop-console) for testing time
 
 Other goodies
 -------------
@@ -79,43 +78,30 @@ This has the same effect as running:
 
     hub create organization/project
 
-Clearance
----------
-
-You can optionally not include Clearance:
-
-    suspenders app --clearance false
-
-Capybara Webkit
----------------
-
-You can optionally not include Capybara Webkit (which depends on QT being
-installed on your machine):
-
-    suspenders app --webkit false
-
 Dependencies
 ------------
 
-Some gems included in Suspenders have native extensions. You should have GCC installed on your
-machine before generating an app with Suspenders.
+Some gems included in Suspenders have native extensions. You should have GCC
+installed on your machine before generating an app with Suspenders.
 
-Use [OS X GCC Installer](/kennethreitz/osx-gcc-installer/) for Snow Leopard
-(OS X 10.6).
+Use [OS X GCC Installer](https://github.com/kennethreitz/osx-gcc-installer/) for
+Snow Leopard (OS X 10.6).
 
 Use [Command Line Tools for XCode](https://developer.apple.com/downloads/index.action)
 for Lion (OS X 10.7) or Mountain Lion (OS X 10.8).
 
-We use [Capybara Webkit](/thoughtbot/capybara-webkit) for full-stack Javascript
-integration testing. It requires QT. Instructions for installing QT are
-[here](/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).
+We use [Capybara Webkit](https://github.com/thoughtbot/capybara-webkit) for
+full-stack Javascript integration testing. It requires QT. Instructions for
+installing QT are
+[here](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).
 
 PostgreSQL needs to be installed and running for the `db:create` rake task.
 
 Issues
 ------
 
-If you have problems, please create a [Github Issue](/thoughtbot/suspenders/issues).
+If you have problems, please create a
+[Github Issue](https://github.com/thoughtbot/suspenders/issues).
 
 Contributing
 ------------
@@ -127,12 +113,13 @@ Credits
 
 ![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
 
-Suspenders is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community)
+Suspenders is maintained and funded by
+[thoughtbot, inc](http://thoughtbot.com/community).
 
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
 License
 -------
 
-Suspenders is Copyright © 2008-2012 thoughtbot. It is free software, and may be
+Suspenders is Copyright © 2008-2013 thoughtbot. It is free software, and may be
 redistributed under the terms specified in the LICENSE file.

data/features/rake_clean.feature

@@ -1,21 +1,15 @@
 @disable-bundler
 Feature: Rake works in the suspended project
+  Background:
+    Given I ensure no databases exist for "test_project"
 
   Scenario: Running rake in the suspended project
     When I suspend a project called "test_project"
     And I cd to the "test_project" root
-    When I drop and create the required databases
-    And I run the rake task "db:create"
-    And I run the rake task "db:migrate"
-    And I run the rake task "db:test:prepare"
-    And I run rake
-    Then I see a successful response in the shell
+    Then I can cleanly rake the project
 
   Scenario: Making a spec then running rake
-    When I drop and create the required databases
-    And I suspend a project called "test_project"
+    When I suspend a project called "test_project"
+    And I cd to the "test_project" root
     And I generate "model post title:string"
-    And I run the rake task "db:migrate"
-    And I run the rake task "db:test:prepare"
-    And I run the rake task "spec"
-    Then I see a successful response in the shell
+    Then I can cleanly rake the project

data/features/step_definitions/suspenders_steps.rb

@@ -2,39 +2,30 @@ require 'aruba/cucumber'
 
 When 'I run rake' do
   in_current_dir do
-    run 'bundle exec rake'
+    run_simple 'bundle exec rake'
   end
 end
 
 When 'I run the rake task "$task_name"' do |task_name|
   in_current_dir do
-    run "bundle exec rake #{task_name}"
+    run_simple "bundle exec rake #{task_name}"
   end
 end
 
 When 'I generate "$generator_with_args"' do |generator_with_args|
   in_current_dir do
-    run "bundle exec rails generate #{generator_with_args}"
+    run_simple "bundle exec rails generate #{generator_with_args}"
   end
 end
 
-Then 'I see a successful response in the shell' do
-  assert_exit_status(0)
-end
-
-When 'I drop and create the required databases' do
-  in_current_dir do
-    run 'bundle exec rake db:drop RAILS_ENV=test'
-    run 'bundle exec rake db:drop'
-    run 'bundle exec rake db:create RAILS_ENV=test'
-    run 'bundle exec rake db:create'
-  end
+When 'I ensure no databases exist for "$project_name"' do |project_name|
+  run "dropdb #{project_name}_development"
+  run "dropdb #{project_name}_test"
 end
 
 When 'I suspend a project called "$project_name"' do |project_name|
   suspenders_bin = File.expand_path(File.join('..', '..', 'bin', 'suspenders'), File.dirname(__FILE__))
-  run "#{suspenders_bin} #{project_name}"
-  assert_exit_status(0)
+  run_simple "#{suspenders_bin} #{project_name}"
 end
 
 When /^I suspend a project called "([^"]*)" with:$/ do |project_name, arguments_table|
@@ -42,8 +33,7 @@ When /^I suspend a project called "([^"]*)" with:$/ do |project_name, arguments_
   arguments = arguments_table.hashes.inject([]) do |accum, argument|
     accum << "#{argument['argument']}=#{argument['value']}"
   end.join
-  run "#{suspenders_bin} #{project_name} #{arguments}"
-  assert_exit_status(0)
+  run_simple "#{suspenders_bin} #{project_name} #{arguments}"
 end
 
 When 'I cd to the "$test_project" root' do |dirname|
@@ -55,8 +45,7 @@ Then 'I can cleanly rake the project' do
     And I run the rake task "db:create"
     And I run the rake task "db:migrate"
     And I run the rake task "db:test:prepare"
-    And I run the rake task "cucumber"
-    Then I see a successful response in the shell
+    And I run rake
   }
 end
 

data/lib/suspenders/app_builder.rb

@@ -19,6 +19,11 @@ module Suspenders
         'raise_delivery_errors = false', 'raise_delivery_errors = true'
     end
 
+    def provide_setup_script
+      copy_file 'bin_setup', 'bin/setup'
+      run 'chmod a+x bin/setup'
+    end
+
     def enable_factory_girl_syntax
       copy_file 'factory_girl_syntax_rspec.rb', 'spec/support/factory_girl.rb'
     end
@@ -77,37 +82,41 @@ module Suspenders
       bundle_command 'exec rake db:create'
     end
 
-    def set_ruby_to_version_being_used
-      inject_into_file 'Gemfile', "\n\nruby '#{RUBY_VERSION}'",
-        :after => /source 'https:\/\/rubygems.org'/
+    def replace_gemfile
+      remove_file 'Gemfile'
+      copy_file 'Gemfile_clean', 'Gemfile'
     end
 
-    def add_custom_gems
-      additions_path = find_in_source_paths('Gemfile_additions')
-      new_gems = File.open(additions_path).read
-      inject_into_file 'Gemfile', "\n#{new_gems}",
-        :after => /gem 'jquery-rails'/
+    def set_ruby_to_version_being_used
+      inject_into_file 'Gemfile', "\n\nruby '#{RUBY_VERSION}'",
+        after: /source 'https:\/\/rubygems.org'/
     end
 
-    def add_clearance_gem
-      inject_into_file 'Gemfile', "\ngem 'clearance'",
-        :after => /gem 'jquery-rails'/
-    end
+    def enable_database_cleaner
+      replace_in_file 'spec/spec_helper.rb',
+        'config.use_transactional_fixtures = true',
+        'config.use_transactional_fixtures = false'
 
-    def add_capybara_webkit_gem
-      inject_into_file 'Gemfile', "\n  gem 'capybara-webkit'",
-        :after => /gem 'capybara'/
+      copy_file 'database_cleaner_rspec.rb', 'spec/support/database_cleaner.rb'
     end
 
     def configure_rspec
       remove_file '.rspec'
       copy_file 'rspec', '.rspec'
       prepend_file 'spec/spec_helper.rb', simplecov_init
+
       replace_in_file 'spec/spec_helper.rb',
         '# config.mock_with :mocha',
         'config.mock_with :mocha'
 
-      generators_config = <<-RUBY
+      rspec_expect_syntax = <<-RUBY
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+      RUBY
+
+      config = <<-RUBY
     config.generators do |generate|
       generate.test_framework :rspec
       generate.helper false
@@ -115,16 +124,32 @@ module Suspenders
       generate.javascript_engine false
       generate.view_specs false
     end
+
       RUBY
 
-      inject_into_class 'config/application.rb', 'Application', generators_config
+      inject_into_file 'spec/spec_helper.rb', rspec_expect_syntax,
+        :after => 'RSpec.configure do |config|'
+      inject_into_class 'config/application.rb', 'Application', config
+    end
+
+    def blacklist_active_record_attributes
+      config = <<-RUBY
+    config.active_record.whitelist_attributes = false
+
+      RUBY
+      inject_into_class 'config/application.rb', 'Application', config
+    end
+
+    def configure_strong_parameters
+      copy_file 'strong_parameters.rb', 'config/initializers/strong_parameters.rb'
     end
 
     def configure_time_zone
-      time_zone_config = <<-RUBY
-          config.active_record.default_timezone = :utc
+      config = <<-RUBY
+    config.active_record.default_timezone = :utc
+
       RUBY
-      inject_into_class "config/application.rb", "Application", time_zone_config
+      inject_into_class 'config/application.rb', 'Application', config
     end
 
     def configure_time_formats
@@ -132,6 +157,10 @@ module Suspenders
       copy_file 'config_locales_en.yml', 'config/locales/en.yml'
     end
 
+    def configure_rack_timeout
+      copy_file 'rack_timeout.rb', 'config/initializers/rack_timeout.rb'
+    end
+
     def configure_action_mailer
       action_mailer_host 'development', "#{app_name}.local"
       action_mailer_host 'test', 'www.example.com'
@@ -145,24 +174,7 @@ module Suspenders
 
     def configure_capybara_webkit
       append_file 'spec/spec_helper.rb' do
-        "\n  Capybara.javascript_driver = :webkit"
-      end
-    end
-
-    def generate_cucumber(options = {})
-      generate 'cucumber:install', '--rspec', '--capybara'
-      inject_into_file 'config/cucumber.yml',
-        ' -drb -r features',
-        :after => %{default: <%= std_opts %> features}
-      copy_file 'features_support_env.rb',
-        'features/support/env.rb',
-        :force => true
-      prepend_file 'features/support/env.rb', simplecov_init
-
-      if options[:webkit]
-        inject_into_file 'features/support/env.rb',
-          "\n  Capybara.javascript_driver = :webkit",
-          :after => /Capybara.default_selector = :css/
+        "\nCapybara.javascript_driver = :webkit"
       end
     end
 
@@ -170,8 +182,9 @@ module Suspenders
       copy_file 'Guardfile', 'Guardfile'
     end
 
-    def generate_clearance
-      generate 'clearance:install'
+    def setup_foreman
+      copy_file 'sample.env', '.sample.env'
+      copy_file 'Procfile', 'Procfile'
     end
 
     def setup_stylesheets
@@ -212,6 +225,7 @@ module Suspenders
       path_addition = override_path_for_tests
       run "#{path_addition} heroku create #{app_name}-production --remote=production"
       run "#{path_addition} heroku create #{app_name}-staging --remote=staging"
+      run "#{path_addition} heroku config:add RACK_ENV=staging RAILS_ENV=staging --remote=staging"
     end
 
     def create_github_repo(repo_name)
@@ -219,9 +233,12 @@ module Suspenders
       run "#{path_addition} hub create #{repo_name}"
     end
 
+    def copy_libraries
+      copy_file 'override_recipient_smtp.rb', 'lib/override_recipient_smtp.rb'
+    end
+
     def copy_miscellaneous_files
       copy_file 'errors.rb', 'config/initializers/errors.rb'
-      copy_file 'Procfile'
     end
 
     def customize_error_pages
@@ -232,6 +249,7 @@ module Suspenders
       style_tags =<<-EOS
 <link href='/assets/application.css' media='all' rel='stylesheet' type='text/css' />
       EOS
+
       %w(500 404 422).each do |page|
         inject_into_file "public/#{page}.html", meta_tags, :after => "<head>\n"
         replace_in_file "public/#{page}.html", /<style.+>.+<\/style>/mi, style_tags.strip
@@ -239,28 +257,18 @@ module Suspenders
       end
     end
 
-    def setup_root_route
-      route "root :to => 'Clearance::Sessions#new'"
-    end
-
     def remove_routes_comment_lines
       replace_in_file 'config/routes.rb',
         /Application\.routes\.draw do.*end/m,
         "Application.routes.draw do\nend"
     end
 
-    def set_attr_accessibles_on_user
-      inject_into_file 'app/models/user.rb',
-        "  attr_accessible :email, :password\n",
-        :after => /include Clearance::User\n/
-    end
-
     def add_email_validator
       copy_file 'email_validator.rb', 'app/validators/email_validator.rb'
     end
 
-    def include_clearance_matchers
-      create_file 'spec/support/clearance.rb', "require 'clearance/testing'"
+    def disable_xml_params
+      copy_file 'disable_xml_params.rb', 'config/initializers/disable_xml_params.rb'
     end
 
     def setup_default_rake_task

data/lib/suspenders/generators/app_generator.rb

@@ -3,9 +3,6 @@ require 'rails/generators/rails/app/app_generator'
 
 module Suspenders
   class AppGenerator < Rails::Generators::AppGenerator
-    class_option :clearance, :type => :boolean, :aliases => '-C', :default => true,
-      :desc => 'Add the Clearance Rails authentication library'
-
     class_option :database, :type => :string, :aliases => '-d', :default => 'postgresql',
       :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
 
@@ -18,9 +15,6 @@ module Suspenders
     class_option :skip_test_unit, :type => :boolean, :aliases => '-T', :default => true,
       :desc => 'Skip Test::Unit files'
 
-    class_option :webkit, :type => :boolean, :aliases => '-W', :default => true,
-      :desc => 'Add the Capybara Webkit Javascript integration testing library'
-
     def finish_template
       invoke :suspenders_customization
       super
@@ -38,10 +32,10 @@ module Suspenders
       invoke :setup_database
       invoke :configure_app
       invoke :setup_stylesheets
+      invoke :copy_libraries
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_routes_comment_lines
-      invoke :setup_root_route
       invoke :setup_git
       invoke :create_heroku_apps
       invoke :create_github_repo
@@ -56,6 +50,7 @@ module Suspenders
     def setup_development_environment
       say 'Setting up the development environment'
       build :raise_delivery_errors
+      build :provide_setup_script
     end
 
     def setup_test_environment
@@ -64,11 +59,8 @@ module Suspenders
       build :test_factories_first
       build :generate_rspec
       build :configure_rspec
-
-      if options[:webkit]
-        build :configure_capybara_webkit
-      end
-
+      build :enable_database_cleaner
+      build :configure_capybara_webkit
       build :setup_guard_spork
     end
 
@@ -97,17 +89,8 @@ module Suspenders
     end
 
     def customize_gemfile
+      build :replace_gemfile
       build :set_ruby_to_version_being_used
-      build :add_custom_gems
-
-      if options[:clearance]
-        build :add_clearance_gem
-      end
-
-      if options[:webkit]
-        build :add_capybara_webkit_gem
-      end
-
       bundle_command 'install --binstubs=bin/stubs'
     end
 
@@ -124,23 +107,15 @@ module Suspenders
     def configure_app
       say 'Configuring app'
       build :configure_action_mailer
+      build :blacklist_active_record_attributes
+      build :configure_strong_parameters
       build :configure_time_zone
       build :configure_time_formats
-
+      build :configure_rack_timeout
+      build :disable_xml_params
       build :add_email_validator
       build :setup_default_rake_task
-      build :setup_clearance
-    end
-
-    def setup_clearance
-      if options[:clearance]
-        build :generate_clearance
-        build :include_clearance_matchers
-
-        if using_active_record?
-          build :set_attr_accessibles_on_user
-        end
-      end
+      build :setup_foreman
     end
 
     def setup_stylesheets
@@ -176,6 +151,11 @@ module Suspenders
       build :init_git
     end
 
+    def copy_libraries
+      say 'Copying libraries'
+      build :copy_libraries
+    end
+
     def copy_miscellaneous_files
       say 'Copying miscellaneous support files'
       build :copy_miscellaneous_files
@@ -190,13 +170,6 @@ module Suspenders
       build :remove_routes_comment_lines
     end
 
-    def setup_root_route
-      if options[:clearance]
-        say 'Setting up a root route'
-        build :setup_root_route
-      end
-    end
-
     def outro
       say 'Congratulations! You just pulled our suspenders.'
       say "Remember to run 'rails generate airbrake' with your API key."

data/lib/suspenders/version.rb

@@ -1,3 +1,3 @@
 module Suspenders
-  VERSION = '1.1.5'
+  VERSION = '1.2.0'
 end

data/suspenders.gemspec

@@ -27,7 +27,7 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency 'rails', '3.2.8'
+  s.add_dependency 'rails', '3.2.12'
   s.add_dependency 'bundler', '>= 1.1'
   s.add_dependency 'hub', '~> 1.10.2'
 

data/templates/{Gemfile_additions → Gemfile_clean}

@@ -1,10 +1,22 @@
-gem 'thin'
-gem 'high_voltage'
-gem 'paperclip'
-gem 'formtastic'
-gem 'flutie'
-gem 'bourbon'
+source 'https://rubygems.org'
+
 gem 'airbrake'
+gem 'bourbon'
+gem 'high_voltage'
+gem 'jquery-rails'
+gem 'pg'
+gem 'psych'
+gem 'rack-timeout'
+gem 'rails', '>= 3.2.11'
+gem 'simple_form'
+gem 'strong_parameters'
+gem 'thin'
+
+group :assets do
+  gem 'sass-rails'
+  gem 'coffee-rails'
+  gem 'uglifier'
+end
 
 group :development do
   gem 'foreman'
@@ -18,14 +30,14 @@ group :development, :test do
 end
 
 group :test do
-  gem 'capybara'
-  gem 'factory_girl_rails'
-  gem 'bourne'
+  gem 'bourne', require: false
+  gem 'capybara-webkit', '>= 0.14.1'
   gem 'database_cleaner'
-  gem 'timecop'
-  gem 'shoulda-matchers'
+  gem 'factory_girl_rails'
   gem 'launchy'
+  gem 'shoulda-matchers'
   gem 'simplecov', require: false
+  gem 'timecop'
 end
 
 group :staging, :production do

data/templates/Procfile

@@ -1 +1 @@
-web: bundle exec rails server thin -p $PORT
+web: bundle exec rails server thin -p $PORT -e $RACK_ENV

data/templates/bin_setup

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# Set up Rails app. Run this script immediately after cloning the codebase.
+# https://github.com/thoughtbot/guides/tree/master/protocol
+
+bundle install --binstubs=bin/stubs
+bundle exec rake db:setup
+
+if [ ! -f .env ]; then
+  cp .sample.env .env
+fi

data/templates/database_cleaner_rspec.rb

@@ -0,0 +1,21 @@
+RSpec.configure do |config|
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:deletion)
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.before(:each, :js => true) do
+    DatabaseCleaner.strategy = :deletion
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

data/templates/disable_xml_params.rb

@@ -0,0 +1,3 @@
+# Protect against injection attacks
+# http://www.kb.cert.org/vuls/id/380039
+ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)

data/templates/factories_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 FactoryGirl.factories.map(&:name).each do |factory_name|
   describe "the #{factory_name} factory" do
     it 'is valid' do
-      build(factory_name).should be_valid
+      expect(build(factory_name)).to be_valid
     end
   end
 end

data/templates/import_scss_styles

@@ -1,4 +1,3 @@
 
 
-@import 'flutie';
-@import 'bourbon';
+@import 'bourbon';

data/templates/rack_timeout.rb

@@ -0,0 +1 @@
+Rack::Timeout.timeout = (ENV['TIMEOUT_IN_SECONDS'] || 5).to_i

data/templates/sample.env

@@ -0,0 +1,2 @@
+# http://ddollar.github.com/foreman/
+RACK_ENV=development

data/templates/strong_parameters.rb

@@ -0,0 +1 @@
+ActiveRecord::Base.send :include, ActiveModel::ForbiddenAttributesProtection

data/templates/suspenders_layout.html.erb.erb

@@ -8,13 +8,6 @@
   <%%= csrf_meta_tags %>
 </head>
 <body class="<%%= body_class %>">
-  <header>
-    <%% if signed_in? -%>
-      <%%= link_to "Sign out", sign_out_path, :method => :delete %>
-    <%% else -%>
-      <%%= link_to "Sign in", sign_in_path %>
-    <%% end -%>
-  </header>
   <%%= render 'flashes' -%>
   <%%= yield %>
   <%%= render 'javascript' %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,6 @@ files:
 - README.md
 - Rakefile
 - bin/suspenders
-- features/clearance_false.feature
 - features/github_repo.feature
 - features/heroku_true.feature
 - features/rake_clean.feature
@@ -125,19 +124,21 @@ files:
 - features/support/env.rb
 - features/support/fake_github.rb
 - features/support/fake_heroku.rb
-- features/webkit_false.feature
 - lib/suspenders/actions.rb
 - lib/suspenders/app_builder.rb
 - lib/suspenders/generators/app_generator.rb
 - lib/suspenders/version.rb
 - suspenders.gemspec
-- templates/Gemfile_additions
+- templates/Gemfile_clean
 - templates/Guardfile
 - templates/Procfile
 - templates/README.md.erb
 - templates/_flashes.html.erb
 - templates/_javascript.html.erb
+- templates/bin_setup
 - templates/config_locales_en.yml
+- templates/database_cleaner_rspec.rb
+- templates/disable_xml_params.rb
 - templates/email_validator.rb
 - templates/errors.rb
 - templates/factories_spec.rb
@@ -147,8 +148,11 @@ files:
 - templates/javascripts/prefilled_input.js
 - templates/override_recipient_smtp.rb
 - templates/postgresql_database.yml.erb
+- templates/rack_timeout.rb
 - templates/rspec
+- templates/sample.env
 - templates/simplecov_init.rb
+- templates/strong_parameters.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.erb.erb
 homepage: http://github.com/thoughtbot/suspenders
@@ -164,26 +168,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3447770025967369151
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3447770025967369151
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Generate a Rails app using thoughtbot's best practices.
 test_files:
-- features/clearance_false.feature
 - features/github_repo.feature
 - features/heroku_true.feature
 - features/rake_clean.feature
@@ -193,4 +190,3 @@ test_files:
 - features/support/env.rb
 - features/support/fake_github.rb
 - features/support/fake_heroku.rb
-- features/webkit_false.feature

data/features/clearance_false.feature

@@ -1,10 +0,0 @@
-@disable-bundler
-Feature: Skipping Clearance
-
-  Scenario: --clearance=false
-    When I suspend a project called "test_project" with:
-      | argument    | value |
-      | --clearance | false |
-    And I cd to the "test_project" root
-    Then "clearance" should not be installed
-    And I can cleanly rake the project

data/features/webkit_false.feature

@@ -1,11 +0,0 @@
-@disable-bundler
-Feature: Skipping Capybara Webkit
-
-  Scenario: --webkit=false
-    When I suspend a project called "test_project" with:
-      | argument | value |
-      | --webkit | false |
-    And I cd to the "test_project" root
-    Then "capybara-webkit" should not be installed
-    And "webkit" should not be included in "spec/spec_helper.rb"
-    And I can cleanly rake the project