lib/spec/api/sugar.rb in rspec-0.5.15 vs lib/spec/api/sugar.rb in rspec-0.5.16

@@ -1,39 +1,51 @@
 module Spec
   module Api
     # This module adds syntactic sugar that allows usage of should_* instead of should.*
     module Sugar
-      alias_method :__orig_method_missing, :method_missing
-      def method_missing(sym, *args, &block)
-        if __is_sweetened? sym
-          object = self
-          calls = sym.to_s.split("_")
-          while calls.length > 1
-            call = calls.shift
-            object = object.__send__(call)
-            break if call == "be" unless ["an","a"].include? calls[0]
+      module SugarizeForRspec; end
+
+      def sugarize_for_rspec!
+        original_method_missing = instance_method(:method_missing)
+        class_eval do
+          include SugarizeForRspec # This is meant to add a signiture to the object that sugarization occurred.
+          def method_missing(sym, *args, &block)
+            _method_missing(sym, args, block)
           end
-          return object.__send__(calls.join("_"), *args, &block)
+
+          define_method :_method_missing do |sym, args, block|
+            return original_method_missing.bind(self).call(sym, *args, &block) unless __is_sweetened?(sym)
+
+            object = self
+            calls = sym.to_s.split("_")
+            while calls.length > 1
+              call = calls.shift
+              object = object.__send__(call)
+              break if call == "be" unless ["an","a"].include? calls[0]
+            end
+            return object.__send__(calls.join("_"), *args, &block)
+          end
+
+          def __is_sweetened?(sym) #:nodoc:
+            return true if sym.to_s =~ /^should_/
+          end
         end
-        __orig_method_missing(sym, *args, &block)
       end
-      
-      def __is_sweetened?(sym) #:nodoc:
-        return true if sym.to_s =~ /^should_/
-      end
     end
     
     module MessageExpectationSugar
       def __is_sweetened?(sym) #:nodoc:
         return true if sym.to_s =~ /^and_|^at_|^any_|^once_/
       end
     end
   end
 end
 
-class Object #:nodoc:
+class Module
   include Spec::Api::Sugar
 end
+
+Object.sugarize_for_rspec!
 
 class Spec::Api::Mock #:nodoc:
   # NOTE: this resolves a bug caused by a conflict between Sugar#method_missing and Mock#method_missing, specifically
   # when the mock is set null_object=>true. It would be nice to get rid of this.
   def should_receive(sym, &block)
\ No newline at end of file