rails-default-database 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0f467540db0d824cee1ed76d28d6dcfcb5ba2d4
-  data.tar.gz: 50d7f21eca4e00fd7d77e2f62189aa50ed7bee6c
+  metadata.gz: f90d52092727be87d95e3bc549871a60f3d1058e
+  data.tar.gz: 9253ba1b2ecfa937e25c9292a6a1285173080c1c
 SHA512:
-  metadata.gz: 8e4fb5c34e4688c66c68f36cd6423454197b51687e776695422ecc3c7715bac16a8f9152ea0a1713d429f4f658c95d89045d0beda8dcbaafe7acdb8e7c3a6daa
-  data.tar.gz: bdc303cbc1b132f38a5a85430a01ea55e4629d7d092b2d7769afe10b2f4b8665c6c6a83af1ec2da8da37bc476f427f14d21c0efd914fb812b9845888659befe0
+  metadata.gz: 56c33a78428a9049739153dc5e54116be58d33cf079d237fa2b9005f6df6ff51d0a077fbdc92d80a2004d80edf2a8e2bb76cd9f4a0624286521f96bebf4cab54
+  data.tar.gz: 9fdd61a51444933c5a76f63a6073658124b05d4be949847495edfd159f79ab60ff15b6c56a1e9bebf6945554ab369ca7e616ffc9772fcf3cd0efa0c2e6d1dd1e

data/README.markdown

@@ -11,6 +11,11 @@ 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.
 
+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

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,5 +1,12 @@
 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 =
       begin
@@ -8,22 +15,35 @@ Rails::Application::Configuration.class_eval do
       end || {}
 
     if url = ENV['DATABASE_URL'].presence
-      config['test'] ||= {}
-      config['test']['url'] ||= ENV['TEST_DATABASE_URL'] ||
-        url.sub(/(?:_development|_test|_production)?(?=\?|$)/, "_test")
-      config[if Rails.env.test? then 'development' else Rails.env end] ||= {}
-      config.keys.each do |k|
-        config[k]['url'] ||= url
+      (environments_for_database_configuration | config.keys).each do |k|
+        config[k] = {'url' => url.gsub('%s', k)}
+        if k == 'test'
+          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|
+      if ENV['TEST_DATABASE_URL'].present?
+        c['test'] = {'url' => ENV['TEST_DATABASE_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).gsub(/[^[:alnum:]]+/, '_')
-    driver = %w(pg mysql mysql2 sqlite3).detect do |a|
+    driver = %w(pg mysql2 mysql sqlite3).detect do |a|
       begin
         require a
         true
@@ -47,11 +67,14 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-default-database
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Tim Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties