Changeset 8159

Timestamp:

11/17/07 01:38:58 (8 months ago)

Author:

bitsweat

Message:

Load config/preinitializer.rb, if present, before loading the environment. Closes #9943.

Files:

• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/environments/boot.rb (modified) (2 diffs)
• trunk/railties/test/boot_test.rb (modified) (1 diff)

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Load config/preinitializer.rb, if present, before loading the environment.  #9943 [Chad Woolley]
-
-* FastCGI handler ignores unsupported signals like USR2 on Windows.  [Grzegorz Derebecki]

trunk/railties/environments/boot.rb

@@ -7 +7 @@
-  class << self
-    def boot!
-
+
+
+
+
-    end
-
@@ -20 +23 @@
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
+
+    def preinitialize
+      load(preinitializer_path) if File.exists?(preinitializer_path)
+    end
+
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end

trunk/railties/test/boot_test.rb

@@ -12 +12 @@
-  end
-
-
+reinitializes_then_p
-    Rails.expects(:booted?).returns(false)
+    Rails.expects(:preinitialize)
-    Rails.expects(:pick_boot).returns(mock(:run => 'result'))
-    assert_equal 'result', Rails.boot!
+  end
+
+  def test_preinitialize_does_not_raise_exception_if_preinitializer_file_does_not_exist
+    Rails.stubs(:preinitializer_path).returns('/there/is/no/such/file')
+
+    assert_nothing_raised { Rails.preinitialize }
+  end
+
+  def test_load_preinitializer_loads_preinitializer_file
+    Rails.stubs(:preinitializer_path).returns("#{File.dirname(__FILE__)}/fixtures/environment_with_constant.rb")
+
+    assert_nil $initialize_test_set_from_env
+    Rails.preinitialize
+    assert_equal "success", $initialize_test_set_from_env
+  ensure
+    $initialize_test_set_from_env = nil
-  end
-