suspenders 1.49.0 → 1.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5aa3ec95c81991e2d82eac5e2d338a6c911f8b2a3f34c6fcbd6226e6a8d93e0
-  data.tar.gz: 24e839f9041fa8a31fdc223f9a58458c63f56639570b44369ec387bd58159fa3
+  metadata.gz: 8da6287b8db00f55d3055a907f8c8e38b449ef15d3f98c1e898770594a8b9134
+  data.tar.gz: 54e3a53194b0b996d5971681d44269122bbf181c8d34f1638e2255592dcbf497
 SHA512:
-  metadata.gz: 7a1a8650d1a6d70a9d4c496d22ec1202bc30ac580b0baf1f9153a7a8b001bc14d7bf1bd8668393f19c0b632a5257ea353f2ad000e320e6eec400666c8439235c
-  data.tar.gz: ed1eecbe03ea4228646d6e942b6ded97431754e0906bc18b92073499fd904bdb24cb05508f95ae09b5ecd230d9d6a148704f0c623aa0a5e18262aa6b37dc287b
+  metadata.gz: 407d7b2087c72518a79276894c1b7c4c7d8ebd9d0d6d5cbbb2f5b068935d1543a976f86bba1314bcf698e4cf1cb54ac279a6c21f0dd5ee485c0f8357f82133f5
+  data.tar.gz: b1bdb1c214097d96bb793614c822ddc20e090fe4cffc11b71841534c20d0108d03bb9fafaebc905b5b5923a26a5e364a2b6de21c03d41f9e2e523f4be6a4eeab

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.5.3

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.5.1
+rvm: 2.5.3
 cache: bundler
 sudo: false
 before_install:

data/NEWS.md

@@ -1,3 +1,13 @@
+1.50.0 (December 28, 2018)
+
+* Removed: jquery-rails.
+* Changed: default FactoryBot to `use_parent_strategy = true`.
+* Upgraded: Ruby 2.5.3.
+* Fixed: set `ASSET_HOST` and `APPLICATION_HOST` at top of `production.rb`.
+* Fixed: `tzinfo-data` gem for Windows.
+* New generator: `suspenders:json` for JSON parsing.
+* New generator: `suspenders:staging:pull_requests` for Heroku app per PR.
+
 1.49.0 (October 19, 2018)
 
 * Removed: NOODP robots meta tags

data/README.md

