suspenders 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccf239065a250f45823c0f9f23fa1295af9549e0
-  data.tar.gz: e806e2ee722a789d4bdf741dd9feaee3867771a3
+  metadata.gz: df50837963e79f73c87df3eed2f3f5e8603abb46
+  data.tar.gz: 1df6eca11374e14a55dfabc9799f42fb5a9f39da
 SHA512:
-  metadata.gz: deff8d09578f7515690f06823b8502f4ca253f579828e7f6fde1bd11c939f5222a45f8f372f86c281d9f604783342318ffcbacfc147ce1a4d7eaf5a004bfe663
-  data.tar.gz: 165e1e2db48cd56e4c6917588fe80967254b82621efc096e073e5263c4bed12e3fb41133b5bedba95bb061a39ef979d149ab70424b5f242a8cb1584f1e51769a
+  metadata.gz: 1d4c1c837459c6f96ba360f859d9097b7daeae0910deb9535ad3ca3945dc38fece989f86de52327437d547a5d2e1dae8eb38bcac3da5887ecfc2f38b4f363c65
+  data.tar.gz: d1b654c7f159935b2eaed3fdc3b3ba7b045d3fe866435862483fca11d89fe7e1ad5c81c28060ff13e5fac159d4bfc020e0e86f2c9c919004c60946179d7112bf

data/Gemfile.lock

@@ -1,114 +1,114 @@
 PATH
   remote: .
   specs:
-    suspenders (1.3.0)
+    suspenders (1.4.0)
       bundler (~> 1.3)
       hub (~> 1.10)
-      rails (= 3.2.13)
+      rails (= 4.0.0)
 
 GEM
   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.5.1)
-      childprocess (~> 0.3.6)
+      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)
       rspec-expectations (>= 2.7.0)
-    builder (3.0.4)
+    atomic (1.1.10)
+    builder (3.1.4)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.3)
+    cucumber (1.3.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.6)
-      multi_json (~> 1.3)
-    diff-lcs (1.2.2)
+      gherkin (~> 2.12.0)
+      multi_json (~> 1.7.5)
+      multi_test (~> 0.0.1)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
-    ffi (1.6.0)
-    gherkin (2.11.6)
-      json (>= 1.7.6)
-    hike (1.2.2)
+    ffi (1.9.0)
+    ffi (1.9.0-x86-mingw32)
+    gherkin (2.12.0)
+      multi_json (~> 1.3)
+    gherkin (2.12.0-x86-mingw32)
+      multi_json (~> 1.3)
+    hike (1.2.3)
     hub (1.10.6)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.7)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    i18n (0.6.4)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
-    multi_json (1.7.2)
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    multi_test (0.0.1)
     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-expectations (2.13.0)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    sprockets (2.2.2)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     thor (0.18.1)
+    thread_safe (0.1.0)
+      atomic
     tilt (1.4.1)
-    treetop (1.4.12)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
-  aruba (~> 0.5)
+  aruba (~> 0.5.2)
   cucumber (~> 1.2)
   suspenders!

data/NEWS.md

@@ -1,3 +1,13 @@
+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

data/README.md

@@ -15,7 +15,7 @@ Then run:
 
     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
@@ -30,6 +30,7 @@ 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
+* [Email Validator](https://github.com/balexand/email_validator) for email validation
 
 And testing gems like:
 

data/features/step_definitions/suspenders_steps.rb

@@ -28,7 +28,7 @@ When 'I suspend a project called "$project_name"' do |project_name|
   run_simple "#{suspenders_bin} #{project_name}"
 end
 
-When /^I suspend a project called "([^"]*)" with:$/ do |project_name, arguments_table|
+When %r{I suspend a project called "([^"]*)" with:} do |project_name, arguments_table|
   suspenders_bin = File.expand_path(File.join('..', '..', 'bin', 'suspenders'), File.dirname(__FILE__))
   arguments = arguments_table.hashes.inject([]) do |accum, argument|
     accum << "#{argument['argument']}=#{argument['value']}"
@@ -49,20 +49,20 @@ 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/suspenders/actions.rb

@@ -15,7 +15,7 @@ module Suspenders
     end
 
     def action_mailer_host(rails_env, host)
-      host_config = "config.action_mailer.default_url_option = { host: '#{host}' }"
+      host_config = "config.action_mailer.default_url_options = { host: '#{host}' }"
       configure_environment(rails_env, host_config)
     end
 

data/lib/suspenders/app_builder.rb

@@ -29,6 +29,23 @@ module Suspenders
       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
@@ -89,11 +106,6 @@ module Suspenders
       directory 'javascripts', 'app/assets/javascripts'
     end
 
