dm-rspec 0.0.1 → 0.0.2

data/README.markdown

@@ -24,8 +24,7 @@ In your spec files you can use the next matchers:
 * have\_many
 * have\_many\_and\_belong\_to
 * have\_property
-* have\_errors\_on
-* have\_error\_on
+* have(n).errors_on(:property)
 
 
 ## Examples
@@ -63,16 +62,19 @@ You specs can contain the next:
     specify {Books.should  have_many_and_belong_to :genres}
 
     it 'has errors' do
-      book = Book.new
+      book = Book.new(:name => 'fails on two validations')
       book.valid?
-      book.should have_errors_on(:name)
+      book.should have(2).errors_on(:name)
     end
 
 
 ## TODO
 
 Implement the next matchers:
-* have(n).errors\_on * have\_many(:models).through(:association) 
+
+* have\_many(:models).through(:association) 
+
+Implement matchers for validations.
 
 
 ## Contributing to dm-rspec

data/VERSION

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

data/lib/dm-rspec.rb

@@ -1,4 +1,5 @@
 module DataMapper
 end
 
+require File.join(File.dirname(__FILE__), 'dm', 'resource')
 require 'dm/matchers'

data/lib/dm/matchers/have_errors_on.rb

@@ -26,9 +26,13 @@ module DataMapper
     end
 
     def have_errors_on(property)
+      puts "dm-rspec: `have_errors_on` is deprecated. Please use `have(n).errors_on` instead"
       HaveErrorsOn.new(property)
     end
 
-    alias :have_error_on :have_errors_on 
+    def have_error_on(property)
+      puts "dm-rspec: `have_error_on` is deprecated. Please use `have(1).error_on` instead"
+      HaveErrorsOn.new(property)
+    end
   end
 end

data/lib/dm/resource.rb

@@ -0,0 +1,11 @@
+module DataMapper
+  module Resource
+
+    def errors_on(property)
+      self.valid?
+      errors.send(:errors)[property] or []
+    end
+
+    alias :error_on :errors_on
+  end
+end

data/spec/dm/matchers/errors_on_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+
+describe 'have errors_on' do
+  before(:all) do
+    @valid = Book.new(:name => 'War and Peace')
+    @one_err = Book.new(:name => 'too short')
+    @two_errs = Book.new
+  end
+
+
+  context '#should' do
+    it 'passes' do
+      lambda {@one_err.should have(1).error_on :name}.should_pass
+      lambda {@two_errs.should have(2).errors_on :name}.should_pass
+      lambda {@valid.should have(0).errors_on :name}.should_pass
+    end
+
+    it 'fails for valid mode' do
+      lambda {@valid.should have(1).errors_on :name}.should fail
+    end
+  end
+
+  context '#should_not' do
+    it 'fails for invalid model' do
+      lambda {@one_err.should_not have(1).error_on :name}.should fail
+      lambda {@two_errs.should_not have(2).errors_on :name}.should fail
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -43,6 +43,7 @@ class Book
   belongs_to :author
   has n, :genres, :through => Resource
   validates_presence_of :name
+  validates_length_of :name, :min => 10
 end
 
 class Author

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-rspec
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-04 00:00:00.000000000 +03:00
+date: 2011-09-05 00:00:00.000000000 +03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &21244360 !ruby/object:Gem::Requirement
+  requirement: &13450840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21244360
+  version_requirements: *13450840
 - !ruby/object:Gem::Dependency
   name: dm-validations
-  requirement: &21243880 !ruby/object:Gem::Requirement
+  requirement: &13450360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21243880
+  version_requirements: *13450360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21243400 !ruby/object:Gem::Requirement
+  requirement: &13449880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *21243400
+  version_requirements: *13449880
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21242920 !ruby/object:Gem::Requirement
+  requirement: &13449400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21242920
+  version_requirements: *13449400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21242440 !ruby/object:Gem::Requirement
+  requirement: &13448920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *21242440
+  version_requirements: *13448920
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &21241960 !ruby/object:Gem::Requirement
+  requirement: &13448440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21241960
+  version_requirements: *13448440
 - !ruby/object:Gem::Dependency
   name: reek
-  requirement: &21241480 !ruby/object:Gem::Requirement
+  requirement: &13447960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.2.8
   type: :development
   prerelease: false
-  version_requirements: *21241480
+  version_requirements: *13447960
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &21241000 !ruby/object:Gem::Requirement
+  requirement: &13447480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21241000
+  version_requirements: *13447480
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &21240520 !ruby/object:Gem::Requirement
+  requirement: &13447000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21240520
+  version_requirements: *13447000
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &21240040 !ruby/object:Gem::Requirement
+  requirement: &13446520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21240040
+  version_requirements: *13446520
 description: RSpec matchers for DataMapper
 email: blake131313@gmail.com
 executables: []
@@ -145,7 +145,9 @@ files:
 - lib/dm/matchers/have_many.rb
 - lib/dm/matchers/have_many_and_belong_to.rb
 - lib/dm/matchers/have_property.rb
+- lib/dm/resource.rb
 - spec/dm/matchers/belong_to_spec.rb
+- spec/dm/matchers/errors_on_spec.rb
 - spec/dm/matchers/have_errors_on_spec.rb
 - spec/dm/matchers/have_many_and_belong_to_spec.rb
 - spec/dm/matchers/have_many_spec.rb