welaika-suspenders 2.36 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 890e00ac9d3e53837f98a7dbf3cf158bba6d8582c65f48112b428d35852ac388
-  data.tar.gz: 7e9395ed08ac1eb6aa369478a0f1678f35ce68a733694335ca7235fe7e65c6b3
+  metadata.gz: f412edc2284c8de2c67dc3a734b0029f2f570fdfe923c5d1afb62d4065965627
+  data.tar.gz: 5ca061824c55a183c1e2330f0b49de0ae8883017a1ea4c4c52fffe9df0ae8717
 SHA512:
-  metadata.gz: 363fe3371d203c7ab31ff04b5fe7ca58a09c874f28aabc0cbe944591ec438a84a966232e028f171ae4b4ec1b1f183f2d564b7440143007ca41c8e31e5afcad90
-  data.tar.gz: 319cf29a2b8006c7b22f8af13f678401a5e4a84c91fa60f7680fe28c36d57228df9e87ce11416fa0e80721f49ca9b685c299b1be1683868b7b148b396b3b1c72
+  metadata.gz: b634b27230111bbc6ad6cc8828ec57a2d9122a8fb1f1368cf21991668f0f960df259eb29542474517408ffc46848fc95fb761d88f193b19135ac54407d5c82ac
+  data.tar.gz: a4fad671b74e728830108969d56950acca33554dc483d427044c6f80687d2d733fe1d8ec0f28d1458cce019fe0cbb05540f58bcd1390da7793264b41555fc572

data/CHANGELOG_WELAIKA.md

@@ -1,3 +1,6 @@
+3.0 (October 20th, 2019)
+* Feature: Rails 6, but welaika-suspenders 2 still continue to support rails 5 for some time
+
 2.36 (October 20th, 2019)
 * Feature: add nvmrc with latest node lts (dubnium)
 * Fix: heroku auto migrate functionality

data/lib/suspenders/generators/base.rb

@@ -13,7 +13,7 @@ module Suspenders
       private
 
       def app_name
-        Rails.app_class.parent_name.demodulize.underscore.dasherize
+        Rails.app_class.module_parent_name.demodulize.underscore.dasherize
       end
     end
   end

data/lib/suspenders/generators/js_driver_generator.rb

@@ -3,9 +3,9 @@ require_relative "base"
 module Suspenders
   class JsDriverGenerator < Generators::Base
     def add_gems
-      gem 'capybara', '>= 2.15', '< 4.0', group: :test
+      gem 'capybara', '>= 2.15', group: :test
       gem 'selenium-webdriver', group: :test
-      gem 'webdrivers', '~> 4.0', group: :test
+      gem 'webdrivers', group: :test
       Bundler.with_clean_env { run "bundle install" }
     end
 

data/lib/suspenders/version.rb

@@ -1,9 +1,9 @@
 module Suspenders
-  RAILS_VERSION = "~> 5.2.3".freeze
+  RAILS_VERSION = "~> 6.0.0".freeze
   POSTGRES_VERSION = "11".freeze # Used in CI
   RUBY_VERSION = IO.
     read("#{File.dirname(__FILE__)}/../../.ruby-version").
     strip.
     freeze
-  VERSION = "2.36".freeze
+  VERSION = "3.0".freeze
 end

data/spec/features/new_project_spec.rb

@@ -240,7 +240,7 @@ RSpec.describe "Suspend a new project with default configuration" do
   end
 
   it "doesn't use turbolinks" do
-    app_js = read_project_file(%w(app assets javascripts application.js))
+    app_js = read_project_file(%w(app javascript packs application.js))
     expect(app_js).not_to match(/turbolinks/)
   end
 

data/templates/Gemfile.erb

@@ -9,8 +9,6 @@ end
 
 ruby '<%= Suspenders::RUBY_VERSION %>'
 
-gem 'bootsnap', '>= 1.1.0', require: false
-gem 'coffee-rails', '~> 4.2'
 gem 'email_validator'
 gem 'interactor'
 gem 'pg', '>= 0.18', '< 2.0'
@@ -22,10 +20,19 @@ gem 'recipient_interceptor'
 gem 'sassc-rails'
 gem 'sprockets', '< 4'
 gem 'title'
-gem 'uglifier', '>= 1.3.0'
-<% if options[:webpack] %>
-gem 'webpacker'
-<% end %>
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'webpacker', '~> 4.0'
+
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 4.0'
+# Use Active Model has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+# Use Active Storage variant
+# gem 'image_processing', '~> 1.2'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+# gem 'jbuilder', '~> 2.7'
+
+gem 'bootsnap', '>= 1.4.2', require: false
 
 group :development do
   gem 'letter_opener'
@@ -39,7 +46,7 @@ group :development, :test do
   gem 'dotenv-rails'
   gem 'pry-byebug'
   gem 'pry-rails'
-  gem 'welaika-suspenders', '< 3'
+  gem 'welaika-suspenders', '>=3'
 end
 
 group :test do
@@ -48,4 +55,3 @@ group :test do
   gem 'timecop'
   gem 'webmock'
 end
-

data/templates/_javascript.html.slim

@@ -1,3 +1,3 @@
-= javascript_include_tag :application
+= javascript_pack_tag :application
 
 = yield :javascript

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: '2.36'
+  version: '3.0'
 platform: ruby
 authors:
 - thoughtbot
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement