data_mapper.rb in datamapper-0.2.1

- old
+ new

@@ -7,15 +7,16 @@
 # * Sets up the database using the config from the yaml file or from the environment
 # * 
 
 # This line just let's us require anything in the +lib+ sub-folder
 # without specifying a full path.
+unless defined?(DM_PLUGINS_ROOT)
+  $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+  DM_PLUGINS_ROOT = (File.dirname(__FILE__) + '/../plugins')
+end
 
-DM_PLUGINS_ROOT = (File.dirname(__FILE__) + '/../plugins')
-
 # Require the basics...
 require 'yaml'
 require 'set'
 require 'fastthread'
 require 'data_mapper/support/blank'
@@ -27,29 +28,47 @@
 require 'data_mapper/base'
 
 # This block of code is for compatibility with Ruby On Rails' or Merb's database.yml
 # file, allowing you to simply require the data_mapper.rb in your
 # Rails application's environment.rb to configure the DataMapper.
-
-application_root, application_environment = *if defined?(MERB_ROOT)
-  [MERB_ROOT, MERB_ENV]
-elsif defined?(RAILS_ROOT)
-  [RAILS_ROOT, RAILS_ENV]
-end
-
-DM_APP_ROOT = application_root || Dir::pwd
-
-if application_root && File.exists?(application_root + '/config/database.yml')
+unless defined?(DM_APP_ROOT)
+  application_root, application_environment = *if defined?(MERB_ROOT)
+    [MERB_ROOT, MERB_ENV]
+  elsif defined?(RAILS_ROOT)
+    [RAILS_ROOT, RAILS_ENV]
+  end
   
-  database_configurations = YAML::load_file(application_root + '/config/database.yml')
-  current_database_config = database_configurations[application_environment] || database_configurations[application_environment.to_sym]
+  DM_APP_ROOT = application_root || Dir::pwd
   
-  default_database_config = {
-    :adapter  => current_database_config['adapter'] || current_database_config[:adapter],
-    :host     => current_database_config['host'] || current_database_config[:host],
-    :database => current_database_config['database'] || current_database_config[:database],
-    :username => current_database_config['username'] || current_database_config[:username],
-    :password => current_database_config['password'] || current_database_config[:password]
-  }
+  if application_root && File.exists?(application_root + '/config/database.yml')
+
+    database_configurations = YAML::load_file(application_root + '/config/database.yml')
+    current_database_config = database_configurations[application_environment] || database_configurations[application_environment.to_sym]
+    
+    config = lambda { |key| current_database_config[key.to_s] || current_database_config[key] }
+    
+    default_database_config = {
+      :adapter  => config[:adapter],
+      :host     => config[:host],
+      :database => config[:database],
+      :username => config[:username],
+      :password => config[:password]
+    }
   
-  DataMapper::Database.setup(default_database_config)
+    DataMapper::Database.setup(default_database_config)
+    
+  elsif application_root && FileTest.directory?(application_root + '/config')
+    
+    %w(development testing production).map do |environment|
+      <<-EOS.margin
+        #{environment}:
+          adapter: mysql
+          username: root
+          password:
+          host: localhost
+          database: #{File.dirname(DM_APP_ROOT).split('/').last}_#{environment}
+      EOS
+    end
+    
+    #File::open(application_root + '/config/database.yml')
+  end
 end
\ No newline at end of file