suspenders 1.55.1 → 20230113.0

data/lib/suspenders/generators/app_generator.rb

@@ -3,43 +3,47 @@ require "rails/generators/rails/app/app_generator"
 
 module Suspenders
   class AppGenerator < Rails::Generators::AppGenerator
+    include ExitOnFailure
+
     hide!
 
     class_option :database, type: :string, aliases: "-d", default: "postgresql",
-                            desc: "Configure for selected database (options: #{DATABASES.join("/")})"
+      desc: "Configure for selected database (options: #{DATABASES.join("/")})"
 
     class_option :heroku, type: :boolean, aliases: "-H", default: false,
-                          desc: "Create staging and production Heroku apps"
+      desc: "Create staging and production Heroku apps"
 
     class_option :heroku_flags, type: :string, default: "",
-                                desc: "Set extra Heroku flags"
+      desc: "Set extra Heroku flags"
 
     class_option :github, type: :string, default: nil,
-                          desc: "Create Github repository and add remote origin pointed to repo"
+      desc: "Create Github repository and add remote origin pointed to repo"
 
     class_option :version, type: :boolean, aliases: "-v", group: :suspenders,
-                           desc: "Show Suspenders version number and quit"
+      desc: "Show Suspenders version number and quit"
 
     class_option :help, type: :boolean, aliases: "-h", group: :suspenders,
-                        desc: "Show this help message and quit"
-
-    class_option :path, type: :string, default: nil,
-                        desc: "Path to the gem"
+      desc: "Show this help message and quit"
 
     class_option :skip_test, type: :boolean, default: true,
-                             desc: "Skip Test Unit"
+      desc: "Skip Test Unit"
 
     class_option :skip_system_test,
       type: :boolean, default: true, desc: "Skip system test files"
 
-    class_option :skip_turbolinks,
-      type: :boolean, default: true, desc: "Skip turbolinks gem"
+    class_option :css,
+      type: :string, default: "postcss", aliases: "-c", desc: "Choose CSS processor"
 
     def finish_template
       invoke :suspenders_customization
       super
     end
 
+    def leftovers
+      generate("suspenders:stylesheet_base") unless options[:api] || options[:css] != "postcss"
+      invoke :outro
+    end
+
     def suspenders_customization
       invoke :customize_gemfile
       invoke :setup_development_environment
@@ -54,11 +58,12 @@ module Suspenders
       invoke :generate_deployment_default
       invoke :remove_config_comment_lines
       invoke :remove_routes_comment_lines
-      invoke :outro
+      invoke :run_database_migrations
+      invoke :generate_views
     end
 
     def customize_gemfile
-      build :replace_gemfile, options[:path]
+      build :replace_gemfile
       bundle_command "install"
     end
 
@@ -80,6 +85,7 @@ module Suspenders
       build :set_test_delivery_method
       build :raise_on_unpermitted_parameters
       build :provide_setup_script
+      build :provide_yarn_script
       build :configure_generators
       build :configure_i18n_for_missing_translations
       build :configure_quiet_assets
@@ -137,19 +143,20 @@ module Suspenders
       build :remove_routes_comment_lines
     end
 
+    def run_database_migrations
+      build :run_database_migrations
+    end
+
     def generate_default
-      run("spring stop")
+      run("spring stop > /dev/null 2>&1 || true")
       generate("suspenders:runner")
       generate("suspenders:profiler")
       generate("suspenders:json")
       generate("suspenders:static")
-      generate("suspenders:stylesheet_base")
       generate("suspenders:testing")
       generate("suspenders:ci")
       generate("suspenders:js_driver")
-      unless options[:api]
-        generate("suspenders:forms")
-      end
+      generate("suspenders:forms") unless options[:api]
       generate("suspenders:db_optimizations")
       generate("suspenders:factories")
       generate("suspenders:lint")
@@ -157,7 +164,6 @@ module Suspenders
       generate("suspenders:analytics")
       generate("suspenders:inline_svg")
       generate("suspenders:advisories")
-      generate("suspenders:preloader")
     end
 
     def generate_deployment_default
@@ -176,7 +182,7 @@ module Suspenders
     end
 
     def outro
-      say "Congratulations! You just pulled our suspenders."
+      say "\nCongratulations! You just pulled our suspenders."
       say honeybadger_outro
     end
 

data/lib/suspenders/generators/base.rb

@@ -5,6 +5,7 @@ module Suspenders
   module Generators
     class Base < Rails::Generators::Base
       include Suspenders::Actions
+      include ExitOnFailure
 
       def self.default_source_root
         File.expand_path(File.join("..", "..", "..", "templates"), __dir__)

data/lib/suspenders/generators/jobs_generator.rb

@@ -3,14 +3,10 @@ require_relative "base"
 module Suspenders
   class JobsGenerator < Generators::Base
     def add_jobs_gem
-      gem "delayed_job_active_record"
+      gem "sidekiq"
       Bundler.with_unbundled_env { run "bundle install" }
     end
 
-    def configure_background_jobs_for_rspec
-      generate "delayed_job:active_record"
-    end
-
     def initialize_active_job
       copy_file(
         "active_job.rb",
@@ -19,9 +15,12 @@ module Suspenders
     end
 
     def configure_active_job
-      configure_application_file(
-        "config.active_job.queue_adapter = :delayed_job"
-      )
+      configure_application_file("config.active_job.queue_adapter = :sidekiq")
+      configure_application_file("config.action_mailer.deliver_later_queue_name = nil")
+      configure_application_file("config.action_mailbox.queues.routing = nil")
+      configure_application_file("config.active_storage.queues.analysis = nil")
+      configure_application_file("config.active_storage.queues.purge = nil")
+      configure_application_file("config.active_storage.queues.mirror = nil")
       configure_environment "test", "config.active_job.queue_adapter = :inline"
     end
 

data/lib/suspenders/generators/json_generator.rb

@@ -6,5 +6,9 @@ module Suspenders
       gem "oj"
       Bundler.with_unbundled_env { run "bundle install" }
     end
+
+    def configure_oj
+      copy_file "oj.rb", "config/initializers/oj.rb"
+    end
   end
 end

data/lib/suspenders/generators/production/email_generator.rb

@@ -7,14 +7,14 @@ module Suspenders
         copy_file "smtp.rb", "config/smtp.rb"
 
         prepend_file "config/environments/production.rb",
-          %{require Rails.root.join("config/smtp")\n}
+          %{require Rails.root.join("config/smtp")\n\n}
       end
 
       def use_smtp
         inject_template_into_file(
           "config/environments/production.rb",
           "partials/email_smtp.rb",
-          after: "config.action_mailer.perform_caching = false"
+          after: "config.action_mailer.perform_caching = false\n"
         )
       end
 

data/lib/suspenders/generators/production/manifest_generator.rb

@@ -17,7 +17,7 @@ module Suspenders
             RACK_ENV: {required: true},
             SECRET_KEY_BASE: {generator: "secret"}
           },
-          addons: ["heroku-postgresql"]
+          addons: ["heroku-postgresql", "heroku-redis"]
         )
       end
     end

data/lib/suspenders/generators/stylesheet_base_generator.rb

@@ -2,29 +2,14 @@ require_relative "base"
 
 module Suspenders
   class StylesheetBaseGenerator < Generators::Base
-    def add_stylesheet_gems
-      gem "bourbon", ">= 6.0.0"
-      Bundler.with_unbundled_env { run "bundle install" }
-    end
-
-    def remove_prior_config
-      remove_file "app/assets/stylesheets/application.css"
-    end
-
-    def add_css_config
+    def setup_normalize
+      run "yarn add postcss-normalize"
       copy_file(
-        "application.scss",
-        "app/assets/stylesheets/application.scss",
+        "application.postcss.css",
+        "app/assets/stylesheets/application.postcss.css",
         force: true
       )
-    end
-
-    def install_bitters
-      run "bitters install --path app/assets/stylesheets"
-    end
-
-    def install_normalize_css
-      run "bin/yarn add normalize.css"
+      copy_file "postcss.config.js", "postcss.config.js", force: true
     end
   end
 end

data/lib/suspenders/generators/testing_generator.rb

@@ -3,8 +3,7 @@ require_relative "base"
 module Suspenders
   class TestingGenerator < Generators::Base
     def add_testing_gems
