combustion 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fe7aab6e68f602f2b368bc8fa1b0bdeadc34a72eacd4b9d3c30ce6f6dfd6d9c
-  data.tar.gz: 7342be839ec93b552be92ba789f8dc1d102b8ceeb301fe9e0ad820724dfd4ebf
+  metadata.gz: f28e971887ec1b8cccd6708b6a5959fd16dc5afb5e3a1983f002385c3ecbf7a8
+  data.tar.gz: b7b4126b5923c1aa847fac7a4b8a2d43d0f8e06aed9fe21cfe62a11c9c5991ba
 SHA512:
-  metadata.gz: 04bba0ac0ac7d86e114549ff9e59e9f35098238b2dc1774254bcfab367938467c9b88790d3a45f17ff50d8c0865d7b9691da25b1b8fdcf6489bebd260880b241
-  data.tar.gz: 8bce1e790cd64eb3c9fc24cfa83d53c1a2627b7fcf82b6ea8759bc856247b92c22a18cd3820b8b41d9f37cc957c6816875991d80c2681baf59bd1a7709cea2ca
+  metadata.gz: ff71dda123358ad658f97c536a7a9e1b8d16d2fc8d00518d126677bb408fb3947ec13e428fd335d3be77bad71a0d6f706dc9b0cc3f681e8b0375c29ff447027c
+  data.tar.gz: 66eaf6b8b3959dc114326a5b7fc73ead3b47a96a11a9bb21c528efcba59349a07eae6ed09430af2fa2f744e74100f99557cc8bf5f71b970fa144e504268c22bb

data/HISTORY

@@ -1,3 +1,7 @@
+0.9.0 - March 26th 2018
+* Only reset databases that are either custom or the current one (Moritz Winter).
+* More consistency around environment handling (rather than presuming it's always the test environment).
+
 0.8.0 - February 1st 2018
 * Rails 5.2.0 support.
 * Requiring digest from std-lib directly.

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', '~> 0.8.0'
+gem.add_development_dependency 'combustion', '~> 0.9.0'
 
 # Gemfile
-gem 'combustion', '~> 0.8.0', :group => :test
+gem 'combustion', '~> 0.9.0', :group => :test
 ```
 
 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     = "0.8.0"
+  s.version     = "0.9.0"
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = "https://github.com/pat/combustion"

data/lib/combustion/database/reset.rb

@@ -12,6 +12,8 @@ class Combustion::Database::Reset
     Combustion::Databases::Firebird   => %w[ firebird ]
   }.freeze
 
+  RAILS_DEFAULT_ENVIRONMENTS = %w[ development production test ].freeze
+
   def self.call
     new.call
   end
@@ -23,7 +25,7 @@ class Combustion::Database::Reset
   end
 
   def call
-    ActiveRecord::Base.configurations.each_value do |configuration|
+    resettable_db_configs.each_value do |configuration|
       adapter = configuration["adapter"] ||
                 configuration["url"].split("://").first
 
@@ -46,4 +48,16 @@ class Combustion::Database::Reset
 
     raise UnsupportedDatabase, "Unsupported database type: #{adapter}"
   end
+
+  # All database configs except Rails default environments
+  # that are not currently in use
+  def resettable_db_configs
+    unused_environments = RAILS_DEFAULT_ENVIRONMENTS - [Rails.env.to_s]
+    resettable_environments = ActiveRecord::Base.configurations.keys -
+                              unused_environments
+
+    ActiveRecord::Base.configurations.select do |name|
+      resettable_environments.include?(name)
+    end
+  end
 end

data/lib/combustion/databases/base.rb

@@ -11,7 +11,7 @@ class Combustion::Databases::Base
     drop
     create
 
-    establish_connection(:test)
+    establish_connection Rails.env.to_sym
   end
 
   private

data/lib/combustion/databases/firebird.rb

@@ -2,7 +2,7 @@
 
 class Combustion::Databases::Firebird < Combustion::Databases::Base
   def reset
-    establish_connection :test
+    establish_connection Rails.env.to_sym
     connection.recreate_database!
   end
 end

data/lib/combustion/databases/oracle.rb

@@ -2,7 +2,7 @@
 
 class Combustion::Databases::Oracle < Combustion::Databases::Base
   def reset
-    establish_connection :test
+    establish_connection Rails.env.to_sym
     connection.structure_drop.split(";\n\n").each do |ddl|
       connection.execute(ddl)
     end

data/spec/database_spec.rb

@@ -20,7 +20,7 @@ module Combustion
         to eq true
     end
 
-    it "returns test databse for model with default connection" do
+    it "returns test database for model with default connection" do
       expect(Model.connection_config[:database]).to match(/test/)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: combustion
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Elegant Rails Engine Testing