-    def add_jquery_ui
-      inject_into_file 'app/assets/javascripts/application.js',
-        "//= require jquery-ui\n", :before => '//= require_tree .'
-    end
-
     def use_postgres_config_template
       template 'postgresql_database.yml.erb', 'config/database.yml',
         :force => true
@@ -130,27 +142,18 @@ module Suspenders
         '# config.mock_with :mocha',
         'config.mock_with :mocha'
 
-      rspec_expect_syntax = <<-RUBY
-
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
+      config = <<-RUBY
+  config.expect_with :rspec do |expect|
+    expect.syntax = :expect
   end
-      RUBY
 
-      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
+  config.fail_fast = true
 
       RUBY
 
-      inject_into_file 'spec/spec_helper.rb', rspec_expect_syntax,
+      inject_into_file 'spec/spec_helper.rb',
+        config,
         :after => 'RSpec.configure do |config|'
-      inject_into_class 'config/application.rb', 'Application', config
     end
 
     def configure_background_jobs_for_rspec
@@ -158,16 +161,6 @@ module Suspenders
       run 'rails g delayed_job:active_record'
     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'
-    end
-
     def configure_time_zone
       config = <<-RUBY
     config.active_record.default_timezone = :utc
@@ -198,7 +191,7 @@ module Suspenders
 
     def configure_capybara_webkit
       append_file 'spec/spec_helper.rb' do
-        "\nCapybara.javascript_driver = :webkit"
+        "\nCapybara.javascript_driver = :webkit\n"
       end
     end
 
@@ -241,7 +234,8 @@ module Suspenders
         'spec/support/mixins',
         'spec/support/shared_examples'
       ].each do |dir|
-        empty_directory_with_gitkeep dir
+        run "mkdir #{dir}"
+        run "touch #{dir}/.gitkeep"
       end
     end
 
@@ -287,17 +281,13 @@ module Suspenders
         "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
 

data/lib/suspenders/generators/app_generator.rb

@@ -30,7 +30,6 @@ module Suspenders
       invoke :setup_staging_environment
       invoke :create_suspenders_views
       invoke :create_common_javascripts
-      invoke :add_jquery_ui
       invoke :configure_app
       invoke :setup_stylesheets
       invoke :copy_miscellaneous_files
@@ -68,6 +67,7 @@ module Suspenders
       build :raise_on_delivery_errors
       build :raise_on_unpermitted_parameters
       build :provide_setup_script
+      build :configure_generators
     end
 
     def setup_test_environment
@@ -106,11 +106,6 @@ module Suspenders
       build :create_common_javascripts
     end
 
-    def add_jquery_ui
-      say 'Add jQuery ui to the standard application.js'
-      build :add_jquery_ui
-    end
-
     def configure_app
       say 'Configuring app'
       build :configure_action_mailer
@@ -120,7 +115,6 @@ module Suspenders
       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

data/lib/suspenders/version.rb

@@ -1,3 +1,3 @@
 module Suspenders
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/suspenders.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'hub', '~> 1.10'
-  s.add_dependency 'rails', '3.2.13'
-  s.add_development_dependency 'aruba', '~> 0.5'
+  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']
   s.date = Date.today.strftime('%Y-%m-%d')

data/templates/Gemfile_clean

@@ -3,15 +3,15 @@ source 'https://rubygems.org'
 gem 'airbrake'
 gem 'bourbon'
 gem 'delayed_job_active_record', '>= 4.0.0.beta2'
+gem 'email_validator'
 gem 'flutie'
 gem 'high_voltage'
 gem 'jquery-rails'
 gem 'pg'
 gem 'rack-timeout'
-gem 'rails', '>= 3.2.11'
+gem 'rails', '>= 4.0.0'
 gem 'recipient_interceptor'
 gem 'simple_form'
-gem 'strong_parameters'
 gem 'unicorn'
 
 group :assets do
@@ -43,5 +43,6 @@ group :test do
 end
 
 group :staging, :production do
-  gem 'newrelic_rpm'
+  gem 'newrelic_rpm', '>= 3.5.7'
+  gem 'rails_12factor'
 end

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/factories_spec.rb

@@ -1,13 +1,12 @@
 require '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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- .DS_Store
 - .gitignore
 - .travis.yml
 - CONTRIBUTING.md
@@ -116,6 +117,7 @@ files:
 - lib/suspenders/generators/app_generator.rb
 - lib/suspenders/version.rb
 - suspenders.gemspec
+- templates/.DS_Store
 - templates/Gemfile_clean
 - templates/Procfile
 - templates/README.md.erb
@@ -126,7 +128,6 @@ files:
 - 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
 - templates/factories_spec_rake_task.rb
@@ -139,7 +140,6 @@ files:
 - templates/sample.env
 - templates/simplecov_init.rb
 - templates/smtp.rb
-- templates/strong_parameters.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.erb.erb
 - templates/unicorn.rb
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.

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/strong_parameters.rb

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