[padrino-core] Reset app dependencies so we are able to load correctl…

…y new controllers/helpers/mailers.
skra · May 20, 2011 · abd3715 · abd3715
1 parent f1fdc23
commit abd3715
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/padrino-core/lib/padrino-core/application.rb b/padrino-core/lib/padrino-core/application.rb
@@ -50,6 +50,7 @@ def new(*args, &bk)
       #
       def reload!
         logger.devel "Reloading #{self}"
+        @_dependencies = nil # Reset dependencies
         reset! # Reset sinatra app
         reset_routes! # Remove all existing user-defined application routes
         Padrino.require_dependencies(self.app_file, :force => true) # Reload the app file

diff --git a/padrino-core/lib/padrino-core/support_lite.rb b/padrino-core/lib/padrino-core/support_lite.rb
@@ -26,7 +26,7 @@ module ObjectSpace
   class << self
     # Returns all the classes in the object space.
     def classes
-      ObjectSpace.each_object(Module).map.select do |klass|
+      ObjectSpace.each_object(Module).select do |klass|
         Class.class_eval { klass } rescue false
       end
     end
@@ -64,4 +64,4 @@ def self.glob_require(glob_pattern, file_path=nil)
 ##
 # Loads our locale configuration files
 #
-I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)
+I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)