suspenders 1.41.0 → 1.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72448ddabb6379077f02f41bc65d4dc8a112d4f0
-  data.tar.gz: 3c56de92f55a3d7984a6dd8a011dd9001934ba10
+  metadata.gz: 5e05970d5749f52683a2dfdfa61a235ad491d845
+  data.tar.gz: dc6f0b8a74087e93f439d58201403b054ac750cb
 SHA512:
-  metadata.gz: bbc752c4b28b8b6dd86270c3d2986c58574fa684b8750ce854c2f7a981c076f5c9104b4b903a5322d04179412c68dab4b498d4a9dcc26eba4c05af678a2b67c7
-  data.tar.gz: 48226bb6d42963e7b0c6bd6bb39e8ab732c9455a2c619fea3618a785aedfea2b3f5b76f4242fbc3ebd7f3687a1510d91887371ebe2fbb5b040043954ada8e1ac
+  metadata.gz: 4037ab32f9b62c91360f7eac64c0de6a2e9e9ad90dea32ed13f2abd5b8964c5dbde5260d4845f713880d6c4e40a65d5e5ea13187a5f99dd65aa850c535d3e97e
+  data.tar.gz: db11125739ae1d52c4edf0be9b49baa8a531824dbc2c4510e87c0be9a8b4cf2512f1208a5641c2fb13d4091d4c34f3eba98ce499df7104478c268f61df93293b

data/NEWS.md

@@ -1,5 +1,12 @@
 master
 
+1.42.0 (July 23, 2016)
+
+* [#784] Require refills once
+* [#790] Ensure stylesheet_base generator runs with a clean bundle
+* [#791] Use Rails' 5 syntax for `public_file_server.headers`
+* [#792] Remove turbolinks from application.js file
+
 1.41.0 (July 1, 2016)
 
 * Update to Rails 5

data/lib/suspenders/app_builder.rb

@@ -43,6 +43,14 @@ module Suspenders
         'raise_delivery_errors = false', 'raise_delivery_errors = true'
     end
 
+    def remove_turbolinks
+      replace_in_file(
+        "app/assets/javascripts/application.js",
+        "//= require turbolinks",
+        ""
+      )
+    end
+
     def set_test_delivery_method
       inject_into_file(
         "config/environments/development.rb",
@@ -169,10 +177,13 @@ module Suspenders
         "config.assets.version = '1.0'",
         'config.assets.version = (ENV["ASSETS_VERSION"] || "1.0")'
 
-      configure_environment(
-        "production",
-        'config.static_cache_control = "public, max-age=31557600"',
-      )
+      config = <<-EOD
+config.public_file_server.headers = {
+    "Cache-Control" => "public, max-age=31557600",
+  }
+      EOD
+
+      configure_environment("production", config)
     end
 
     def setup_secret_token
@@ -322,15 +333,6 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       copy_file "Procfile", "Procfile"
     end
 
-    def install_refills
-      generate "refills:import", "flashes"
-      remove_dir "app/views/refills"
-    end
-
-    def install_bitters
-      run "bitters install --path app/assets/stylesheets"
-    end
-
     def setup_default_directories
       [
         'app/views/pages',

data/lib/suspenders/generators/app_generator.rb

@@ -39,9 +39,6 @@ module Suspenders
       invoke :setup_secret_token
       invoke :create_suspenders_views
       invoke :configure_app
-      invoke :setup_stylesheets
-      invoke :install_bitters
-      invoke :install_refills
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_config_comment_lines
@@ -80,6 +77,7 @@ module Suspenders
       say 'Setting up the development environment'
       build :raise_on_missing_assets_in_test
       build :raise_on_delivery_errors
+      build :remove_turbolinks
       build :set_test_delivery_method
       build :add_bullet_gem_configuration
       build :raise_on_unpermitted_parameters
@@ -141,21 +139,6 @@ module Suspenders
       build :setup_rack_mini_profiler
     end
 
-    def setup_stylesheets
-      say 'Set up stylesheets'
-      build :setup_stylesheets
-    end
-
-    def install_bitters
-      say 'Install Bitters'
-      build :install_bitters
-    end
-
-    def install_refills
-      say "Install Refills"
-      build :install_refills
-    end
-
     def setup_git
       if !options[:skip_git]
         say "Initializing git"
@@ -237,11 +220,8 @@ module Suspenders
 
     def generate_default
       run("spring stop")
-
       generate("suspenders:static")
       generate("suspenders:stylesheet_base")
-
-      bundle_command "install"
     end
 
     def outro

data/lib/suspenders/generators/static_generator.rb

@@ -4,6 +4,7 @@ module Suspenders
   class StaticGenerator < Rails::Generators::Base
     def add_high_voltage
       gem "high_voltage"
+      Bundler.with_clean_env { run "bundle install" }
     end
   end
 end

data/lib/suspenders/generators/stylesheet_base_generator.rb

@@ -10,6 +10,7 @@ module Suspenders
       gem "bourbon", "5.0.0.beta.6"
       gem "neat", "~> 1.8.0"
       gem "refills", group: [:development, :test]
+      Bundler.with_clean_env { run "bundle install" }
     end
 
     def add_css_config
@@ -23,5 +24,14 @@ module Suspenders
     def remove_prior_config
       remove_file "app/assets/stylesheets/application.css"
     end
+
+    def install_refills
+      generate "refills:import", "flashes"
+      remove_dir "app/views/refills"
+    end
+
+    def install_bitters
+      run "bitters install --path app/assets/stylesheets"
+    end
   end
 end

data/lib/suspenders/version.rb

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

data/spec/features/new_project_spec.rb

@@ -114,9 +114,10 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(result).to match(/^ +config.assets.quiet = true$/)
   end
 
-  it "configures static_cache_control in production" do
+  it "configures public_file_server.headers in production" do
+    IO.write("production_config.rb", production_config)
     expect(production_config).to match(
-      /config.static_cache_control = "public, max-age=.+"/,
+      /^ +config.public_file_server.headers = {\n +"Cache-Control" => "public,/,
     )
   end
 
@@ -262,10 +263,18 @@ RSpec.describe "Suspend a new project with default configuration" do
   end
 
   it "configures bourbon, neat, and refills" do
+    flashes_path = %w(app assets stylesheets refills _flashes.scss)
+    expect(read_project_file(flashes_path)).to match(/mixin/m)
+
     app_css = read_project_file(%w(app assets stylesheets application.scss))
     expect(app_css).to match(/normalize-rails.*bourbon.*neat.*base.*refills/m)
   end
 
+  it "doesn't use turbolinks" do
+    app_js = read_project_file(%w(app assets javascripts application.js))
+    expect(app_js).not_to match(/turbolinks/)
+  end
+
   def development_config
     @_development_config ||=
       read_project_file %w(config environments development.rb)

data/templates/Gemfile.erb

@@ -37,7 +37,6 @@ group :development, :test do
   gem "factory_girl_rails"
   gem "pry-byebug"
   gem "pry-rails"
-  gem "refills"
   gem "rspec-rails", "~> 3.5.0.beta4"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.41.0
+  version: 1.42.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters