Permalink
Browse files

Ruby 1.9 compat: dependencies uses Module#local_constant_names. Refer…

…ences #1689 [Frederick Cheung]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8482 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 8b5f4e4 commit c64a29f6f1e7e7d95193862ab571e2b03f648b34 @jeremy jeremy committed Dec 22, 2007
@@ -32,4 +32,10 @@ def local_constants
! inherited.key?(const) || inherited[const].object_id != const_get(const).object_id
end
end
+
+ # Returns the names of the constants defined locally rather than the
+ # constants themselves. See <tt>local_constants</tt>.
+ def local_constant_names
+ local_constants.map(&:to_s)
+ end
end
@@ -318,13 +318,13 @@ def new_constants_in(*descs)
watch_frames = descs.collect do |desc|
if desc.is_a? Module
mod_name = desc.name
- initial_constants = desc.local_constants
+ initial_constants = desc.local_constant_names
elsif desc.is_a?(String) || desc.is_a?(Symbol)
mod_name = desc.to_s
# Handle the case where the module has yet to be defined.
initial_constants = if qualified_const_defined?(mod_name)
- mod_name.constantize.local_constants
+ mod_name.constantize.local_constant_names
else
[]
end
@@ -349,7 +349,7 @@ def new_constants_in(*descs)
mod = mod_name.constantize
next [] unless mod.is_a? Module
- new_constants = mod.local_constants - prior_constants
+ new_constants = mod.local_constant_names - prior_constants
# Make sure no other frames takes credit for these constants.
constant_watch_stack.each do |frame_name, constants|

0 comments on commit c64a29f

Please sign in to comment.