rspec-expectations 2.8.0 → 2.9.0.rc2

data/spec/rspec/matchers/method_missing_spec.rb

@@ -8,6 +8,7 @@ end
 
 describe "RSpec::Matchers method_missing hook" do
   subject { self }
+
   it_behaves_like "a well-behaved method_missing hook"
 
   context 'when invoked in a Test::Unit::TestCase' do

data/spec/rspec/matchers/operator_matcher_spec.rb

@@ -196,7 +196,7 @@ describe "should <=" do
 
 end
 
-describe RSpec::Matchers::PositiveOperatorMatcher do
+describe RSpec::Matchers::BuiltIn::PositiveOperatorMatcher do
 
   it "works when the target has implemented #send" do
     o = Object.new
@@ -208,7 +208,7 @@ describe RSpec::Matchers::PositiveOperatorMatcher do
 
 end
 
-describe RSpec::Matchers::NegativeOperatorMatcher do
+describe RSpec::Matchers::BuiltIn::NegativeOperatorMatcher do
 
   it "works when the target has implemented #send" do
     o = Object.new

data/spec/rspec/matchers/throw_symbol_spec.rb

@@ -1,112 +1,110 @@
 require 'spec_helper'
 
-module RSpec
-  module Matchers
-    describe ThrowSymbol do
-      describe "with no args" do
-        before(:each) { @matcher = throw_symbol }
-      
-        it "matches if any Symbol is thrown" do
-          @matcher.matches?(lambda{ throw :sym }).should be_true
-        end
-        it "matches if any Symbol is thrown with an arg" do
-          @matcher.matches?(lambda{ throw :sym, "argument" }).should be_true
-        end
-        it "does not match if no Symbol is thrown" do
-          @matcher.matches?(lambda{ }).should be_false
-        end
-        it "provides a failure message" do
-          @matcher.matches?(lambda{})
-          @matcher.failure_message_for_should.should == "expected a Symbol to be thrown, got nothing"
-        end
-        it "provides a negative failure message" do
-          @matcher.matches?(lambda{ throw :sym})
-          @matcher.failure_message_for_should_not.should == "expected no Symbol to be thrown, got :sym"
-        end
-      end
-          
-      describe "with a symbol" do
-        before(:each) { @matcher = throw_symbol(:sym) }
-      
-        it "matches if correct Symbol is thrown" do
-          @matcher.matches?(lambda{ throw :sym }).should be_true
-        end
-        it "matches if correct Symbol is thrown with an arg" do
-          @matcher.matches?(lambda{ throw :sym, "argument" }).should be_true
-        end
-        it "does not match if no Symbol is thrown" do
-          @matcher.matches?(lambda{ }).should be_false
-        end
-        it "does not match if correct Symbol is thrown" do
-          @matcher.matches?(lambda{ throw :other_sym }).should be_false
-        end
-        it "provides a failure message when no Symbol is thrown" do
-          @matcher.matches?(lambda{})
-          @matcher.failure_message_for_should.should == "expected :sym to be thrown, got nothing"
-        end
-        it "provides a failure message when wrong Symbol is thrown" do
-          @matcher.matches?(lambda{ throw :other_sym })
-          @matcher.failure_message_for_should.should == "expected :sym to be thrown, got :other_sym"
-        end
-        it "provides a negative failure message" do
-          @matcher.matches?(lambda{ throw :sym })
-          @matcher.failure_message_for_should_not.should == "expected :sym not to be thrown, got :sym"
-        end
-        it "only matches NameErrors raised by uncaught throws" do
-          expect {
-            @matcher.matches?(lambda{ sym }).should be_false
-          }.to raise_error(NameError)
-        end
+module RSpec::Matchers::BuiltIn
+  describe ThrowSymbol do
+    describe "with no args" do
+      before(:each) { @matcher = throw_symbol }
+
+      it "matches if any Symbol is thrown" do
+        @matcher.matches?(lambda{ throw :sym }).should be_true
+      end
+      it "matches if any Symbol is thrown with an arg" do
+        @matcher.matches?(lambda{ throw :sym, "argument" }).should be_true
+      end
+      it "does not match if no Symbol is thrown" do
+        @matcher.matches?(lambda{ }).should be_false
+      end
+      it "provides a failure message" do
+        @matcher.matches?(lambda{})
+        @matcher.failure_message_for_should.should == "expected a Symbol to be thrown, got nothing"
       end
