From cd9ffd11e13ef6e62eba2cbd5c3760ff04132820 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Tue, 16 Mar 2010 23:24:00 -0700
Subject: Eliminate warnings for AM on 1.8

---
 activesupport/lib/active_support/core_ext/module/delegation.rb    | 6 +++++-
 activesupport/lib/active_support/core_ext/module/remove_method.rb | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 activesupport/lib/active_support/core_ext/module/remove_method.rb

(limited to 'activesupport/lib/active_support/core_ext/module')

diff --git a/activesupport/lib/active_support/core_ext/module/delegation.rb b/activesupport/lib/active_support/core_ext/module/delegation.rb
index df8aefea5a..d78cecc390 100644
--- a/activesupport/lib/active_support/core_ext/module/delegation.rb
+++ b/activesupport/lib/active_support/core_ext/module/delegation.rb
@@ -34,7 +34,7 @@ class Module
   #   class Foo
   #     CONSTANT_ARRAY = [0,1,2,3]
   #     @@class_array  = [4,5,6,7]
-  #     
+  #
   #     def initialize
   #       @instance_array = [8,9,10,11]
   #     end
@@ -120,6 +120,10 @@ class Module
         end
 
       module_eval(<<-EOS, file, line)
+        if instance_methods(false).map(&:to_s).include?("#{prefix}#{method}")
+          remove_method("#{prefix}#{method}")
+        end
+
         def #{prefix}#{method}(*args, &block)               # def customer_name(*args, &block)
           #{to}.__send__(#{method.inspect}, *args, &block)  #   client.__send__(:name, *args, &block)
         rescue NoMethodError                                # rescue NoMethodError
diff --git a/activesupport/lib/active_support/core_ext/module/remove_method.rb b/activesupport/lib/active_support/core_ext/module/remove_method.rb
new file mode 100644
index 0000000000..2714a46b28
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/module/remove_method.rb
@@ -0,0 +1,6 @@
+class Module
+  def remove_possible_method(method)
+    remove_method(method)
+  rescue NameError
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From a5587efc1903fd27d4b179753aa6e139445ad18c Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Wed, 17 Mar 2010 00:15:55 -0700
Subject: Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM
 warnings are in dependencies.

---
 .../lib/active_support/core_ext/module/method_names.rb     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 activesupport/lib/active_support/core_ext/module/method_names.rb

(limited to 'activesupport/lib/active_support/core_ext/module')

diff --git a/activesupport/lib/active_support/core_ext/module/method_names.rb b/activesupport/lib/active_support/core_ext/module/method_names.rb
new file mode 100644
index 0000000000..2eb40a83ab
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/module/method_names.rb
@@ -0,0 +1,14 @@
+class Module
+  if instance_methods[0].is_a?(Symbol)
+    def instance_method_names(*args)
+      instance_methods(*args).map(&:to_s)
+    end
+
+    def method_names(*args)
+      methods(*args).map(&:to_s)
+    end
+  else
+    alias_method :instance_method_names, :instance_methods
+    alias_method :method_names, :methods
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From fbe35656a95228f760a2cd09676423ba41fe70ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 19 Mar 2010 12:01:48 +0100
Subject: Singleton classes returns parent's methods with
 instance_methods(false) and this makes remove_method in Module#delegate fail.
 Add a test case and fix the bug.

---
 activesupport/lib/active_support/core_ext/module/delegation.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support/core_ext/module')

diff --git a/activesupport/lib/active_support/core_ext/module/delegation.rb b/activesupport/lib/active_support/core_ext/module/delegation.rb
index d78cecc390..db6aea9b87 100644
--- a/activesupport/lib/active_support/core_ext/module/delegation.rb
+++ b/activesupport/lib/active_support/core_ext/module/delegation.rb
@@ -1,3 +1,5 @@
+require "active_support/core_ext/module/remove_method"
+
 class Module
   # Provides a delegate class method to easily expose contained objects' methods
   # as your own. Pass one or more methods (specified as symbols or strings)
@@ -121,7 +123,7 @@ class Module
 
       module_eval(<<-EOS, file, line)
         if instance_methods(false).map(&:to_s).include?("#{prefix}#{method}")
-          remove_method("#{prefix}#{method}")
+          remove_possible_method("#{prefix}#{method}")
         end
 
         def #{prefix}#{method}(*args, &block)               # def customer_name(*args, &block)
-- 
cgit v1.2.3