JonathanTron-rspec_sequel_matchers 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/rspec_sequel/association.rb

@@ -0,0 +1,30 @@
+module RspecSequel
+
+  class Association < Base
+
+    def description
+      desc = "have a #{association_type} association #{@attribute.inspect}"
+      desc << " with #{hash_to_nice_string @options}" unless @options.empty?
+      desc
+    end
+
+    def valid?(db, i, c, attribute, options)
+      @association = c.association_reflection(attribute) || {}
+      if @association.empty?
+        @suffix << "(no association #{@attribute.inspect} found)"
+        false
+      else
+        matching = @association[:type] == association_type
+        options.each{|key, value|
+          if @association[key]!=value
+            @suffix << "expected #{key.inspect} == #{value.inspect} but found #{@association[key].inspect} instead"
+            matching = false
+          end
+        }
+        matching
+      end
+    end
+
+  end
+
+end

data/lib/rspec_sequel/base.rb

@@ -2,6 +2,7 @@ module RspecSequel
 
   class Base
     def initialize(attribute, options={})
+      raise ArgumentError, "not enough params for matcher, required attribute is missing" if attribute.nil?
       @attribute = attribute.to_sym
       @options = options
       @description = []
@@ -25,7 +26,7 @@ module RspecSequel
       [@prefix, "not", description, @suffix].flatten.compact.join(" ")
     end
     def hash_to_nice_string(hash)
-      hash.sort.collect{|param| param.join(" => ")}.join(", ")
+      hash.sort{|a,b| a[0].to_s<=>b[0].to_s}.collect{|param| param.collect{|v| v.inspect}.join(" => ")}.join(", ")
     end
   end
 

data/lib/rspec_sequel/matchers/have_column.rb

@@ -3,7 +3,7 @@ module RspecSequel
 
     class HaveColumnMatcher < RspecSequel::Base
       def description
-        desc = "have a column :#{@attribute}"
+        desc = "have a column #{@attribute.inspect}"
         desc << " with type #{@options[:type]}" if @options[:type]
         desc
       end

data/lib/rspec_sequel/matchers/have_many_to_many.rb

@@ -0,0 +1,22 @@
+module RspecSequel
+  module Matchers
+
+    class HaveManyToManyMatcher < RspecSequel::Association
+      def association_type
+        :many_to_many
+      end
+      
+      def valid?(db, i, c, attribute, options)
+        matching = super
+
+        # check that association model exists, etc.
+        matching
+      end
+    end
+
+    def have_many_to_many(*args)
+      HaveManyToManyMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/have_many_to_one.rb

@@ -0,0 +1,22 @@
+module RspecSequel
+  module Matchers
+
+    class HaveManyToOneMatcher < RspecSequel::Association
+      def association_type
+        :many_to_one
+      end
+      
+      def valid?(db, i, c, attribute, options)
+        matching = super
+
+        # check that association model exists, etc.
+        matching
+      end
+    end
+
+    def have_many_to_one(*args)
+      HaveManyToOneMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/have_one_to_many.rb

@@ -0,0 +1,22 @@
+module RspecSequel
+  module Matchers
+
+    class HaveOneToManyMatcher < RspecSequel::Association
+      def association_type
+        :one_to_many
+      end
+      
+      def valid?(db, i, c, attribute, options)
+        matching = super
+
+        # check that association model exists, etc.
+        matching
+      end
+    end
+
+    def have_one_to_many(*args)
+      HaveOneToManyMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/validate_exact_length.rb

@@ -0,0 +1,25 @@
+module RspecSequel
+  module Matchers
+
+    class ValidateExactLengthMatcher < RspecSequel::Validation
+      def description
+        desc = "validate exact length of #{@attribute.inspect} to #{@additionnal.inspect}"
+        desc << " with #{hash_to_nice_string @options}" unless @options.empty?
+        desc
+      end
+
+      def additionnal_param_type
+        Fixnum
+      end
+
+      def validation_type
+        :validates_exact_length
+      end
+    end
+
+    def validate_exact_length(*args)
+      ValidateExactLengthMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/validate_presence.rb

@@ -1,33 +1,15 @@
 module RspecSequel
   module Matchers
 
-    class ValidatePresenceMatcher < RspecSequel::Base
+    class ValidatePresenceMatcher < RspecSequel::Validation
       def description
