rails-default-database 1.0.6 → 1.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7075c5a3d27a37d456dfeff951e4edc47f4ea9cd
+  data.tar.gz: 6c37e55732b34440e7993db87f215fcb3708af22
+SHA512:
+  metadata.gz: 1f9cf2c162b1c60c5d9b3426ae2bdd28e5b50ffd8b4837e05be6205149638e9d9a536163a62cac61b9419ac78015710c6ebd83a6a2958f9303098b8b7649e97c
+  data.tar.gz: 9fc50a30d34d8aea25865e1435450db59f2e1ab46bbdd45e0a2c674eb93605bf9234ee852686f141d344d5ecd398c4b9b99b8f1807a60344ca2f411c9b8881d5

data/lib/rails-default-database.rb

@@ -4,7 +4,7 @@ Rails::Application::Configuration.class_eval do
     config_file =
       begin
         database_configuration_without_default
-      rescue Errno::ENOENT
+      rescue Errno::ENOENT, RuntimeError
       end || {}
 
     default_database_configuration.merge(config_file)
@@ -12,49 +12,37 @@ Rails::Application::Configuration.class_eval do
 
   def default_database_configuration
     name = File.basename(root)
-    generator = begin
-      require 'pg'
-      lambda do |env|
-        {
-          'adapter' => 'postgresql',
-          'min_messages' => 'warning',
-          'database' => "#{name}_#{env}"
-        }
-      end
-    rescue LoadError
+    driver = %w(pg mysql mysql2 sqlite3).detect do |a|
       begin
-        require 'mysql'
-        lambda do |env|
-          {
-            'adapter' => 'mysql',
-            'username' => 'root',
-            'database' => "#{name}_#{env}"
-          }
-        end
+        require a
+        true
       rescue LoadError
-        begin
-          require 'mysql2'
-          lambda do |env|
-            {
-              'adapter' => 'mysql2',
-              'username' => 'root',
-              'database' => "#{name}_#{env}"
-            }
-          end
-        rescue LoadError
-          require 'sqlite3'
-          lambda do |env|
-            {
-              'adapter' => 'sqlite3',
-              'database' => "db/#{env}.sqlite3"
-            }
-          end
-        end
       end
     end
+    defaults =
+      case driver
+      when 'pg'
+        {
+          'adapter' => 'postgresql',
+          'min_messages' => 'warning'
+        }
+      when 'sqlite3'
+        {
+          'adapter' => 'sqlite3',
+          'database' => 'db/%s.sqlite3'
+        }
+      when nil
+        {}
+      else
+        {'adapter' => driver}
+      end
+    defaults['database'] ||= "#{name}_%s"
 
     %w(development test production).inject({}) do |h, env|
-      h.update(env => generator.call(env))
+      h[env] = defaults.merge(
+        'database' => defaults['database'].gsub('%s', env)
+      )
+      h
     end
   end
 

metadata

@@ -1,27 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rails-default-database
 version: !ruby/object:Gem::Version
-  version: 1.0.6
-  prerelease: 
+  version: 1.0.7
 platform: ruby
 authors:
 - Tim Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &82419040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82419040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides a default database configuration for Rails applications that
   lack one
 email: ruby@tpope.org
@@ -29,32 +31,31 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.markdown
 - MIT-LICENSE
-- lib/rails-default-database.rb
+- README.markdown
 - lib/rails-default-database.rake
+- lib/rails-default-database.rb
 homepage: http://github.com/tpope/rails-default-database
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Make database.yml optional in Rails
 test_files: []