welaika-suspenders 2.28.0 → 2.29.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fb58f9064558206c892628144c70454883cb9d5a
-  data.tar.gz: be931d3210db58476f0b83f9cdad1f7657cb0948
+SHA256:
+  metadata.gz: f2bc8b6b54027c607ac3d40740602bb464a24c69baebdccbf0274b6bcf52b541
+  data.tar.gz: c6145805c840fd18b6e4b40e63332de24bc626f6f0de7b8f7fc83b816f2b7e5a
 SHA512:
-  metadata.gz: e7ea1c8aa4ccbca4a1452b6dad622b280e4ea73d14b025f978b052577e2425e02bf9158aada3f1b21743f81917c725d54b7bdb9814422ec40dbf00242ea0c7af
-  data.tar.gz: 3e4b7a2fb33324933a13a5014c900b8effe9979d148d458cbdc0047418b11aadb38ff315e66fd8c31a05276f720f5775b7a096dc3fd0af59bc3fa6609f2582d7
+  metadata.gz: 9d92f5e43680df4e9dca8a24618153f3d98cd5ee5de61504b0b8a0fddc796a33b25b90a9189d501150ace679d85343de2a566bcc97e66092cead0ebc9545b55c
+  data.tar.gz: 90adc4777638db3f20b4caac5ca84a7fadb5a7acf3662f041a396d9a304fca49483c871e65b86f62fb9841393b42620336e63c12548fcc62b6df8c1f3f913f9e

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.1

data/.travis.yml

@@ -1,11 +1,13 @@
 language: ruby
-rvm: 2.4.1
+rvm: 2.5.1
 cache: bundler
 sudo: false
 before_install:
   - "echo '--colour' > ~/.rspec"
   - git config --global user.name 'Travis CI'
   - git config --global user.email 'travis-ci@example.com'
+  - gem install bundler
+  - gem update --system
 install: bundle install
 notifications:
   email: false

data/CONTRIBUTING.md

@@ -13,9 +13,6 @@ Set up your machine:
 
     ./bin/setup
 