@@ -36,13 +36,11 @@ It includes application gems like:
 * [Bitters](https://github.com/thoughtbot/bitters) for scaffold application styles
 * [Delayed Job](https://github.com/collectiveidea/delayed_job) for background
   processing
-* [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
 * [Honeybadger](https://honeybadger.io) for exception notification
-* [jQuery Rails](https://github.com/rails/jquery-rails) for jQuery
 * [Neat](https://github.com/thoughtbot/neat) for semantic grids
 * [Normalize](https://necolas.github.io/normalize.css/) for resetting browser styles
+* [Oj](http://www.ohler.com/oj/)
 * [Postgres](https://github.com/ged/ruby-pg) for access to the Postgres database
 * [Rack Canonical Host](https://github.com/tylerhunt/rack-canonical-host) to
   ensure all requests are served from the same domain

data/lib/suspenders.rb

@@ -11,10 +11,12 @@ require "suspenders/generators/jobs_generator"
 require "suspenders/generators/analytics_generator"
 require "suspenders/generators/views_generator"
 require "suspenders/generators/js_driver_generator"
+require "suspenders/generators/json_generator"
 require "suspenders/generators/testing_generator"
 require "suspenders/generators/production/force_tls_generator"
 require "suspenders/generators/production/email_generator"
 require "suspenders/generators/production/timeout_generator"
+require "suspenders/generators/staging/pull_requests_generator"
 require "suspenders/actions"
 require "suspenders/adapters/heroku"
 require "suspenders/app_builder"

data/lib/suspenders/adapters/heroku.rb

@@ -55,15 +55,6 @@ module Suspenders
         end
       end
 
-      def create_review_apps_setup_script
-        app_builder.template(
-          "bin_setup_review_app.erb",
-          "bin/setup_review_app",
-          force: true,
-        )
-        app_builder.run "chmod a+x bin/setup_review_app"
-      end
-
       def create_heroku_application_manifest_file
         app_builder.template "app.json.erb", "app.json"
       end

data/lib/suspenders/app_builder.rb

@@ -10,7 +10,6 @@ module Suspenders
       :create_heroku_application_manifest_file,
       :create_heroku_pipeline,
       :create_production_heroku_app,
-      :create_review_apps_setup_script,
       :create_staging_heroku_app,
       :set_heroku_application_host,
       :set_heroku_backup_schedule,
@@ -100,11 +99,6 @@ module Suspenders
 
     def enable_rack_canonical_host
       config = <<-RUBY
-
-  if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
-    ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
-  end
-
   config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
       RUBY
 

data/lib/suspenders/generators/app_generator.rb

@@ -57,7 +57,7 @@ module Suspenders
       invoke :setup_default_directories
       invoke :create_local_heroku_setup
       invoke :create_heroku_apps
-      invoke :generate_production_default
+      invoke :generate_deployment_default
       invoke :remove_config_comment_lines
       invoke :remove_routes_comment_lines
       invoke :outro
@@ -115,7 +115,6 @@ module Suspenders
 
     def create_local_heroku_setup
       say "Creating local Heroku setup"
-      build :create_review_apps_setup_script
       build :create_deploy_script
       build :create_heroku_application_manifest_file
     end
@@ -179,6 +178,7 @@ module Suspenders
 
     def generate_default
       run("spring stop")
+      generate("suspenders:json")
       generate("suspenders:static")
       generate("suspenders:stylesheet_base")
       generate("suspenders:testing")
@@ -195,7 +195,8 @@ module Suspenders
       generate("suspenders:views")
     end
 
-    def generate_production_default
+    def generate_deployment_default
+      generate("suspenders:staging:pull_requests")
       generate("suspenders:production:force_tls")
       generate("suspenders:production:email")
       generate("suspenders:production:timeout")

data/lib/suspenders/generators/json_generator.rb

@@ -0,0 +1,10 @@
+require "rails/generators"
+
+module Suspenders
+  class JsonGenerator < Rails::Generators::Base
+    def add_oj
+      gem "oj"
+      Bundler.with_clean_env { run "bundle install" }
+    end
+  end
+end

data/lib/suspenders/generators/staging/pull_requests_generator.rb

@@ -0,0 +1,47 @@
+require "rails/generators"
+require_relative "../../actions"
+
+module Suspenders
+  module Staging
+    class PullRequestsGenerator < Rails::Generators::Base
+      include Suspenders::Actions
+
+      source_root File.expand_path(
+        File.join("..", "..", "..", "..", "templates"),
+        File.dirname(__FILE__),
+      )
+
+      def configure_heroku_staging_pr_pipeline_host
+        config = <<-RUBY
+
+  if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
+    ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
+    ENV["ASSET_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
+  end
+        RUBY
+
+        inject_into_file(
+          "config/environments/production.rb",
+          config,
+          after: "Rails.application.configure do\n",
+        )
+      end
+
+      def create_review_apps_setup_script
+        template(
+          "bin_setup_review_app.erb",
+          "bin/setup_review_app",
+          force: true,
+        )
+
+        run "chmod a+x bin/setup_review_app"
+      end
+
+      private
+
+      def app_name
+        Rails.application.class.parent_name.demodulize.underscore.dasherize
+      end
+    end
+  end
+end

data/lib/suspenders/version.rb

@@ -4,5 +4,5 @@ module Suspenders
     read("#{File.dirname(__FILE__)}/../../.ruby-version").
     strip.
     freeze
-  VERSION = "1.49.0".freeze
+  VERSION = "1.50.0".freeze
 end

data/spec/features/json_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:json" do
+  it "generates the Gemfile for JSON parsing" do
+    with_app { generate("suspenders:json") }
+
+    expect("Gemfile").to match_contents(%r{gem .oj.})
+  end
+
+  it "cleans up the Gemfile from JSON parsing" do
+    with_app { destroy("suspenders:json") }
+
+    expect("Gemfile").not_to match_contents(%r{gem .oj.})
+  end
+end

data/spec/features/new_project_spec.rb

@@ -242,8 +242,9 @@ RSpec.describe "Suspend a new project with default configuration" do
     ]
 
     config_files.each do |file|
-      expect(file).not_to match(/.*#.*/)
-      expect(file).not_to match(/^$\n/)
+      expect(file).not_to match(%r{.*#.*})
+      expect(file).not_to eq(file.strip)
+      expect(file).not_to match(%r{^$\n\n})
     end
   end
 

data/spec/features/staging/pull_requests_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:staging:pull_requests" do
+  it "generates the configuration for Heroku pipeline review apps" do
+    with_app { generate("suspenders:staging:pull_requests") }
+
+    expect("config/environments/production.rb").to \
+      match_contents(%r{HEROKU_APP_NAME})
+
+    expect("bin/setup_review_app").to \
+      match_contents(%r{APP_NAME=dummy-app-staging-pr-\$1})
+  end
+
+  it "destroys the configuration for Heroku pipeline review apps" do
+    with_app { destroy("suspenders:staging:pull_requests") }
+
+    expect("config/environments/production.rb").not_to \
+      match_contents(%r{APP_NAME=dummy-app-staging-pr-\$1})
+
+    expect("bin/setup_review_app").not_to exist_as_a_file
+  end
+end

data/templates/Gemfile.erb

@@ -9,7 +9,6 @@ ruby "<%= Suspenders::RUBY_VERSION %>"
 
 gem "autoprefixer-rails"
 gem "honeybadger"
-gem "jquery-rails"
 gem "pg"
 gem "puma"
 gem "rack-canonical-host"
@@ -19,6 +18,7 @@ gem "sass-rails", "~> 5.0"
 gem "skylight"
 gem "sprockets", ">= 3.0.0"
 gem "title"
+gem "tzinfo-data", platforms: [:mingw, :x64_mingw, :mswin, :jruby]
 gem "uglifier"
 gem "bootsnap", require: false
 <% if options[:webpack] %>

data/templates/_javascript.html.erb

@@ -1,10 +1,3 @@
 <%= javascript_include_tag :application %>
 
 <%= yield :javascript %>
-
-<% if Rails.env.test? %>
-  <%= javascript_tag do %>
-    $.fx.off = true;
-    $.ajaxSetup({ async: false });
-  <% end %>
-<% end %>

data/templates/factory_bot_rspec.rb

@@ -1,3 +1,5 @@
+FactoryBot.use_parent_strategy = true
+
 RSpec.configure do |config|
   config.include FactoryBot::Syntax::Methods
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.49.0
+  version: 1.50.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -91,10 +91,12 @@ files:
 - lib/suspenders/generators/forms_generator.rb
 - lib/suspenders/generators/jobs_generator.rb
 - lib/suspenders/generators/js_driver_generator.rb
+- lib/suspenders/generators/json_generator.rb
 - lib/suspenders/generators/lint_generator.rb
 - lib/suspenders/generators/production/email_generator.rb
 - lib/suspenders/generators/production/force_tls_generator.rb
 - lib/suspenders/generators/production/timeout_generator.rb
+- lib/suspenders/generators/staging/pull_requests_generator.rb
 - lib/suspenders/generators/static_generator.rb
 - lib/suspenders/generators/stylesheet_base_generator.rb
 - lib/suspenders/generators/testing_generator.rb
@@ -107,8 +109,10 @@ files:
 - spec/features/cli_help_spec.rb
 - spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
+- spec/features/json_spec.rb
 - spec/features/new_project_spec.rb
 - spec/features/production/email_spec.rb
+- spec/features/staging/pull_requests_spec.rb
 - spec/spec_helper.rb
 - spec/support/contain_json_matcher.rb
 - spec/support/exist_as_a_file_matcher.rb
@@ -170,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.1
+      version: 2.5.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -178,24 +182,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.7.4
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.
-test_files:
-- spec/adapters/heroku_spec.rb
-- spec/fakes/bin/heroku
-- spec/fakes/bin/hub
-- spec/features/api_spec.rb
-- spec/features/cli_help_spec.rb
-- spec/features/github_spec.rb
-- spec/features/heroku_spec.rb
-- spec/features/new_project_spec.rb
-- spec/features/production/email_spec.rb
-- spec/spec_helper.rb
-- spec/support/contain_json_matcher.rb
-- spec/support/exist_as_a_file_matcher.rb
-- spec/support/fake_github.rb
-- spec/support/fake_heroku.rb
-- spec/support/match_contents_matcher.rb
-- spec/support/suspenders.rb
+test_files: []