Merge pull request #10600 from aditya-kapoor/code_refactor

Removed Class Eval and used define_method instead for the SafeBuffer

1 files changed, 9 insertions, 11 deletions

diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index dc033ed11b..7c21abea72 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -171,17 +171,15 @@ module ActiveSupport #:nodoc:
     end
 
     UNSAFE_STRING_METHODS.each do |unsafe_method|
-      if 'String'.respond_to?(unsafe_method)
-        class_eval <<-EOT, __FILE__, __LINE__ + 1
-          def #{unsafe_method}(*args, &block)       # def capitalize(*args, &block)
-            to_str.#{unsafe_method}(*args, &block)  #   to_str.capitalize(*args, &block)
-          end                                       # end
-
-          def #{unsafe_method}!(*args)              # def capitalize!(*args)
-            @html_safe = false                      #   @html_safe = false
-            super                                   #   super
-          end                                       # end
-        EOT
+      if String.new.respond_to?(unsafe_method) 
+        define_method(unsafe_method) do |*args, &block|
+          to_str.send(unsafe_method, *args, &block)
+        end
+        
+        define_method("#{unsafe_method}!") do |*args|
+          @html_safe = false
+          super(*args)
+        end
       end
     end
   end