bretels 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 417a804e6c24e698010740e209dbaa1832dab7a3
-  data.tar.gz: 28bbe8160d288696b53245ce21bd3da2627ec0d6
+  metadata.gz: 472f46af3217abca672dcc3c8679f3480d27b24f
+  data.tar.gz: 820a4c2e9fe39269340950fc99f1e4acb07cf2a9
 SHA512:
-  metadata.gz: 3b4ea638b5b74ce900e668b44684a0ba604b9079dfbb574c7dab84bac79b3548f06cae9c385c149ca7578e89bad319225c58b9e33d349a7838985f027504e817
-  data.tar.gz: 0b50b8e3781d2be6b05034a93a19b7243ded16d6a85111dde30bbf70224a9f06e72d01b2a868e94db6be5224e2f0ac0ffd4d120fc51034bbe530f1b9ae911d85
+  metadata.gz: 714a1c209819a7ae02366bc9c13654f7edb68eb11a71341d0bbe0c96267e61dab2d9e9f9435ae74e9526c7589f3dae86b88e0951f98b80b0d799b7379d8f0ca8
+  data.tar.gz: f393b7746fe1245b61ecccb09b58796c580b0f1162d3dccdcef7545a9822182c5201bd2cbef9d523f8f01d0420fdc24e77c724cef9ee209c35b48cb4a9708d9f

data/Gemfile.lock

@@ -1,84 +1,108 @@
 PATH
   remote: .
   specs:
-    bretels (1.0.3)
+    bretels (1.1.0)
       bundler (>= 1.1)
-      rails (= 4.0.0)
+      rails (~> 4.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
       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.1)
