rspec_sequel_matchers 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa526b346bfeb8c91d845abef9afcd0bd0862c4
-  data.tar.gz: d017977416952636de1d9def1067fb4f457730f3
+  metadata.gz: 7fbe09f732990a7ef67a071dd5a098bd59dba9b3
+  data.tar.gz: e560e7eff477f0f0880a6863672f742ef7bc6d2f
 SHA512:
-  metadata.gz: 7b4b845c80e17d88f571c5726c2eb3398f96acdcd3d055aaa3e0dc52b63a9bee97b4750ca7e0638a6736ff09cfeeb3c3215e13cad962e857e908e6cb538e5e1a
-  data.tar.gz: 10e277ca7152b0ef84a049bfc799d1697984684835e239ef5a14e7d280b84b65dcea18c505cc18c1d4a86f4ac656a0436e947c9bc1649c50e5e4d12606e57c85
+  metadata.gz: ba3d2bf0ca0f1a37c730f6190b1bc79140f3e48374f1ccd8ea6b08b774ee3e20a13413644cefb4f5dacc27103a5eceaf3e7d6590d63aa47ca57da5e071bc50bd
+  data.tar.gz: 4f37d2a825f9ecf1d5589d893b0e2e1dc7c2f34d6b188ed8011bfc79e6d6c40731ada9f91e39c8bcaf46acecaf700a93e04e326da49e0b426960359dde106675

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Jonathan Tron, Joseph Halter
+Copyright (c) 2009-2014 Jonathan Tron, Joseph Halter
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/{README.rdoc → README.md}