+      it "provides a negative failure message" do
+        @matcher.matches?(lambda{ throw :sym})
+        @matcher.failure_message_for_should_not.should == "expected no Symbol to be thrown, got :sym"
+      end
+    end
 
-      describe "with a symbol and an arg" do
-        before(:each) { @matcher = throw_symbol(:sym, "a") }
-    
-        it "matches if correct Symbol and args are thrown" do
-          @matcher.matches?(lambda{ throw :sym, "a" }).should be_true
-        end
-        it "does not match if nothing is thrown" do
-          @matcher.matches?(lambda{ }).should be_false
-        end
-        it "does not match if other Symbol is thrown" do
-          @matcher.matches?(lambda{ throw :other_sym, "a" }).should be_false
-        end
-        it "does not match if no arg is thrown" do
-          @matcher.matches?(lambda{ throw :sym }).should be_false
-        end
-        it "does not match if wrong arg is thrown" do
-          @matcher.matches?(lambda{ throw :sym, "b" }).should be_false
-        end
-        it "provides a failure message when no Symbol is thrown" do
-          @matcher.matches?(lambda{})
-          @matcher.failure_message_for_should.should == %q[expected :sym with "a" to be thrown, got nothing]
-        end
-        it "provides a failure message when wrong Symbol is thrown" do
-          @matcher.matches?(lambda{ throw :other_sym })
-          @matcher.failure_message_for_should.should == %q[expected :sym with "a" to be thrown, got :other_sym]
-        end
-        it "provides a failure message when wrong arg is thrown" do
-          @matcher.matches?(lambda{ throw :sym, "b" })
-          @matcher.failure_message_for_should.should == %q[expected :sym with "a" to be thrown, got :sym with "b"]
-        end
-        it "provides a failure message when no arg is thrown" do
-          @matcher.matches?(lambda{ throw :sym })
-          @matcher.failure_message_for_should.should == %q[expected :sym with "a" to be thrown, got :sym with no argument]
-        end
-        it "provides a negative failure message" do
-          @matcher.matches?(lambda{ throw :sym })
-          @matcher.failure_message_for_should_not.should == %q[expected :sym with "a" not to be thrown, got :sym with no argument]
-        end
-        it "only matches NameErrors raised by uncaught throws" do
-          expect {
-            @matcher.matches?(lambda{ sym }).should be_false
-          }.to raise_error(NameError)
-        end
-        it "raises other errors" do
-          expect {
-            @matcher.matches?(lambda { raise "Boom" })
-          }.to raise_error(/Boom/)
-        end
+    describe "with a symbol" do
+      before(:each) { @matcher = throw_symbol(:sym) }
+
+      it "matches if correct Symbol is thrown" do
+        @matcher.matches?(lambda{ throw :sym }).should be_true
+      end
+      it "matches if correct Symbol is thrown with an arg" do
+        @matcher.matches?(lambda{ throw :sym, "argument" }).should be_true
+      end
+      it "does not match if no Symbol is thrown" do
+        @matcher.matches?(lambda{ }).should be_false
+      end
+      it "does not match if correct Symbol is thrown" do
+        @matcher.matches?(lambda{ throw :other_sym }).should be_false
+      end
+      it "provides a failure message when no Symbol is thrown" do
+        @matcher.matches?(lambda{})
+        @matcher.failure_message_for_should.should == "expected :sym to be thrown, got nothing"
+      end
+      it "provides a failure message when wrong Symbol is thrown" do
+        @matcher.matches?(lambda{ throw :other_sym })
+        @matcher.failure_message_for_should.should == "expected :sym to be thrown, got :other_sym"
+      end
+      it "provides a negative failure message" do
+        @matcher.matches?(lambda{ throw :sym })
+        @matcher.failure_message_for_should_not.should == "expected :sym not to be thrown, got :sym"
+      end
+      it "only matches NameErrors raised by uncaught throws" do
+        expect {
+          @matcher.matches?(lambda{ sym }).should be_false
+        }.to raise_error(NameError)
+      end
+    end
+
+    describe "with a symbol and an arg" do
+      before(:each) { @matcher = throw_symbol(:sym, "a") }
+
+      it "matches if correct Symbol and args are thrown" do
+        @matcher.matches?(lambda{ throw :sym, "a" }).should be_true
+      end
+      it "does not match if nothing is thrown" do
+        @matcher.matches?(lambda{ }).should be_false
+      end
+      it "does not match if other Symbol is thrown" do
+        @matcher.matches?(lambda{ throw :other_sym, "a" }).should be_false
+      end
+      it "does not match if no arg is thrown" do
+        @matcher.matches?(lambda{ throw :sym }).should be_false
+      end
+      it "does not match if wrong arg is thrown" do
+        @matcher.matches?(lambda{ throw :sym, "b" }).should be_false
+      end
+      it "provides a failure message when no Symbol is thrown" do
+        @matcher.matches?(lambda{})
+        @matcher.failure_message_for_should.should == %q[expected :sym with "a" to be thrown, got nothing]
+      end
+      it "provides a failure message when wrong Symbol is thrown" do
+        @matcher.matches?(lambda{ throw :other_sym })
+        @matcher.failure_message_for_should.should == %q[expected :sym with "a" to be thrown, got :other_sym]
+      end
+      it "provides a failure message when wrong arg is thrown" do
+        @matcher.matches?(lambda{ throw :sym, "b" })
+        @matcher.failure_message_for_should.should == %q[expected :sym with "a" to be thrown, got :sym with "b"]
+      end
+      it "provides a failure message when no arg is thrown" do
+        @matcher.matches?(lambda{ throw :sym })
+        @matcher.failure_message_for_should.should == %q[expected :sym with "a" to be thrown, got :sym with no argument]
+      end
+      it "provides a negative failure message" do
+        @matcher.matches?(lambda{ throw :sym })
+        @matcher.failure_message_for_should_not.should == %q[expected :sym with "a" not to be thrown, got :sym with no argument]
+      end
+      it "only matches NameErrors raised by uncaught throws" do
+        expect {
+          @matcher.matches?(lambda{ sym }).should be_false
+        }.to raise_error(NameError)
+      end
+      it "raises other errors" do
+        expect {
+          @matcher.matches?(lambda { raise "Boom" })
+        }.to raise_error(/Boom/)
       end
     end
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-expectations
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: 
+  hash: 2405012749
+  prerelease: 6
   segments: 
   - 2
