combustion 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb6d2a6b0969112f3503bab5f3b9c4847118d4a7e109651cf1ac616de7d419b
-  data.tar.gz: 3d8ae68beb0394aec13846aafa2f20b4c195403e07a727106a61a1098ce3cc99
+  metadata.gz: d75fdd951c2753bc78da33f55e44da984f70f8ef688c09f350d672d4dd5cd6bc
+  data.tar.gz: 94a09faad89e5c0f14b2e696862cf9a13d72c06cf645287303bdcd3758c7a42e
 SHA512:
-  metadata.gz: e814d51e52656bc048850758136196e8f93bcb164e131773cf5d36c291a5568482550e1c9899d263d5d0a21e5f73cd523537db4114598f753885a275542623fe
-  data.tar.gz: c16a93e9c6130109c94a7b0324f4350eb96f6041512f419fac6666b0816ed11b1431c68efa20df803c0193ed820b8dd849f46bff767843f2d27fb8abc256e03b
+  metadata.gz: 27ab0c66fbf63e48f67acf75af81b29dda40bd8307633675097fc344521d52dbcbcc6e93695315272a5b9023c948743cff78f6f134084a2fc49e4565e2307a8c
+  data.tar.gz: 435840a9905a72fd0883499400a7b4abecb288c3d1d4c5f66da9a4280a4a440159e2634089a76de7c47dab2edd4a16152a1f4adb4c2716789d1b6b2385456157

data/.rubocop.yml

@@ -1,9 +1,6 @@
 inherit_from:
   - https://gist.githubusercontent.com/pat/ba3b8ffb1901bfe5439b460943b6b019/raw/.rubocop.yml
 
-AllCops:
-  TargetRubyVersion: 2.2
-
 Bundler/OrderedGems:
   Exclude:
     - 'gemfiles/*'
@@ -17,7 +14,7 @@ Layout/CaseIndentation:
 Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 
 Metrics/BlockLength:

data/.travis.yml

@@ -6,11 +6,11 @@ env:
     - "DB_ADAPTER=postgresql"
     - "DB_ADAPTER=mysql2"
 rvm:
-  - 2.2.10
   - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 before_install:
   - gem install bundler --version "~> 1.17"
 install:

data/HISTORY

@@ -1,3 +1,6 @@
+1.2.0 - April 18th 2020
+* Support ActiveStorage (Mikko Kokkonen).
+
 1.1.2 - November 4th 2019
 * Generate an empty asset manifest file for Rails 6.
 

data/README.md

@@ -10,10 +10,10 @@ Get the gem into either your gemspec or your Gemfile, depending on how you manag
 
 ```ruby
 # gemspec
-gem.add_development_dependency 'combustion', '~> 1.1'
+gem.add_development_dependency 'combustion', '~> 1.2'
 
 # Gemfile
-gem 'combustion', '~> 1.1'
+gem 'combustion', '~> 1.2'
 ```
 
 In your `spec_helper.rb`, get Combustion to set itself up - which has to happen before you introduce `rspec/rails` and - if being used - `capybara/rails`. Here's an example within context:

data/combustion.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "combustion"
-  s.version     = "1.1.2"
+  s.version     = "1.2.0"
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = "https://github.com/pat/combustion"
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pg"
   s.add_development_dependency "rails"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "rubocop", "~> 0.68.0"
+  s.add_development_dependency "rubocop", "~> 0.81"
   s.add_development_dependency "sqlite3"
 end

data/lib/combustion.rb

@@ -12,18 +12,27 @@ module Combustion
   self.path          = "/spec/internal"
   self.schema_format = :ruby
 
-  MODULES = if Rails.version.to_f >= 3.1
-    %w[ active_record action_controller action_view action_mailer sprockets ]
-  else
-    %w[ active_record action_controller action_view action_mailer ]
-  end
+  MODULES = begin
+    hash = {
+      :active_model      => "active_model/railtie",
+      :active_record     => "active_record/railtie",
+      :action_controller => "action_controller/railtie",
+      :action_mailer     => "action_mailer/railtie",
+      :action_view       => "action_view/railtie"
+    }
+
+    hash[:sprockets]      = "sprockets/railtie"     if Rails.version.to_f >= 3.1
+    hash[:active_storage] = "active_storage/engine" if Rails.version.to_f >= 5.2
+
+    hash
+  end.freeze
 
   def self.initialize!(*modules, &block)
     self.setup_environment = block if block_given?
 
     options = modules.extract_options!
-    modules = MODULES if modules == [:all]
-    modules.each { |mod| require "#{mod}/railtie" }
+    modules = MODULES.keys if modules == [:all]
+    modules.each { |mod| require MODULES[mod] }
 
     Bundler.require :default, Rails.env
 
@@ -65,8 +74,9 @@ module Combustion
   end
 end
 
-require "combustion/application"
 require "combustion/configurations/action_controller"
 require "combustion/configurations/action_mailer"
 require "combustion/configurations/active_record"
+require "combustion/configurations/active_storage"
+require "combustion/application"
 require "combustion/database"

data/lib/combustion/application.rb

@@ -6,6 +6,13 @@ Rails.env = ENV["RAILS_ENV"] || "test"
 
 module Combustion
   class Application < Rails::Application
+    CONFIGURERS = [
+      Combustion::Configurations::ActiveRecord,
+      Combustion::Configurations::ActionController,
+      Combustion::Configurations::ActionMailer,
+      Combustion::Configurations::ActiveStorage
+    ].freeze
+
     version = Rails.version.to_f
 
     # Core Settings
