JonathanTron-rspec_sequel_matchers 0.0.2 → 0.1.0

data/README.rdoc

@@ -1,9 +1,34 @@
 = rspec_sequel_matchers
 
-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.
-
-Validation matchers assume that you're using the recommanded validation_helpers plugin.
+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.
+
+Matchers assume that you're using the recommanded validation_helpers plugin. All instance validation methods are supported, namely:
+* validates_exact_length
+* validates_format
+* validates_includes
+* validates_integer
+* validates_length_range
+* validates_max_length
+* validates_min_length
+* validates_not_string
+* validates_numeric
+* validates_presence
+* validates_unique
+
+Each one with all possible options, namely:
+* :allow_blank
+* :allow_missing
+* :allow_nil
+* :message
+
+There're also matchers for associations class methods:
+* :many_to_many
+* :many_to_one
+* :one_to_many
+
+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
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/lib/rspec_sequel/association.rb

@@ -4,7 +4,7 @@ module RspecSequel
 
     def description
       desc = "have a #{association_type} association #{@attribute.inspect}"
-      desc << " with #{hash_to_nice_string @options}" unless @options.empty?
+      desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
       desc
     end
 

data/lib/rspec_sequel/base.rb

@@ -3,7 +3,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
+      @attribute = attribute
       @options = options
       @description = []
     end

data/lib/rspec_sequel/matchers/validate_exact_length.rb

@@ -3,8 +3,8 @@ module RspecSequel
 
     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 = "validate length of #{@attribute.inspect} is exactly #{@additionnal.inspect}"
+        desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
         desc
       end
 

data/lib/rspec_sequel/matchers/validate_format.rb

@@ -0,0 +1,25 @@
+module RspecSequel
+  module Matchers
+
+    class ValidateFormatMatcher < RspecSequel::Validation
+      def description
+        desc = "validate format of #{@attribute.inspect} against #{@additionnal.inspect}"
+        desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
+        desc
+      end
+
+      def additionnal_param_type
+        Regexp
+      end
+
+      def validation_type
+        :validates_format
+      end
+    end
+
+    def validate_format(*args)
+      ValidateFormatMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/validate_includes.rb

@@ -0,0 +1,25 @@
+module RspecSequel
+  module Matchers
+
+    class ValidateIncludesMatcher < RspecSequel::Validation
+      def description
+        desc = "validate that #{@attribute.inspect} is included in #{@additionnal.inspect}"
+        desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
+        desc
+      end
+
+      def additionnal_param_type
+        Enumerable
+      end
+
+      def validation_type
+        :validates_includes
+      end
+    end
+
+    def validate_includes(*args)
+      ValidateIncludesMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/validate_integer.rb

@@ -0,0 +1,21 @@
+module RspecSequel
+  module Matchers
+
+    class ValidateIntegerMatcher < RspecSequel::Validation
+      def description
+        desc = "validate that #{@attribute.inspect} is a valid integer"
+        desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
+        desc
+      end
+
+      def validation_type
+        :validates_integer
+      end
+    end
+
+    def validate_integer(*args)
+      ValidateIntegerMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/validate_length_range.rb

@@ -0,0 +1,25 @@
+module RspecSequel
+  module Matchers
+
+    class ValidateLengthRangeMatcher < RspecSequel::Validation
+      def description
+        desc = "validate length of #{@attribute.inspect} is included in #{@additionnal.inspect}"
+        desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
+        desc
+      end
+
+      def additionnal_param_type
+        Enumerable
+      end
+
+      def validation_type
+        :validates_length_range
+      end
+    end
+
+    def validate_length_range(*args)
+      ValidateLengthRangeMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/validate_max_length.rb