@@ -1,4 +1,9 @@
-= rspec_sequel_matchers
+[![Build Status](https://travis-ci.org/openhood/rspec_sequel_matchers.svg?branch=master)](https://travis-ci.org/openhood/rspec_sequel_matchers)
+
+# rspec_sequel_matchers
+
+**Starting with version 0.4.0 this gem is only compatible with `RSpec >= 3.x`, if
+you want to use it with `RSpec < 3.x` use the 0.3.x versions.**
 
 Some Sequel Matchers for RSpec, using no other gem than rspec and sequel themself. As a consequence, you can use these matchers with Rails, Sinatra or any other framework. It's pretty feature complete.
 
@@ -25,32 +30,45 @@ There're also matchers for associations class methods:
 * :many_to_many
 * :many_to_one
 * :one_to_many
+* :one_to_one
 
 And there's an additionnal matcher have_column to check columns existance and their type, see example usage bellow.
 
 RspecSequel::Matchers has an extensive test suite and will give you as much explanation as possible in failure messages such as expected column type versus column type found in database.
 
-== Install
+## Install
+
+```sh
+gem install rspec_sequel_matchers
+```
+
+or with `Bundler`, put in you `Gemfile`:
 
-  sudo gem install openhood-rspec_sequel_matchers
+```ruby
+gem "rspec_sequel_matchers", group: :test
+```
 
-== Config
+## Config
 
-  In spec_helper.rb
+In spec_helper.rb
 
-    RSpec.configure do |config|
-      config.include RspecSequel::Matchers
-      # ... other config ...
-    end
+```ruby
+RSpec.configure do |config|
+  config.include RspecSequel::Matchers
+  # ... other config ...
+end
+```
 
-== Example usage
+## Example usage
 
-  describe Item do
-    it{ should have_column :name, :type => String }
-    it{ should_not have_column :wrong_name }
-    it{ should_validate_presence :name, :allow_nil => true }
-  end
+```ruby
+describe Item do
+  it{ is_expected.to have_column :name, :type => String }
+  it{ is_expected.not_to have_column :wrong_name }
+  it{ is_expected.to validate_presence :name, :allow_nil => true }
+end
+```
 
-== Copyright
+## Copyright
 
-Copyright (c) 2009 Jonathan Tron - Joseph Halter. See LICENSE for details.
+Copyright (c) 2009-2014 Jonathan Tron - Joseph Halter. See LICENSE for details.

data/lib/rspec_sequel/base.rb

@@ -1,14 +1,20 @@
+require "sequel"
 require "sequel/extensions/inflector"
+require "rspec/mocks"
+require "rspec/mocks/example_methods"
 
 module RspecSequel
 
   class Base
+    include RSpec::Mocks::ExampleMethods
+
     def initialize(attribute, options={})
       raise ArgumentError, "not enough params for matcher, required attribute is missing" if attribute.nil?
       @attribute = attribute
       @options = options
       @description = []
     end
+
     def matches?(target)
       @suffix = []
       if target.is_a?(Sequel::Model)
@@ -19,15 +25,18 @@ module RspecSequel
         valid?(target.db, target.new, target, @attribute, @options)
       end
     end
+
     def failure_message
       [@prefix, description, @suffix].flatten.compact.join(" ")
     end
-    def negative_failure_message
+
+    def failure_message_when_negated
       [@prefix, "not", description, @suffix].flatten.compact.join(" ")
     end
+
     def hash_to_nice_string(hash)
       hash.sort{|a,b| a[0].to_s<=>b[0].to_s}.collect{|param| param.collect{|v| v.inspect}.join(" => ")}.join(", ")
     end
   end
 
-end
+end

data/lib/rspec_sequel/matchers/have_one_to_one.rb

@@ -0,0 +1,19 @@
+module RspecSequel
+  module Matchers
+    class HaveOneToOneMatcher < RspecSequel::Association
+      def association_type
+        :one_to_one
+      end
+
+      def valid?(db, i, c, attribute, options)
+        matching = super
+
+        matching
+      end
+    end
+
+    def have_one_to_one(*args)
+      HaveOneToOneMatcher.new(*args)
+    end
+  end
+end

data/lib/rspec_sequel/validation.rb

@@ -44,7 +44,7 @@ module RspecSequel
       called_count = 0
       i = i.dup
       i.class.columns # ensure colums are read again after .dup
-      i.should_receive(validation_type).and_return{|*args|
+      allow(i).to receive(validation_type) do |*args|
         called_options = args.last.is_a?(Hash) ? args.pop : {}
         called_attributes = args_to_called_attributes(args)
         called_additionnal = args.shift if additionnal_param_required?
@@ -59,7 +59,7 @@ module RspecSequel
             called_count += 1
           end
         end
-      }
+      end
       i.valid?
       if called_count>1
         @suffix << "but validation is called too many times"
@@ -67,7 +67,7 @@ module RspecSequel
       end
       called_count==1
     end
-    
+
     def args_to_called_attributes(args)
       [args.pop].flatten
     end

data/spec/have_column_matcher_spec.rb

@@ -12,78 +12,78 @@ describe "have_column_matcher" do
     describe "without type" do
       it "should contain a description" do
         @matcher = have_column :name
-        @matcher.description.should == "have a column :name"
+        expect( @matcher.description ).to eq "have a column :name"
       end
       it "should set failure messages" do
         @matcher = have_column :name
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected Item to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected Item to not " + @matcher.description
       end
     end
     describe "with type as symbol" do
       it "should contain a description" do
         @matcher = have_column :name, :type => :string
-        @matcher.description.should == "have a column :name with type string"
+        expect( @matcher.description ).to eq "have a column :name with type string"
       end
       it "should set failure messages" do
         @matcher = have_column :password, :type => :string
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected Item to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected Item to not " + @matcher.description
       end
     end
     describe "with type as object" do
       it "should contain a description" do
         @matcher = have_column :name, :type => String
-        @matcher.description.should == "have a column :name with type String"
+        expect( @matcher.description ).to eq "have a column :name with type String"
       end
       it "should set failure messages" do
         @matcher = have_column :password, :type => String
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected Item to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected Item to not " + @matcher.description
       end
       it "should explicit found type if different than expected" do
         @matcher = have_column :name, :type => Integer
         @matcher.matches? subject
         explanation = " (type found: string, varchar(255))"
-        @matcher.failure_message.should == "expected Item to " + @matcher.description + explanation
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description + explanation
+        expect( @matcher.failure_message ).to eq "expected Item to " + @matcher.description + explanation
+        expect( @matcher.failure_message_when_negated ).to eq "expected Item to not " + @matcher.description + explanation
       end
     end
     describe "on anonymous Sequel::Model class" do
       it "should set failure messages" do
         @matcher = have_column :password
         @matcher.matches? Sequel::Model(:comments)
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected Comment to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected Comment to not " + @matcher.description
       end
     end
     describe "on Sequel::Model class" do
       it "should set failure messages" do
         @matcher = have_column :password
         @matcher.matches? Item
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected Item to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected Item to not " + @matcher.description
       end
     end
     describe "on Sequel::Model instance" do
       it "should set failure messages" do
         @matcher = have_column :password
         @matcher.matches? Item.new
-        @matcher.failure_message.should == "expected #<Item @values={}> to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected #<Item @values={}> to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected #<Item @values={}> to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected #<Item @values={}> to not " + @matcher.description
       end
     end
   end
 
   describe "matchers" do
-    it{ should have_column(:name) }
-    it{ should have_column(:name, :type => :string) }
-    it{ should have_column(:name, :type => String) }
-    it{ should_not have_column(:password) }
-    it{ should_not have_column(:name, :type => :integer) }
+    it{ is_expected.to have_column(:name) }
+    it{ is_expected.to have_column(:name, :type => :string) }
+    it{ is_expected.to have_column(:name, :type => String) }
+    it{ is_expected.not_to have_column(:password) }
+    it{ is_expected.not_to have_column(:name, :type => :integer) }
   end
 
-end
+end

data/spec/have_many_to_many_matcher_spec.rb

@@ -15,42 +15,42 @@ describe "have_many_to_many_matcher" do
     describe "without option" do
       it "should contain a description" do
         @matcher = have_many_to_many :items
-        @matcher.description.should == "have a many_to_many association :items"
+        expect( @matcher.description ).to eq "have a many_to_many association :items"
       end
       it "should set failure messages" do
         @matcher = have_many_to_many :items
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected Comment to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected Comment to not " + @matcher.description
       end
     end
     describe "with options" do
       it "should contain a description" do
         @matcher = have_many_to_many :items, :class_name => "Item"
-        @matcher.description.should == 'have a many_to_many association :items with option(s) :class_name => "Item"'
+        expect( @matcher.description ).to eq 'have a many_to_many association :items with option(s) :class_name => "Item"'
       end
       it "should set failure messages" do
         @matcher = have_many_to_many :items, :class_name => "Item"
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected Comment to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected Comment to not " + @matcher.description
       end
       it "should explicit used options if different than expected" do
         @matcher = have_many_to_many :items, :class_name => "Price"
         @matcher.matches? subject
         explanation = ' expected :class_name == "Price" but found "Item" instead'
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description + explanation
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description + explanation
+        expect( @matcher.failure_message ).to eq "expected Comment to " + @matcher.description + explanation
+        expect( @matcher.failure_message_when_negated ).to eq "expected Comment to not " + @matcher.description + explanation
       end
     end
   end
 
   describe "matchers" do
-    it{ should have_many_to_many(:items) }
-    it{ should have_many_to_many(:items, :class_name => "Item", :join_table => :comments_items) }
-    it{ should_not have_many_to_many(:prices) }
-    it{ should_not have_many_to_many(:items, :class_name => "Price") }
-    it{ should_not have_many_to_many(:items, :join_table => :items_comments) }
+    it{ is_expected.to have_many_to_many(:items) }
+    it{ is_expected.to have_many_to_many(:items, :class_name => "Item", :join_table => :comments_items) }
+    it{ is_expected.not_to have_many_to_many(:prices) }
+    it{ is_expected.not_to have_many_to_many(:items, :class_name => "Price") }
+    it{ is_expected.not_to have_many_to_many(:items, :join_table => :items_comments) }
   end
 
-end
+end

data/spec/have_many_to_one_matcher_spec.rb

@@ -15,41 +15,41 @@ describe "have_many_to_one_matcher" do
     describe "without option" do
       it "should contain a description" do
         @matcher = have_many_to_one :item
-        @matcher.description.should == "have a many_to_one association :item"
+        expect( @matcher.description ).to eq "have a many_to_one association :item"
       end
       it "should set failure messages" do
         @matcher = have_many_to_one :item
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected Comment to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected Comment to not " + @matcher.description
       end
     end
     describe "with options" do
       it "should contain a description" do
         @matcher = have_many_to_one :item, :class_name => "Item"
-        @matcher.description.should == 'have a many_to_one association :item with option(s) :class_name => "Item"'
+        expect( @matcher.description ).to eq 'have a many_to_one association :item with option(s) :class_name => "Item"'
       end
       it "should set failure messages" do
         @matcher = have_many_to_one :item, :class_name => "Item"
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected Comment to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected Comment to not " + @matcher.description
       end
       it "should explicit used options if different than expected" do
         @matcher = have_many_to_one :item, :class_name => "Price"
         @matcher.matches? subject
         explanation = ' expected :class_name == "Price" but found "Item" instead'
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description + explanation
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description + explanation
+        expect( @matcher.failure_message ).to eq "expected Comment to " + @matcher.description + explanation
+        expect( @matcher.failure_message_when_negated ).to eq "expected Comment to not " + @matcher.description + explanation
       end
     end
   end
 
   describe "matchers" do
-    it{ should have_many_to_one(:item) }
-    it{ should have_many_to_one(:item, :class_name => "Item") }
-    it{ should_not have_many_to_one(:price) }
-    it{ should_not have_many_to_one(:item, :class_name => "Price") }
+    it{ is_expected.to have_many_to_one(:item) }
+    it{ is_expected.to have_many_to_one(:item, :class_name => "Item") }
+    it{ is_expected.not_to have_many_to_one(:price) }
+    it{ is_expected.not_to have_many_to_one(:item, :class_name => "Price") }
   end
 
 end

data/spec/have_one_to_many_matcher_spec.rb

@@ -15,41 +15,41 @@ describe "have_one_to_many_matcher" do
     describe "without option" do
       it "should contain a description" do
         @matcher = have_one_to_many :comments
-        @matcher.description.should == "have a one_to_many association :comments"
+        expect( @matcher.description ).to eq "have a one_to_many association :comments"
       end
       it "should set failure messages" do
         @matcher = have_one_to_many :comments
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected Item to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected Item to not " + @matcher.description
       end
     end
     describe "with options" do
       it "should contain a description" do
         @matcher = have_one_to_many :comments, :class_name => "Comment"
-        @matcher.description.should == 'have a one_to_many association :comments with option(s) :class_name => "Comment"'
+        expect( @matcher.description ).to eq 'have a one_to_many association :comments with option(s) :class_name => "Comment"'
       end
       it "should set failure messages" do
         @matcher = have_one_to_many :comments, :class_name => "Comment"
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect( @matcher.failure_message ).to eq "expected Item to " + @matcher.description
+        expect( @matcher.failure_message_when_negated ).to eq "expected Item to not " + @matcher.description
       end
       it "should explicit used options if different than expected" do
         @matcher = have_one_to_many :comments, :class_name => "Price"
         @matcher.matches? subject
         explanation = ' expected :class_name == "Price" but found "Comment" instead'
-        @matcher.failure_message.should == "expected Item to " + @matcher.description + explanation
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description + explanation
+        expect( @matcher.failure_message ).to eq "expected Item to " + @matcher.description + explanation
+        expect( @matcher.failure_message_when_negated ).to eq "expected Item to not " + @matcher.description + explanation
       end
     end
   end
 
   describe "matchers" do
-    it{ should have_one_to_many(:comments) }
-    it{ should have_one_to_many(:comments, :class_name => "Comment") }
-    it{ should_not have_one_to_many(:prices) }
-    it{ should_not have_one_to_many(:comments, :class_name => "Price") }
+    it{ is_expected.to have_one_to_many(:comments) }
+    it{ is_expected.to have_one_to_many(:comments, :class_name => "Comment") }
+    it{ is_expected.not_to have_one_to_many(:prices) }
+    it{ is_expected.not_to have_one_to_many(:comments, :class_name => "Price") }
   end
 
 end