@@ -26,9 +33,7 @@ module Combustion
     def self.configure_for_combustion
       config.root = File.expand_path File.join(Dir.pwd, Combustion.path)
 
-      Combustion::Configurations::ActiveRecord.call config
-      Combustion::Configurations::ActionController.call config
-      Combustion::Configurations::ActionMailer.call config
+      CONFIGURERS.each { |configurer| configurer.call config }
 
       config.assets.enabled = true if defined?(Sprockets)
     end

data/lib/combustion/configurations/active_storage.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Combustion::Configurations::ActiveStorage
+  def self.call(config)
+    return unless defined?(ActiveStorage::Engine)
+
+    config.active_storage.service = :test
+  end
+end

data/lib/combustion/generator.rb

@@ -23,6 +23,7 @@ module Combustion
       template "templates/database.yml", "spec/internal/config/database.yml"
       template "templates/schema.rb",    "spec/internal/db/schema.rb"
       template "templates/config.ru",    "config.ru"
+      template "templates/storage.yml", "spec/internal/config/storage.yml"
 
       create_file "spec/internal/app/assets/config/manifest.js"
       create_file "spec/internal/public/favicon.ico"

data/spec/database_spec.rb

@@ -1,32 +1,24 @@
 # frozen_string_literal: true
 
-module Combustion
-  describe Database do
-    before(:all) do
-      Dir.chdir(File.expand_path("dummy", __dir__)) do
-        Combustion.initialize! :active_record
-      end
-    end
-
-    it "creates dummy table from migration in base database" do
-      expect(Model.connection.table_exists?("dummy_table")).to eq true
-      expect(Model.connection.table_exists?("dummy_in_another_db")).to eq false
-    end
+RSpec.describe Combustion::Database do
+  it "creates dummy table from migration in base database" do
+    expect(Model.connection.table_exists?("dummy_table")).to eq true
+    expect(Model.connection.table_exists?("dummy_in_another_db")).to eq false
+  end
 
-    it "creates another dummy table from another database" do
-      expect(ModelInAnotherDb.connection.table_exists?("dummy_table")).
-        to eq false
-      expect(ModelInAnotherDb.connection.table_exists?("dummy_in_another_db")).
-        to eq true
-    end
+  it "creates another dummy table from another database" do
+    expect(ModelInAnotherDb.connection.table_exists?("dummy_table")).
+      to eq false
+    expect(ModelInAnotherDb.connection.table_exists?("dummy_in_another_db")).
+      to eq true
+  end
 
-    it "returns test database for model with default connection" do
-      expect(Model.connection_config[:database]).to match(/test/)
-    end
+  it "returns test database for model with default connection" do
+    expect(Model.connection_config[:database]).to match(/test/)
+  end
 
-    it "returns test_another for model with connection to second database" do
-      expect(ModelInAnotherDb.connection_config[:database]).
-        to match(/test_another/)
-    end
+  it "returns test_another for model with connection to second database" do
+    expect(ModelInAnotherDb.connection_config[:database]).
+      to match(/test_another/)
   end
 end

data/spec/dummy/spec/internal/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//

data/spec/spec_helper.rb

@@ -13,3 +13,7 @@ if Rails::VERSION::STRING.to_f < 4.1
 end
 
 require File.expand_path("dummy/lib/engine.rb", __dir__)
+
+Dir.chdir(File.expand_path("dummy", __dir__)) do
+  Combustion.initialize! :all
+end

data/templates/storage.yml

@@ -0,0 +1,3 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2020-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: '0.81'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: '0.81'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +175,7 @@ files:
 - lib/combustion/configurations/action_controller.rb
 - lib/combustion/configurations/action_mailer.rb
 - lib/combustion/configurations/active_record.rb
+- lib/combustion/configurations/active_storage.rb
 - lib/combustion/database.rb
 - lib/combustion/database/load_schema.rb
 - lib/combustion/database/migrate.rb
@@ -191,6 +192,7 @@ files:
 - spec/dummy/db/migrate/20150717075542_create_dummy_test_table.rb
 - spec/dummy/db/migrate/20150717075543_create_dummy_test_table_in_another_db.rb
 - spec/dummy/lib/engine.rb
+- spec/dummy/spec/internal/app/assets/config/manifest.js
 - spec/dummy/spec/internal/app/models/model.rb
 - spec/dummy/spec/internal/app/models/model_in_another_db.rb
 - spec/dummy/spec/internal/config/database.yml
@@ -202,6 +204,7 @@ files:
 - templates/database.yml
 - templates/routes.rb
 - templates/schema.rb
+- templates/storage.yml
 homepage: https://github.com/pat/combustion
 licenses:
 - MIT
@@ -221,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Elegant Rails Engine Testing
@@ -230,6 +233,7 @@ test_files:
 - spec/dummy/db/migrate/20150717075542_create_dummy_test_table.rb
 - spec/dummy/db/migrate/20150717075543_create_dummy_test_table_in_another_db.rb
 - spec/dummy/lib/engine.rb
+- spec/dummy/spec/internal/app/assets/config/manifest.js
 - spec/dummy/spec/internal/app/models/model.rb
 - spec/dummy/spec/internal/app/models/model_in_another_db.rb
 - spec/dummy/spec/internal/config/database.yml