suspenders 1.2.0 → 1.2.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2IxZmFiNjM0NmE0Y2IwODZiMzk3MTNiZjg5ZjEyYzI0YjQwNWRlMg==
+  data.tar.gz: !binary |-
+    NzBhZjliOWQ5YmZiNGYyYTE2NTBkZGRjNjIzMDk5NmE4NGQ3YTlmYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    M2MxZjFhMjY0MDU5ZTc1YWYxZjA2NTNhYTkwYzMyYmFiNWRmZTMwYzYzYTQx
+    ZjQwNTc3MzM0YTc4ZWU4MTVlZjdlNDJkZWJiZjA2MDNhMWU5MjI3NjdjOWMx
+    M2YxZmM3OGE0MjkzMTBjNzJjMWJmOTRlZTYyZTRhNjIyMzBkNDg=
+  data.tar.gz: !binary |-
+    YjM5YjNiOTg0NzgwMzNlNWQ0YzVhMmQ5ODAxYWEwMmFjNTAyZGQ2OTY3M2Ix
+    OGE3NTU2MTg1MGQwNzA5ZTc4MmRkMTM2OTFjNjY2NGY3NjRkY2JjOGQxYTEy
+    YjA0ZTFkNWNmMjBlZjUwMmE3N2IzZDNlOThkMDFkMjU0Y2RlZWM=

data/NEWS.md

@@ -1,3 +1,12 @@
+1.2.1 (February 28, 2013)
+
+* Use Ruby 1.9.3 and 2.0
+* Update staging and production email delivery
+* Remove Spork and Guard
+* Add better_errors and binding_of_caller gems
+* Fix ActiveRecord attributes' blacklist
+* Add Flutie to Gemfile
+
 1.2.0 (February 13, 2013)
 
 * Upgrade Rails from 3.2.8 to 3.2.12 to keep pace with security patches.

data/lib/suspenders/app_builder.rb

@@ -33,11 +33,26 @@ module Suspenders
       append_file 'Rakefile', factories_spec_rake_task
     end
 
+    def configure_smtp
+      copy_file 'smtp.rb', 'config/initializers/smtp.rb'
+
+      prepend_file 'config/environments/production.rb',
+        "require Rails.root.join('config/initializers/smtp')"
+
+      config = <<-RUBY
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.smtp_settings = SMTP_SETTINGS
+      RUBY
+
+      inject_into_file 'config/environments/production.rb', config,
+        :after => 'config.action_mailer.raise_delivery_errors = false'
+    end
+
     def setup_staging_environment
       run 'cp config/environments/production.rb config/environments/staging.rb'
-      inject_into_file 'config/environments/staging.rb',
-        "\n  config.action_mailer.delivery_method = :override_recipient_smtp, to: 'staging@example.com'",
-        :after => 'config.action_mailer.raise_delivery_errors = false'
+
+      prepend_file 'config/environments/staging.rb',
+        "Mail.register_interceptor RecipientInterceptor.new(ENV['EMAIL_RECIPIENTS'])"
     end
 
     def initialize_on_precompile
@@ -133,11 +148,9 @@ module Suspenders
     end
 
     def blacklist_active_record_attributes
-      config = <<-RUBY
-    config.active_record.whitelist_attributes = false
-
-      RUBY
-      inject_into_class 'config/application.rb', 'Application', config
+      replace_in_file 'config/application.rb',
+        'config.active_record.whitelist_attributes = true',
+        'config.active_record.whitelist_attributes = false'
     end
 
     def configure_strong_parameters
@@ -178,8 +191,8 @@ module Suspenders
       end
     end
 
-    def setup_guard_spork
-      copy_file 'Guardfile', 'Guardfile'
+    def generate_clearance
+      generate 'clearance:install'
     end
 
     def setup_foreman
@@ -233,10 +246,6 @@ 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'
     end

data/lib/suspenders/generators/app_generator.rb

@@ -25,6 +25,7 @@ module Suspenders
       invoke :customize_gemfile
       invoke :setup_development_environment
       invoke :setup_test_environment
+      invoke :setup_production_environment
       invoke :setup_staging_environment
       invoke :create_suspenders_views
       invoke :create_common_javascripts
@@ -32,7 +33,6 @@ 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
@@ -64,6 +64,11 @@ module Suspenders
       build :setup_guard_spork
     end
 
+    def setup_production_environment
+      say 'Setting up the production environment'
+      build :configure_smtp
+    end
+
     def setup_staging_environment
       say 'Setting up the staging environment'
       build :setup_staging_environment

data/lib/suspenders/version.rb

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

data/suspenders.gemspec

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "suspenders/version"
+require 'suspenders/version'
+require 'date'
 
 Gem::Specification.new do |s|
   s.name     = 'suspenders'
   s.version  = Suspenders::VERSION
   s.date     = Date.today.strftime('%Y-%m-%d')
-  s.authors  = ["thoughtbot"]
+  s.authors  = ['thoughtbot']
   s.email    = 'support@thoughtbot.com'
   s.homepage = 'http://github.com/thoughtbot/suspenders'
 

data/templates/Gemfile_clean

@@ -2,29 +2,31 @@ source 'https://rubygems.org'
 
 gem 'airbrake'
 gem 'bourbon'
+gem 'flutie'
 gem 'high_voltage'
 gem 'jquery-rails'
 gem 'pg'
 gem 'psych'
 gem 'rack-timeout'
 gem 'rails', '>= 3.2.11'
+gem 'recipient_interceptor'
 gem 'simple_form'
 gem 'strong_parameters'
 gem 'thin'
 
 group :assets do
-  gem 'sass-rails'
   gem 'coffee-rails'
+  gem 'sass-rails'
   gem 'uglifier'
 end
 
 group :development do
   gem 'foreman'
+  gem 'better_errors'
+  gem 'binding_of_caller'
 end
 
 group :development, :test do
-  gem 'guard'
-  gem 'guard-spork'
   gem 'rspec-rails'
   gem 'sham_rack'
 end

data/templates/smtp.rb

@@ -0,0 +1,10 @@
+if Rails.env.staging? || Rails.env.production?
+  SMTP_SETTINGS = {
+    address: ENV['SMTP_ADDRESS'], # example: 'smtp.sendgrid.net'
+    authentication: :plain,
+    domain: ENV['SMTP_DOMAIN'], # example: 'this-app.com'
+    password: ENV['SMTP_PASSWORD'],
+    port: '587',
+    user_name: ENV['SMTP_USERNAME']
+  }
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.2.1
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hub
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -130,7 +119,6 @@ files:
 - lib/suspenders/version.rb
 - suspenders.gemspec
 - templates/Gemfile_clean
-- templates/Guardfile
 - templates/Procfile
 - templates/README.md.erb
 - templates/_flashes.html.erb
@@ -146,39 +134,38 @@ files:
 - templates/factory_girl_syntax_rspec.rb
 - templates/import_scss_styles
 - 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/smtp.rb
 - templates/strong_parameters.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.erb.erb
 homepage: http://github.com/thoughtbot/suspenders
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.
 test_files:
 - features/github_repo.feature

data/templates/Guardfile

@@ -1,12 +0,0 @@
-guard 'spork' do
-  watch 'config/application.rb'
-  watch 'config/environment.rb'
-  watch %r{^config/environments/.*\.rb$}
-  watch %r{^config/initializers/.*\.rb$}
-  watch 'config/routes.rb'
-  watch 'Gemfile.lock'
-  watch 'spec/factories.rb'
-  watch 'spec/spec_helper.rb'
-  watch %r{^spec/support/.*\.rb$}
-  watch 'config/locales/.*'
-end

data/templates/override_recipient_smtp.rb

@@ -1,38 +0,0 @@
-module Mail
-  # == Sending Email with Override Recipient SMTP
-  #
-  # Use the OverrideRecipientSMTP delivery method when you don't want your app
-  # to accidentally send emails to addresses other than the overridden recipient
-  # which you configure.
-  #
-  # An typical use case is in your app's staging environment, your development
-  # team will receive all staging emails without accidentally emailing users with
-  # active email addresses in the database.
-  #
-  # === Sending via OverrideRecipientSMTP
-  #
-  #   config.action_mailer.delivery_method = :override_recipient_smtp,
-  #      to: 'staging@example.com'
-  #
-  # === Sending to multiple email addresses
-  #
-  #   config.action_mailer.delivery_method = :override_recipient_smtp,
-  #      to: ['dan@example.com', 'harlow@example.com']
-  class OverrideRecipientSMTP < Mail::SMTP
-    def initialize(values)
-      unless values[:to]
-        raise ArgumentError.new('A :to option is required when using :override_recipient_smtp')
-      end
-
-      super(values)
-    end
-
-    def deliver!(mail)
-      mail.to = settings[:to]
-      mail.cc = nil
-      mail.bcc = nil
-
-      super(mail)
-    end
-  end
-end