welaika-suspenders 1.2.10 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e911a9c4100bc8ad23b5cfd311a67feded21cee
-  data.tar.gz: ee75709876fd6433c90e5b64063bf69f0e7b7231
+  metadata.gz: 6bd75804513df3c2ca1d1ec1b762a773de7a4caf
+  data.tar.gz: cd57eda3e4cfd279910f39c8919255ff11932c6c
 SHA512:
-  metadata.gz: 55ff84d327b1b29fe4f84b62205e92f5af7fc4eda6a4148dae5337729c40922454c792171107e1de2af015b3f00fe425dfec49aac891a75e4b00b79b488e0f6a
-  data.tar.gz: 973bf6aedf39db63ead37ac0bd63e1ad7b20a178f55680a1083c72376fa1613bb48cf0ecb591e920aaa540edca3e745ca9f2843052de875fc7c23ef454641f2d
+  metadata.gz: 607d82380093cba26fd9861a824f53016bcb3701bf691934562cd6517b611ee7f3efaf4dc762063fb22a0ee441f7d963b4c1ea8b145f2b9ab9e1689d5378d3ae
+  data.tar.gz: 22f642a87e09108150ede87ea5261f50f8c74fd6fbf547361ded0f94aaa269e887e2c787670d4d9426706188e5ee9225fdd4d1cabbd86c53e573e1abe1e83dc1

data/.gitignore