-  - 8
+  - 9
   - 0
-  version: 2.8.0
+  - rc
+  - 2
+  version: 2.9.0.rc2
 platform: ruby
 authors: 
 - Steven Baker
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -24,25 +26,72 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 1
-        - 2
-        version: 1.1.2
+        - 3
+        version: 1.1.3
   prerelease: false
   requirement: *id001
   name: diff-lcs
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  prerelease: false
+  requirement: *id002
+  name: rake
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 1
+        - 9
+        version: 1.1.9
+  prerelease: false
+  requirement: *id003
+  name: cucumber
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 4
+        - 11
+        version: 0.4.11
+  prerelease: false
+  requirement: *id004
+  name: aruba
+  type: :development
 description: rspec expectations (should[_not] and matchers)
 email: rspec-users@rubyforge.org
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.md
-- License.txt
+extra_rdoc_files: []
+
 files: 
 - lib/rspec-expectations.rb
 - lib/rspec/expectations.rb
@@ -57,39 +106,42 @@ files:
 - lib/rspec/expectations/handler.rb
 - lib/rspec/expectations/version.rb
 - lib/rspec/matchers.rb
-- lib/rspec/matchers/base_matcher.rb
-- lib/rspec/matchers/be.rb
 - lib/rspec/matchers/be_close.rb
-- lib/rspec/matchers/be_instance_of.rb
-- lib/rspec/matchers/be_kind_of.rb
-- lib/rspec/matchers/be_within.rb
 - lib/rspec/matchers/block_aliases.rb