-        desc = "validate presence of :#{@attribute}"
-        unless @options.empty?
-          desc << " with #{hash_to_nice_string @options}"
-        end
+        desc = "validate presence of #{@attribute.inspect}"
+        desc << " with #{hash_to_nice_string @options}" unless @options.empty?
         desc
       end
 
-      def valid?(db, i, c, attribute, options)
-
-        # check column existance
-        called_count = 0
-        i = i.dup
-        i.stub!(:validates_presence).and_return{|*args|
-          if args.shift==attribute
-            if options.empty?
-              called_count += 1
-            else
-              called_options = args.shift
-              @suffix << "(called with #{hash_to_nice_string called_options})"
-              called_count +=1 if called_options==options
-            end
-          end
-        }
-        i.valid?
-        called_count==1
+      def validation_type
+        :validates_presence
       end
     end
 

data/lib/rspec_sequel/validation.rb

@@ -0,0 +1,73 @@
+module RspecSequel
+
+  class Validation < Base
+
+    def initialize(*args)
+      # initialize Base
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      super(args.pop, options)
+
+      # check additionnal param
+      if additionnal_param_required?
+        if args.size>1
+          raise ArgumentError, "too many params for matcher"
+        else
+          @additionnal = args.pop
+          raise ArgumentError, "expected matcher first parameter to be #{additionnal_param_type.inspect} but received #{@additionnal.class.inspect} instead" unless @additionnal.kind_of?(additionnal_param_type)
+        end
+      else
+        raise ArgumentError, "too many params for matcher" unless args.empty?
+      end
+    end
+
+    def additionnal_param_type
+      NilClass
+    end
+
+    def additionnal_param_required?
+      additionnal_param_type!=NilClass
+    end
+
+    def valid_options
+      [:allow_blank, :allow_missing, :allow_nil, :message]
+    end
+
+    def valid?(db, i, c, attribute, options)
+      # check options
+      invalid_options = options.keys.reject{|o| valid_options.include?(o)}
+      invalid_options.each{|o|
+        @suffix << "but option #{o.inspect} is not valid"
+      }
+      return false unless invalid_options.empty?
+
+      # check validation itself
+      called_count = 0
+      i = i.dup
+      i.class.columns # ensure colums are read again after .dup
+      i.stub!(validation_type).and_return{|*args|
+        called_options = args.last.is_a?(Hash) ? args.pop : {}
+        called_attributes = [args.pop].flatten
+        called_additionnal = args.shift if additionnal_param_required?
+        if !args.empty?
+          @suffix << "but called with too many params"
+        elsif called_attributes.include?(attribute)
+          if additionnal_param_required? && @additionnal!=called_additionnal
+            @suffix << "but called with #{called_additionnal} instead"
+          elsif !options.empty? && called_options!=options
+            @suffix << "but called with option(s) #{hash_to_nice_string called_options} instead"
+          else
+            called_count += 1
+          end
+        end
+      }
+      i.valid?
+      if called_count>1
+        @suffix << "but validation is called too many times"
+        return false
+      end
+      called_count==1
+    end
+
+  end
+
+end

data/lib/rspec_sequel_matchers.rb

@@ -1,5 +1,7 @@
 # Load base
-require File.join(File.dirname(__FILE__), "rspec_sequel", "base")
+["base", "association", "validation"].each do |file|
+  require File.join(File.dirname(__FILE__), "rspec_sequel", file)
+end
 
 # Add matchers
 Dir[File.join(File.dirname(__FILE__), "rspec_sequel", "matchers", "*.rb")].each do |file|

data/rspec_sequel_matchers.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec_sequel_matchers}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Tron", "Joseph Halter"]
-  s.date = %q{2009-08-05}
+  s.date = %q{2009-08-13}
   s.email = %q{jonathan@tron.name}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -19,14 +19,26 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "lib/rspec_sequel/association.rb",
      "lib/rspec_sequel/base.rb",
      "lib/rspec_sequel/matchers/have_column.rb",
+     "lib/rspec_sequel/matchers/have_many_to_many.rb",
+     "lib/rspec_sequel/matchers/have_many_to_one.rb",
+     "lib/rspec_sequel/matchers/have_one_to_many.rb",
+     "lib/rspec_sequel/matchers/validate_exact_length.rb",
      "lib/rspec_sequel/matchers/validate_presence.rb",
