github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't do remove_possible_method when delegate is used. Two reasons: 1) warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937.

Browse Source
This commit is contained in:
Jon Leighton
2011-07-18 00:22:12 +01:00
parent e9bd83402e
commit fcbde454f6
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actionpack/lib/abstract_controller/layouts.rb
View File

@@ -139,7 +139,7 @@ module AbstractController
# #
# end # end
# #
# This will assign "weblog_standard" as the WeblogController's layout for all actions except for the +rss+ action, which will # This will assign "weblog_standard" as the WeblogController's layout for all actions except for the +rss+ action, which will
# be rendered directly, without wrapping a layout around the rendered view. # be rendered directly, without wrapping a layout around the rendered view.
# #
# Both the <tt>:only</tt> and <tt>:except</tt> condition can accept an arbitrary number of method references, so # Both the <tt>:only</tt> and <tt>:except</tt> condition can accept an arbitrary number of method references, so
@@ -167,6 +167,7 @@ module AbstractController
included do included do
class_attribute :_layout_conditions class_attribute :_layout_conditions
remove_possible_method :_layout_conditions
delegate :_layout_conditions, :to => :'self.class' delegate :_layout_conditions, :to => :'self.class'
self._layout_conditions = {} self._layout_conditions = {}
_write_layout_method _write_layout_method

4
activesupport/lib/active_support/core_ext/module/delegation.rb
View File

@@ -127,10 +127,6 @@ class Module
end end
module_eval(<<-EOS, file, line - 5) module_eval(<<-EOS, file, line - 5)
if instance_methods(false).map(&:to_s).include?("#{prefix}#{method}")
remove_possible_method("#{prefix}#{method}")
end
def #{prefix}#{method}(*args, &block) # def customer_name(*args, &block) def #{prefix}#{method}(*args, &block) # def customer_name(*args, &block)
#{to}.__send__(#{method.inspect}, *args, &block) # client.__send__(:name, *args, &block) #{to}.__send__(#{method.inspect}, *args, &block) # client.__send__(:name, *args, &block)
rescue NoMethodError # rescue NoMethodError rescue NoMethodError # rescue NoMethodError