-      gem "spring-commands-rspec", group: :development
-      gem "rspec-rails", "~> 3.6", group: %i[development test]
+      gem "rspec-rails", "~> 5.1", group: %i[development test]
       gem "shoulda-matchers", group: :test
 
       Bundler.with_unbundled_env { run "bundle install" }

data/lib/suspenders/generators/views_generator.rb

@@ -11,11 +11,6 @@ module Suspenders
       copy_file "flashes_helper.rb", "app/helpers/flashes_helper.rb"
     end
 
-    def create_shared_javascripts
-      copy_file "_javascript.html.erb",
-        "app/views/application/_javascript.html.erb"
-    end
-
     def create_shared_css_overrides
       copy_file "_css_overrides.html.erb",
         "app/views/application/_css_overrides.html.erb"

data/lib/suspenders/version.rb

@@ -1,8 +1,8 @@
 module Suspenders
-  RAILS_VERSION = "~> 6.0.0".freeze
+  RAILS_VERSION = "~> 7.0.0".freeze
   RUBY_VERSION = IO
     .read("#{File.dirname(__FILE__)}/../../.ruby-version")
     .strip
     .freeze
-  VERSION = "1.55.1".freeze
+  VERSION = "20230113.0".freeze
 end

data/lib/suspenders.rb

@@ -1,4 +1,6 @@
 require "suspenders/version"
+require "suspenders/exit_on_failure"
+require "suspenders/generators/accessibility_generator"
 require "suspenders/generators/advisories_generator"
 require "suspenders/generators/app_generator"
 require "suspenders/generators/static_generator"
@@ -16,7 +18,6 @@ require "suspenders/generators/js_driver_generator"
 require "suspenders/generators/json_generator"
 require "suspenders/generators/testing_generator"
 require "suspenders/generators/inline_svg_generator"
-require "suspenders/generators/preloader_generator"
 require "suspenders/generators/profiler_generator"
 require "suspenders/generators/runner_generator"
 require "suspenders/generators/production/force_tls_generator"
@@ -28,5 +29,6 @@ require "suspenders/generators/production/manifest_generator"
 require "suspenders/generators/production/single_redirect"
 require "suspenders/generators/staging/pull_requests_generator"
 require "suspenders/actions"
+require "suspenders/actions/strip_comments_action"
 require "suspenders/adapters/heroku"
 require "suspenders/app_builder"

data/templates/Gemfile.erb

@@ -7,11 +7,14 @@ end
 
 ruby "<%= Suspenders::RUBY_VERSION %>"
 
-<% unless options[:api] %>
-gem "autoprefixer-rails"
+<% if options[:api] %>
+gem "sprockets", "< 4"
 <% end %>
+
 gem "bootsnap", require: false
+gem "cssbundling-rails"
 gem "honeybadger"
+gem "jsbundling-rails"
 gem "pg"
 gem "puma"
 gem "rack-canonical-host"
@@ -19,10 +22,11 @@ gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 gem "recipient_interceptor"
 gem "sassc-rails"
 gem "skylight"
-gem "sprockets", "< 4"
+gem "sprockets-rails"
+gem "stimulus-rails"
 gem "title"
+gem "turbo-rails"
 gem "tzinfo-data", platforms: [:mingw, :x64_mingw, :mswin, :jruby]
-gem "webpacker"
 
 group :development do
   gem "listen"

data/templates/Procfile

@@ -1,2 +1,2 @@
 web: bundle exec puma -p $PORT -C ./config/puma.rb
-worker: bundle exec rails jobs:work
+worker: bundle exec sidekiq

data/templates/active_job.rb

@@ -1,4 +1,5 @@
 require "active_job/logging"
+require "active_job/log_subscriber"
 
 ActiveSupport::Notifications.unsubscribe("enqueue.active_job")
 

data/templates/application.postcss.css

@@ -0,0 +1 @@
+@import "normalize.css"

data/templates/bin_yarn

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  yarn = ENV["PATH"].split(File::PATH_SEPARATOR)
+    .select { |dir| File.expand_path(dir) != __dir__ }
+    .product(["yarn", "yarnpkg", "yarn.cmd", "yarn.ps1"])
+    .map { |dir, file| File.expand_path(file, dir) }
+    .find { |file| File.executable?(file) }
+
+  if yarn
+    exec yarn, *ARGV
+  else
+    warn "Yarn executable was not detected in the system."
+    warn "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/templates/descriptions/jobs.md

