dm-rspec 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -2,8 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.4)
+    columnize (0.3.6)
     data_objects (0.10.6)
       addressable (~> 2.1)
     diff-lcs (1.1.3)
@@ -21,6 +20,7 @@ GEM
       dm-core (~> 1.1.0)
     do_sqlite3 (0.10.6)
       data_objects (= 0.10.6)
+    ffi (1.0.9)
     git (1.2.5)
     guard (0.6.3)
       thor (~> 0.14.6)
@@ -31,10 +31,12 @@ GEM
       git (>= 1.2.5)
       rake
     libnotify (0.5.7)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    rake (0.9.2)
-    rcov (0.9.10)
+      ffi (= 1.0.9)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
+    rcov (0.9.11)
     reek (1.2.8)
       ruby2ruby (~> 1.2)
       ruby_parser (~> 2.0)
@@ -47,22 +49,17 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby2ruby (1.3.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby2ruby (1.3.1)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    ruby_parser (2.3.0)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.6)
+    sexp_processor (3.0.8)
     thor (0.14.6)
 
 PLATFORMS
@@ -80,4 +77,4 @@ DEPENDENCIES
   rcov
   reek (~> 1.2.8)
   rspec (~> 2.3.0)
-  ruby-debug19
+  ruby-debug

data/README.markdown

@@ -1,4 +1,4 @@
-# dm-rspec
+# dm-rspec (RSpec matchers for DataMapper)
 by Potapov Sergey (aka Blake)
 
 A set of rspec matchers to test DataMapper models like you test ActiveRecord models with rspec-rails.
@@ -19,9 +19,10 @@ Add the next to your `spec_helper`:
       config.include(DataMapper::Matchers)
     end
 
-In your spec files you can use the next matchers:
+In your spec files you can use the next matchers to test appropriate DataMapper's validations:
 
 * belong\_to
+* have\_one
 * have\_many
 * have\_many\_and\_belong\_to
 * have\_property
@@ -34,7 +35,7 @@ In your spec files you can use the next matchers:
 
 ## Examples
 
-Assume you have the next models:
+Assume you have the next data mapper models:
 
     class Book
       include DataMapper::Resource
@@ -66,7 +67,7 @@ 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}
+    specify {Books.should validate_presence_of :name}
 
     it 'has errors' do
       book = Book.new(:name => 'fails on two validations')
@@ -78,7 +79,7 @@ You specs can contain the next:
 
 ## TODO
 
-Implement the next matchers:
+Implement the next rspec matchers:
 
 * have timestamps
 * matchers to verify validations

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/dm/matchers/have_one.rb

@@ -0,0 +1,34 @@
+module DataMapper
+  module Matchers
+    class HaveOne
+      def initialize(child)
+        @child = child
+      end
+
+      def matches?(parent)
+        @parent = parent
+        relation = @parent.relationships[@child.to_s]
+
+        relation and
+        relation.is_a?(DataMapper::Associations::OneToOne::Relationship) and
+        relation.parent_model == parent
+      end
+
+      def failure_message
+        "expected to have one #{@child}"
+      end
+
+      def negative_failure_message
+        "expected not to have one #{@child}"
+      end
+
+      def description
+        "has one #{@child}"
+      end
+    end
+
+    def have_one(name)
+      HaveOne.new(name)
+    end
+  end
+end

data/lib/dm/matchers/validate_presence_of.rb

@@ -6,21 +6,17 @@ module DataMapper
 
     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
+        validators = model.validators.contexts[:default]
+        presence_of = validators.find do |validator|
+          validator.is_a? DataMapper::Validations::PresenceValidator and validator.field_name == @property
         end
+        return false unless presence_of
+        return false if @msg and @msg != presence_of.options[:message]
         true
       end
+
     end
 
   end

data/lib/dm/matchers/validate_uniqueness_of.rb

@@ -6,16 +6,15 @@ module DataMapper
 
     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}
+      def matches?(model)
+        validators = model.validators.contexts[:default]
+        uniqueness_of = validators.find do |validator|
+          validator.is_a? DataMapper::Validations::UniquenessValidator and validator.field_name == @property
+        end
+        return false unless uniqueness_of
+        return false if @msg and @msg != uniqueness_of.options[:message]
+        true
       end
     end
 