+     "lib/rspec_sequel/validation.rb",
      "lib/rspec_sequel_matchers.rb",
      "rspec_sequel_matchers.gemspec",
      "spec/have_column_matcher_spec.rb",
+     "spec/have_many_to_many_matcher_spec.rb",
+     "spec/have_many_to_one_matcher_spec.rb",
+     "spec/have_one_to_many_matcher_spec.rb",
      "spec/migrations/001_create_items.rb",
+     "spec/migrations/002_create_comments.rb",
+     "spec/migrations/003_create_comments_items.rb",
      "spec/spec_helper.rb",
+     "spec/validate_exact_length_matcher_spec.rb",
      "spec/validate_presence_matcher_spec.rb"
   ]
   s.has_rdoc = true
@@ -37,8 +49,14 @@ Gem::Specification.new do |s|
   s.summary = %q{TODO}
   s.test_files = [
     "spec/have_column_matcher_spec.rb",
+     "spec/have_many_to_many_matcher_spec.rb",
+     "spec/have_many_to_one_matcher_spec.rb",
+     "spec/have_one_to_many_matcher_spec.rb",
      "spec/migrations/001_create_items.rb",
+     "spec/migrations/002_create_comments.rb",
+     "spec/migrations/003_create_comments_items.rb",
      "spec/spec_helper.rb",
+     "spec/validate_exact_length_matcher_spec.rb",
      "spec/validate_presence_matcher_spec.rb"
   ]
 

data/spec/have_column_matcher_spec.rb

@@ -1,10 +1,11 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
-class Item < Sequel::Model
-end
-
 describe "have_column_matcher" do
 
+  before :all do
+    define_model :item
+  end
+
   subject{ Item }
 
   describe "messages" do
@@ -17,7 +18,7 @@ describe "have_column_matcher" do
         @matcher = have_column :name
         @matcher.matches? subject
         @matcher.failure_message.should == "expected Item to have a column :name"
-        @matcher.negative_failure_message.should == "expected Item to not have a column :name"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
       end
     end
     describe "with type as symbol" do
@@ -29,7 +30,7 @@ describe "have_column_matcher" do
         @matcher = have_column :password, :type => :string
         @matcher.matches? subject
         @matcher.failure_message.should == "expected Item to have a column :password with type string"
-        @matcher.negative_failure_message.should == "expected Item to not have a column :password with type string"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
       end
     end
     describe "with type as object" do
@@ -41,21 +42,21 @@ describe "have_column_matcher" do
         @matcher = have_column :password, :type => String
         @matcher.matches? subject
         @matcher.failure_message.should == "expected Item to have a column :password with type String"
-        @matcher.negative_failure_message.should == "expected Item to not have a column :password with type String"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
       end
       it "should explicit found type if different than expected" do
         @matcher = have_column :name, :type => Integer
         @matcher.matches? subject
         @matcher.failure_message.should == "expected Item to have a column :name with type Integer (type found: string, varchar(255))"
-        @matcher.negative_failure_message.should == "expected Item to not have a column :name with type Integer (type found: string, varchar(255))"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
       end
     end
     describe "on anonymous Sequel::Model class" do
       it "should set failure messages" do
         @matcher = have_column :password
-        @matcher.matches? Sequel::Model(:items)
-        @matcher.failure_message.should == "expected items to have a column :password"
-        @matcher.negative_failure_message.should == "expected items to not have a column :password"
+        @matcher.matches? Sequel::Model(:comments)
+        @matcher.failure_message.should == "expected comments to have a column :password"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
       end
     end
     describe "on Sequel::Model class" do
@@ -63,7 +64,7 @@ describe "have_column_matcher" do
         @matcher = have_column :password
         @matcher.matches? Item
         @matcher.failure_message.should == "expected Item to have a column :password"
-        @matcher.negative_failure_message.should == "expected Item to not have a column :password"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
       end
     end
     describe "on Sequel::Model instance" do
@@ -71,7 +72,7 @@ describe "have_column_matcher" do
         @matcher = have_column :password
         @matcher.matches? Item.new
         @matcher.failure_message.should == "expected #<Item @values={}> to have a column :password"
-        @matcher.negative_failure_message.should == "expected #<Item @values={}> to not have a column :password"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
       end
     end
   end

data/spec/have_many_to_many_matcher_spec.rb