-- lib/rspec/matchers/change.rb
+- lib/rspec/matchers/built_in.rb
+- lib/rspec/matchers/built_in/base_matcher.rb
+- lib/rspec/matchers/built_in/be.rb
+- lib/rspec/matchers/built_in/be_instance_of.rb
+- lib/rspec/matchers/built_in/be_kind_of.rb
+- lib/rspec/matchers/built_in/be_within.rb
+- lib/rspec/matchers/built_in/change.rb
+- lib/rspec/matchers/built_in/cover.rb
+- lib/rspec/matchers/built_in/eq.rb
+- lib/rspec/matchers/built_in/eql.rb
+- lib/rspec/matchers/built_in/equal.rb
+- lib/rspec/matchers/built_in/exist.rb
+- lib/rspec/matchers/built_in/has.rb
+- lib/rspec/matchers/built_in/have.rb
+- lib/rspec/matchers/built_in/include.rb
+- lib/rspec/matchers/built_in/match.rb
+- lib/rspec/matchers/built_in/match_array.rb
+- lib/rspec/matchers/built_in/raise_error.rb
+- lib/rspec/matchers/built_in/respond_to.rb
+- lib/rspec/matchers/built_in/satisfy.rb
+- lib/rspec/matchers/built_in/throw_symbol.rb
 - lib/rspec/matchers/compatibility.rb
-- lib/rspec/matchers/cover.rb
 - lib/rspec/matchers/dsl.rb
-- lib/rspec/matchers/eq.rb
-- lib/rspec/matchers/eql.rb
-- lib/rspec/matchers/equal.rb
-- lib/rspec/matchers/errors.rb
-- lib/rspec/matchers/exist.rb
 - lib/rspec/matchers/extensions/instance_eval_with_args.rb
 - lib/rspec/matchers/generated_descriptions.rb
-- lib/rspec/matchers/has.rb
-- lib/rspec/matchers/have.rb
-- lib/rspec/matchers/include.rb
-- lib/rspec/matchers/match.rb
-- lib/rspec/matchers/match_array.rb
 - lib/rspec/matchers/matcher.rb
 - lib/rspec/matchers/method_missing.rb
 - lib/rspec/matchers/operator_matcher.rb
 - lib/rspec/matchers/pretty.rb
-- lib/rspec/matchers/raise_error.rb
-- lib/rspec/matchers/respond_to.rb
-- lib/rspec/matchers/satisfy.rb
-- lib/rspec/matchers/throw_symbol.rb
-- License.txt
 - README.md
+- License.txt
+- Changelog.md
+- .yardopts
+- .document
 - features/README.markdown
 - features/Upgrade.md
 - features/built_in_matchers/README.md
@@ -176,19 +228,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.8.0
+summary: rspec-expectations-2.9.0.rc2
 test_files: 
 - features/README.markdown
 - features/Upgrade.md

data/lib/rspec/matchers/base_matcher.rb

@@ -1,56 +0,0 @@
-module RSpec
-  module Matchers
-    # @api private
-    #
-    # Used _internally_ as a base class for matchers that ship with
-    # rspec-expectations.
-    #
-    # ### Warning:
-    #
-    # This class is for internal use, and subject to change without notice.  We
-    # strongly recommend that you do not base your custom matchers on this
-    # class. If/when this changes, we will announce it and remove this warning.
-    module BaseMatcher
-      include RSpec::Matchers::Pretty
-
-      attr_reader :actual, :expected, :rescued_exception
-
-      def initialize(expected=nil)
-        @expected = expected
-      end
-
-      def matches?(actual)
-        @actual = actual
-      end
-
-      def match_unless_raises(exception=Exception)
-        begin
-          yield
-          true
-        rescue exception => @rescued_exception
-          false
-        end
-      end
-
-      def failure_message_for_should
-        "expected #{actual.inspect} to #{name_to_sentence}#{expected_to_sentence}"
-      end
-
-      def failure_message_for_should_not
-        "expected #{actual.inspect} not to #{name_to_sentence}#{expected_to_sentence}"
-      end
-
-      def description
-        expected ? "#{name_to_sentence} #{expected.inspect}" : name_to_sentence
-      end
-
-      def diffable?
-        false
-      end
-
-      def ==(other)
-        matches?(other)
-      end
-    end
-  end
-end