Renamed Object#metaclass to Object#__metaclass__ to keep it out of th…

…e way.
jeremy · Jan 11, 2007 · 71d3e72 · 71d3e72
1 parent a89c5ec
commit 71d3e72
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/mocha/class_method.rb b/lib/mocha/class_method.rb
@@ -26,19 +26,19 @@ def mock
     end
 
     def hide_original_method
-      stubbee.metaclass.class_eval "alias_method :#{hidden_method}, :#{method}" if stubbee.metaclass.method_defined?(method)
+      stubbee.__metaclass__.class_eval "alias_method :#{hidden_method}, :#{method}" if stubbee.__metaclass__.method_defined?(method)
     end
 
     def define_new_method
-      stubbee.metaclass.class_eval "def #{method}(*args, &block); mocha.method_missing(:#{method}, *args, &block); end"
+      stubbee.__metaclass__.class_eval "def #{method}(*args, &block); mocha.method_missing(:#{method}, *args, &block); end"
     end
 
     def remove_new_method
-      stubbee.metaclass.class_eval "remove_method :#{method}"
+      stubbee.__metaclass__.class_eval "remove_method :#{method}"
     end
 
     def restore_original_method
-      stubbee.metaclass.class_eval "alias_method :#{method}, :#{hidden_method}; remove_method :#{hidden_method}" if stubbee.metaclass.method_defined?(hidden_method)
+      stubbee.__metaclass__.class_eval "alias_method :#{method}, :#{hidden_method}; remove_method :#{hidden_method}" if stubbee.__metaclass__.method_defined?(hidden_method)
     end
 
     def hidden_method

diff --git a/lib/mocha/metaclass.rb b/lib/mocha/metaclass.rb
@@ -1,6 +1,6 @@
 class Object
 
-  def metaclass
+  def __metaclass__
     class << self; self; end
   end
 

diff --git a/test/method_definer.rb b/test/method_definer.rb
@@ -3,7 +3,7 @@
 class Object
 
   def define_instance_method(method_symbol, &block)
-    metaclass.send(:define_method, method_symbol, block)
+    __metaclass__.send(:define_method, method_symbol, block)
   end
 
   def replace_instance_method(method_symbol, &block)
@@ -12,7 +12,7 @@ def replace_instance_method(method_symbol, &block)
   end
 
   def define_instance_accessor(*symbols)
-    symbols.each { |symbol| metaclass.send(:attr_accessor, symbol) }
+    symbols.each { |symbol| __metaclass__.send(:attr_accessor, symbol) }
   end
 
 end