Merge pull request #34 from github/dbussink/rails32-proc-bind

Remove Proc#bind from Rails 3.2
github · Oct 9, 2014 · eadedf7 · eadedf7
2 parents b6f150c + c831f67
commit eadedf7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 30 deletions.
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
@@ -2,7 +2,6 @@
 require 'action_mailer/collector'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/proc'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/module/anonymous'
@@ -627,7 +626,7 @@ def mail(headers={}, &block)
 
       # Call all the procs (if any)
       default_values = self.class.default.merge(self.class.default) do |k,v|
-        v.respond_to?(:call) ? v.bind(self).call : v
+        v.respond_to?(:call) ? instance_eval(&v) : v
       end
 
       # Handle defaults

diff --git a/activesupport/lib/active_support/core_ext/proc.rb b/activesupport/lib/active_support/core_ext/proc.rb
diff --git a/activesupport/lib/active_support/rescuable.rb b/activesupport/lib/active_support/rescuable.rb
@@ -1,6 +1,5 @@
 require 'active_support/concern'
 require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/proc'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/array/extract_options'
 
@@ -108,7 +107,11 @@ def handler_for_rescue(exception)
       when Symbol
         method(rescuer)
       when Proc
-        rescuer.bind(self)
+        if rescuer.arity == 0
+          Proc.new { instance_exec(&rescuer) }
+        else
+          Proc.new { |_exception| instance_exec(_exception, &rescuer) }
+        end
       end
     end
   end

diff --git a/activesupport/test/core_ext/proc_test.rb b/activesupport/test/core_ext/proc_test.rb