rails-default-database 1.0.7 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7075c5a3d27a37d456dfeff951e4edc47f4ea9cd
-  data.tar.gz: 6c37e55732b34440e7993db87f215fcb3708af22
+SHA256:
+  metadata.gz: 5131765f88d06c672a6f77edebfc8832036fa0ee1100b4e4f89bbd2a6a9bbfe5
+  data.tar.gz: 1148dea899f6d075a0ad14f655b6d30b7e32cfc19705752fb43bea92433143b3
 SHA512:
-  metadata.gz: 1f9cf2c162b1c60c5d9b3426ae2bdd28e5b50ffd8b4837e05be6205149638e9d9a536163a62cac61b9419ac78015710c6ebd83a6a2958f9303098b8b7649e97c
-  data.tar.gz: 9fc50a30d34d8aea25865e1435450db59f2e1ab46bbdd45e0a2c674eb93605bf9234ee852686f141d344d5ecd398c4b9b99b8f1807a60344ca2f411c9b8881d5
+  metadata.gz: 64d4d192d3f0d81de6874fab97ab41455bca27fb7b443e4c91b19b63d0a911e9b08d88c3e68ef4099a2fd585c9ecf615278893cc2be18128e093ebd895d1e773
+  data.tar.gz: a0f594baf1fc95e3ac2c43da3ddaa9b55948282198db4cb49d9838901b84c6890f8dab4ddf9f2034ce47fd5cccd8b22c91c5e855e28f6f9174c84a90f2e5d762

data/README.markdown

@@ -11,7 +11,18 @@ You can still override the defaults by creating `config/database.yml`.
 Use `rake db:config` to create `config/database.yml` with the defaults
 that would have been assumed.
 
-License
--------
+The default database name is based on the name of the root directory of your
+application.  This can be overridden by setting
+`config.database_name = 'foo_%s'` in `config/application.rb`, with `%s` being
+a placeholder for the current environment name.
+
+As in standard Rails, the `DATABASE_URL` environment variable takes
+precedence when defined.  However, in the test environment, Rails Default
+Database will append `_test` to the database name (after stripping an optional
+existing environment suffix), ensuring the development (or production!)
+database is never clobbered.  This enables storing your database configuration
+in [`.env`](https://github.com/bkeepers/dotenv), if you so choose.
+
+## License
 
 Copyright (c) Tim Pope.  MIT License.

data/lib/rails-default-database.rake

@@ -2,6 +2,6 @@ desc 'Write out config/database.yml from rails-default-database'
 task 'db:config' do
   contents = Rails.configuration.database_configuration.to_yaml
   File.open(Rails.root.join('config/database.yml'), 'w') do |f|
-    f.puts contents.sub(/^---\n/, '')
+    f.puts contents.sub(/^---\n/, '').gsub(/%i/, '')
   end
 end

data/lib/rails-default-database.rb

@@ -1,18 +1,50 @@
 Rails::Application::Configuration.class_eval do
 
+  def environments_for_database_configuration
+    ['development', 'test', 'production'] |
+      root.join('config', 'environments').children.map do |e|
+        e.basename('.rb').to_s if e.extname == '.rb'
+      end.compact.sort
+  end
+
   def database_configuration_with_default
-    config_file =
+    config =
       begin
         database_configuration_without_default
       rescue Errno::ENOENT, RuntimeError
       end || {}
 
-    default_database_configuration.merge(config_file)
+    if url = ENV['DATABASE_URL'].presence
+      (environments_for_database_configuration | config.keys).each do |k|
+        config[k] = {'url' => url.gsub('%s', k)}
+        if k == 'test' && ENV['TEST_DATABASE_URL'] != 'default' && ENV['CI'] != 'true'
+          config[k]['url'] =
+            config[k]['url'].sub(/(?:_(?:#{environments_for_database_configuration.join('|')})(?:\d*|%i))?(?=\?|$)/, "_test")
+        end
+      end
+      config
+    else
+      default_database_configuration.merge(config)
+    end.tap do |c|
+      url = ENV['TEST_DATABASE_URL'].presence
+      if url && url != 'default'
+        c['test'] = {'url' => url}
+      end
+      %w(url database).each do |key|
+        if value = c['test'] && c['test'][key]
+          c['test'][key] = value.sub(/%i/, ENV['TEST_ENV_NUMBER'].to_s)
+        end
+      end
+    end
+  end
+
+  attr_writer :database_name
+  def database_name
+    @database_name || File.basename(root).gsub(/[^[:alnum:]]+/, '_') + '_%s'
   end
 
   def default_database_configuration
-    name = File.basename(root)
-    driver = %w(pg mysql mysql2 sqlite3).detect do |a|
+    driver = %w(pg mysql2 mysql sqlite3).detect do |a|
       begin
         require a
         true
@@ -36,17 +68,23 @@ Rails::Application::Configuration.class_eval do
       else
         {'adapter' => driver}
       end
-    defaults['database'] ||= "#{name}_%s"
+    defaults['database'] ||= database_name
 
-    %w(development test production).inject({}) do |h, env|
+    environments_for_database_configuration.inject({}) do |h, env|
+      database = defaults['database']
+      database += '_%s' if env == 'test' && database !~ /%s/
+      database = database.gsub('%s', "#{env}#{'%i' if env == 'test'}")
       h[env] = defaults.merge(
-        'database' => defaults['database'].gsub('%s', env)
+        'database' => database
       )
       h
     end
   end
 
-  alias_method_chain :database_configuration, :default
+  unless method_defined?(:database_configuration_without_default)
+    alias database_configuration_without_default database_configuration
+    alias database_configuration database_configuration_with_default
+  end
 end
 
 class RailsDefaultDatabaseRailtie < Rails::Railtie

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-default-database
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.2
 platform: ruby
 authors:
 - Tim Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -53,8 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Make database.yml optional in Rails