Moved method_name into Parameter class and renamed class MethodSignat…

…ure.

Mocha/Expectation/#initialize.rb

@@ -1,6 +1,6 @@
 def initialize(mock, method_name, backtrace = nil)
-  @mock, @method_name = mock, method_name
-  @parameters = Parameters.new
+  @mock = mock
+  @method_signature = MethodSignature.new(method_name)
   @expected_count, @invoked_count = 1, 0
   @return_values = ReturnValues.new
   @yield_parameters = YieldParameters.new

Mocha/Expectation/#match?.rb

@@ -1,3 +1,3 @@
 def match?(method_name, *arguments)
-  (@method_name == method_name) && @parameters.match?(arguments)
+  @method_signature.match?(method_name, arguments)
 end

Mocha/Expectation/#method_name.rb

@@ -0,0 +1,3 @@
+def method_name
+  @method_signature.method_name
+end

Mocha/Expectation/#method_signature.rb

@@ -1,3 +1,3 @@
 def method_signature
-  "#{@method_name}#{@parameters}"
+  "#{@method_signature}"
 end

Mocha/Expectation/#with.rb

@@ -1,4 +1,4 @@
 def with(*arguments, &block)
-  @parameters = Parameters.new(arguments, &block)
+  @method_signature.modify(arguments, &block)
   self
 end

Mocha/MethodSignature/#initialize.rb

@@ -0,0 +1,3 @@
+def initialize(method_name, parameters = nil, &block)
+  @method_name, @parameters, @block = method_name, parameters, block
+end

Mocha/MethodSignature/#match?.rb

@@ -0,0 +1,3 @@
+def match?(method_name, parameters)
+  (@method_name == method_name) && (@parameters.nil? || (@block && @block.call(*parameters)) || (@parameters == parameters))
+end

Mocha/Parameters/#initialize.rb → Mocha/MethodSignature/#modify.rb

@@ -1,3 +1,3 @@
-def initialize(parameters = nil, &block)
+def modify(parameters = nil, &block)
   @parameters, @block = parameters, block
 end

Mocha/Parameters/#to_s.rb → Mocha/MethodSignature/#to_s.rb

@@ -3,8 +3,8 @@ def to_s
     text = @parameters.mocha_inspect
     text = text.gsub(/^\[|\]$/, '')
     text = text.gsub(/^\{|\}$/, '') if @parameters.length == 1
-    "(#{text})"
+    "#{@method_name}(#{text})"
   else
-    ""
+    "#{@method_name}"
   end
 end

Mocha/MissingExpectation/#verify.rb

@@ -1,6 +1,6 @@
 def verify
   msg = error_message(0, 1)
-  similar_expectations_list = @mock.similar_expectations(@method_name).collect { |expectation| expectation.method_signature }.join("\n")
+  similar_expectations_list = @mock.similar_expectations(method_name).collect { |expectation| expectation.method_signature }.join("\n")
   msg << "\nSimilar expectations:\n#{similar_expectations_list}" unless similar_expectations_list.empty?
   error = ExpectationError.new(msg, backtrace)
   raise error if @invoked_count