method_missing is private

rspec · Nov 25, 2010 · 9571f5c · 9571f5c
1 parent 831403a
commit 9571f5c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/lib/rspec/matchers/have.rb b/lib/rspec/matchers/have.rb
@@ -73,10 +73,10 @@ def respond_to?(sym)
 
       private
 
-      def method_missing(sym, *args, &block)
+      def method_missing(method, *args, &block)
-        @collection_name = sym
+        @collection_name = method
         if inflector = (defined?(ActiveSupport::Inflector) && ActiveSupport::Inflector.respond_to?(:pluralize) ? ActiveSupport::Inflector : (defined?(Inflector) ? Inflector : nil))
-          @plural_collection_name = inflector.pluralize(sym.to_s)
+          @plural_collection_name = inflector.pluralize(method.to_s)
         end
         @args = args
         @block = block

diff --git a/lib/rspec/matchers/matcher.rb b/lib/rspec/matchers/matcher.rb
@@ -107,11 +107,11 @@ def chain(method, &block)
 
     private
 
-      def method_missing(name, *args, &block)
+      def method_missing(method, *args, &block)
-        if $matcher_execution_context.respond_to?(name)
+        if $matcher_execution_context.respond_to?(method)
-          $matcher_execution_context.send name, *args, &block
+          $matcher_execution_context.send method, *args, &block
         else
-          super(name, *args, &block)
+          super(method, *args, &block)
         end
       end
 

diff --git a/lib/rspec/matchers/method_missing.rb b/lib/rspec/matchers/method_missing.rb
@@ -1,8 +1,11 @@
 module RSpec
   module Matchers
-    def method_missing(sym, *args, &block) # :nodoc:
+
-      return Matchers::BePredicate.new(sym, *args, &block) if sym.to_s =~ /^be_/
+    private
-      return Matchers::Has.new(sym, *args, &block) if sym.to_s =~ /^have_/
+
+    def method_missing(method, *args, &block) # :nodoc:
+      return Matchers::BePredicate.new(method, *args, &block) if method.to_s =~ /^be_/
+      return Matchers::Has.new(method, *args, &block) if method.to_s =~ /^have_/
       super
     end
   end