@@ -1,3 +1,3 @@
 Set up our favorite job runner.
 
-Currently we like DelayedJob. Run all tests inline by default.
+Currently we like Sidekiq. Run all tests inline by default.

data/templates/descriptions/runner.md

@@ -1,6 +1,6 @@
 Set up the app to run locally with ease.
 
-Use Puma and the Rails jobs runner to run the app. This can be done via either
+Use Puma and Sidekiq to run the app. This can be done via either
 `heroku local` or any Foreman-compatible project runner (e.g. `foreman start`).
 
 Configure your app using `.env`. Installs a basic `.sample.env` that is meant

data/templates/descriptions/stylesheet_base.md

@@ -1,4 +1 @@
-Set up the basic tools needed for the thoughtbot design system.
-
-This integrates the Bourbon library of Scss mixins with Normalize.css as a
-reset, then re-styles it by bringing Bitters into your project.
+Adds PostCSS Normalize

data/templates/descriptions/testing.md

@@ -6,4 +6,4 @@ Set up the project for an in-depth test-driven development workflow.
 - Prepare for system tests in `spec/system`.
 - Integrate Formulaic for easier form testing.
 - RSpec infers the file type based on the directory name.
-- Install and configure RSpec and shoulda-matchers, with Spring integration.
+- Install and configure RSpec and shoulda-matchers.

data/templates/errors.rb

@@ -12,6 +12,7 @@ HTTP_ERRORS = [
   EOFError,
   Errno::ECONNRESET,
   Errno::EINVAL,
+  Errno::ECONNREFUSED,
   Net::HTTPBadResponse,
   Net::HTTPHeaderSyntaxError,
   Net::ProtocolError,

data/templates/oj.rb

@@ -0,0 +1,3 @@
+require "oj"
+
+Oj.optimize_rails

data/templates/partials/email_smtp.rb

@@ -1,2 +1,2 @@
-config.action_mailer.delivery_method = :smtp
-config.action_mailer.smtp_settings = SMTP_SETTINGS
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.smtp_settings = SMTP_SETTINGS

data/templates/partials/pull_requests_config.rb

@@ -1,4 +1,5 @@
-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
+  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
+

data/templates/postcss.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+  plugins: [
+    require('postcss-nesting'),
+    require('autoprefixer'),
+    require('postcss-normalize')
+  ],
+}
+

data/templates/postgresql_database.yml.erb

@@ -6,6 +6,7 @@ development: &default
   pool: <%%= Integer(ENV.fetch("DB_POOL", 5)) %>
   reaping_frequency: <%%= Integer(ENV.fetch("DB_REAPING_FREQUENCY", 10)) %>
   timeout: 5000
+  url:  <%%= ENV["DATABASE_URL"] %>
 
 test:
   <<: *default

data/templates/sample_env

@@ -3,6 +3,7 @@ ASSET_HOST=localhost:3000
 APPLICATION_HOST=localhost:3000
 PORT=3000
 RACK_ENV=development
+REDIS_URL=localhost:6379
 SECRET_KEY_BASE=development_secret
 SMTP_ADDRESS=smtp.example.com
 SMTP_DOMAIN=example.com

data/templates/suspenders_layout.html.erb.erb

@@ -1,21 +1,23 @@
 <!DOCTYPE html>
 <html lang="<%= I18n.locale %>">
 <head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
   <%%#
     Configure default and controller-, and view-specific titles in
     config/locales/en.yml. For more see:
     https://github.com/calebthompson/title#usage
   %>
   <title><%%= title %></title>
-  <%%= stylesheet_link_tag :application, media: "all" %>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
   <%%= csrf_meta_tags %>
+  <%%= csp_meta_tag %>
+
+  <%%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
+  <%%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
 </head>
 <body>
   <%%= render "flashes" -%>
   <%%= yield %>
-  <%%= render "javascript" %>
   <%%= render "css_overrides" %>
 </body>
 </html>