-    atomic (1.1.14)
-    builder (3.1.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
     erubis (2.7.0)
+    globalid (0.3.3)
+      activesupport (>= 4.1.0)
     hike (1.2.3)
-    i18n (0.6.9)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    polyglot (0.3.3)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    i18n (0.7.0)
+    json (1.8.2)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    multi_json (1.11.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
       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)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
-    sprockets (2.10.1)
+    rake (10.4.2)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/bretels.gemspec

@@ -26,6 +26,6 @@ Fork of thoughtbot's Suspenders for use at Brightin.
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency 'rails', '4.0.0'
+  s.add_dependency 'rails', '~> 4.2.0'
   s.add_dependency 'bundler', '>= 1.1'
 end

data/lib/bretels/app_builder.rb

@@ -15,8 +15,10 @@ module Bretels
         'raise_delivery_errors = false', 'raise_delivery_errors = true'
     end
 
-    def enable_factory_girl_syntax
+    def add_support_files
       copy_file 'factory_girl_syntax_rspec.rb', 'spec/support/factory_girl.rb'
+      copy_file 'database_cleaner.rb', 'spec/support/database_cleaner.rb'
+      copy_file 'poltergeist.rb', 'spec/support/poltergeist.rb'
     end
 
     def test_factories_first
@@ -27,6 +29,10 @@ module Bretels
       empty_directory 'spec/factories'
     end
 
+    def install_spring_gem
+      `gem install spring spring-commands-rspec`
+    end
+
     def add_cdn_settings
       config = <<-RUBY
 \n\n  # Cloudfront settings
@@ -41,30 +47,6 @@ module Bretels
         :after => "config.assets.digest = true"
     end
 
-    def configure_smtp
-      config = <<-RUBY
-\n\n  ActionMailer::Base.smtp_settings = {
-    :address        => 'smtp.sendgrid.net',
-    :port           => '587',
-    :authentication => :plain,
-    :user_name      => ENV['SENDGRID_USERNAME'],
-    :password       => ENV['SENDGRID_PASSWORD'],
-    :domain         => 'herokuapp.com',
-    :enable_starttls_auto => true
-  }
-  config.action_mailer.delivery_method = :smtp
-      RUBY
-
-      inject_into_file 'config/environments/production.rb', config.rstrip,
-        :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 enable_rack_deflater
       config = <<-RUBY
 
@@ -178,10 +160,11 @@ module Bretels
 
     def generate_rspec
       copy_file 'spec_helper.rb', 'spec/spec_helper.rb'
+      copy_file 'rails_helper.rb', 'spec/rails_helper.rb'
     end
 
     def setup_foreman
-      copy_file 'unicorn.rb', 'config/unicorn.rb'
+      copy_file 'puma.rb', 'config/puma.rb'
       copy_file 'Procfile', 'Procfile'
     end
 
@@ -194,9 +177,9 @@ module Bretels
     def gitignore_files
       concat_file 'suspenders_gitignore', '.gitignore'
       [
-        'spec/support',
-        'spec/lib',
+        'spec/features',
         'spec/models',
+        'spec/support'
       ].each do |dir|
         empty_directory(dir)
         create_file("#{dir}/.gitkeep")
@@ -215,42 +198,16 @@ module Bretels
       run "#{path_addition} heroku config:add RACK_ENV=staging RAILS_ENV=staging --remote=staging"
     end
 
-    def customize_error_pages
-      meta_tags =<<-EOS
-  <meta charset='utf-8' />
-  <meta name='robots' content='noodp' />
-      EOS
-      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
-        replace_in_file "public/#{page}.html", /<!--.+-->\n/, ''
-      end
-    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 add_email_validator
-      copy_file 'email_validator.rb', 'app/validators/email_validator.rb'
+        /Rails\.application\.routes\.draw do.*end/m,
+        "Rails.application.routes.draw do\nend"
     end
 
     def add_airbrake_configuration
       copy_file 'airbrake.rb', 'config/initializers/airbrake.rb'
     end
 
-    def setup_default_rake_task
-      append_file 'Rakefile' do
-        "task(:default).clear\ntask :default => [:spec]"
-      end
-    end
-
     def raise_unpermitted_params
       config = <<-RUBY
 \n\n  config.action_controller.action_on_unpermitted_parameters = :raise

data/lib/bretels/generators/app_generator.rb

@@ -28,7 +28,6 @@ module Bretels
       invoke :setup_database
       invoke :configure_app
       invoke :setup_stylesheets
-      invoke :customize_error_pages
       invoke :remove_routes_comment_lines
       invoke :remove_turbolinks
       invoke :setup_git
@@ -45,11 +44,12 @@ module Bretels
       build :raise_delivery_errors
       build :initialize_on_precompile
       build :lib_in_load_path
+      build :install_spring_gem
     end
 
     def setup_test_environment
       say 'Setting up the test environment'
-      build :enable_factory_girl_syntax
+      build :add_support_files
       build :test_factories_first
       build :generate_rspec
       build :configure_rspec
@@ -58,7 +58,6 @@ module Bretels
 
     def setup_production_environment
       say 'Setting up the production environment'
-      build :configure_smtp
       build :enable_force_ssl
       build :add_cdn_settings
       build :enable_rack_deflater
@@ -70,7 +69,7 @@ module Bretels
     end
 
     def create_suspenders_views
-      say 'Creating suspenders views'
+      say 'Creating bretel views'
       build :create_partials_directory
       build :create_shared_flashes
       build :create_application_layout
@@ -79,6 +78,7 @@ module Bretels
     def customize_gemfile
       build :replace_gemfile
       build :set_ruby_to_version_being_used
+      bundle_command 'install'
     end
 
     def setup_database
@@ -98,8 +98,6 @@ module Bretels
       build :configure_dutch_language
       build :configure_rack_timeout
       build :add_airbrake_configuration
-      build :add_email_validator
-      build :setup_default_rake_task
       build :setup_foreman
     end
 
@@ -129,11 +127,6 @@ module Bretels
       build :init_git
     end
 
-    def customize_error_pages
-      say 'Customizing the 500/404/422 pages'
-      build :customize_error_pages
-    end
-
     def remove_turbolinks
       build :remove_turbolinks
     end
@@ -143,14 +136,7 @@ module Bretels
     end
 
     def outro
-      say 'Done. Congratulations!'
-      say '1. Run bundle install'
-      say '2. Run rake db:create'
-      say "3. Update config/initializers/airbrake.rb"
-    end
-
-    def run_bundle
-      # Let's not: We'll bundle manually at the right spot
+      say 'Done. Congratulations! Please run bin/setup to setup database!'
     end
 
     protected
@@ -158,6 +144,5 @@ module Bretels
     def get_builder_class
       Bretels::AppBuilder
     end
-
   end
 end

data/lib/bretels/version.rb

@@ -1,3 +1,3 @@
 module Bretels
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/templates/Gemfile_clean

@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
 
-ruby '2.0.0'
-
-gem 'rails', '~> 4.0.0'
+gem 'rails', '~> 4.2.0'
+gem 'airbrake'
 gem 'coffee-rails'
 gem 'jquery-rails'
 gem 'pg'
@@ -10,13 +9,14 @@ gem 'rack-timeout'
 gem 'rails-i18n'
 gem 'sass-rails'
 gem 'uglifier'
-gem 'airbrake'
 
 group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'letter_opener'
   gem 'quiet_assets'
+  gem 'spring'
+  gem 'spring-commands-rspec'
 end
 
 group :staging do
@@ -29,12 +29,13 @@ group :development, :test do
 end
 
 group :test do
-  gem 'launchy'
+  gem 'capybara'
+  gem 'poltergeist'
+  gem 'database_cleaner'
 end
 
 group :staging, :production do
-  gem 'newrelic_rpm'
   gem 'rack-zippy'
   gem 'rails_12factor'
-  gem 'unicorn'
+  gem 'puma'
 end

data/templates/Procfile

@@ -1 +1 @@
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: bundle exec puma -C config/puma.rb

data/templates/_flashes.html.erb

@@ -1,5 +1,3 @@
-<div id="flash">
-  <% flash.each do |key, value| -%>
-    <div id="flash_<%= key %>"><%= value %></div>
-  <% end -%>
-</div>
+<% flash.each do |key, value| -%>
+  <div id="flash--<%= key %>"><%= value %></div>
+<% end -%>

data/templates/airbrake.rb

@@ -1,6 +1,13 @@
+require 'rake'
+require 'airbrake/rake_handler'
+
 Airbrake.configure do |config|
   config.api_key = ''
   config.host    = ''
   config.port    = 443
   config.secure  = true
-end
+  config.rescue_rake_exceptions = true
+  ENV.keys.each do |filtered_key|
+    config.rake_environment_filters << filtered_key
+  end
+end

data/templates/database_cleaner.rb

@@ -0,0 +1,16 @@
+RSpec.configure do |config|
+  config.use_transactional_fixtures = false
+
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do |example|
+    DatabaseCleaner.strategy = example.metadata[:js] ? :truncation : :transaction
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

data/templates/factories_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe 'validate FactoryGirl factories' do
+RSpec.describe 'validate FactoryGirl factories' do
   FactoryGirl.factories.each do |factory|
     context "with factory for :#{factory.name}" do
       subject { FactoryGirl.build(factory.name) }

data/templates/poltergeist.rb

@@ -0,0 +1,3 @@
+require 'capybara/poltergeist'
+
+Capybara.javascript_driver = :poltergeist

data/templates/postgresql_database.yml.erb

@@ -2,6 +2,7 @@ development: &default
   adapter: postgresql
   database: <%= app_name %>_development
   encoding: utf8
+  host: localhost
   min_messages: warning
   pool: 5
   timeout: 5000

data/templates/puma.rb

@@ -0,0 +1,17 @@
+workers Integer(ENV["WEB_CONCURRENCY"] || 3)
+threads Integer(ENV["MIN_THREADS"] || 1), Integer(ENV["MAX_THREADS"] || 16)
+
+preload_app!
+
+rackup DefaultRackup
+port ENV["PORT"] || 3000
+environment ENV["RACK_ENV"] || "development"
+
+on_worker_boot do
+  ActiveSupport.on_load(:active_record) do
+    config = ActiveRecord::Base.configurations[Rails.env] ||
+             Rails.application.config.database_configuration[Rails.env]
+    config["pool"] = ENV["MAX_THREADS"] || 16
+    ActiveRecord::Base.establish_connection(config)
+  end
+end

data/templates/rails_helper.rb

@@ -0,0 +1,11 @@
+ENV["RAILS_ENV"] = "test"
+require 'spec_helper'
+require File.expand_path("../../config/environment", __FILE__)
+require "rspec/rails"
+
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |file| require file }
+ActiveRecord::Migration.maintain_test_schema!
+
+RSpec.configure do |config|
+  config.infer_spec_type_from_file_location!
+end

