rspec-collection_matchers 0.0.2 → 0.0.3

data/.travis.yml

@@ -2,16 +2,15 @@ language: ruby
 script: "script/test_all"
 bundler_args: "--standalone --binstubs --without documentation"
 rvm:
-  - 1.8.7
-  - 1.9.2
+  - 2.1.0
+  - 2.0.0
   - 1.9.3
+  - 1.9.2
+  - 1.8.7
   - ree
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - 2.0.0
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
-    - rvm: rbx-18mode
+  - jruby-18mode
+  - rbx
+env:
+  - BRANCH=master
+  - BRANCH=2-99-maintenance

data/Changelog.md

@@ -0,0 +1,12 @@
+### 0.0.3 / 2014-02-16
+
+[full changelog](http://github.com/rspec/rspec-collection_matchers/compare/v0.0.2...v0.0.3)
+
+Enhancements:
+
+* Update to latest RSpec 3 matcher API. (Myron Marston)
+
+Bug Fixes:
+
+* Raise an error when you attempt to use matcher against an `Integer`
+  which previously would have incorrectly used a `#size` of 8. (Kassio Borges)

data/Gemfile

@@ -7,12 +7,20 @@ gemspec
   if File.exist?(library_path)
     gem lib, :path => library_path
   else
-    gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => "2-99-maintenance"
+    gem lib, :git    => "git://github.com/rspec/#{lib}.git",
+             :branch => ENV.fetch('BRANCH',"master")
   end
 end
 
+# only the master branche is supported on rspec-support
+gem "rspec-support", :git => "git://github.com/rspec/rspec-support.git"
+
 gem "cucumber", "~> 1.1.9"
 gem "aruba",    "~> 0.5"
 gem "rake",     "~> 10.0.0"
 
+platform :rbx do
+  gem 'rubysl'
+end
+
 eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')

data/lib/rspec/collection_matchers/have.rb

@@ -2,6 +2,7 @@ module RSpec
   module CollectionMatchers
     class Have
       QUERY_METHODS = [:size, :length, :count].freeze
+      IGNORED_CLASSES = [Integer].freeze
 
       def initialize(expected, relativity=:exactly)
         @expected = case expected
@@ -33,7 +34,7 @@ module RSpec
           raise not_a_collection if @actual.nil?
         else
           query_method = determine_query_method(collection)
-          raise not_a_collection unless query_method
+          raise not_a_collection if !query_method || is_ignored_class?(collection)
           @actual = collection.__send__(query_method)
         end
         case @relativity
@@ -60,35 +61,41 @@ module RSpec
         QUERY_METHODS.detect {|m| collection.respond_to?(m)}
       end
 
+      def is_ignored_class?(collection)
+        IGNORED_CLASSES.any? {|klass| klass === collection}
+      end
+
       def not_a_collection
         "expected #{@collection_name} to be a collection but it does not respond to #length, #size or #count"
       end
 
-      def failure_message_for_should
+      def failure_message
         "expected #{relative_expectation} #{@collection_name}, got #{@actual}"
       end
+      alias failure_message_for_should failure_message
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         if @relativity == :exactly
           return "expected target not to have #{@expected} #{@collection_name}, got #{@actual}"
         elsif @relativity == :at_most
           return <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
-  #{Expectations::Syntax.negative_expression("actual", "have_at_most(#{@expected}).#{@collection_name}")}
+  #{Syntax.negative_expression("actual", "have_at_most(#{@expected}).#{@collection_name}")}
 We recommend that you use this instead:
-  #{Expectations::Syntax.positive_expression("actual", "have_at_least(#{@expected + 1}).#{@collection_name}")}
+  #{Syntax.positive_expression("actual", "have_at_least(#{@expected + 1}).#{@collection_name}")}
 EOF
         elsif @relativity == :at_least
           return <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
-  #{Expectations::Syntax.negative_expression("actual", "have_at_least(#{@expected}).#{@collection_name}")}
+  #{Syntax.negative_expression("actual", "have_at_least(#{@expected}).#{@collection_name}")}
 We recommend that you use this instead:
-  #{Expectations::Syntax.positive_expression("actual", "have_at_most(#{@expected - 1}).#{@collection_name}")}
+  #{Syntax.positive_expression("actual", "have_at_most(#{@expected - 1}).#{@collection_name}")}
 EOF
         end
       end
+      alias failure_message_for_should_not failure_message_when_negated
 
       def description
         "have #{relative_expectation} #{@collection_name}"
@@ -118,5 +125,53 @@ EOF
         RUBY_VERSION < '1.9' ? Enumerable::Enumerator : Enumerator
       end
     end
+
+    module Syntax
+      # @api private
+      # Generates a positive expectation expression.
+      def self.positive_expression(target_expression, matcher_expression)
+        expression_generator.positive_expression(target_expression, matcher_expression)
+      end
+
+      # @api private
+      # Generates a negative expectation expression.
+      def self.negative_expression(target_expression, matcher_expression)
+        expression_generator.negative_expression(target_expression, matcher_expression)
+      end
+
+      # @api private
+      # Selects which expression generator to use based on the configured syntax.
+      def self.expression_generator
+        if RSpec::Expectations::Syntax.expect_enabled?
+          ExpectExpressionGenerator
+        else
+          ShouldExpressionGenerator
+        end
+      end
+
+      # @api private
+      # Generates expectation expressions for the `should` syntax.
+      module ShouldExpressionGenerator
+        def self.positive_expression(target_expression, matcher_expression)
+          "#{target_expression}.should #{matcher_expression}"
+        end
+
+        def self.negative_expression(target_expression, matcher_expression)
+          "#{target_expression}.should_not #{matcher_expression}"
+        end
+      end
+
+      # @api private
+      # Generates expectation expressions for the `expect` syntax.
+      module ExpectExpressionGenerator
+        def self.positive_expression(target_expression, matcher_expression)
+          "expect(#{target_expression}).to #{matcher_expression}"
+        end
+
+        def self.negative_expression(target_expression, matcher_expression)
+          "expect(#{target_expression}).not_to #{matcher_expression}"
+        end
+      end
+    end
   end
 end

data/lib/rspec/collection_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module CollectionMatchers
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/rspec/collection_matchers/have_spec.rb

@@ -105,6 +105,17 @@ describe "have matcher" do
   end
 
   describe "expect(...).to have(n).items where result responds to items but returns something other than a collection" do
+    it "provides a meaningful error" do
+      owner = Class.new do
+        def items
+          1
+        end
+      end.new
+      expect do
+        expect(owner).to have(3).items
+      end.to raise_error("expected items to be a collection but it does not respond to #length, #size or #count")
+    end
+
     it "provides a meaningful error" do
       owner = Class.new do
         def items
@@ -333,7 +344,7 @@ EOF
 
     it "passes block to target" do
       target = double("target")
-      block = lambda { 5 }
+      block = Proc.new { 5 }
       target.should_receive(:items).with("arg1","arg2", block).and_return([1,2,3])
       expect(target).to have(3).items("arg1","arg2", block)
     end
@@ -485,3 +496,72 @@ EOF
     end
   end
 end
+
+module RSpec
+  module CollectionMatchers
+    describe Syntax do
+      describe "expression generation" do
+        let(:target) { "foo" }
+        let(:expectation) { "eq('bar')" }
+        let(:positive_expect_example) { "expect(foo).to eq('bar')" }
+        let(:positive_should_example) { "foo.should eq('bar')" }
+        let(:negative_expect_example) { "expect(foo).not_to eq('bar')" }
+        let(:negative_should_example) { "foo.should_not eq('bar')" }
+
+        def positive_expression
+          Syntax.positive_expression(target, expectation)
+        end
+
+        def negative_expression
+          Syntax.negative_expression(target, expectation)
+        end
+
+        context "when only :expect is enabled", :uses_only_expect do
+          before do
+            expect(Expectations::Syntax.should_enabled?).to be_falsey
+            expect(Expectations::Syntax.expect_enabled?).to be_truthy
+          end
+
+          it 'generates a positive expression using the expect syntax' do
+            expect(positive_expression).to eq(positive_expect_example)
+          end
+
+          it 'generates a negative expression using the expect syntax' do
+            expect(negative_expression).to eq(negative_expect_example)
+          end
+        end
+
+        context "when both :should and :expect are enabled", :uses_should do
+          before do
+            expect(Expectations::Syntax.should_enabled?).to be_truthy
+            expect(Expectations::Syntax.expect_enabled?).to be_truthy
+          end
+
+          it 'generates a positive expression using the expect syntax' do
+            expect(positive_expression).to eq(positive_expect_example)
+          end
+
+          it 'generates a negative expression using the expect syntax' do
+            expect(negative_expression).to eq(negative_expect_example)
+          end
+        end
+
+        context "when only :should is enabled", :uses_only_should do
+          before do
+            Expectations::Syntax.should_enabled?.should be_truthy
+            Expectations::Syntax.expect_enabled?.should be_falsey
+          end
+
+          it 'generates a positive expression using the expect syntax' do
+            positive_expression.should eq(positive_should_example)
+          end
+
+          it 'generates a negative expression using the expect syntax' do
+            negative_expression.should eq(negative_should_example)
+          end
+        end
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -9,3 +9,42 @@ RSpec.configure do |config|
 
   config.order = 'random'
 end
+
+shared_context "with #should enabled", :uses_should do
+  orig_syntax = nil
+
+  before(:all) do
+    orig_syntax = RSpec::Matchers.configuration.syntax
+    RSpec::Matchers.configuration.syntax = [:expect, :should]
+  end
+
+  after(:all) do
+    RSpec::Matchers.configuration.syntax = orig_syntax
+  end
+end
+
+shared_context "with #should exclusively enabled", :uses_only_should do
+  orig_syntax = nil
+
+  before(:all) do
+    orig_syntax = RSpec::Matchers.configuration.syntax
+    RSpec::Matchers.configuration.syntax = :should
+  end
+
+  after(:all) do
+    RSpec::Matchers.configuration.syntax = orig_syntax
+  end
+end
+
+shared_context "with #expect exclusively enabled", :uses_only_expect do
+  orig_syntax = nil
+
+  before(:all) do
+    orig_syntax = RSpec::Matchers.configuration.syntax
+    RSpec::Matchers.configuration.syntax = :expect
+  end
+
+  after(:all) do
+    RSpec::Matchers.configuration.syntax = orig_syntax
+  end
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rspec-collection_matchers
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Hugo Baraúna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +53,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- Changelog.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -68,27 +74,34 @@ files:
 homepage: https://github.com/rspec/rspec-collection_matchers
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3346654767301501509
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3346654767301501509
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: rspec-collection_matchers-0.0.2
+specification_version: 3
+summary: rspec-collection_matchers-0.0.3
 test_files:
 - features/have.feature
 - features/support/env.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjEwMzdhODUyN2ZiZDY4ZmMzZGIyM2YwM2IzYTFiNmFkOTY1ODczMA==
-  data.tar.gz: !binary |-
-    YjllMDY2MTVlYTk3ZTViMTBlNWJjN2Y1NWIwZmRlNGQ1NTFiNTI0Mw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YzAwZTFlNjNmMjE4ZjVkYzBlZWJlZGVhMzMwMmFhOTk1ODJiOGYyZTlmNTY5
-    ZWU0YjhmODUwNzU3ODcxYWRmNGJiZDc5MmI2YjgwMDY1MDg0YjE0MTIwNzE4
-    M2EwYTQ5OTIwN2IzN2NlMzQ3NzY2ZGE5NjcwMmQ5NTc2ZDIwYTM=
-  data.tar.gz: !binary |-
-    ODNiNTA1OTVhNjlmOTBkM2VlYTY5YTUwZmE1N2ZkOGQ3YTNhNjAyZjRkY2U5
-    MmVmMzg4YWFkMGI2OWI0YzI3YjRhZjY5YWJhNGVkMmZjYzlkOTY0M2ZhOTM1
-    MDhkMTUzNGRmM2Y3YTgyYjEwYjUwMTE5ODcwZTQ4NjYxNGNlY2I=