@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe "have_many_to_many_matcher" do
+
+  before :all do
+    define_model :item
+    define_model :comment do
+      many_to_many :items
+    end
+  end
+
+  subject{ Comment }
+
+  describe "messages" 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"
+      end
+      it "should set failure messages" do
+        @matcher = have_many_to_many :items
+        @matcher.matches? subject
+        @matcher.failure_message.should == "expected Comment to have a many_to_many association :items"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+      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 :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 have a many_to_many association :items with :class_name => "Item"'
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+      end
+      it "should explicit used options if different than expected" do
+        @matcher = have_many_to_many :items, :class_name => "Price"
+        @matcher.matches? subject
+        @matcher.failure_message.should == 'expected Comment to have a many_to_many association :items with :class_name => "Price" expected :class_name == "Price" but found "Item" instead'
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+      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) }
+  end
+
+end

data/spec/have_many_to_one_matcher_spec.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe "have_many_to_one_matcher" do
+
+  before :all do
+    define_model :item
+    define_model :comment do
+      many_to_one :item
+    end
+  end
+
+  subject{ Comment }
+
+  describe "messages" 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"
+      end
+      it "should set failure messages" do
+        @matcher = have_many_to_one :item
+        @matcher.matches? subject
+        @matcher.failure_message.should == "expected Comment to have a many_to_one association :item"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+      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 :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 have a many_to_one association :item with :class_name => "Item"'
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+      end
+      it "should explicit used options if different than expected" do
+        @matcher = have_many_to_one :item, :class_name => "Price"
+        @matcher.matches? subject
+        @matcher.failure_message.should == 'expected Comment to have a many_to_one association :item with :class_name => "Price" expected :class_name == "Price" but found "Item" instead'
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+      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") }
+  end
+
+end

data/spec/have_one_to_many_matcher_spec.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe "have_one_to_many_matcher" do
+
+  before :all do
+    define_model :item do
+      one_to_many :comments
+    end
+    define_model :comment
+  end
+
+  subject{ Item }
+
+  describe "messages" 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"
+      end
+      it "should set failure messages" do
+        @matcher = have_one_to_many :comments
+        @matcher.matches? subject
+        @matcher.failure_message.should == "expected Item to have a one_to_many association :comments"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+      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 :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 have a one_to_many association :comments with :class_name => "Comment"'
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+      end
+      it "should explicit used options if different than expected" do
+        @matcher = have_one_to_many :comments, :class_name => "Price"
+        @matcher.matches? subject
+        @matcher.failure_message.should == 'expected Item to have a one_to_many association :comments with :class_name => "Price" expected :class_name == "Price" but found "Comment" instead'
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+      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") }
+  end
+
+end

data/spec/migrations/002_create_comments.rb

@@ -0,0 +1,17 @@
+class CreateComments < Sequel::Migration
+
+  def up
+    create_table  :comments do 
+      primary_key :id
+      foreign_key :item_id, :items, :type => Fixnum
+      String      :content
+      DateTime    :created_at
+      index       :item_id
+    end
+  end
+
+  def down
+    drop_table    :comments
+  end
+
+end

data/spec/migrations/003_create_comments_items.rb

@@ -0,0 +1,15 @@
+class CreateCommentsItems < Sequel::Migration
+
+  def up
+    create_table  :comments_items do 
+      foreign_key :comment_id, :comments, :type => Fixnum
+      foreign_key :item_id, :items, :type => Fixnum
+      index       [:comment_id, :item_id], :unique => true
+    end
+  end
+
+  def down
+    drop_table    :comments_items
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require "spec"
 require "rubygems"
 require "sequel"
+require "sequel/extensions/inflector"
 require "sequel/extensions/migration"
 require File.join(File.dirname(__FILE__), "..", "lib", "rspec_sequel_matchers")
 
@@ -9,19 +10,37 @@ begin
   Sequel.sqlite
 rescue Sequel::AdapterNotFound
   puts "sqlite not available. Install it with: sudo gem install sqlite3-ruby"
+  exit 1 # failure
+end
+
+# drop all tables and migrate on start
+db = Sequel::Model.db
+db.tables.each do |table_name|
+  db.drop_table table_name
+end
+Sequel::Migrator.apply(db, File.join(File.dirname(__FILE__), "migrations"))
+
+def define_model(model, &block)
+  model_name = model.to_s.camelize.to_sym
+  table_name = model.to_s.tableize.to_sym
+  @defined_models ||= []
+  @defined_models << model_name
+  klass = Object.const_set model_name, Sequel::Model(table_name)
+  klass.class_eval &block if block_given?
 end
 
 Spec::Runner.configure do |config|
   config.include(RspecSequel::Matchers)