@@ -0,0 +1,25 @@
+module RspecSequel
+  module Matchers
+
+    class ValidateMaxLengthMatcher < RspecSequel::Validation
+      def description
+        desc = "validate length of #{@attribute.inspect} is less than or equal to #{@additionnal.inspect}"
+        desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
+        desc
+      end
+
+      def additionnal_param_type
+        Fixnum
+      end
+
+      def validation_type
+        :validates_max_length
+      end
+    end
+
+    def validate_max_length(*args)
+      ValidateMaxLengthMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/validate_min_length.rb

@@ -0,0 +1,25 @@
+module RspecSequel
+  module Matchers
+
+    class ValidateMinLengthMatcher < RspecSequel::Validation
+      def description
+        desc = "validate length of #{@attribute.inspect} is greater than or equal to #{@additionnal.inspect}"
+        desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
+        desc
+      end
+
+      def additionnal_param_type
+        Fixnum
+      end
+
+      def validation_type
+        :validates_min_length
+      end
+    end
+
+    def validate_min_length(*args)
+      ValidateMinLengthMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/validate_not_string.rb

@@ -0,0 +1,21 @@
+module RspecSequel
+  module Matchers
+
+    class ValidateNotStringMatcher < RspecSequel::Validation
+      def description
+        desc = "validate that #{@attribute.inspect} is not a string"
+        desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
+        desc
+      end
+
+      def validation_type
+        :validates_not_string
+      end
+    end
+
+    def validate_not_string(*args)
+      ValidateNotStringMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/validate_numeric.rb

@@ -0,0 +1,21 @@
+module RspecSequel
+  module Matchers
+
+    class ValidateNumericMatcher < RspecSequel::Validation
+      def description
+        desc = "validate that #{@attribute.inspect} is a valid float"
+        desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
+        desc
+      end
+
+      def validation_type
+        :validates_numeric
+      end
+    end
+
+    def validate_numeric(*args)
+      ValidateNumericMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/matchers/validate_presence.rb

@@ -4,7 +4,7 @@ module RspecSequel
     class ValidatePresenceMatcher < RspecSequel::Validation
       def description
         desc = "validate presence of #{@attribute.inspect}"
-        desc << " with #{hash_to_nice_string @options}" unless @options.empty?
+        desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
         desc
       end
 

data/lib/rspec_sequel/matchers/validate_unique.rb

@@ -0,0 +1,33 @@
+module RspecSequel
+  module Matchers
+
+    class ValidateUniqueMatcher < RspecSequel::Validation
+      def description
+        desc = "validate uniqueness of #{@attribute.inspect}"
+        desc << " with option(s) #{hash_to_nice_string @options}" unless @options.empty?
+        desc
+      end
+
+      def validation_type
+        :validates_unique
+      end
+
+      def valid_options
+        [:message]
+      end
+
+      def args_to_called_attributes(args)
+        called_attributes = []
+        until args.empty?
+          called_attributes << args.shift
+        end
+        called_attributes
+      end
+    end
+
+    def validate_unique(*args)
+      ValidateUniqueMatcher.new(*args)
+    end
+
+  end
+end

data/lib/rspec_sequel/validation.rb

@@ -46,7 +46,7 @@ module RspecSequel
       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_attributes = args_to_called_attributes(args)
         called_additionnal = args.shift if additionnal_param_required?
         if !args.empty?
           @suffix << "but called with too many params"
@@ -67,6 +67,10 @@ module RspecSequel
       end
       called_count==1
     end
+    
+    def args_to_called_attributes(args)
+      [args.pop].flatten
+    end
 
   end
 

data/rspec_sequel_matchers.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec_sequel_matchers}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Tron", "Joseph Halter"]
@@ -26,7 +26,16 @@ Gem::Specification.new do |s|
      "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_format.rb",
+     "lib/rspec_sequel/matchers/validate_includes.rb",
+     "lib/rspec_sequel/matchers/validate_integer.rb",
+     "lib/rspec_sequel/matchers/validate_length_range.rb",
+     "lib/rspec_sequel/matchers/validate_max_length.rb",
+     "lib/rspec_sequel/matchers/validate_min_length.rb",
+     "lib/rspec_sequel/matchers/validate_not_string.rb",
+     "lib/rspec_sequel/matchers/validate_numeric.rb",
      "lib/rspec_sequel/matchers/validate_presence.rb",