@@ -0,0 +1,9 @@
+*.gem
+*.swp
+.bundle
+.rake_tasks
+/bin/*
+!bin/welaika-suspenders
+pkg
+test_project
+tmp/aruba

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+notifications:
+  email: false

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,115 +1,102 @@
 PATH
   remote: .
   specs:
-    welaika-suspenders (1.2.10)
-      bundler
-      hub
-      rails
+    welaika-suspenders (1.4.0)
+      bundler (~> 1.3)
+      hub (~> 1.10)
+      rails (= 4.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
       mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
-      ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
-    builder (3.0.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.1.9)
+      rspec-expectations (>= 2.7.0)
+    atomic (1.1.10)
+    builder (3.1.4)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.3.5)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    diff-lcs (1.1.3)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12.0)
+      multi_json (~> 1.7.5)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
-    ffi (1.3.1)
-    gherkin (2.9.3)
-      json (>= 1.4.6)
-    hike (1.2.2)
-    hub (1.10.5)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.6)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    ffi (1.9.0)
+    gherkin (2.12.0)
+      multi_json (~> 1.3)
+    hike (1.2.3)
+    hub (1.10.6)
+    i18n (0.6.4)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
-    multi_json (1.7.3)
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    multi_test (0.0.2)
     polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    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.12.1)
-    sprockets (2.2.2)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.0.7)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
     tilt (1.4.1)
-    treetop (1.4.12)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
@@ -118,6 +105,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.4.11)
-  cucumber (~> 1.1.9)
+  aruba (~> 0.5.2)
+  cucumber (~> 1.2)
   welaika-suspenders!

data/NEWS.md

@@ -1,3 +1,22 @@
+1.4.0 (July 21, 2013)
+
+* Support Rails 4.
+* Support Ruby 2.
+* Remove jQuery UI.
+* Factories spec works for non-ActiveRecord objects.
+* Use New Relic RPM gem >= 3.5.7 for Heroku request queue accuracy.
+* Abort RSpec runs on first failure.
+* Replace custom email validator with gem.
+
+1.3.0 (May 13, 2013)
+
+* Switch web server from Thin to Unicorn
+* Set up database before setting up RSpec so that the rspec:install task works
+* Add Delayed::Job
+* Clean up cruft from ActionMailer delivery configuration
+* strong_parameters now raises an error in development
+* Enforce Ruby 1.9.2+ in the gemspec
+
 1.2.2 (March 14, 2013)
 
 * Fix Syntax error in staging/production environment config files.

data/README.md

@@ -15,7 +15,7 @@ Then run:
 
     welaika-suspenders projectname
 
-This will create a Rails 3.2 app in `projectname`. This script creates a
+This will create a Rails 4.0 app in `projectname`. This script creates a
 new git repository. It is not meant to be used against an existing repo.
 
 Gemfile
@@ -29,7 +29,29 @@ It includes application gems like:
 
 * [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
+* [Delayed Job](https://github.com/collectiveidea/delayed_job) for background
+  processing
+* [Email Validator](https://github.com/balexand/email_validator) for email
+  validation
+* [Flutie](https://github.com/thoughtbot/flutie) for `page_title` and
+  `body_class` view helpers
+* [High Voltage](https://github.com/thoughtbot/high_voltage) for static pages
+* [jQuery Rails](https://github.com/rails/jquery-rails) for jQuery
+* [Neat](https://github.com/thoughtbot/neat) for semantic grids
+* [Postgres](https://github.com/ged/ruby-pg) for access to the Postgres database
+* [Rack Timeout](https://github.com/kch/rack-timeout) to abort requests that are
+  taking too long
+* [Recipient Interceptor](https://github.com/croaky/recipient_interceptor) to
+  avoid accidentally sending emails to real people from staging
+* [Simple Form](https://github.com/plataformatec/simple_form) for form markup
+  and style
+* [Unicorn](https://github.com/defunkt/unicorn) to serve HTTP requests
+
+And gems only for staging and production like:
+
+* [New Relic RPM](https://github.com/newrelic/rpm) for monitoring performance
+* [Rails 12 Factor](https://github.com/heroku/rails_12factor) to making running
+  Rails 4 apps easier on Heroku
 
 And testing gems like:
 
@@ -81,6 +103,8 @@ This has the same effect as running:
 Dependencies
 ------------
 
+Suspenders requires Ruby 1.9.2 or greater.
+
 Some gems included in Suspenders have native extensions. You should have GCC
 installed on your machine before generating an app with Suspenders.
 

data/features/step_definitions/suspenders_steps.rb

@@ -49,20 +49,21 @@ Then 'I can cleanly rake the project' do
   }
 end
 
-Then /^"(.*)" should not be installed$/ do |gem_name|
+Then %r{"(.*)" should not be installed} do |gem_name|
   in_current_dir do
     system("bundle show #{gem_name} 2>&1 > /dev/null").should be_false
   end
 end
 
-Then /^"(.*)" should not be included in "(.*)"$/ do |content, file_path|
+Then %r{"(.*)" should not be included in "(.*)"} do |content, file_path|
   check_file_content file_path, content, false
 end
 
-Then /^the "([^"]*)" Heroku app should exist$/ do |app_name|
+Then %r{the "([^"]*)" Heroku app should exist} do |app_name|
   FakeHeroku.should have_created_app(app_name)
 end
 
-Then /^the "([^"]*)" Github repo should exist$/ do |repo_name|
+Then %r{the "([^"]*)" Github repo should exist} do |repo_name|
   FakeGithub.should have_created_repo(repo_name)
 end
+

data/lib/welaika_suspenders/actions.rb

@@ -15,10 +15,15 @@ module WelaikaSuspenders
     end
 
     def action_mailer_host(rails_env, host)
+      host_config = "config.action_mailer.default_url_options = { host: '#{host}' }"
+      configure_environment(rails_env, host_config)
+    end
+
+    def configure_environment(rails_env, config)
       inject_into_file(
         "config/environments/#{rails_env}.rb",
-        "\n\n  config.action_mailer.default_url_options = { :host => '#{host}' }",
-        :before => "\nend"
+        "\n\n  #{config}",
+        before: "\nend"
       )
     end
 

data/lib/welaika_suspenders/app_builder.rb

@@ -14,16 +14,38 @@ module WelaikaSuspenders
       remove_file 'app/assets/images/rails.png'
     end
 
-    def raise_delivery_errors
+    def raise_on_delivery_errors
       replace_in_file 'config/environments/development.rb',
         'raise_delivery_errors = false', 'raise_delivery_errors = true'
     end
 
+    def raise_on_unpermitted_parameters
+      configure_environment 'development',
+        'config.action_controller.action_on_unpermitted_parameters = :raise'
+    end
+
     def provide_setup_script
       copy_file 'bin_setup', 'bin/setup'
       run 'chmod a+x bin/setup'
     end
 
+    def configure_generators
+      config = <<-RUBY
+  config.generators do |generate|
+    generate.helper false
+    generate.javascript_engine false
+    generate.request_specs false
+    generate.routing_specs false
+    generate.stylesheets false
+    generate.test_framework :rspec
+    generate.view_specs false
+  end
+
+      RUBY
+
+      inject_into_class 'config/application.rb', 'Application', config
+    end
+
     def enable_factory_girl_syntax
       copy_file 'factory_girl_syntax_rspec.rb', 'spec/support/factory_girl.rb'
     end
@@ -39,25 +61,14 @@ module WelaikaSuspenders
       prepend_file 'config/environments/production.rb',
         "require Rails.root.join('config/initializers/smtp')\n"
 
-      production_config = <<-RUBY
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = SMTP_SETTINGS
-      RUBY
+      config = <<-RUBY
 
-      development_config = <<-RUBY
+  config.action_mailer.delivery_method = :smtp
+config.action_mailer.smtp_settings = SMTP_SETTINGS
       RUBY
 
-      inject_into_file(
-        'config/environments/production.rb',
-        production_config,
+      inject_into_file 'config/environments/production.rb', config,
         :after => 'config.action_mailer.raise_delivery_errors = false'
-      )
-
-      inject_into_file(
-        'config/environments/development.rb',
-        "\n\n  config.action_mailer.delivery_method = :letter_opener",
-        :before => "\nend"
-      )
     end
 
     def setup_staging_environment
@@ -124,38 +135,30 @@ module WelaikaSuspenders
       copy_file 'database_cleaner_rspec.rb', 'spec/support/database_cleaner.rb'
     end
 
+    def configure_dragonfly
+      copy_file 'dragonfly_initializer.rb', 'config/initializers/dragonfly.rb'
+      copy_file 'create_dragonfly_jobs.rb', 'db/migrate/20130713151359_create_dragonfly_jobs.rb'
+    end
+
     def configure_rspec
       remove_file '.rspec'
       copy_file 'rspec', '.rspec'
+      prepend_file 'spec/spec_helper.rb', rails_root_definition
       prepend_file 'spec/spec_helper.rb', simplecov_init
 
-      config = <<-RUBY
-    config.generators do |generate|
-      generate.test_framework :rspec
-      generate.helper false
-      generate.stylesheets false
-      generate.javascript_engine false
-      generate.view_specs false
-    end
-
-      RUBY
-
-      inject_into_class 'config/application.rb', 'Application', config
       replace_in_file 'spec/spec_helper.rb', /RSpec.configure do.*end\n/m, ""
 
+      copy_file 'capybara_selectors.rb', 'spec/support/capybara_selectors.rb'
+      copy_file 'exist_in_db.rb', 'spec/support/matchers/exist_in_db.rb'
+      copy_file 'dragonfly.rb', 'spec/support/dragonfly.rb'
+
       copy_file 'rspec_config.rb', 'spec/support/rspec_config.rb'
       copy_file 'unit_spec_helper.rb', 'spec/unit_spec_helper.rb'
       copy_file 'model_spec_helper.rb', 'spec/model_spec_helper.rb'
     end
 
-    def blacklist_active_record_attributes
-      replace_in_file 'config/application.rb',
-        'config.active_record.whitelist_attributes = true',
-        'config.active_record.whitelist_attributes = false'
-    end
-
-    def configure_strong_parameters
-      copy_file 'strong_parameters.rb', 'config/initializers/strong_parameters.rb'
+    def configure_background_jobs_for_rspec
+      copy_file 'background_jobs_rspec.rb', 'spec/support/background_jobs.rb'
     end
 
     def configure_time_zone
@@ -188,7 +191,7 @@ module WelaikaSuspenders
 
     def configure_capybara_webkit
       append_file 'spec/spec_helper.rb' do
-        "\nCapybara.javascript_driver = :webkit"
+        "\nCapybara.javascript_driver = :webkit\n"
       end
     end
 
@@ -196,16 +199,19 @@ module WelaikaSuspenders
       generate 'clearance:install'
     end
 
+    def configure_unicorn
+      copy_file 'unicorn.rb', 'config/unicorn.rb'
+    end
+
     def setup_foreman
       copy_file 'sample.env', '.sample.env'
       copy_file 'sample.env', '.env'
       copy_file 'Procfile', 'Procfile'
-      copy_file 'unicorn.rb', 'config/unicorn.rb'
     end
 
     def setup_stylesheets
       remove_file 'app/assets/stylesheets/application.css'
-      copy_file 'import_sass_styles', 'app/assets/stylesheets/application.css.sass'
+      copy_file 'application.css.scss', 'app/assets/stylesheets/application.css.scss'
     end
 
     def gitignore_files
@@ -225,16 +231,16 @@ module WelaikaSuspenders
         'spec/presenters',
         'spec/services',
         'spec/support',
-        'spec/support/matchers',
-        'spec/support/mixins',
-        'spec/support/shared_contexts',
         'spec/support/shared_examples',
+        'spec/support/matchers',
         'spec/views',
       ].each do |dir|
-        empty_directory_with_gitkeep dir
+        run "mkdir #{dir}"
+        run "touch #{dir}/.gitkeep"
       end
     end
 
+
     def init_git
       run 'git init'
     end
@@ -277,17 +283,13 @@ module WelaikaSuspenders
         "Application.routes.draw do\nend"
     end
 
-    def add_email_validator
-      copy_file 'email_validator.rb', 'app/validators/email_validator.rb'
-    end
-
     def disable_xml_params
       copy_file 'disable_xml_params.rb', 'config/initializers/disable_xml_params.rb'
     end
 
     def setup_default_rake_task
       append_file 'Rakefile' do
-        "task(:default).clear\ntask :default => [:spec]"
+        "task(:default).clear\ntask :default => [:spec]\n"
       end
     end
 
@@ -307,6 +309,10 @@ module WelaikaSuspenders
     def simplecov_init
       IO.read find_in_source_paths('simplecov_init.rb')
     end
+
+    def rails_root_definition
+      IO.read find_in_source_paths('rails_root_definition.rb')
+    end
   end
 end
 

data/lib/welaika_suspenders/generators/app_generator.rb

@@ -36,6 +36,7 @@ module WelaikaSuspenders
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_routes_comment_lines
+      invoke :configure_dragonfly
       invoke :setup_git
       invoke :create_heroku_apps
       invoke :create_github_repo
@@ -47,10 +48,28 @@ module WelaikaSuspenders
       build :remove_rails_logo_image
     end
 
+    def customize_gemfile
+      build :replace_gemfile
+      build :set_ruby_to_version_being_used
+      bundle_command 'install --binstubs=bin/stubs'
+    end
+
+    def setup_database
+      say 'Setting up database'
+
+      if 'postgresql' == options[:database]
+        build :use_postgres_config_template
+      end
+
+      build :create_database
+    end
+
     def setup_development_environment
       say 'Setting up the development environment'
-      build :raise_delivery_errors
+      build :raise_on_delivery_errors
+      build :raise_on_unpermitted_parameters
       build :provide_setup_script
+      build :configure_generators
     end
 
     def setup_test_environment
@@ -59,6 +78,7 @@ module WelaikaSuspenders
       build :test_factories_first
       build :generate_rspec
       build :configure_rspec
+      build :configure_background_jobs_for_rspec
       build :enable_database_cleaner
       build :configure_capybara_webkit
       build :setup_guard_spork
@@ -93,12 +113,6 @@ module WelaikaSuspenders
       build :setup_presenters
     end
 
-    def customize_gemfile
-      build :replace_gemfile
-      build :set_ruby_to_version_being_used
-      bundle_command 'install --binstubs=bin/stubs'
-    end
-
     def setup_database
       say 'Setting up database'
 
@@ -118,8 +132,8 @@ module WelaikaSuspenders
       build :configure_time_formats
       build :configure_rack_timeout
       build :disable_xml_params
-      build :add_email_validator
       build :setup_default_rake_task
+      build :configure_unicorn
       build :setup_foreman
     end
 
@@ -175,9 +189,13 @@ module WelaikaSuspenders
       build :remove_routes_comment_lines
     end
 
+    def configure_dragonfly
+      say 'Configuring dragonfly'
+      build :configure_dragonfly
+    end
+
     def outro
       say 'Congratulations! You just pulled our suspenders.'
-      say "Remember to run 'rails generate airbrake' with your API key."
     end
 
     def run_bundle
@@ -195,3 +213,4 @@ module WelaikaSuspenders
     end
   end
 end
+

data/lib/welaika_suspenders/version.rb

@@ -1,4 +1,4 @@
 module WelaikaSuspenders
-  VERSION = '1.2.10'
+  VERSION = '1.4.0'
 end
 

data/templates/Gemfile_clean

@@ -2,16 +2,19 @@ source 'https://rubygems.org'
 
 gem 'airbrake'
 gem 'bourbon'
+gem 'dragonfly'
+gem 'email_validator'
 gem 'flutie'
 gem 'jquery-rails'
+gem 'neat'
 gem 'pg'
+gem 'rack-cache'
 gem 'rack-timeout'
-gem 'rails', '>= 3.2.11'
+gem 'rails', '>= 4.0.0'
 gem 'recipient_interceptor'
 gem 'showcase'
 gem 'simple_form'
 gem 'slim-rails'
-gem 'strong_parameters'
 gem 'unicorn'
 
 group :assets do
@@ -47,6 +50,7 @@ group :test do
 end
 
 group :staging, :production do
-  gem 'newrelic_rpm'
+  gem 'newrelic_rpm', '>= 3.5.7'
+  gem 'rails_12factor'
 end
 

data/templates/Procfile

@@ -1,2 +1,3 @@
 web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+# worker: bundle exec rake jobs:work
 

data/templates/application.css.scss

@@ -0,0 +1,8 @@
+@charset 'utf-8';
+
+///////////////////////////////////////////////////////////////////////////////
+
+@import 'bourbon';
+@import 'neat';
+
+///////////////////////////////////////////////////////////////////////////////

data/templates/background_jobs_rspec.rb

@@ -0,0 +1,19 @@
+module BackgroundJobs
+  def run_background_jobs_immediately
+    delay_jobs = Delayed::Worker.delay_jobs
+    Delayed::Worker.delay_jobs = false
+    yield
+  ensure
+    Delayed::Worker.delay_jobs = delay_jobs
+  end
+end
+
+RSpec.configure do |config|
+  config.around(:each, type: :feature) do |example|
+    run_background_jobs_immediately do
+      example.run
+    end
+  end
+
+  config.include BackgroundJobs
+end

data/templates/capybara_selectors.rb

@@ -0,0 +1,29 @@
+Capybara.add_selector :record do
+  xpath do |record|
+    XPath.css("#" + ActionController::RecordIdentifier.dom_id(record))
+  end
+
+  match do |record|
+    record.is_a?(ActiveRecord::Base)
+  end
+end
+
+Capybara.add_selector :alert do
+  xpath do
+    XPath.css(".flash.alert")
+  end
+end
+
+Capybara.add_selector :notice do
+  xpath do
+    XPath.css(".flash.notice")
+  end
+end
+
+Capybara.add_selector :role do
+  xpath do |role|
+    XPath.css("[role=#{role}]")
+  end
+end
+
+

data/templates/create_dragonfly_jobs.rb

@@ -0,0 +1,9 @@
+class CreateDragonflyJobs < ActiveRecord::Migration
+  def change
+    create_table :dragonfly_jobs do |t|
+      t.string :uid
+      t.string :job
+    end
+  end
+end
+

data/templates/database_cleaner_rspec.rb

@@ -1,3 +1,5 @@
+require 'database_cleaner'
+
 RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.clean_with(:deletion)

data/templates/disable_xml_params.rb

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

data/templates/dragonfly.rb

@@ -0,0 +1,9 @@
+require 'uri'
+require 'dragonfly'
+require 'rack/cache'
+
+app = Dragonfly[:images]
+app.configure_with(:imagemagick)
+app.define_macro(ActiveRecord::Base, :image_accessor)
+app.define_macro(ActiveRecord::Base, :file_accessor)
+

data/templates/dragonfly_initializer.rb

@@ -0,0 +1,47 @@
+require 'uri'
+require 'dragonfly'
+require 'rack/cache'
+
+app = Dragonfly[:images]
+app.configure_with(:rails)
+app.configure_with(:imagemagick)
+app.define_macro(ActiveRecord::Base, :image_accessor)
+app.define_macro(ActiveRecord::Base, :file_accessor)
+
+rack_cache_already_inserted = Rails.application.config.action_controller.perform_caching && Rails.application.config.action_dispatch.rack_cache
+
+Rails.application.middleware.insert 0, Rack::Cache, {
+  :verbose     => false,
+  :metastore   => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
+  :entitystore => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
+} unless rack_cache_already_inserted
+
+Rails.application.middleware.insert_after Rack::Cache, Dragonfly::Middleware, :images
+
+if ENV['S3_BUCKET']
+  class DragonflyJob < ActiveRecord::Base
+    before_destroy do |thumb|
+      Dragonfly[:images].datastore.destroy(thumb.uid)
+    end
+  end
+
+  app.cache_duration = 3600*24*365*3
+  app.configure do |c|
+    c.define_url do |app, job, opts|
+      thumb = DragonflyJob.find_by_job(job.serialize)
+      if !thumb
+        uid = job.store
+        thumb = DragonflyJob.create!(uid: uid, job: job.serialize)
+      end
+      app.datastore.url_for(thumb.uid)
+    end
+  end
+  app.datastore = Dragonfly::DataStorage::S3DataStore.new
+  app.datastore.configure do |c|
+    c.bucket_name = ENV['S3_BUCKET']
+    c.access_key_id = ENV['S3_KEY']
+    c.secret_access_key = ENV['S3_SECRET']
+    c.region = ENV['S3_REGION']
+  end
+end
+

data/templates/exist_in_db.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :exist_in_db do
+  match do |actual|
+    actual.class.exists?(actual.id)
+  end
+end
+

data/templates/factories_spec.rb

@@ -1,14 +1,14 @@
-require 'spec_helper'
+require 'model_spec_helper'
 
-describe 'validate FactoryGirl factories' do
-  FactoryGirl.factories.each do |factory|
-    context "with factory for :#{factory.name}" do
-      subject { FactoryGirl.build(factory.name) }
+FactoryGirl.factories.map(&:name).each do |factory_name|
+  describe "Factory :#{factory_name}" do
+    it 'is valid' do
+      factory = build(factory_name)
 
-      it 'is valid' do
-        is_valid = subject.valid?
-        expect(is_valid).to be_true, subject.errors.full_messages.join(',')
+      if factory.respond_to?(:valid?)
+        expect(factory).to be_valid, factory.errors.full_messages.join(',')
       end
     end
   end
 end
+

data/templates/factories_spec_rake_task.rb

@@ -1,6 +1,6 @@
-
 if defined?(RSpec)
   desc 'Run factory specs.'
+
   RSpec::Core::RakeTask.new(:factory_specs) do |t|
     t.pattern = './spec/models/factories_spec.rb'
   end

data/templates/model_spec_helper.rb

@@ -9,13 +9,27 @@ ActiveRecord::Base.establish_connection(db_config['test'])
 require File.join(RAILS_ROOT, "spec/support/database_cleaner.rb")
 
 # add activerecord plugins here
+require 'email_validator'
 # require 'friendly_id'
 
+# Needed by rspec-rails to work without the whole Rails dependency
+unless defined?(Rails)
+  module Rails
+    module VERSION
+      STRING = '4'
+    end
+  end
+end
+
+require 'rspec/rails/extensions/active_record/base'
+
 autoload_paths = ActiveSupport::Dependencies.autoload_paths
 %w(app/models app/validators).each do |path|
   autoload_paths.push(path) unless autoload_paths.include?(path)
 end
 
+require File.join(RAILS_ROOT, "spec/support/dragonfly.rb")
+
 # find definitions only if factory girls has not been already required
 if require 'factory_girl'
   require File.join(RAILS_ROOT, "spec/support/factory_girl.rb")

data/templates/rails_root_definition.rb

@@ -0,0 +1,2 @@
+RAILS_ROOT = File.expand_path('../../', __FILE__) unless defined?(RAILS_ROOT)
+

data/templates/rspec_config.rb

@@ -6,6 +6,7 @@ RSpec.configure do |config|
   end
   config.mock_with :mocha
   config.order = "random"
+  config.fail_fast = true
   if defined?(Rails)
     config.fixture_path = "#{::Rails.root}/spec/fixtures"
     config.use_transactional_fixtures = false

data/templates/unicorn.rb

@@ -1,5 +1,7 @@
-worker_processes Integer(ENV["WEB_CONCURRENCY"] || 3)
-timeout 15
+# https://devcenter.heroku.com/articles/rails-unicorn
+
+worker_processes (ENV['WEB_CONCURRENCY'] || 3).to_i
+timeout (ENV['WEB_TIMEOUT'] || 5).to_i
 preload_app true
 
 before_fork do |server, worker|
@@ -8,14 +10,18 @@ before_fork do |server, worker|
     Process.kill 'QUIT', Process.pid
   end
 
-  defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
+  if defined? ActiveRecord::Base
+    ActiveRecord::Base.connection.disconnect!
+  end
 end
 
 after_fork do |server, worker|
   Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
+    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
   end
 
-  defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
+  if defined? ActiveRecord::Base
+    ActiveRecord::Base.establish_connection
+  end
 end
 

data/templates/unit_spec_helper.rb

@@ -2,7 +2,7 @@ require 'active_support/dependencies'
 require 'showcase'
 
 # add project root to load path
-RAILS_ROOT = File.expand_path('../../', __FILE__)
+RAILS_ROOT = File.expand_path('../../', __FILE__) unless defined?(RAILS_ROOT)
 $LOAD_PATH.unshift(RAILS_ROOT) unless $LOAD_PATH.include?(RAILS_ROOT)
 
 require File.join(RAILS_ROOT, "spec/support/rspec_config.rb")
@@ -12,3 +12,4 @@ autoload_paths = ActiveSupport::Dependencies.autoload_paths
 %w(app/presenters).each do |path|
   autoload_paths.push(path) unless autoload_paths.include?(path)
 end
+

data/welaika-suspenders.gemspec

@@ -1,37 +1,35 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('../lib', __FILE__)
 require 'welaika_suspenders/version'
 require 'date'
 
 Gem::Specification.new do |s|
-  s.name     = 'welaika-suspenders'
-  s.version  = WelaikaSuspenders::VERSION
-  s.date     = Date.today.strftime('%Y-%m-%d')
+  s.required_ruby_version = '>= 1.9.2'
+  s.add_dependency 'bundler', '~> 1.3'
+  s.add_dependency 'hub', '~> 1.10'
+  s.add_dependency 'rails', '4.0.0'
+  s.add_development_dependency 'aruba', '~> 0.5.2'
+  s.add_development_dependency 'cucumber', '~> 1.2'
   s.authors  = ['thoughtbot', 'welaika']
-  s.email    = 'info@welaika.com'
-  s.homepage = 'http://github.com/welaika/welaika-suspenders'
+  s.date = Date.today.strftime('%Y-%m-%d')
 
-  s.summary     = "Generate a Rails app using weLaika's best practices."
   s.description = <<-HERE
 Suspenders is a base Rails project that you can upgrade. It is used by
 thoughtbot to get a jump start on a working app. Use Suspenders if you're in a
 rush to build something amazing; don't use it if you like missing deadlines.
   HERE
 
-  s.files = `git ls-files`.split("\n").
-    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg)/ }
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.email    = 'info@welaika.com'
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |file| File.basename(file) }
   s.extra_rdoc_files = %w[README.md LICENSE]
-
-  s.add_dependency 'rails'
-  s.add_dependency 'bundler'
-  s.add_dependency 'hub'
-
-  s.add_development_dependency 'cucumber', '~> 1.1.9'
-  s.add_development_dependency 'aruba', '~> 0.4.11'
+  s.files = `git ls-files`.split("\n")
+  s.homepage = 'http://github.com/welaika/welaika-suspenders'
+  s.license = 'MIT'
+  s.name = 'welaika-suspenders'
+  s.rdoc_options = ['--charset=UTF-8']
+  s.require_paths = ['lib']
+  s.summary = "Generate a Rails app using weLaika's best practices."
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.version  = WelaikaSuspenders::VERSION
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.4.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,78 +9,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: hub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: hub
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: '1.2'
 description: |
   Suspenders is a base Rails project that you can upgrade. It is used by
   thoughtbot to get a jump start on a working app. Use Suspenders if you're in a
@@ -93,6 +93,9 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- .DS_Store
+- .gitignore
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -115,39 +118,46 @@ files:
 - lib/welaika_suspenders/generators/app_generator.rb
 - lib/welaika_suspenders/version.rb
 - lib/welaika_suspenders/version_check.rb
+- templates/.DS_Store
 - templates/Gemfile_clean
 - templates/Procfile
 - templates/README.md.erb
 - templates/_flashes.html.slim
 - templates/_javascript.html.slim
+- templates/application.css.scss
+- templates/background_jobs_rspec.rb
 - templates/bin_setup
+- templates/capybara_selectors.rb
 - templates/config_locales_en.yml
+- templates/create_dragonfly_jobs.rb
 - templates/database_cleaner_rspec.rb
 - templates/disable_xml_params.rb
-- templates/email_validator.rb
+- templates/dragonfly.rb
+- templates/dragonfly_initializer.rb
 - templates/errors.rb
+- templates/exist_in_db.rb
 - templates/factories_spec.rb
 - templates/factories_spec_rake_task.rb
 - templates/factory_girl_syntax_rspec.rb
 - templates/import_common_javascripts
-- templates/import_sass_styles
 - templates/model_spec_helper.rb
 - templates/postgresql_database.yml.erb
 - templates/presenters.rb
 - templates/rack_timeout.rb
+- templates/rails_root_definition.rb
 - templates/rspec
 - templates/rspec_config.rb
 - templates/sample.env
 - templates/simplecov_init.rb
 - templates/smtp.rb
-- templates/strong_parameters.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.slim.erb
 - templates/unicorn.rb
 - templates/unit_spec_helper.rb
 - welaika-suspenders.gemspec
 homepage: http://github.com/welaika/welaika-suspenders
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -158,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='

data/templates/email_validator.rb

@@ -1,7 +0,0 @@
-class EmailValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    unless value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
-      record.errors[attribute] << (options[:message] || "is not an email")
-    end
-  end
-end

data/templates/import_sass_styles

@@ -1 +0,0 @@
-@import bourbon

data/templates/strong_parameters.rb

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