dm-rspec 0.0.2 → 0.1.0

data/CHANGELOG.markdown

@@ -0,0 +1,15 @@
+### version 0.1.0 / 2011-09-04
+
+* New matcher: have many through
+* have\_errors\_on is removed
+
+
+### version 0.0.2 / 2011-09-04
+
+* New matcher have(n).errors_on(:property)
+* have\_errors\_on is deprecated
+
+
+### version 0.0.1 / 2011-09-03
+
+* Initial release

data/README.markdown

@@ -1,4 +1,5 @@
 # dm-rspec
+by Potapov Sergey (aka Blake)
 
 A set of rspec matchers to test DataMapper models like you test ActiveRecord models with rspec-rails.
 
@@ -25,6 +26,7 @@ In your spec files you can use the next matchers:
 * have\_many\_and\_belong\_to
 * have\_property
 * have(n).errors_on(:property)
+* have_many(:association).trough(:another_association)
 
 
 ## Examples
@@ -72,9 +74,8 @@ You specs can contain the next:
 
 Implement the next matchers:
 
-* have\_many(:models).through(:association) 
-
-Implement matchers for validations.
+* have timestamps
+* matchers to verify validations
 
 
 ## Contributing to dm-rspec

data/VERSION

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

data/lib/dm/matchers.rb

@@ -6,6 +6,6 @@ end
 
 require 'dm/matchers/belong_to'
 require 'dm/matchers/have_many'
-require 'dm/matchers/have_errors_on'
 require 'dm/matchers/have_property'
 require 'dm/matchers/have_many_and_belong_to'
+require 'dm/matchers/have_many_through'

data/lib/dm/matchers/have_many.rb

@@ -15,6 +15,12 @@ module DataMapper
         relation.parent_model == parent
       end
 
+      # called only when the next syntax is used:
+      #   Book.should have_many(:tags).trough(:tagging)
+      def through(broker)
+        HaveManyThrough.new(@children, broker)
+      end
+
       def failure_message
         "expected to have many #{@children}"
       end

data/lib/dm/matchers/have_many_through.rb

@@ -0,0 +1,31 @@
+module DataMapper
+  module Matchers
+
+    class HaveManyThrough
+      def initialize(children, broker)
+        @children, @broker = children, broker
+      end
+
+      def matches?(parent)
+        relation = parent.relationships[@children.to_s]
+
+        relation.parent_model == parent and
+        relation.name == @children.to_sym and
+        relation.options[:through] == @broker.to_sym
+      end
+
+      def failure_message
+        "expected to have many #{@children} through #{@broker}"
+      end
+
+      def negative_failure_message
+        "expected to not have many #{@children} through #{@broker}"
+      end
+      
+      def description
+        "has many #{@children} through #{@broker}"
+      end
+    end
+
+  end
+end

data/spec/dm/matchers/have_many_through_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+
+describe DataMapper::Matchers::HaveManyThrough do
+  context '#should' do
+    it 'passes if association exists' do
+      lambda { Book.should have_many(:tags).through(:taggings) }.should_pass
+    end
+
+    it 'fails if association does not exist' do
+      lambda { Author.should have_many(:books).through(:something) }.should fail_with "expected to have many books through something"
+      lambda { Book.should have_many(:tags).through(:author) }.should fail_with "expected to have many tags through author"
+    end
+  end
+
+  context '#should_not' do
+    it 'fails if association exists' do
+      lambda { Book.should_not have_many(:tags).through(:taggings) }.should fail_with "expected to not have many tags through taggings"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -42,6 +42,8 @@ class Book
   property :name, String
   belongs_to :author
   has n, :genres, :through => Resource
+  has n, :taggings
+  has n, :tags, :through => :taggings
   validates_presence_of :name
   validates_length_of :name, :min => 10
 end
@@ -58,3 +60,16 @@ class Genre
   property :name, String
   has n, :books, :through => Resource
 end
