@@ -8,7 +8,7 @@ class CustomMatcher Object.const_set(build_class_name(class_name), klass) end - def initialize(expected = nil) + def initialize(*expected) @expected = expected end @@ -26,10 +26,11 @@ class CustomMatcher def matches?(target) @target = target - if self.method(:matcher).arity == 2 - matcher(@target, @expected) - else - matcher(@target) + case self.method(:matcher).arity + when -1, 2..10 then matcher(@target, *@expected) + when 1 then matcher(@target) + when 0 then matcher() + else fail end end @@ -40,7 +41,8 @@ class CustomMatcher private def message(positive = true) - "#{positive ? 'Expected' : 'Did not expect'} #{@target.inspect} to #{class_display_name} #{@expected.inspect if self.method(:matcher).arity == 2}" + expected = @expected.size == 1 ? @expected.first : @expected + "#{positive ? 'Expected' : 'Did not expect'} #{@target.inspect} to #{class_display_name} #{expected.inspect if self.method(:matcher).arity == 2}" end def class_display_name lib/rspec-custom-matchers.rb @@ -6,8 +6,24 @@ matcher(:be_divisible_by) { |number, divisor| number % divisor == 0 } matcher(:be_even) {|even| even % 2 == 0} matcher(:be_odd) {|odd| odd % 2 != 0} matcher(:be_equal_to) +matcher(:be_close_to) do |*args| + l,r, margin = args + (l - r).abs <= (margin || 1) +end +matcher(:be_sum_of) do |l,r,add| + l.should == r + add +end describe "6" do + it "should be close to" do + 6.should be_close_to(5) + 6.should be_close_to(4,2) + end + + it "should be sum of" do + 6.should be_sum_of(4,2) + end + it "should be divisible by 3" do 6.should be_divisible_by(3) end spec/matcher_spec.rb 02f2a7af7247496eb1f425796f5c194d41e8786a Greg Weber greg@grubtop.(none) http://github.com/xdotcommer/rspec-custom-matchers/commit/10aca0d6f6833531a11838747680dad6c21da787 10aca0d6f6833531a11838747680dad6c21da787 2009-04-16T13:03:56-07:00 2009-04-16T08:15:22-07:00 support for more than 2 arguments to matcher Signed-off-by: Michael Cowden <mcowden@yahoo.com> e4888eea2c23e557029cb9b53d358a02686eb114 Michael Cowden mcowden@yahoo.com