Merge branch 'master' of git://github.com/padrino/padrino-framework

ujifgc · Apr 11, 2012 · f205548 · f205548
2 parents d70cb45 + 865d67c
commit f205548
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/padrino-core/lib/padrino-core/reloader.rb b/padrino-core/lib/padrino-core/reloader.rb
@@ -103,7 +103,7 @@ def changed?
       # We lock dependencies sets to prevent reloading of protected constants
       #
       def lock!
-        klasses = ObjectSpace.classes.map { |klass| "#{klass}".split('::')[0] }.uniq
+        klasses = ObjectSpace.classes.map { |klass| klass._orig_klass_name.split('::')[0] }.uniq
         klasses = klasses | Padrino.mounted_apps.map { |app| app.app_class }
         Padrino::Reloader.exclude_constants.concat(klasses)
       end

diff --git a/padrino-core/lib/padrino-core/support_lite.rb b/padrino-core/lib/padrino-core/support_lite.rb
@@ -188,6 +188,14 @@ def undent
   end
 end
 
+##
+# Make sure we can always use the class name
+# In reloader for accessing class_name Foo._orig_klass_name
+#
+class Module
+  alias :_orig_klass_name :to_s
+end
+
 ##
 # Loads our locale configuration files
 #

diff --git a/padrino-helpers/lib/padrino-helpers.rb b/padrino-helpers/lib/padrino-helpers.rb
@@ -37,7 +37,7 @@ class << self
       #
       # @example Register the helper module
       #   require 'padrino-helpers'
-      #   class Padrino::Appliocation
+      #   class Padrino::Application
       #     register Padrino::Helpers
       #   end
       #