rspec_multi_matchers 1.1.0 → 1.2.0

data/README.rdoc

@@ -2,17 +2,13 @@
 
 == Summary
 * test collection using each or other enumerable methods
-* tests fell more natural and have a friendlier failure message
+* makes testing more natural and have a friendlier failure message
 
 == HomePage
 * http://github.com/gregwebs/rspec-multi-matchers
 
 == DESCRIPTION:
 
-* match_each
-* match_enum
-* match_in_order
-
     require 'rubygems'
     require 'spec'
     require 'rspec_multi_matchers'
@@ -23,6 +19,11 @@
           n.should == 1
         }
       end
+
+      # this is a new shortcut for a smaller use case
+      it 'should be all ones' do
+        [1,1,1].should each be_eql(1)
+      end
     end
     
     =begin output
@@ -41,7 +42,7 @@ the item line gives the index of the item being yielded to the block, and the it
 === Warning
 
 Note the use of brackets  '{ ... }' instead of 'do ... end'
-this is necessary because 'do .. end' does not bind strong enough
+this is necessary because 'do .. end' does not bind strongly enough
 
 == RELATED ARTICLES:
 
@@ -55,7 +56,7 @@ this is necessary because 'do .. end' does not bind strong enough
 
 (The MIT License)
 
-Copyright (c) 2008 Greg Weber
+Copyright (c) 2010 Greg Weber
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/match_each.rb

@@ -1,3 +1,24 @@
+def each meta_or_options = nil, &block
+  if block or !meta_or_options
+    MatchEach.new meta_or_options, &block
+  else
+    each_matcher meta_or_options
+  end
+end
+
+RSpec::Matchers.define :each_matcher do |meta|
+  match do |actual|
+    actual.each_with_index do |i, j|
+      @elem = j
+      i.should meta_or_options
+    end
+  end
+
+  failure_message_for_should do |actual|
+    "at[#{@elem}] #{meta_or_options.failure_message_for_should}"
+  end
+end
+
 class MatchEach
 
   class MatchEachError < Exception; end
@@ -25,7 +46,7 @@ class MatchEach
     target.each do |obj|
       begin
         @block.call(obj)
-      rescue Spec::Expectations::ExpectationNotMetError => e
+      rescue RSpec::Expectations::ExpectationNotMetError => e
         @error = e
         @failure_object = obj
         return false
@@ -50,13 +71,14 @@ class MatchEach
   def failure_line
     # find 'matches?' in statck trace
     # then move back to the first line number that is not a function call
-    error_line = nil
+    error_lines = []
     @error.backtrace.each do |line|