+     "lib/rspec_sequel/matchers/validate_unique.rb",
      "lib/rspec_sequel/validation.rb",
      "lib/rspec_sequel_matchers.rb",
      "rspec_sequel_matchers.gemspec",
@@ -39,7 +48,16 @@ Gem::Specification.new do |s|
      "spec/migrations/003_create_comments_items.rb",
      "spec/spec_helper.rb",
      "spec/validate_exact_length_matcher_spec.rb",
-     "spec/validate_presence_matcher_spec.rb"
+     "spec/validate_format_matcher_spec.rb",
+     "spec/validate_includes_matcher_spec.rb",
+     "spec/validate_integer_matcher_spec.rb",
+     "spec/validate_length_range_matcher_spec.rb",
+     "spec/validate_max_length_matcher_spec.rb",
+     "spec/validate_min_length_matcher_spec.rb",
+     "spec/validate_not_string_matcher_spec.rb",
+     "spec/validate_numeric_matcher_spec.rb",
+     "spec/validate_presence_matcher_spec.rb",
+     "spec/validate_unique_matcher_spec.rb"
   ]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/JonathanTron/rspec_sequel_matchers}
@@ -57,7 +75,16 @@ Gem::Specification.new do |s|
      "spec/migrations/003_create_comments_items.rb",
      "spec/spec_helper.rb",
      "spec/validate_exact_length_matcher_spec.rb",
-     "spec/validate_presence_matcher_spec.rb"
+     "spec/validate_format_matcher_spec.rb",
+     "spec/validate_includes_matcher_spec.rb",
+     "spec/validate_integer_matcher_spec.rb",
+     "spec/validate_length_range_matcher_spec.rb",
+     "spec/validate_max_length_matcher_spec.rb",
+     "spec/validate_min_length_matcher_spec.rb",
+     "spec/validate_not_string_matcher_spec.rb",
+     "spec/validate_numeric_matcher_spec.rb",
+     "spec/validate_presence_matcher_spec.rb",
+     "spec/validate_unique_matcher_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/have_column_matcher_spec.rb

@@ -17,8 +17,8 @@ describe "have_column_matcher" do
       it "should set failure messages" do
         @matcher = have_column :name
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to have a column :name"
-        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+        @matcher.failure_message.should == "expected Item to " + @matcher.description
+        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
       end
     end
     describe "with type as symbol" do
@@ -29,8 +29,8 @@ describe "have_column_matcher" do
       it "should set failure messages" 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 == @matcher.failure_message.gsub("to have", "to not have")
+        @matcher.failure_message.should == "expected Item to " + @matcher.description
+        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
       end
     end
     describe "with type as object" do
@@ -41,38 +41,39 @@ describe "have_column_matcher" do
       it "should set failure messages" 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 == @matcher.failure_message.gsub("to have", "to not have")
+        @matcher.failure_message.should == "expected Item to " + @matcher.description
+        @matcher.negative_failure_message.should == "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
-        @matcher.failure_message.should == "expected Item to 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")
+        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
       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 comments to have a column :password"
-        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+        @matcher.failure_message.should == "expected comments to " + @matcher.description
+        @matcher.negative_failure_message.should == "expected comments 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 have a column :password"
-        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+        @matcher.failure_message.should == "expected Item to " + @matcher.description
+        @matcher.negative_failure_message.should == "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 have a column :password"
-        @matcher.negative_failure_message.should == @matcher.failure_message.gsub("to have", "to not have")
+        @matcher.failure_message.should == "expected #<Item @values={}> to " + @matcher.description
+        @matcher.negative_failure_message.should == "expected #<Item @values={}> to not " + @matcher.description
       end
     end
   end