data/templates/spec_helper.rb

@@ -1,16 +1,19 @@
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-require 'rspec/autorun'
+RSpec.configure do |config|
+  config.disable_monkey_patching!
 
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
+  end
 
-RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
-  config.use_transactional_fixtures = true
-  config.infer_base_class_for_anonymous_controllers = false
-  config.order = "random"
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
+  config.order = :random
+  Kernel.srand config.seed
+
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :expect
+    mocks.verify_partial_doubles = true
   end
 end

data/templates/staging.rb.erb

@@ -1,5 +1,5 @@
 load "config/environments/production.rb"
 
-<%=app_const%>.configure do
+Rails.application.configure do
   Mail.register_interceptor RecipientInterceptor.new(ENV['EMAIL_RECEIVERS'])
 end

data/templates/suspenders_layout.html.erb.erb

@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8" />
   <title></title>
-  <%%= stylesheet_link_tag :application, :media => 'all' %>
+  <%%= stylesheet_link_tag :application, media: 'all' %>
   <%%= javascript_include_tag :application %>
   <%%= csrf_meta_tags %>
 </head>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bretels
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - brightin
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,16 +66,18 @@ files:
 - templates/_flashes.html.erb
 - templates/airbrake.rb
 - templates/config_locales_nl.yml
-- templates/email_validator.rb
+- templates/database_cleaner.rb
 - templates/factories_spec.rb
 - templates/factory_girl_syntax_rspec.rb
+- templates/poltergeist.rb
 - templates/postgresql_database.yml.erb
+- templates/puma.rb
 - templates/rack_timeout.rb
+- templates/rails_helper.rb
 - templates/spec_helper.rb
 - templates/staging.rb.erb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.erb.erb
-- templates/unicorn.rb
 homepage: http://github.com/brightin/bretels
 licenses: []
 metadata: {}
@@ -96,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using brightins'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/unicorn.rb

@@ -1,24 +0,0 @@
-worker_processes Integer(ENV['WEB_CONCURRENCY'] || 3)
-timeout Integer(ENV['WEB_TIMEOUT'] || 15)
-preload_app true
-
-before_fork do |server, worker|
-
-  Signal.trap 'TERM' do
-    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
-    Process.kill 'QUIT', Process.pid
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.connection.disconnect!
-end
-
-after_fork do |server, worker|
-
-  Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.establish_connection
-end