-      if line.match(/:\d+:in\s*[`'"](.*)[`'"]\s*$/)
-        return error_line if $1 == 'matches?'
-      else
-        error_line = line.match(/^[^:]+:(\d+)/)[1]
+      if line[/:\d+:in\s*[`'"](.*)[`'"]\s*$/, 1] == 'matches?'
+        error_lines.reverse_each do |line|
+          return line[/^[^:]+:(\d+)/, 1] if line !~ %r!rspec-multi-matchers/lib/match_each\.rb!
+        end
       end
+      error_lines.push line
     end
 
     nil # should not reach here
@@ -72,7 +94,3 @@ class MatchEach
 
   # no need for should_not, so no negative_failure_messages
 end
-
-def each(options=nil, &block)
-  MatchEach.new options, &block
-end

data/lib/rspec_multi_matchers.rb

@@ -1,8 +1,10 @@
+require 'rspec'
+
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module RspecMultiMatchers
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end
 
 require "match_each"

data/spec/lib/match_each_spec.rb

@@ -11,12 +11,12 @@ describe MatchEach do
   it 'should add to the inner error message' do
     begin
       2.should == 1
-    rescue Rspec::Expectations::ExpectationNotMetError => e
+    rescue RSpec::Expectations::ExpectationNotMetError => e
       @line = __LINE__ + 2
       lambda{ [1,2,3].should each { |n|
         n.should == 1
       } }.should raise_error(
-        Rspec::Expectations::ExpectationNotMetError, /^\s*line: #{@line}\s*item 1: 2\s*#{Regexp.escape(e.message)}/m)
+        RSpec::Expectations::ExpectationNotMetError, /^\s*line: #{@line}\s*item 1: 2\s*#{Regexp.escape(e.message)}/m)
     else fail
     end
   end

data/spec/lib/match_in_order_spec.rb

@@ -11,20 +11,20 @@ describe MatchInOrder do
 
   it "should not match the same regular expressions twice" do
     "a".should_not match_in_order(/a/,/a/)
-    lambda{ "a".should match_in_order(/a/,/a/) }.should raise_error(Rspec::Expectations::ExpectationNotMetError, 'expected "" to match /a/' << "\n" << 'within string: "a"')
+    lambda{ "a".should match_in_order(/a/,/a/) }.should raise_error(RSpec::Expectations::ExpectationNotMetError, 'expected "" to match /a/' << "\n" << 'within string: "a"')
 
     "abc".should_not match_in_order(/a/,/b/,/c/,/a/)
-    lambda{ "abc".should match_in_order(/a/,/b/,/c/,/a/) }.should raise_error(Rspec::Expectations::ExpectationNotMetError, 'expected "" to match /a/' << "\n" << 'within string: "abc"') 
+    lambda{ "abc".should match_in_order(/a/,/b/,/c/,/a/) }.should raise_error(RSpec::Expectations::ExpectationNotMetError, 'expected "" to match /a/' << "\n" << 'within string: "abc"') 
   end
 
   it "should match multiple regular expressions in order" do
     "abc".should match_in_order(/a/,/b/,/c/)
-    lambda{ "abc".should_not match_in_order(/a/,/b/,/c/) }.should raise_error(Rspec::Expectations::ExpectationNotMetError,'expected "abc" to not match in order against: [/a/, /b/, /c/]') 
+    lambda{ "abc".should_not match_in_order(/a/,/b/,/c/) }.should raise_error(RSpec::Expectations::ExpectationNotMetError,'expected "abc" to not match in order against: [/a/, /b/, /c/]') 
 
     "abc".should_not match_in_order(/a/,/c/,/b/)
-    lambda{ "abc".should match_in_order(/a/,/c/,/b/) }.should raise_error(Rspec::Expectations::ExpectationNotMetError,'expected "" to match /b/' << "\n" << 'within string: "abc"')
+    lambda{ "abc".should match_in_order(/a/,/c/,/b/) }.should raise_error(RSpec::Expectations::ExpectationNotMetError,'expected "" to match /b/' << "\n" << 'within string: "abc"')
 
     "abc".should_not match_in_order(/b/,/a/,/c/)
-    lambda{ "abc".should match_in_order(/b/,/a/,/c/) }.should raise_error(Rspec::Expectations::ExpectationNotMetError,'expected "c" to match /a/' << "\n" << 'within string: "abc"')
+    lambda{ "abc".should match_in_order(/b/,/a/,/c/) }.should raise_error(RSpec::Expectations::ExpectationNotMetError,'expected "c" to match /a/' << "\n" << 'within string: "abc"')
   end
 end

data/spec/shared_enum_spec.rb

@@ -12,7 +12,7 @@ shared_examples_for "each matcher" do
   end
 
   it 'should raise an error if there are no items in the enumerable object' do
-    lambda{ [].should send(*@iterator){} }.should raise_error(@class::BlankEnumerableError)
+    lambda{ [].should send(*@iterator){} }.should raise_error(@class::BlankEnumerableError, /.*/)
     [false, nil].each do |f|
       @iterator.push(:empty => f)
       lambda{ [].should send(*@iterator){}}.should raise_error(@class::BlankEnumerableError)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec_multi_matchers
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: 31
+  prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Greg Weber
@@ -15,12 +15,91 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -07:00
+date: 2011-08-24 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: better collection testing
-email: 
+description: |
+  = rspec-multi-matchers
+  
+  == Summary
+  * test collection using each or other enumerable methods
+  * makes testing more natural and have a friendlier failure message
+  
+  == HomePage
+  * http://github.com/gregwebs/rspec-multi-matchers
+  
+  == DESCRIPTION:
+  
+      require 'rubygems'
+      require 'spec'
+      require 'rspec_multi_matchers'
+      
+      describe 'array of ones' do
+        it 'should be all ones' do
+          [1,2,3].should each { |n| 
+            n.should == 1
+          }
+        end
+  
+        # this is a new shortcut for a smaller use case
+        it 'should be all ones' do
+          [1,1,1].should each be_eql(1)
+        end
+      end
+      
+      =begin output
+      'array of ones should fail on 2' FAILED
+          line: 14
+        item 1: 2
+      expected: 1,
+           got: 2 (using ==)
+      =end
+  
+  As expected, the output shows expected and got fields
+  line is the line number of the expectiation inside the block
+  the item line gives the index of the item being yielded to the block, and the item itself
+  
+  
+  === Warning
+  
+  Note the use of brackets  '{ ... }' instead of 'do ... end'
+  this is necessary because 'do .. end' does not bind strongly enough
+  
+  == RELATED ARTICLES:
+  
+  * http://blog.thoughtfolder.com/2008-11-05-rspec-should-each-matcher.html
+  
+  == INSTALL:
+  
+  * gem install rspec_multi_matchers
+  
+  == LICENSE:
+  
+  (The MIT License)
+  
+  Copyright (c) 2010 Greg Weber
+  
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  'Software'), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+email: greg@gregweber.info
 executables: []
 
 extensions: []
@@ -41,7 +120,7 @@ files:
 - spec/shared_enum_spec.rb
 - spec/spec.opts
 has_rdoc: true
-homepage: 
+homepage: https://github.com/gregwebs/rspec-multi-matchers
 licenses: []
 
 post_install_message: 
@@ -70,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: better collection testing