-If you're having trouble installing `capybara-webkit` check their [installation
-instructions](https://github.com/thoughtbot/capybara-webkit#qt-dependency-and-installation-issues).
-
 Make sure the tests pass:
 
     rake
@@ -52,3 +49,11 @@ We may suggest changes.
 
 To update the Ruby version,
 change `.ruby-version` and `.travis.yml`.
+
+If you see this error while running tests:
+
+```
+Your Ruby version is XXX, but your Gemfile specified YYY (Bundler::RubyVersionMismatch)
+```
+
+Try removing the `tmp/` directory and re-running the tests.

data/NEWS.md

@@ -1,3 +1,38 @@
+* Bug fix: change production timeouts generator to use working configuration
+  method with latest version of Rack::Timeout
+
+1.47.0 (May 25, 2018)
+
+* Bug fix: normalize.css Sass import is concatenated with other styles now
+* Bug fix: the suspenders gem itself is not needed in production
+* Bug fix: bundle install after adding a gem
+* Breaking: remove Refills
+* Breaking: rename suspenders:enforce_ssl to suspenders:production:force_tls
+* Upgrade: update to Ruby 2.5.1
+* Upgrade: update to Rails 5.2.0
+* New generator: production email
+* New generator: production timeouts
+
+1.46.0 (January 26, 2018)
+
+* Bug fix: Fix for action mailer asset_host
+* Bug fix: Lock pg to ~> 0.18
+* Breaking: Remove Database Cleaner
+* Upgrade: Update to Rails 5.1.4
+* Upgrade: Update to Ruby 2.5.0
+* Upgrade: Update bourbon from 5.0.0.beta.8 to 5.0.0
+* Upgrade: Update FactoryGirl to FactoryBot
+* Generators: Analytics generator
+* Generators: CI generator
+* Generators: DB optimization generator
+* Generators: Factories generator
+* Generators: Forms generator
+* Generators: Javascript driver generator
+* Generators: Jobs generator
+* Generators: Lint generator
+* Generators: Testing driver generator
+* Generators: Views generator
+
 1.45.0 (September 8, 2017)
 
 * Bump Rails to 5.1.3 (#857)

data/README.md

@@ -64,7 +64,7 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - add some html meta tags
 - use EU region as default for Heroku
 - use CDATA wrapper for javascript
-- create common folders like `app/queries`, `app/services`, etc.
+- create common folders like `app/queries`, `app/interactions`, etc.
 - use `application.sass` instead of `application.scss`
 - add `brakeman` gem
 - set `Rome` as `time_zone`

data/RELEASING.md

@@ -1,19 +1,18 @@
 # Releasing
 
-1. Update `lib/suspenders/version.rb` file accordingly.
-2. Update `NEWS.md` to reflect the changes since last release.
+1. Update `NEWS.md` to reflect the changes since last release.
+2. Update `lib/suspenders/version.rb` file accordingly.
 3. Commit changes. There shouldn't be code changes, and thus CI doesn't need to
-   run, you can then add `[ci skip]` to the commit message.
+   run; you can add `[ci skip]` to the commit message.
 4. Tag the release: `git tag vVERSION -a -s`. The tag message should contain the
    appropriate `NEWS.md` subsection.
 5. Push changes: `git push --tags`
 6. Build and publish to rubygems:
-   ```bash
+   ```sh
    gem build suspenders.gemspec
    gem push suspenders-*.gem
    ```
-
 7. Add a new GitHub release:
    https://github.com/thoughtbot/suspenders/releases/new?tag=vVERSION
-8. Announce the new release, making sure to say "thank you" to the contributors
-   who helped shape this version!
+8. Announce the new release, making sure to thank the contributors who helped
+   shape this version!

data/Rakefile

@@ -5,4 +5,4 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:rspec)
 
 desc 'Run the test suite'
-task :default => :rspec
+task default: :rspec

data/diff_suspenders.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+diff --minimal \
+     --brief \
+     --ignore-all-space \
+     --recursive \
+     --exclude=".git" \
+     --exclude="pkg" \
+     --exclude="tmp" \
+     --exclude="README.md" \
+     --exclude="NEWS.md" \
+     --exclude="USAGE" \
+     --exclude="LICENSE" \
+     --exclude="Gemfile.lock" \
+     ./ ../suspenders

data/lib/suspenders.rb

@@ -1,9 +1,22 @@
-require 'suspenders/version'
-require 'suspenders/generators/app_generator'
-require "suspenders/generators/enforce_ssl_generator"
-require "suspenders/generators/initialize_active_job_generator"
-require 'suspenders/generators/static_generator'
-require 'suspenders/generators/stylesheet_base_generator'
-require 'suspenders/actions'
+require "suspenders/version"
+require "suspenders/generators/app_generator"
+require "suspenders/generators/static_generator"
+require "suspenders/generators/stylesheet_base_generator"
+require "suspenders/generators/forms_generator"
+require "suspenders/generators/ci_generator"
+require "suspenders/generators/db_optimizations_generator"
+require "suspenders/generators/factories_generator"
+require "suspenders/generators/lint_generator"
+require "suspenders/generators/views_generator"
+require "suspenders/generators/js_driver_generator"
+require "suspenders/generators/testing_generator"
+require "suspenders/generators/decorator_generator"
+require "suspenders/generators/error_reporting_generator"
+require "suspenders/generators/faker_generator"
+require "suspenders/generators/security_generator"
+require "suspenders/generators/production/force_tls_generator"
+require "suspenders/generators/production/email_generator"
+require "suspenders/generators/production/timeout_generator"
+require "suspenders/actions"
 require "suspenders/adapters/heroku"
-require 'suspenders/app_builder'
+require "suspenders/app_builder"

data/lib/suspenders/actions.rb

@@ -19,14 +19,6 @@ module Suspenders
       configure_environment(rails_env, config)
     end
 
-    def configure_application_file(config)
-      inject_into_file(
-        "config/application.rb",
-        "\n\n    #{config}",
-        before: "\n  end"
-      )
-    end
-
     def configure_environment(rails_env, config)
       inject_into_file(
         "config/environments/#{rails_env}.rb",
@@ -34,5 +26,60 @@ module Suspenders
         before: "\nend"
       )
     end
+
+    def expand_json(file, data)
+      action ExpandJson.new(destination_root, file, data)
+    end
+
+    class ExpandJson
+      def initialize(destination_root, file, data)
+        @destination_root = destination_root
+        @file = file
+        @data = data
+      end
+
+      def invoke!
+        write_out { |existing_json| existing_json.merge(data) }
+      end
+
+      def revoke!
+        write_out { |existing_json| hash_unmerge(existing_json, data) }
+      end
+
+      private
+
+      attr_reader :destination_root, :file, :data
+
+      def write_out
+        new_json = yield(existing_json)
+        IO.write(destination_file, JSON.pretty_generate(new_json))
+      end
+
+      def destination_file
+        File.join(destination_root, file)
+      end
+
+      def existing_json
+        JSON.parse(IO.read(destination_file))
+      rescue Errno::ENOENT
+        {}
+      end
+
+      def hash_unmerge(hash, subhash)
+        subhash.reduce(hash) do |acc, (k, v)|
+          if hash.has_key?(k)
+            if v == hash[k]
+              acc.except(k)
+            elsif v.is_a?(Hash)
+              acc.merge(k => hash_unmerge(hash[k], v))
+            else
+              acc
+            end
+          else
+            acc
+          end
+        end
+      end
+    end
   end
 end

data/lib/suspenders/app_builder.rb

@@ -55,23 +55,6 @@ module Suspenders
       )
     end
 
-    def add_bullet_gem_configuration
-      config = <<-RUBY
-  config.after_initialize do
-    Bullet.enable = true
-    Bullet.bullet_logger = true
-    Bullet.rails_logger = true
-  end
-
-      RUBY
-
-      inject_into_file(
-        "config/environments/development.rb",
-        config,
-        after: "config.action_mailer.raise_delivery_errors = true\n",
-      )
-    end
-
     def raise_on_unpermitted_parameters
       config = <<-RUBY
     config.action_controller.action_on_unpermitted_parameters = :raise
@@ -93,15 +76,10 @@ module Suspenders
       run "chmod a+x bin/setup"
     end
 
-    def provide_dev_prime_task
-      copy_file 'dev.rake', 'lib/tasks/dev.rake'
-    end
-
     def configure_generators
       config = <<-RUBY
 
     config.generators do |generate|
-      generate.controller_specs false
       generate.helper false
       generate.javascripts false
       generate.request_specs false
@@ -116,33 +94,8 @@ module Suspenders
       inject_into_class 'config/application.rb', 'Application', config
     end
 
-    def set_up_factory_girl_for_rspec
-      copy_file 'factory_girl_rspec.rb', 'spec/support/factory_girl.rb'
-    end
-
-    def add_helpers_for_rspec
-      copy_file 'queries_helper_rspec.rb', 'spec/support/queries_helper.rb'
-      copy_file 'fixtures_helper_rspec.rb', 'spec/support/fixtures_helper.rb'
-    end
-
-    def set_up_faker
-      copy_file 'faker_rspec.rb', 'spec/support/faker.rb'
-    end
-
-    def configure_smtp
-      copy_file 'smtp.rb', 'config/smtp.rb'
-
-      prepend_file 'config/environments/production.rb',
-        %{require Rails.root.join("config/smtp")\n}
-
-      config = <<-RUBY
-
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = SMTP_SETTINGS
-      RUBY
-
-      inject_into_file 'config/environments/production.rb', config,
-        after: "config.action_mailer.raise_delivery_errors = false"
+    def configure_local_mail
+      copy_file "email.rb", "config/initializers/email.rb"
     end
 
     def enable_rack_canonical_host
@@ -167,9 +120,11 @@ module Suspenders
         "# config.action_controller.asset_host = 'http://assets.example.com'",
         'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("APPLICATION_HOST"))'
 
-      replace_in_file 'config/initializers/assets.rb',
-        "config.assets.version = '1.0'",
-        'config.assets.version = (ENV["ASSETS_VERSION"] || "1.0")'
+      if File.exist?("config/initializers/assets.rb")
+        replace_in_file 'config/initializers/assets.rb',
+          "config.assets.version = '1.0'",
+          'config.assets.version = (ENV["ASSETS_VERSION"] || "1.0")'
+      end
 
       config = <<-EOD
 config.public_file_server.headers = {
@@ -188,33 +143,6 @@ config.public_file_server.headers = {
       remove_file "config/initializers/wrap_parameters.rb"
     end
 
-    def create_partials_directory
-      empty_directory 'app/views/application'
-    end
-
-    def create_shared_flashes
-      copy_file '_flashes.html.slim', 'app/views/application/_flashes.html.slim'
-      copy_file "flashes_helper.rb", "app/helpers/flashes_helper.rb"
-    end
-
-    def create_shared_javascripts
-      copy_file '_javascript.html.slim', 'app/views/application/_javascript.html.slim'
-    end
-
-    def create_shared_css_overrides
-      copy_file(
-        "_css_overrides.html.erb",
-        "app/views/application/_css_overrides.html.erb",
-      )
-    end
-
-    def create_application_layout
-      remove_file 'app/views/layouts/application.html.erb'
-      template 'suspenders_layout.html.slim',
-        'app/views/layouts/application.html.slim',
-        force: true
-    end
-
     def use_postgres_config_template
       template 'postgresql_database.yml.erb', 'config/database.yml',
         force: true
@@ -234,58 +162,19 @@ config.public_file_server.headers = {
       end
     end
 
-    def set_ruby_to_version_being_used
+    def ruby_version
       create_file '.ruby-version', "#{Suspenders::RUBY_VERSION}\n"
     end
 
-    def enable_database_cleaner
-      copy_file 'database_cleaner_rspec.rb', 'spec/support/database_cleaner.rb'
-    end
-
-    def provide_shoulda_matchers_config
-      copy_file(
-        "shoulda_matchers_config_rspec.rb",
-        "spec/support/shoulda_matchers.rb"
-      )
-    end
-
-    def configure_spec_support_features
-      empty_directory_with_keep_file 'spec/features'
-      empty_directory_with_keep_file 'spec/support/features'
-    end
-
-    def configure_rspec
-      remove_file "spec/rails_helper.rb"
-      remove_file "spec/spec_helper.rb"
-      copy_file "rails_helper.rb", "spec/rails_helper.rb"
-      copy_file "spec_helper.rb", "spec/spec_helper.rb"
-    end
-
-    def configure_ci
-      template "circle.yml.erb", "circle.yml"
-    end
-
-    def configure_i18n_for_test_environment
-      copy_file "i18n.rb", "spec/support/i18n.rb"
-    end
-
     def configure_i18n_for_missing_translations
       raise_on_missing_translations_in("development")
       raise_on_missing_translations_in("test")
     end
 
-    def configure_background_jobs_for_rspec
-      run 'rails g delayed_job:active_record'
-    end
-
     def configure_action_mailer_in_specs
       copy_file 'action_mailer.rb', 'spec/support/action_mailer.rb'
     end
 
-    def configure_capybara
-      copy_file "capybara.rb", "spec/support/capybara.rb"
-    end
-
     def configure_locales_and_time_zone
       remove_file "config/locales/en.yml"
       template "config_locales_it.yml.erb", "config/locales/it.yml"
@@ -299,34 +188,6 @@ config.public_file_server.headers = {
       inject_into_class 'config/application.rb', 'Application', config
     end
 
-    def configure_rack_timeout
-      rack_timeout_config = <<-RUBY
-Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
-      RUBY
-
-      append_file "config/environments/production.rb", rack_timeout_config
-    end
-
-    def configure_slim
-      copy_file 'slim.rb', 'config/initializers/slim.rb'
-    end
-
-    def configure_simple_form
-      bundle_command "exec rails generate simple_form:install"
-    end
-
-    def configure_draper
-      bundle_command "exec rails generate draper:install"
-    end
-
-    def configure_active_interaction
-      copy_file "sample_service.rb", "app/services/sample_service.rb"
-    end
-
-    def configure_errbit
-      copy_file "errbit.rb", "config/initializers/errbit.rb"
-    end
-
     def configure_action_mailer
       action_mailer_host "development", %{"localhost:3000"}
       action_mailer_asset_host "development", %{"http://localhost:3000"}
@@ -339,17 +200,6 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       )
     end
 
-    def configure_active_job
-      configure_application_file(
-        "config.active_job.queue_adapter = :delayed_job"
-      )
-      configure_environment "test", "config.active_job.queue_adapter = :inline"
-    end
-
-    def generate_rspec
-      generate 'rspec:install'
-    end
-
     def replace_default_puma_configuration
       copy_file "puma.rb", "config/puma.rb", force: true
     end
@@ -363,16 +213,17 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
         'app/decorators',
         'app/forms',
         'app/queries',
-        'app/services',
+        'app/interactions',
         'app/views/pages',
+        'spec/lib',
+        'spec/controllers',
+        'spec/helpers',
         'spec/decorators',
-        'spec/fixtures',
         'spec/forms',
-        'spec/helpers',
-        'spec/lib',
         'spec/queries',
-        'spec/requests',
-        'spec/services',
+        'spec/interactions',
+        'spec/fixtures',
+        'spec/factories',
         'spec/support/matchers',
         'spec/support/mixins',
         'spec/support/shared_examples'
@@ -408,35 +259,10 @@ you can deploy to staging and production with:
       run "chmod a+x bin/deploy"
     end
 
-    def setup_brakeman
-      copy_file "brakeman.rake", "lib/tasks/brakeman.rake"
-    end
-
-    def setup_slim_lint
-      copy_file "slim-lint.rake", "lib/tasks/slim-lint.rake"
-      copy_file "slim-lint.yml", ".slim-lint.yml"
-    end
-
-    def setup_rubocop
-      copy_file "rubocop.rake", "lib/tasks/rubocop.rake"
-      copy_file "rubocop.yml", ".rubocop.yml"
-      copy_file "rubocop_todo.yml", ".rubocop_todo.yml"
-    end
-
-    def setup_bundler_audit
-      copy_file "bundler_audit.rake", "lib/tasks/bundler_audit.rake"
-    end
-
     def setup_spring
       bundle_command "exec spring binstub --all"
     end
 
-    def create_binstubs
-      bundle_command "binstubs brakeman"
-      bundle_command "binstubs rubocop"
-      bundle_command "binstubs slim_lint"
-    end
-
     def copy_miscellaneous_files
       copy_file "browserslist", "browserslist"
       copy_file "errors.rb", "config/initializers/errors.rb"
@@ -451,8 +277,11 @@ you can deploy to staging and production with:
       EOS
 
       %w(500 404 422).each do |page|
-        inject_into_file "public/#{page}.html", meta_tags, after: "<head>\n"
-        replace_in_file "public/#{page}.html", /<!--.+-->\n/, ''
+        path = "public/#{page}.html"
+        if File.exist?(path)
+          inject_into_file path, meta_tags, after: "<head>\n"
+          replace_in_file path, /<!--.+-->\n/, ''
+        end
       end
     end