dm-rspec 0.1.0 → 0.1.1

data/CHANGELOG.markdown

@@ -1,3 +1,10 @@
+### version 0.1.1 / 2011-09-12
+
+* New matcher: validate\_presence\_of
+* New matcher: validate\_uniqueness\_of
+* New matcher: validate\_format\_of
+
+
 ### version 0.1.0 / 2011-09-04
 
 * New matcher: have many through

data/Gemfile

@@ -17,4 +17,7 @@ group :development do
   gem 'libnotify' if RUBY_PLATFORM =~ /linux/
   gem 'ruby-debug19' if RUBY_VERSION =~ /^1\.9/
   gem 'ruby-debug' if RUBY_VERSION =~ /^1\.8/
+
+  gem 'dm-migrations'
+  gem 'dm-sqlite-adapter'
 end

data/Gemfile.lock

@@ -4,25 +4,33 @@ GEM
     addressable (2.2.6)
     archive-tar-minitar (0.5.2)
     columnize (0.3.4)
+    data_objects (0.10.6)
+      addressable (~> 2.1)
     diff-lcs (1.1.3)
-    dm-core (1.0.2)
-      addressable (~> 2.2)
-      extlib (~> 0.9.15)
-    dm-validations (1.0.2)
-      dm-core (~> 1.0.2)
-    extlib (0.9.15)
-    ffi (1.0.9)
+    dm-core (1.1.0)
+      addressable (~> 2.2.4)
+    dm-do-adapter (1.1.0)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.1.0)
+    dm-migrations (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-sqlite-adapter (1.1.0)
+      dm-do-adapter (~> 1.1.0)
+      do_sqlite3 (~> 0.10.2)
+    dm-validations (1.1.0)
+      dm-core (~> 1.1.0)
+    do_sqlite3 (0.10.6)
+      data_objects (= 0.10.6)
     git (1.2.5)
-    guard (0.5.1)
+    guard (0.6.3)
       thor (~> 0.14.6)
-    guard-rspec (0.4.0)
+    guard-rspec (0.4.5)
       guard (>= 0.4.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     libnotify (0.5.7)
-      ffi (= 1.0.9)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     rake (0.9.2)
@@ -47,14 +55,14 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby2ruby (1.2.5)
+    ruby2ruby (1.3.0)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    ruby_parser (2.2.0)
+    ruby_parser (2.3.0)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.5)
+    sexp_processor (3.0.6)
     thor (0.14.6)
 
 PLATFORMS
@@ -63,6 +71,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   dm-core
+  dm-migrations
+  dm-sqlite-adapter
   dm-validations
   guard-rspec
   jeweler (~> 1.6.4)

data/README.markdown

@@ -25,8 +25,11 @@ In your spec files you can use the next matchers:
 * have\_many
 * have\_many\_and\_belong\_to
 * have\_property
-* have(n).errors_on(:property)
-* have_many(:association).trough(:another_association)
+* have(n).errors\_on(:property)
+* have\_many(:association).trough(:another\_association)
+* validate\_presence\_of(:property)
+* validate\_uniqueness\_of(:property)
+* validate\_format\_of(:property).with(/regexp/)
 
 
 ## Examples
@@ -63,6 +66,8 @@ You specs can contain the next:
     specify {Genre.should  have_many_and_belong_to :books}
     specify {Books.should  have_many_and_belong_to :genres}
 
+    specify {Books.should validates_presence_of :name}
+
     it 'has errors' do
       book = Book.new(:name => 'fails on two validations')
       book.valid?
@@ -70,6 +75,7 @@ You specs can contain the next:
     end
 
 
+
 ## TODO
 
 Implement the next matchers:

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/dm/matchers/validate_format_of.rb

@@ -0,0 +1,40 @@
+module DataMapper
+  module Matchers
+    def validate_format_of(property)
+      ValidateFormatOf.new(property)
+    end
+
+    class ValidateFormatOf < ValidationMatcher
+      set_validation_subject "format"
+
+      def with(format)
+        @format = format
+        self
+      end
+
+      def matches?(model)
+        validators = model.validators.contexts[:default]
+        format_of = validators.find do |validator|
+          validator.is_a? DataMapper::Validations::FormatValidator and validator.field_name == @property
+        end
+        return false unless format_of
+        return false unless format_of.options[:with] == @format
+        return false if     @msg and @msg != format_of.options[:message]
+        true
+      end
+
+      def failure_message
+        msg = "expected to validate #{@validation_subject} of #{@property} with #{@format.inspect}"
+        msg = %Q'#{msg} and message "#{@msg}"' if @msg
+        msg
+      end
+
+      def negative_failure_message
+        msg = "expected to not validate #{@validation_subject} of #{@property} with #{@format.inspect}"
+        msg = %Q'#{msg} and message "#{@msg}"' if @msg
+        msg
+      end
+    end
+
+  end
+end

data/lib/dm/matchers/validate_presence_of.rb

@@ -0,0 +1,27 @@
+module DataMapper
+  module Matchers
+    def validate_presence_of(property)
+      ValidatePresenceOf.new(property)
+    end
+
+    class ValidatePresenceOf < ValidationMatcher
+      set_validation_subject "presence"
+      set_default_msg_reg    /must not be blank$/
+
+
+      def matches?(model)
+        [nil, ''].each do |val|
+          obj = model.new(@property => val)
+          return false if obj.valid?
+          if messages = obj.errors.send(:errors)[@property]
+            return false unless messages.find{|msg| msg =~ @msg_reg}
+          else
+            return false
+          end
+        end
+        true
+      end
+    end
+
+  end
+end

data/lib/dm/matchers/validate_uniqueness_of.rb

@@ -0,0 +1,23 @@
+module DataMapper
+  module Matchers
+    def validate_uniqueness_of(property)
+      ValidateUniquenessOf.new(property)
+    end
+
+    class ValidateUniquenessOf < ValidationMatcher
+      set_validation_subject "uniqueness"
+      set_default_msg_reg    /is already taken$/
+
+      def matches?(klass)
+        val = rand.to_s
+        klass.create!(@property => val)
+        model = klass.new(@property => val)
+        model.valid?
+        errors = model.errors.send(:errors)
+        errors = errors[@property.to_sym]
+        errors and errors.find {|msg| msg =~ @msg_reg}
+      end
+    end
+
+  end
+end

data/lib/dm/matchers/validation_matcher.rb

@@ -0,0 +1,47 @@
+module DataMapper
+  module Matchers
+    class ValidationMatcher
+
+      class << self
+	def set_validation_subject(subject)
+	  @validation_subject = subject
+	end
+
+	def set_default_msg_reg(msg_reg)
+	  @default_msg_reg = msg_reg
+	end
+      end
+
+
+
+      def initialize(property)
+        @property = property.to_sym
+	@validation_subject = self.class.instance_eval { @validation_subject }
+	@msg_reg = self.class.instance_eval { @default_msg_reg }
+      end
+
+      def with_message(msg)
+        @msg = msg
+        @msg_reg = /^#{Regexp.escape(@msg)}$/
+        self
+      end
+
+      def failure_message
+        msg = "expected to validate #{@validation_subject} of #{@property}"
+        msg = %Q'#{msg} with message "#{@msg}"' if @msg
+        msg
+      end
+
+      def negative_failure_message
+        msg = "expected to not validate #{@validation_subject} of #{@property}"
+        msg = %Q'#{msg} with message "#{@msg}"' if @msg
+        msg
+      end
+
+      def description
+        "validates #{@validation_subject} of #{@property}"
+      end
+
+    end
+  end
+end

data/lib/dm/matchers.rb

@@ -6,6 +6,13 @@ end
 
 require 'dm/matchers/belong_to'
 require 'dm/matchers/have_many'
-require 'dm/matchers/have_property'
 require 'dm/matchers/have_many_and_belong_to'
 require 'dm/matchers/have_many_through'
+
+require 'dm/matchers/have_property'
+
+require 'dm/matchers/validation_matcher'
+
+require 'dm/matchers/validate_presence_of'
+require 'dm/matchers/validate_uniqueness_of'
+require 'dm/matchers/validate_format_of'

data/spec/dm/matchers/have_many_and_belong_to_spec.rb

@@ -8,15 +8,15 @@ describe DataMapper::Matchers::HaveManyAndBelongTo do
     end
 
     it 'fails if association does not exist' do
-      lambda { Book.should have_many_and_belong_to :authors}.should
-	fail_with "expected to have many and belong to authors"
+      lambda { Book.should have_many_and_belong_to :authors}.
+        should fail_with "expected to have many and belong to authors"
     end
   end
 
   context '#should_not' do
     it 'fails if association exists' do
-      lambda { Author.should_not have_many_and_belong_to :books}.should
-	fail_with "expected to not have many and belong to books"
+      lambda { Genre.should_not have_many_and_belong_to :books}.
+        should fail_with "expected to not have many and belong to books"
     end
   end
 end

data/spec/dm/matchers/validate_format_of_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe 'validate_format_of' do
+
+  context 'without message' do
+    context '#should 'do
+      it 'passes if validatation exists' do
+        lambda { Tag.should validate_format_of(:name).with(/\w+/) }.should_pass
+      end
+
+      it 'fails if validation does not exist' do
+        lambda { Tag.should validate_format_of(:id).with(/\w+/) }.
+          should fail_with 'expected to validate format of id with /\w+/'
+      end
+    end
+
+    context '#should_not' do
+      it 'fails if validation exists' do
+        lambda { Tag.should_not validate_format_of(:name).with(/\w+/) }.
+          should fail_with 'expected to not validate format of name with /\w+/'
+      end
+    end
+  end
+
+
+
+  context 'with message' do
+    context '#should' do
+      it 'passes if messages are the same' do
+        lambda{ Genre.should validate_format_of(:name).with(/\w+/).
+          with_message('Bad format of genre')
+        }.should_pass
+      end
+
+      it 'fails if messages are different' do
+        lambda{ Genre.should validate_format_of(:name).with(/\w+/).
+          with_message('Different message')
+        }.should fail_with 'expected to validate format of name with /\w+/ and message "Different message"'
+      end
+    end
+
+    context '#should_not' do
+      it 'fails if validation message exists and it is the same' do
+        lambda{ Genre.should_not validate_format_of(:name).with(/\w+/).
+          with_message('Bad format of genre')
+        }.should fail_with 'expected to not validate format of name with /\w+/ and message "Bad format of genre"'
+      end
+    end
+  end
+end

data/spec/dm/matchers/validate_presence_of_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+
+describe 'validate_presence_of' do
+  # Create class for the test
+  before(:all) do
+    @human = Class.new do
+      include DataMapper::Resource
+      property :first_name, String
+      property :last_name , String
+      property :age       , Integer
+
+      validates_presence_of :first_name, :message => 'Where is the first name?'
+      validates_presence_of :last_name
+    end
+  end
+
+
+  context "without message" do
+    context '#should' do
+      it 'passes if validation exists' do
+        lambda{ @human.should validate_presence_of :last_name}.should_pass
+      end
+
+      it 'fails if validation does not exist' do
+        lambda{ @human.should validate_presence_of :age}.
+          should fail_with "expected to validate presence of age"
+      end
+    end
+
+    context '#should_not' do
+      it 'fails if validation exists' do
+        lambda{ @human.should_not validate_presence_of :last_name}.
+          should fail_with "expected to not validate presence of last_name"
+      end
+    end
+  end
+
+
+  context 'with message' do
+    context '#should' do
+      it 'passes if messages are the same' do
+        lambda{ @human.should validate_presence_of(:first_name).
+          with_message('Where is the first name?')
+        }.should_pass
+      end
+
+      it 'fails if messages are different' do
+        lambda{ @human.should validate_presence_of(:first_name).
+          with_message('Different message')
+        }.should fail_with 'expected to validate presence of first_name with message "Different message"'
+      end
+    end
+
+    context '#should_not' do
+      it 'fails if validation message exists' do
+        lambda{ @human.should_not validate_presence_of(:first_name).
+          with_message('Where is the first name?')
+        }.should fail_with 'expected to not validate presence of first_name with message "Where is the first name?"'
+      end
+    end
+  end
+end

data/spec/dm/matchers/validate_uniquness_of_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe 'validate_uniqueness_of' do
+
+  context 'without message' do
+    context '#should 'do
+      it 'passes if validatation exists' do
+        lambda { Author.should validate_uniqueness_of :last_name}.should_pass
+      end
+
+      it 'fails if validation does not exist' do
+        lambda { Author.should validate_uniqueness_of :first_name}.
+          should fail_with "expected to validate uniqueness of first_name"
+      end
+    end
+
+    context '#should_not' do
+      it 'fails if validation exists' do
+        lambda { Author.should_not validate_uniqueness_of :last_name}.
+          should fail_with "expected to not validate uniqueness of last_name"
+      end
+    end
+  end
+
+
+
+  context 'with message' do
+    context '#should' do
+      it 'passes if messages are the same' do
+        lambda{ Genre.should validate_uniqueness_of(:name).
+          with_message('Genre name must be unique!')
+        }.should_pass
+      end
+
+      it 'fails if messages are different' do
+        lambda{ Genre.should validate_uniqueness_of(:name).
+          with_message('Different message')
+        }.should fail_with 'expected to validate uniqueness of name with message "Different message"'
+      end
+    end
+
+    context '#should_not' do
+      it 'fails if validation message exists and it is the same' do
+        lambda{ Genre.should_not validate_uniqueness_of(:name).
+          with_message('Genre name must be unique!')
+        }.should fail_with 'expected to not validate uniqueness of name with message "Genre name must be unique!"'
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,9 +3,14 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'dm-core'
 require 'dm-validations'
+require 'dm-migrations'
+require 'dm-sqlite-adapter'
 
 require 'dm-rspec'
 
+
+DataMapper.setup(:default, "sqlite3::memory:")
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
@@ -34,6 +39,8 @@ class Proc
 end
 
 
+
+
 # Models for testing
 #
 class Book
@@ -45,13 +52,17 @@ class Book
   has n, :taggings
   has n, :tags, :through => :taggings
   validates_presence_of :name
+  validates_uniqueness_of :name, :message => 'Book name must be unique!'
   validates_length_of :name, :min => 10
 end
 
 class Author
   include DataMapper::Resource
   property :id, Serial
+  property :first_name, String
+  property :last_name, String
   has n, :books
+  validates_uniqueness_of :last_name
 end
 
 class Genre
@@ -59,6 +70,8 @@ class Genre
   property :id, Serial
   property :name, String
   has n, :books, :through => Resource
+  validates_uniqueness_of :name, :message => 'Genre name must be unique!'
+  validates_format_of :name, :with => /\w+/, :message => "Bad format of genre"
 end
 
 class Tag
@@ -66,10 +79,17 @@ class Tag
   property :id, Serial
   has n, :taggings
   has n, :books, :through => :taggings
+  property :name, String
+  validates_format_of :name, :with => /\w+/
 end
 
 class Tagging
   include DataMapper::Resource
+  property :id, Serial
   belongs_to :tag
   belongs_to :book
 end
+
+
+DataMapper.finalize
+DataMapper.auto_migrate!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000 +03:00
+date: 2011-09-12 00:00:00.000000000 +03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &18252280 !ruby/object:Gem::Requirement
+  requirement: &15883760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18252280
+  version_requirements: *15883760
 - !ruby/object:Gem::Dependency
   name: dm-validations
-  requirement: &18251800 !ruby/object:Gem::Requirement
+  requirement: &15883280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18251800
+  version_requirements: *15883280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18251320 !ruby/object:Gem::Requirement
+  requirement: &15882800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *18251320
+  version_requirements: *15882800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18250840 !ruby/object:Gem::Requirement
+  requirement: &15882320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18250840
+  version_requirements: *15882320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18250360 !ruby/object:Gem::Requirement
+  requirement: &15881840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *18250360
+  version_requirements: *15881840
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &18249880 !ruby/object:Gem::Requirement
+  requirement: &15881360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18249880
+  version_requirements: *15881360
 - !ruby/object:Gem::Dependency
   name: reek
-  requirement: &18249400 !ruby/object:Gem::Requirement
+  requirement: &15880880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.2.8
   type: :development
   prerelease: false
-  version_requirements: *18249400
+  version_requirements: *15880880
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &18248920 !ruby/object:Gem::Requirement
+  requirement: &15880400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18248920
+  version_requirements: *15880400
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &18248440 !ruby/object:Gem::Requirement
+  requirement: &15879920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18248440
+  version_requirements: *15879920
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &18247960 !ruby/object:Gem::Requirement
+  requirement: &15879440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18247960
+  version_requirements: *15879440
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  requirement: &15878960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *15878960
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  requirement: &15912980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *15912980
 description: RSpec matchers for DataMapper
 email: blake131313@gmail.com
 executables: []
@@ -146,6 +168,10 @@ files:
 - lib/dm/matchers/have_many_and_belong_to.rb
 - lib/dm/matchers/have_many_through.rb
 - lib/dm/matchers/have_property.rb
+- lib/dm/matchers/validate_format_of.rb
+- lib/dm/matchers/validate_presence_of.rb
+- lib/dm/matchers/validate_uniqueness_of.rb
+- lib/dm/matchers/validation_matcher.rb
 - lib/dm/resource.rb
 - spec/dm/matchers/belong_to_spec.rb
 - spec/dm/matchers/errors_on_spec.rb
@@ -153,6 +179,9 @@ files:
 - spec/dm/matchers/have_many_spec.rb
 - spec/dm/matchers/have_many_through_spec.rb
 - spec/dm/matchers/have_property_spec.rb
+- spec/dm/matchers/validate_format_of_spec.rb
+- spec/dm/matchers/validate_presence_of_spec.rb
+- spec/dm/matchers/validate_uniquness_of_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/greyblake/dm-rspec