+
+class Tag
+  include DataMapper::Resource
+  property :id, Serial
+  has n, :taggings
+  has n, :books, :through => :taggings
+end
+
+class Tagging
+  include DataMapper::Resource
+  belongs_to :tag
+  belongs_to :book
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-rspec
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000 +03:00
+date: 2011-09-06 00:00:00.000000000 +03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &13450840 !ruby/object:Gem::Requirement
+  requirement: &18252280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13450840
+  version_requirements: *18252280
 - !ruby/object:Gem::Dependency
   name: dm-validations
-  requirement: &13450360 !ruby/object:Gem::Requirement
+  requirement: &18251800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13450360
+  version_requirements: *18251800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13449880 !ruby/object:Gem::Requirement
+  requirement: &18251320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *13449880
+  version_requirements: *18251320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13449400 !ruby/object:Gem::Requirement
+  requirement: &18250840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13449400
+  version_requirements: *18250840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13448920 !ruby/object:Gem::Requirement
+  requirement: &18250360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *13448920
+  version_requirements: *18250360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &13448440 !ruby/object:Gem::Requirement
+  requirement: &18249880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13448440
+  version_requirements: *18249880
 - !ruby/object:Gem::Dependency
   name: reek
-  requirement: &13447960 !ruby/object:Gem::Requirement
+  requirement: &18249400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.2.8
   type: :development
   prerelease: false
-  version_requirements: *13447960
+  version_requirements: *18249400
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &13447480 !ruby/object:Gem::Requirement
+  requirement: &18248920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13447480
+  version_requirements: *18248920
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &13447000 !ruby/object:Gem::Requirement
+  requirement: &18248440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13447000
+  version_requirements: *18248440
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &13446520 !ruby/object:Gem::Requirement
+  requirement: &18247960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13446520
+  version_requirements: *18247960
 description: RSpec matchers for DataMapper
 email: blake131313@gmail.com
 executables: []
@@ -131,6 +131,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- CHANGELOG.markdown
 - GPL-LICENSE.txt
 - Gemfile
 - Gemfile.lock
@@ -141,16 +142,16 @@ files:
 - lib/dm-rspec.rb
 - lib/dm/matchers.rb
 - lib/dm/matchers/belong_to.rb
-- lib/dm/matchers/have_errors_on.rb
 - 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_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
+- spec/dm/matchers/have_many_through_spec.rb
 - spec/dm/matchers/have_property_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/dm/matchers/have_errors_on.rb

@@ -1,38 +0,0 @@
-module DataMapper
-  module Matchers
-
-    class HaveErrorsOn
-      def initialize(property)
-	@property = property.to_sym
-      end
-
-      def matches?(model)
-	@model = model
-	@model.valid?
-	!@model.errors[@property].empty?
-      end
-
-      def failure_message
-	"expected to have errors on #{@property}"
-      end
-
-      def negative_failure_message
-	"expected to not have errors on #{@property}"
-      end
-
-      def description
-        "has errors on #{@property}"
-      end
-    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
-
-    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/spec/dm/matchers/have_errors_on_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-
-describe DataMapper::Matchers::HaveErrorsOn do
-  before(:all) do
-    @invalid = Book.new
-    @valid = Book.new(:name => 'War and Peace')
-  end
-
-
-  context '#should' do
-    it 'passes for invalid model' do
-      lambda {@invalid.should have_errors_on :name}.should_pass
-      lambda {@invalid.should have_error_on :name}.should_pass
-    end
-
-    it 'fails for valid model' do
-      lambda {@valid.should have_errors_on :name}.should fail_with "expected to have errors on name"
-      lambda {@valid.should have_error_on :name}.should fail_with "expected to have errors on name"
-    end
-  end
-
-  context '#should_not' do
-    it 'fails for invalid model' do
-      lambda {@invalid.should_not have_errors_on :name}.should fail_with "expected to not have errors on name"
-      lambda {@invalid.should_not have_error_on :name}.should fail_with "expected to not have errors on name"
-    end
-  end
-end