Permalink
Browse files

Add the gem load paths before the framework is loaded, so certain gem…

…s like RedCloth and BlueCloth can be frozen. [#320 state:resolved]
  • Loading branch information...
technoweenie committed Jun 8, 2008
1 parent faad1e3 commit 51e4106dcc58e5218e8b297ad870a063b7bb1ab8
Showing with 6 additions and 4 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +4 −4 railties/lib/initializer.rb
View
@@ -1,5 +1,7 @@
*Edge*
+* Add the gem load paths before the framework is loaded, so certain gems like RedCloth and BlueCloth can be frozen.
+
* Fix discrepancies with loading rails/init.rb from gems.
* Plugins check for the gem init path (rails/init.rb) before the standard plugin init path (init.rb) [Jacek Becela]
@@ -113,10 +113,10 @@ def process
check_ruby_version
install_gem_spec_stubs
set_load_path
-
+ add_gem_load_paths
+
require_frameworks
set_autoload_paths
- add_gem_load_paths
add_plugin_load_paths
load_environment
@@ -242,12 +242,12 @@ def add_plugin_load_paths
def add_gem_load_paths
unless @configuration.gems.empty?
require "rubygems"
- @configuration.gems.each &:add_load_paths
+ @configuration.gems.each { |gem| gem.add_load_paths }
end
end
def load_gems
- @configuration.gems.each(&:load)
+ @configuration.gems.each { |gem| gem.load }
end
def check_gem_dependencies

0 comments on commit 51e4106

Please sign in to comment.