Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit f2055485950739a2d1776ce54def851b03e2503b 2 parents d70cb45 + 865d67c
Igor Bochkariov authored April 11, 2012
2  padrino-core/lib/padrino-core/reloader.rb
@@ -103,7 +103,7 @@ def changed?
103 103
       # We lock dependencies sets to prevent reloading of protected constants
104 104
       #
105 105
       def lock!
106  
-        klasses = ObjectSpace.classes.map { |klass| "#{klass}".split('::')[0] }.uniq
  106
+        klasses = ObjectSpace.classes.map { |klass| klass._orig_klass_name.split('::')[0] }.uniq
107 107
         klasses = klasses | Padrino.mounted_apps.map { |app| app.app_class }
108 108
         Padrino::Reloader.exclude_constants.concat(klasses)
109 109
       end
8  padrino-core/lib/padrino-core/support_lite.rb
@@ -189,6 +189,14 @@ def undent
189 189
 end
190 190
 
191 191
 ##
  192
+# Make sure we can always use the class name
  193
+# In reloader for accessing class_name Foo._orig_klass_name
  194
+#
  195
+class Module
  196
+  alias :_orig_klass_name :to_s
  197
+end
  198
+
  199
+##
192 200
 # Loads our locale configuration files
193 201
 #
194 202
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)
2  padrino-helpers/lib/padrino-helpers.rb
@@ -37,7 +37,7 @@ class << self
37 37
       #
38 38
       # @example Register the helper module
39 39
       #   require 'padrino-helpers'
40  
-      #   class Padrino::Appliocation
  40
+      #   class Padrino::Application
41 41
       #     register Padrino::Helpers
42 42
       #   end
43 43
       #

0 notes on commit f205548

Please sign in to comment.
Something went wrong with that request. Please try again.