welaika-suspenders 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf7022f2b37a0700fadecdc3fee3ae499e5014c8
-  data.tar.gz: bf41da9706fa43631bfc42a814e22e345bc6dd44
+  metadata.gz: e515a2ae4181d07d0c7d6f8a70b1a7a7b12ce861
+  data.tar.gz: 4b194d1cf51111a88bc5cc5554a2a621dc02639f
 SHA512:
-  metadata.gz: a27f6edc2500ee53cbd62ce0f13704e1b48c1497aff5a49f775102a6e52eb4f914e4f147f2a6e53e16fc632461f61f2e724b922dcba5f59bdb5609382670abfe
-  data.tar.gz: 319ce8f5816f0928a7c690ee71c69bdb8ea6f8d7cdfe8737ce079f5886dbac7bf5ec7fb8a102b6614951fb9081a7ee462afa190fb0bbde1b589153b8a5a57c66
+  metadata.gz: 96603f5bfc50773d45f19b01a098dfaab7e23d984bbf51a0371c735e1f2bf5bb7cb50360fed0f649c7177a33c9ad26a07f2c264c5d709d449aca8b9fc46ca759
+  data.tar.gz: bba6c405841e065de805c923ec72fcfc5a5de1acb3b8ea62a3e5b60392023aff104577f19b660175de0ba5b5ee8eb7dbe69da698f4ee68d6679c4a659f0e44cc

data/.ruby-version

@@ -1 +1 @@
-2.1.5
+2.2.0

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.5
+  - 2.2.0
 before_install:
   - "echo '--colour' > ~/.rspec"
   - git config --global user.name 'Travis CI'

data/Gemfile.lock

@@ -1,41 +1,50 @@
 PATH
   remote: .
   specs:
-    welaika-suspenders (2.3.0)
+    welaika-suspenders (2.4.0)
       bitters (~> 0.10.0)
       bundler (~> 1.3)
-      rails (= 4.1.8)
+      rails (= 4.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.8)
-      actionview (= 4.1.8)
-      activesupport (= 4.1.8)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
       rack-test (~> 0.6.2)
-    actionview (4.1.8)
-      activesupport (= 4.1.8)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.8)
-      activesupport (= 4.1.8)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
+      globalid (>= 0.3.0)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.1.8)
-      activemodel (= 4.1.8)
-      activesupport (= 4.1.8)
-      arel (~> 5.0.0)
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0)
     aruba (0.5.4)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
@@ -67,34 +76,47 @@ GEM
     ffi (1.9.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
+    globalid (0.3.0)
+      activesupport (>= 4.1.0)
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
     json (1.8.1)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (1.25.1)
+    mime-types (2.4.3)
     mini_portile (0.6.0)
     minitest (5.5.0)
     multi_json (1.10.1)
     multi_test (0.1.1)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
-    rack (1.5.2)
+    rack (1.6.0)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.8)
-      actionmailer (= 4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
-      activemodel (= 4.1.8)
-      activerecord (= 4.1.8)
-      activesupport (= 4.1.8)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.8)
-      sprockets-rails (~> 2.0)
-    railties (4.1.8)
-      actionpack (= 4.1.8)
-      activesupport (= 4.1.8)
+      railties (= 4.2.0)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)

data/NEWS.md

@@ -1,3 +1,12 @@
+1.21.0 (January 4, 2015)
+
+* Use Ruby 2.2.0.
+* Use Rails 4.2.0.
+* Install [Refills] and Refills' "flashes" component.
+* Add `bin/deploy` script.
+
+[Refills]: http://refills.bourbon.io/components/#flashes
+
 1.20.0 (November 25, 2014)
 
 * Use Ruby 2.1.5.

data/README.md

