don't define class_eval on Kernel

we don't need to do this just switch behaviour based on type
matthewrudy · Mar 10, 2013 · 26f21ad · dkubb · Mar 12, 2013 · matthewrudy
1 parent ffbec4f
commit 26f21ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/memoist.rb b/lib/memoist.rb
@@ -22,6 +22,14 @@ def self.escape_punctuation(string)
     string.sub(/\?\Z/, '_query').sub(/!\Z/, '_bang')
   end
 
+  def self.memoist_eval(klass, *args, &block)
+    if klass.respond_to?(:class_eval)
+      klass.class_eval(*args, &block)
+    else
+      klass.singleton_class.class_eval(*args, &block)
+    end
+  end
+
   module InstanceMethods
     def self.included(base)
       base.class_eval do
@@ -91,7 +99,7 @@ def memoize(*method_names)
       unmemoized_method = Memoist.unmemoized_method_for(method_name, identifier)
       memoized_ivar = Memoist.memoized_ivar_for(method_name, identifier)
 
-      class_eval do
+      Memoist.memoist_eval(self) do
         include InstanceMethods
 
         if method_defined?(unmemoized_method)

diff --git a/lib/memoist/core_ext/singleton_class.rb b/lib/memoist/core_ext/singleton_class.rb
@@ -5,9 +5,4 @@ class << self
       self
     end
   end unless respond_to?(:singleton_class) # exists in 1.9.2
-
-  # class_eval on an object acts like singleton_class.class_eval.
-  def class_eval(*args, &block)
-    singleton_class.class_eval(*args, &block)
-  end
-end
+end