-  
-  config.before(:all) do
-    db = Sequel::Model.db
-    db.tables.each do |table_name|
-      db["DROP #{table_name}"]
-    end
-    Sequel::Migrator.apply(db, File.join(File.dirname(__FILE__), "migrations"))
+
+  # undefine models defined via define_model (if any)
+  config.after(:all) do
+    @defined_models.each{|model_name|
+      Object.send(:remove_const, model_name)
+    }
+    @defined_models = nil
   end
 
+  # truncate all tables between each spec
   config.after(:each) do
     db = Sequel::Model.db
     db.tables.each do |table_name|

data/spec/validate_exact_length_matcher_spec.rb

@@ -0,0 +1,86 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe "validate_exact_length_matcher" do
+
+  before :all do
+    define_model :item do
+      plugin :validation_helpers
+      def validate
+        validates_exact_length 4, :name, :allow_nil => true
+      end
+    end
+  end
+
+  subject{ Item }
+
+  describe "arguments" do
+    it "should require attribute" do
+      lambda{
+        @matcher = validate_exact_length
+      }.should raise_error(ArgumentError)
+    end
+    it "should require additionnal parameters" do
+      lambda{
+        @matcher = validate_exact_length :name
+      }.should raise_error(ArgumentError)
+    end
+    it "should refuse invalid additionnal parameters" do
+      lambda{
+        @matcher = validate_exact_length :id, :name
+      }.should raise_error(ArgumentError)
+    end
+    it "should accept valid additionnal parameters" do
+      lambda{
+        @matcher = validate_exact_length 4, :name
+      }.should_not raise_error(ArgumentError)
+    end
+  end
+
+  describe "messages" do
+    describe "without option" do
+      it "should contain a description" do
+        @matcher = validate_exact_length 4, :name
+        @matcher.description.should == "validate exact length of :name to 4"
+      end
+      it "should set failure messages" do
+        @matcher = validate_exact_length 4, :name
+        @matcher.matches? subject
+        @matcher.failure_message.should == "expected Item to validate exact length of :name to 4"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to validate", "to not validate")
+      end
+    end
+    describe "with options" do
+      it "should contain a description" do
+        @matcher = validate_exact_length 4, :name, :allow_nil => true
+        @matcher.description.should == "validate exact length of :name to 4 with :allow_nil => true"
+      end
+      it "should set failure messages" do
+        @matcher = validate_exact_length 4, :price, :allow_nil => true
+        @matcher.matches? subject
+        @matcher.failure_message.should == "expected Item to validate exact length of :price to 4 with :allow_nil => true"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to validate", "to not validate")
+      end
+      it "should explicit used options if different than expected" do
+        @matcher = validate_exact_length 4, :name, :allow_blank => true
+        @matcher.matches? subject
+        @matcher.failure_message.should == "expected Item to validate exact length of :name to 4 with :allow_blank => true but called with option(s) :allow_nil => true instead"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to validate", "to not validate")
+      end
+      it "should warn if invalid options are used" do
+        @matcher = validate_exact_length 4, :name, :allow_anything => true
+        @matcher.matches? subject
+        @matcher.failure_message.should == "expected Item to validate exact length of :name to 4 with :allow_anything => true but option :allow_anything is not valid"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to validate", "to not validate")
+      end
+    end
+  end
+
+  describe "matchers" do
+    it{ should validate_exact_length(4, :name) }
+    it{ should validate_exact_length(4, :name, :allow_nil => true) }
+    it{ should_not validate_exact_length(4, :price) }
+    it{ should_not validate_exact_length(3, :name) }
+    it{ should_not validate_exact_length(4, :name, :allow_blank => true) }
+  end
+
+end

data/spec/validate_presence_matcher_spec.rb

@@ -1,16 +1,31 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
-class Item < Sequel::Model
-  plugin :validation_helpers
-  def validate
-    validates_presence :name, :allow_nil => true
-  end
-end
-
 describe "validate_presence_matcher" do
 