@@ -3,7 +3,6 @@
 This is a [suspenders](https://github.com/thoughtbot/suspenders) fork in use at [weLaika](http://dev.welaika.com).
 Big thanks to [thoughtbot](http://thoughtbot.com/community) for providing such a great starting point.
 
-
 ## Installation
 
 First install the suspenders gem:
@@ -52,3 +51,6 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - use pry-byebug instead of byebug
 - use CDATA wrapper for javascript
 - create a .ruby-gemset file with app name
+- create common folders like `app/queries`, `app/services`, etc.
+- use `application.css.sass` instead of `application.css.scss`
+- do not use import refills/flashes

data/lib/suspenders/app_builder.rb

@@ -32,8 +32,8 @@ module Suspenders
     end
 
     def provide_setup_script
-      template 'bin_setup.erb', 'bin/setup', port_number: port_number
-      run 'chmod a+x bin/setup'
+      template "bin_setup.erb", "bin/setup", port_number: port, force: true
+      run "chmod a+x bin/setup"
     end
 
     def provide_dev_prime_task
@@ -89,22 +89,27 @@ module Suspenders
   config.middleware.use Rack::Deflater
       RUBY
 
-      inject_into_file 'config/environments/production.rb', config,
-        :after => "config.serve_static_assets = false\n"
+      inject_into_file(
+        "config/environments/production.rb",
+        config,
+        after: serve_static_files_line
+      )
     end
 
     def setup_asset_host
       replace_in_file 'config/environments/production.rb',
-        '# config.action_controller.asset_host = "http://assets.example.com"',
+        "# config.action_controller.asset_host = 'http://assets.example.com'",
         'config.action_controller.asset_host = ENV.fetch("ASSET_HOST")'
 
       replace_in_file 'config/initializers/assets.rb',
         "config.assets.version = '1.0'",
         'config.assets.version = (ENV["ASSETS_VERSION"] || "1.0")'
 
-      replace_in_file 'config/environments/production.rb',
-        'config.serve_static_assets = false',
-        'config.static_cache_control = "public, max-age=#{1.year.to_i}"'
+      inject_into_file(
+        "config/environments/production.rb",
+        'config.static_cache_control = "public, max-age=#{1.year.to_i}"',
+        after: serve_static_files_line
+      )
     end
 
     def setup_staging_environment
@@ -173,8 +178,11 @@ end
     end
 
     def setup_heroku_specific_gems
-      inject_into_file 'Gemfile', "\n\s\sgem 'rails_12factor'",
+      inject_into_file(
+        "Gemfile",
+        %{\n\s\sgem "rails_stdout_logging"},
         after: /group :staging, :production do/
+      )
     end
 
     def enable_database_cleaner
@@ -241,8 +249,12 @@ end
       copy_file 'slim.rb', 'config/initializers/slim.rb'
     end
 
+    def configure_simple_form
+      bundle_command "exec rails generate simple_form:install"
+    end
+
     def configure_action_mailer
-      action_mailer_host 'development', "localhost:#{port_number}"
+      action_mailer_host 'development', "localhost:#{port}"
       action_mailer_host 'test', 'www.example.com'
       action_mailer_host 'staging', "staging.#{app_name}.com"
       action_mailer_host 'production', "#{app_name}.com"
@@ -279,8 +291,8 @@ end
 
     def setup_stylesheets
       remove_file 'app/assets/stylesheets/application.css'
-      copy_file 'application.css.scss',
-        'app/assets/stylesheets/application.css.scss'
+      copy_file 'application.css.sass',
+        'app/assets/stylesheets/application.css.sass'
     end
 
     def install_bitters
@@ -291,10 +303,18 @@ end
       remove_file '.gitignore'
       copy_file 'suspenders_gitignore', '.gitignore'
       [
+        'app/forms',
+        'app/presenters',
+        'app/queries',
+        'app/services',
         'app/views/pages',
-        'spec/lib',
         'spec/controllers',
+        'spec/forms',
         'spec/helpers',
+        'spec/lib',
+        'spec/presenters',
+        'spec/queries',
+        'spec/services',
         'spec/support/matchers',
         'spec/support/mixins',
         'spec/support/shared_examples'
@@ -447,8 +467,12 @@ end
       SecureRandom.hex(64)
     end
 
-    def port_number
-      @port_number ||= [3000, 4000, 5000, 7000, 8000, 9000].sample
+    def port
+      @port ||= [3000, 4000, 5000, 7000, 8000, 9000].sample
+    end
+
+    def serve_static_files_line
+      "config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?\n"
     end
   end
 end

data/lib/suspenders/generators/app_generator.rb

@@ -127,6 +127,7 @@ module Suspenders
       build :configure_time_zone
       build :configure_time_formats
       build :configure_rack_timeout
+      build :configure_simple_form
       build :configure_slim
       build :disable_xml_params
       build :configure_available_locales

data/lib/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
-  RAILS_VERSION = "4.1.8"
+  RAILS_VERSION = "4.2.0"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/spec/features/heroku_spec.rb

@@ -1,14 +1,15 @@
-require 'spec_helper'
-
-feature 'Heroku' do
-  scenario 'Suspend a project with --heroku=true' do
-    run_suspenders('--heroku=true')
-
-    expect(FakeHeroku).to have_gem_included(project_path, 'rails_12factor')
-    expect(FakeHeroku).to have_created_app_for('staging')
-    expect(FakeHeroku).to have_created_app_for('production')
-    expect(FakeHeroku).to have_configured_vars('staging', 'SECRET_KEY_BASE')
-    expect(FakeHeroku).to have_configured_vars('production', 'SECRET_KEY_BASE')
+require "spec_helper"
+
+feature "Heroku" do
+  scenario "Suspend a project with --heroku=true" do
+    run_suspenders("--heroku=true")
+
+    expect(FakeHeroku).
+      to have_gem_included(project_path, "rails_stdout_logging")
+    expect(FakeHeroku).to have_created_app_for("staging")
+    expect(FakeHeroku).to have_created_app_for("production")
+    expect(FakeHeroku).to have_configured_vars("staging", "SECRET_KEY_BASE")
+    expect(FakeHeroku).to have_configured_vars("production", "SECRET_KEY_BASE")
 
     bin_setup = IO.read("#{project_path}/bin/setup")
     app_name = SuspendersTestHelpers::APP_NAME

data/spec/features/new_project_spec.rb

@@ -120,4 +120,10 @@ feature 'Suspend a new project with default configuration' do
     expect(locales_en_file).to match(/application: #{app_name.humanize}/)
   end
 
+  scenario "config simple_form" do
+    run_suspenders
+
+    expect(File).to exist("#{project_path}/config/initializers/simple_form.rb")
+  end
+
 end

data/templates/Gemfile.erb

@@ -4,7 +4,7 @@ ruby "<%= Suspenders::RUBY_VERSION %>"
 
 gem "airbrake"
 gem "bourbon", "~> 3.2.1"
-gem "coffee-rails"
+gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "email_validator"
 gem "flutie"
@@ -19,7 +19,7 @@ gem "rack-timeout"
 gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 gem "rails-i18n"
 gem "recipient_interceptor"
-gem "sass-rails", "~> 4.0.3"
+gem "sass-rails", "~> 5.0"
 gem "slim-rails"
 gem "simple_form"
 gem "title"
@@ -28,13 +28,14 @@ gem "unicorn"
 
 group :development do
   gem "letter_opener"
-  gem "bundler-audit"
   gem "spring"
   gem "spring-commands-rspec"
+  gem "web-console"
 end
 
 group :development, :test do
   gem "awesome_print"
+  gem "bundler-audit", require: false
   gem "dotenv-rails"
   gem "faker"
   gem "factory_girl_rails"

data/templates/application.css.sass

@@ -0,0 +1,7 @@
+@charset "utf-8"
+
+@import "normalize-rails"
+@import "bourbon"
+@import "base/grid-settings"
+@import "neat"
+@import "base/base"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,7 @@ files:
 - templates/_flashes.html.slim
 - templates/_javascript.html.slim
 - templates/action_mailer.rb
-- templates/application.css.scss
+- templates/application.css.sass
 - templates/background_jobs_rspec.rb
 - templates/bin_deploy
 - templates/bin_setup.erb
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.5
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.

data/templates/application.css.scss

@@ -1,7 +0,0 @@
-@charset 'utf-8';
-
-@import 'normalize-rails';
-@import 'bourbon';
-@import 'base/grid-settings';
-@import 'neat';
-@import 'base/base';