data/lib/dm/matchers.rb

@@ -5,6 +5,7 @@ module DataMapper
 end
 
 require 'dm/matchers/belong_to'
+require 'dm/matchers/have_one'
 require 'dm/matchers/have_many'
 require 'dm/matchers/have_many_and_belong_to'
 require 'dm/matchers/have_many_through'

data/spec/dm/matchers/have_one_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe DataMapper::Matchers::HaveOne do
+  context '#should' do
+    it 'passes if association exists' do
+      lambda { Book.should have_one :foreword}.should_pass
+    end
+
+    it 'fails if association does not exist' do
+      lambda { Author.should have_one :book}.should fail_with "expected to have one book"
+    end
+  end
+
+  context '#should_not' do
+    it 'fails if association exists' do
+      lambda { Book.should_not have_one :foreword}.should fail_with "expected not to have one foreword"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -48,6 +48,7 @@ class Book
   property :id, Serial
   property :name, String
   belongs_to :author
+  has 1, :foreword
   has n, :genres, :through => Resource
   has n, :taggings
   has n, :tags, :through => :taggings
@@ -90,6 +91,10 @@ class Tagging
   belongs_to :book
 end
 
+class Foreword
+  include DataMapper::Resource
+  property :id, Serial
+end
 
 DataMapper.finalize
 DataMapper.auto_migrate!

metadata

@@ -1,156 +1,207 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dm-rspec
-version: !ruby/object:Gem::Version
-  version: 0.1.1
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
-authors:
+authors: 
 - Potapov Sergey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000 +03:00
-default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: dm-core
-  requirement: &15883760 !ruby/object:Gem::Requirement
+
+date: 2011-12-29 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: dm-core
   prerelease: false
-  version_requirements: *15883760
-- !ruby/object:Gem::Dependency
-  name: dm-validations
-  requirement: &15883280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: dm-validations
   prerelease: false
-  version_requirements: *15883280
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &15882800 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-  type: :development
+  name: rspec
   prerelease: false
-  version_requirements: *15882800
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &15882320 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
+  name: bundler
   prerelease: false
-  version_requirements: *15882320
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &15881840 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
         version: 1.6.4
-  type: :development
+  name: jeweler
   prerelease: false
-  version_requirements: *15881840
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &15881360 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rcov
   prerelease: false
-  version_requirements: *15881360
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: &15880880 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 2
+        - 8
         version: 1.2.8
-  type: :development
+  name: reek
   prerelease: false
-  version_requirements: *15880880
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &15880400 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *15880400
-- !ruby/object:Gem::Dependency
-  name: libnotify
-  requirement: &15879920 !ruby/object:Gem::Requirement
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: guard-rspec
   prerelease: false
-  version_requirements: *15879920
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &15879440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *15879440
-- !ruby/object:Gem::Dependency
-  name: dm-migrations
-  requirement: &15878960 !ruby/object:Gem::Requirement
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: libnotify
+  prerelease: false
   type: :development
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: ruby-debug
   prerelease: false
-  version_requirements: *15878960
-- !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
-  requirement: &15912980 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: dm-migrations
+  prerelease: false
   type: :development
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: dm-sqlite-adapter
   prerelease: false
-  version_requirements: *15912980
+  type: :development
+  requirement: *id012
 description: RSpec matchers for DataMapper
 email: blake131313@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - .document
 - .rspec
 - CHANGELOG.markdown
@@ -167,6 +218,7 @@ files:
 - lib/dm/matchers/have_many.rb
 - lib/dm/matchers/have_many_and_belong_to.rb
 - lib/dm/matchers/have_many_through.rb
+- lib/dm/matchers/have_one.rb
 - lib/dm/matchers/have_property.rb
 - lib/dm/matchers/validate_format_of.rb
 - lib/dm/matchers/validate_presence_of.rb
@@ -178,35 +230,44 @@ files:
 - spec/dm/matchers/have_many_and_belong_to_spec.rb
 - spec/dm/matchers/have_many_spec.rb
 - spec/dm/matchers/have_many_through_spec.rb
+- spec/dm/matchers/have_one_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
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: It's a set of matchers for DataMapper. Something similar to rspec-rails gem.
 test_files: []
+