+  before :all do
+    define_model :item do
+      plugin :validation_helpers
+      def validate
+        validates_presence [:id, :name], :allow_nil => true
+      end
+    end
+  end
+
   subject{ Item }
 
+  describe "arguments" do
+    it "should require attribute" do
+      lambda{
+        @matcher = validate_presence
+      }.should raise_error(ArgumentError)
+    end
+    it "should refuse additionnal parameters" do
+      lambda{
+        @matcher = validate_presence :name, :id
+      }.should raise_error(ArgumentError)
+    end
+  end
+
   describe "messages" do
     describe "without option" do
       it "should contain a description" do
@@ -21,25 +36,31 @@ describe "validate_presence_matcher" do
         @matcher = validate_presence :name
         @matcher.matches? subject
         @matcher.failure_message.should == "expected Item to validate presence of :name"
-        @matcher.negative_failure_message.should == "expected Item to not validate presence of :name"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to validate", "to not validate")
       end
     end
     describe "with options" do
       it "should contain a description" do
         @matcher = validate_presence :name, :allow_nil => true
-        @matcher.description.should == "validate presence of :name with allow_nil => true"
+        @matcher.description.should == "validate presence of :name with :allow_nil => true"
       end
       it "should set failure messages" do
         @matcher = validate_presence :price, :allow_nil => true
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to validate presence of :price with allow_nil => true"
-        @matcher.negative_failure_message.should == "expected Item to not validate presence of :price with allow_nil => true"
+        @matcher.failure_message.should == "expected Item to validate presence of :price with :allow_nil => true"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to validate", "to not validate")
       end
       it "should explicit used options if different than expected" do
         @matcher = validate_presence :name, :allow_blank => true
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to validate presence of :name with allow_blank => true (called with allow_nil => true)"
-        @matcher.negative_failure_message.should == "expected Item to not validate presence of :name with allow_blank => true (called with allow_nil => true)"
+        @matcher.failure_message.should == "expected Item to validate presence of :name with :allow_blank => true but called with option(s) :allow_nil => true instead"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to validate", "to not validate")
+      end
+      it "should warn if invalid options are used" do
+        @matcher = validate_presence :name, :allow_anything => true
+        @matcher.matches? subject
+        @matcher.failure_message.should == "expected Item to validate presence of :name with :allow_anything => true but option :allow_anything is not valid"
+        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to validate", "to not validate")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: JonathanTron-rspec_sequel_matchers
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jonathan Tron
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-05 00:00:00 -07:00
+date: 2009-08-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,14 +49,26 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/rspec_sequel/association.rb
 - lib/rspec_sequel/base.rb
 - lib/rspec_sequel/matchers/have_column.rb
+- lib/rspec_sequel/matchers/have_many_to_many.rb
+- lib/rspec_sequel/matchers/have_many_to_one.rb
+- lib/rspec_sequel/matchers/have_one_to_many.rb
+- lib/rspec_sequel/matchers/validate_exact_length.rb
 - lib/rspec_sequel/matchers/validate_presence.rb
+- lib/rspec_sequel/validation.rb
 - lib/rspec_sequel_matchers.rb
 - rspec_sequel_matchers.gemspec
 - spec/have_column_matcher_spec.rb
+- spec/have_many_to_many_matcher_spec.rb
+- spec/have_many_to_one_matcher_spec.rb
+- spec/have_one_to_many_matcher_spec.rb
 - spec/migrations/001_create_items.rb
+- spec/migrations/002_create_comments.rb
+- spec/migrations/003_create_comments_items.rb
 - spec/spec_helper.rb
+- spec/validate_exact_length_matcher_spec.rb
 - spec/validate_presence_matcher_spec.rb
 has_rdoc: true
 homepage: http://github.com/JonathanTron/rspec_sequel_matchers
@@ -87,6 +99,12 @@ specification_version: 2
 summary: TODO
 test_files: 
 - spec/have_column_matcher_spec.rb
+- spec/have_many_to_many_matcher_spec.rb
+- spec/have_many_to_one_matcher_spec.rb
+- spec/have_one_to_many_matcher_spec.rb
 - spec/migrations/001_create_items.rb
+- spec/migrations/002_create_comments.rb
+- spec/migrations/003_create_comments_items.rb
 - spec/spec_helper.rb
+- spec/validate_exact_length_matcher_spec.rb
 - spec/validate_presence_matcher_spec.rb