mongoid-rspec 1.3.2 → 1.4.1

data/Gemfile

@@ -1 +1,2 @@
-gemspec
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -1,43 +1,43 @@
 PATH
   remote: .
   specs:
-    mongoid-rspec (1.3.0)
-      mongoid (~> 2.0.0)
+    mongoid-rspec (1.4.1)
+      mongoid (~> 2.0.0.rc.7)
+      mongoid-rspec
       rspec (~> 2)
 
 GEM
+  remote: http://rubygems.org/
   specs:
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activesupport (3.0.1)
-    bson (1.1.2)
+      i18n (~> 0.4)
+    activesupport (3.0.5)
+    bson (1.2.4)
     builder (2.1.2)
     diff-lcs (1.1.2)
-    i18n (0.4.2)
-    mongo (1.1.2)
-      bson (>= 1.1.1)
-    mongoid (2.0.0.beta.20)
+    i18n (0.5.0)
+    mongo (1.2.4)
+      bson (>= 1.2.4)
+    mongoid (2.0.0.rc.7)
       activemodel (~> 3.0)
-      mongo (~> 1.1)
+      mongo (~> 1.2)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    tzinfo (0.3.23)
+    rspec-mocks (2.5.0)
+    tzinfo (0.3.24)
     will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  mongoid (~> 2.0.0)
   mongoid-rspec!
-  rspec (~> 2)

data/README.markdown

@@ -3,30 +3,43 @@ mongoid-rspec
 
 RSpec matchers for Mongoid.
 
-
 Association Matchers
 -
     describe User do
-      it { should reference_many :articles }
-      it { should reference_many :comments }    
+      it { should reference_many(:articles).with_foreign_key(:author_id) }
+      it { should have_many(:articles).with_foreign_key(:author_id) }
+  
+      it { should reference_one(:record) }
+      it { should have_one(:record) }    
+  
+      it { should reference_many :comments }
+      it { should have_many :comments }
+  
       it { should embed_one :profile }
-      it { should reference_many(:children).stored_as(:array) }
-    end
   
+      it { should reference_and_be_referenced_in_many(:children).of_type(User) }
+      it { should have_and_belong_to_many(:children) }
+    end
+
     describe Profile do
       it { should be_embedded_in(:user).as_inverse_of(:profile) }
     end
-  
+
     describe Article do
-      it { should be_referenced_in(:user).as_inverse_of(:articles) }
+      it { should be_referenced_in(:author).of_type(User).as_inverse_of(:articles) }
+      it { should belong_to(:author).of_type(User).as_inverse_of(:articles) }
       it { should embed_many(:comments) }
     end
-  
+
     describe Comment do
       it { should be_embedded_in(:article).as_inverse_of(:comments) }
       it { should be_referenced_in(:user).as_inverse_of(:comments) }
     end
 
+    describe Record do
+      it { should be_referenced_in(:user).as_inverse_of(:record) }
+    end
+
 Validation Matchers
 -
     describe User do
@@ -36,10 +49,12 @@ Validation Matchers
       it { should validate_associated(:profile) }
       it { should validate_inclusion_of(:role).to_allow("admin", "member") }
       it { should validate_numericality_of(:age) }
+      it { should validate_length_of(:us_phone).as_exactly(7) }
+      it { should validate_confirmation_of(:email) }
     end
     
     describe Article do
-      it { should validate_length_of(:title) }
+      it { should validate_length_of(:title).within(4..100) }
     end
 
 Others
@@ -64,3 +79,9 @@ drop in existing or dedicated support file in spec/support (spec/support/mongoid
     RSpec.configure do |configuration|
       configuration.include Mongoid::Matchers
     end
+    
+Acknowledgement
+-
+Thanks to [Durran Jordan](https://github.com/durran) for providing the changes necessary to make 
+this compatible with mongoid 2.0.0.rc, and for other [contributors](https://github.com/evansagge/mongoid-rspec/contributors) 
+to this project.

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "evansagge@gmail.com"
     gem.homepage = "http://github.com/evansagge/mongoid-rspec"
     gem.authors = ["Evan Sagge"]
-    gem.add_dependency "mongoid", "~> 2.0.0"
+    gem.add_dependency "mongoid", "~> 2.0.0.rc.7"
     gem.add_dependency "rspec", "~> 2"
   end
   Jeweler::GemcutterTasks.new
@@ -32,7 +32,7 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
+# task :spec => :check_dependencies
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.4.1

data/lib/matchers/associations.rb

@@ -1,17 +1,18 @@
-require 'mongoid/associations'
+require 'mongoid/relations'
 
 module Mongoid
   module Matchers
     module Associations
-      HAS_MANY = defined?(Mongoid::Associations::HasManyRelated) ? Mongoid::Associations::HasManyRelated : Mongoid::Associations::ReferencesMany
-      HAS_MANY_AS_ARRAY = Mongoid::Associations::ReferencesManyAsArray
-      HAS_ONE = defined?(Mongoid::Associations::HasOneRelated) ? Mongoid::Associations::HasOneRelated : Mongoid::Associations::ReferencesOne
-      BELONGS_TO = defined?(Mongoid::Associations::BelongsToRelated) ? Mongoid::Associations::BelongsToRelated : Mongoid::Associations::ReferencedIn
-      EMBEDS_MANY = Mongoid::Associations::EmbedsMany
-      EMBEDS_ONE = Mongoid::Associations::EmbedsOne
-      EMBEDDED_IN = Mongoid::Associations::EmbeddedIn
-
-      
+
+      HAS_MANY = Mongoid::Relations::Referenced::Many
+      HAS_AND_BELONGS_TO_MANY = Mongoid::Relations::Referenced::ManyToMany
+      HAS_ONE = Mongoid::Relations::Referenced::One
+      BELONGS_TO = Mongoid::Relations::Referenced::In
+      EMBEDS_MANY = Mongoid::Relations::Embedded::Many
+      EMBEDS_ONE = Mongoid::Relations::Embedded::One
+      EMBEDDED_IN = Mongoid::Relations::Embedded::In
+
+
       class HaveAssociationMatcher
         def initialize(name, association_type)
           @association = {}
@@ -24,13 +25,13 @@ module Mongoid
           @expectation_message = "#{type_description} #{@association[:name].inspect}"
           @expectation_message << " of type #{@association[:class].inspect}" unless @association[:class].nil?
         end
-        
+
         def of_type(klass)
           @association[:class] = klass
           @expectation_message << " of type #{@association[:class].inspect}"
           self
         end
-        
+
         def as_inverse_of(association_inverse_name)
           raise "#{@association[:type].inspect} does not respond to :inverse_of" unless [BELONGS_TO, EMBEDDED_IN].include?(@association[:type])
           @association[:inverse_of] = association_inverse_name.to_s
@@ -39,60 +40,74 @@ module Mongoid
         end
         
         def stored_as(store_as)
-          @association[:type] = HAS_MANY_AS_ARRAY if store_as == :array
+          raise NotImplementedError, "`references_many #{@association[:name]} :stored_as => :array` has been removed in Mongoid 2.0.0.rc, use `references_and_referenced_in_many #{@association[:name]}` instead"
+        end
+
+        def with_foreign_key(foreign_key)
+          @association[:foreign_key] = foreign_key.to_s
+          @expectation_message << " using foreign key #{@association[:foreign_key].inspect}"
           self
         end
-        
+
         def matches?(actual)
           @actual = actual.is_a?(Class) ? actual : actual.class
-          association = @actual.associations[@association[:name]]
-          
-          
-          if association.nil?
+          metadata = @actual.relations[@association[:name]]
+
+          if metadata.nil?
             @negative_result_message = "no association named #{@association[:name]}"
             return false
           else
             @positive_result_message = "association named #{@association[:name]}"
           end
-          
-          if association.association != @association[:type]
-            @negative_result_message = "#{@actual.inspect} #{type_description(association.association, false)} #{@association[:name]}"
+
+          relation = metadata.relation
+          if relation != @association[:type]
+            @negative_result_message = "#{@actual.inspect} #{type_description(relation, false)} #{@association[:name]}"
             return false
           else
-            @positive_result_message = "#{@actual.inspect} #{type_description(association.association, false)} #{@association[:name]}"
+            @positive_result_message = "#{@actual.inspect} #{type_description(relation, false)} #{@association[:name]}"
           end
-          
-          if !@association[:class].nil? and @association[:class] != association.klass
-            @negative_result_message = "#{@positive_result_message} of type #{association.klass.inspect}"
+
+          if !@association[:class].nil? and @association[:class] != metadata.klass
+            @negative_result_message = "#{@positive_result_message} of type #{metadata.klass.inspect}"
             return false
           else
-            @positive_result_message = "#{@positive_result_message} of type #{association.klass.inspect}"
+            @positive_result_message = "#{@positive_result_message} of type #{metadata.klass.inspect}"
           end
-          
+
           if @association[:inverse_of]
-            if @association[:inverse_of].to_s != association.inverse_of.to_s
-              @negative_result_message = "#{@positive_result_message} which is an inverse of #{association.inverse_of}"
+            if @association[:inverse_of].to_s != metadata.inverse_of.to_s
+              @negative_result_message = "#{@positive_result_message} which is an inverse of #{metadata.inverse_of}"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which is an inverse of #{metadata.inverse_of}"
+            end
+          end
+
+          if @association[:foreign_key]
+            if metadata.foreign_key != @association[:foreign_key]
+              @negative_result_message = "#{@positive_result_message} with foreign key #{metadata.foreign_key.inspect}"
               return false
             else
-              @positive_result_message = "#{@positive_result_message} which is an inverse of #{association.inverse_of}"
+              @positive_result_message = "#{@positive_result_message} with foreign key #{metadata.foreign_key.inspect}"
             end
           end
-          
-          true
+
+          return true
         end
-        
-        def failure_message_for_should  
-          "Expected #{@actual.inspect} to #{@expectation_message}, got #{@negative_result_message}"  
-        end  
-      
-        def failure_message_for_should_not  
-          "Expected #{@actual.inspect} to not #{@expectation_message}, got #{@positive_result_message}"  
+
+        def failure_message_for_should
+          "Expected #{@actual.inspect} to #{@expectation_message}, got #{@negative_result_message}"
         end
-        
+
+        def failure_message_for_should_not
+          "Expected #{@actual.inspect} to not #{@expectation_message}, got #{@positive_result_message}"
+        end
+
         def description
           @expectation_message
         end
-        
+
         def type_description(type = nil, passive = true)
           type ||= @association[:type]
           case type.name
@@ -106,42 +121,50 @@ module Mongoid
             (passive ? 'reference' : 'references') << ' one'
           when HAS_MANY.name
             (passive ? 'reference' : 'references') << ' many'
-          when HAS_MANY_AS_ARRAY.name
-            (passive ? 'reference' : 'references') << ' many as array'
+          when HAS_AND_BELONGS_TO_MANY.name
+            (passive ? 'reference' : 'references') << ' and referenced in many'
           when BELONGS_TO.name
             (passive ? 'be referenced in' : 'referenced in')
           else
             raise "Unknown association type '%s'" % type
           end
         end
-      end      
-      
+      end
+
       def embed_one(association_name)
         HaveAssociationMatcher.new(association_name, EMBEDS_ONE)
       end
-      
+
       def embed_many(association_name)
         HaveAssociationMatcher.new(association_name, EMBEDS_MANY)
-      end    
-      
+      end
+
       def be_embedded_in(association_name)
         HaveAssociationMatcher.new(association_name, EMBEDDED_IN)
       end
-      
+
       def have_one_related(association_name)
         HaveAssociationMatcher.new(association_name, HAS_ONE)
-      end        
+      end
       alias :reference_one :have_one_related
-      
+      alias :have_one :have_one_related
+
       def have_many_related(association_name)
         HaveAssociationMatcher.new(association_name, HAS_MANY)
-      end     
-      alias :reference_many :have_many_related   
-      
+      end
+      alias :reference_many :have_many_related
+      alias :have_many :have_many_related
+
+      def have_and_belong_to_many(association_name)
+        HaveAssociationMatcher.new(association_name, HAS_AND_BELONGS_TO_MANY)
+      end
+      alias :reference_and_be_referenced_in_many :have_and_belong_to_many
+
       def belong_to_related(association_name)
         HaveAssociationMatcher.new(association_name, BELONGS_TO)
-      end     
-      alias :be_referenced_in :belong_to_related 
-    end 
+      end
+      alias :be_referenced_in :belong_to_related
+      alias :belong_to :belong_to_related
+    end
   end
-end
+end

data/lib/matchers/document.rb

@@ -57,37 +57,6 @@ module Mongoid
       HaveFieldMatcher.new(*args)
     end
     alias_method :have_fields, :have_field
-
-    class SaveMatcher
-      def initialize(attributes = {})
-        @attributes = attributes
-      end
-
-      def matches?(actual)
-        @actual = actual.is_a?(Class) ?
-          ( defined?(::Factory) ? ::Factory.build(actual.name.underscore, @attributes) : actual.new(@attributes)) :
-          actual
-        @actual.valid? and @actual.save
-      end
-
-      def failure_message_for_should
-        "Expected #{@actual.inspect} to save properly, got #{@actual.errors.full_messages.to_sentence}"
-      end
-
-      def failure_message_for_should_not
-        "Expected #{@actual.inspect} to not save, got saved instead"
-      end
-
-      def description
-        "save properly"
-      end
-    end
-
-    def save(attributes = {})
-      SaveMatcher.new(attributes)
-    end
-    alias_method :save_properly, :save
-
   end
 end
 

data/lib/matchers/validations.rb

@@ -26,7 +26,7 @@ module Mongoid
         
         def failure_message_for_should  
           "Expected #{@klass.inspect} to #{description}, got #{@negative_result_message}"  
-        end  
+        end
       
         def failure_message_for_should_not  
           "Expected #{@klass.inspect} to not #{description}, got #{@positive_result_message}"  

data/lib/matchers/validations/confirmation_of.rb

@@ -0,0 +1,9 @@
+module Mongoid
+  module Matchers
+    module Validations  
+      def validate_confirmation_of(field)
+        HaveValidationMatcher.new(field, :confirmation)
+      end
+    end
+  end
+end  

data/lib/matchers/validations/length_of.rb

@@ -1,9 +1,100 @@
 module Mongoid
   module Matchers
     module Validations
+      class ValidateLengthOfMatcher < HaveValidationMatcher
+        def initialize(name)
+          super(name, :length)
+        end
+
+        def with_maximum(value)
+          @maximum = value
+          self
+        end
+
+        def with_minimum(value)
+          @minimum = value
+          self
+        end
+
+        def within(value)
+          @within = value
+          self
+        end
+        alias :in :within
+
+        def as_exactly(value)
+          @is = value
+          self
+        end
+        alias :is :as_exactly
+
+        def matches?(actual)
+          return false unless @result = super(actual)
+
+          check_maximum if @maximum
+          check_minimum if @minimum
+          check_range if @within
+          check_exact if @is
+
+          @result
+        end
+
+        def description
+          options_desc = []
+          options_desc << " with maximum #{@maximum}" if @maximum
+          options_desc << " with minimum #{@minimum}" if @minimum
+          options_desc << " within range #{@within}" if @within
+          options_desc << " as exactly #{@is}" if @is
+          super << options_desc.to_sentence
+        end
+
+        private
+
+        def check_maximum
+          actual = @validator.options[:maximum]
+          if actual == @maximum
+            @positive_result_message << " with maximum of #{@maximum}"
+          else
+            @negative_result_message << " with maximum of #{actual}"
+            @result = false
+          end
+        end
+
+        def check_minimum
+          actual = @validator.options[:minimum]
+          if actual == @minimum
+            @positive_result_message << " with minimum of #{@minimum}"
+          else
+            @negative_result_message << " with minimum of #{actual}"
+            @result = false
+          end
+        end
+
+        def check_range
+          min, max = [@within.min, @within.max]
+          actual = @validator.options
+          if actual[:minimum] == min && actual[:maximum] == max
+            @positive_result_message << " with range #{@within.inspect}"
+          else
+            @negative_result_message << " with range #{(actual[:minimum]..actual[:maximum]).inspect}"
+            @result = false
+          end
+        end
+
+        def check_exact
+          actual = @validator.options[:is]
+          if actual == @is
+            @positive_result_message << " is exactly #{@is}"
+          else
+            @negative_result_message << " is exactly #{actual}"
+            @result = false
+          end
+        end
+      end
+
       def validate_length_of(field)
-        HaveValidationMatcher.new(field, :length)
+        ValidateLengthOfMatcher.new(field)
       end
     end
   end
-end
+end

data/lib/matchers/validations/numericality_of.rb

@@ -1,9 +1,41 @@
 module Mongoid
   module Matchers
-    module Validations  
+    module Validations
+      class ValidateNumericalityOfMatcher < HaveValidationMatcher
+        def initialize(field)
+          super(field, :numericality)
+        end
+
+        def greater_than(value)
+          @greater_than = value
+          self
+        end
+
+        def matches?(actual)
+          return false unless result = super(actual)
+
+          if @greater_than
+            if @validator.options[:greater_than] == @greater_than
+              @positive_result_message = @positive_result_message << " checking if values are greater than #{@validator.options[:greater_than].inspect}"
+            else
+              @negative_result_message = @negative_result_message << " checking if values are greater than #{@validator.options[:greater_than].inspect}"
+              result = false
+            end
+          end
+
+          result
+        end
+
+        def description
+          options_desc = []
+          options_desc << " allowing values greater than #{@greater_than}" if @greater_than
+          super << options_desc.to_sentence
+        end
+      end
+
       def validate_numericality_of(field)
-        HaveValidationMatcher.new(field, :numericality)
-      end           
+        ValidateNumericalityOfMatcher.new(field)
+      end
     end
   end
-end  
+end

data/lib/mongoid-rspec.rb

@@ -6,6 +6,7 @@ require 'matchers/document'
 require 'matchers/associations'
 require 'matchers/validations'
 require 'matchers/validations/associated'
+require 'matchers/validations/confirmation_of'
 require 'matchers/validations/format_of'
 require 'matchers/validations/inclusion_of'
 require 'matchers/validations/length_of'

data/mongoid-rspec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid-rspec}
-  s.version = "1.3.2"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Sagge"]
-  s.date = %q{2010-11-11}
+  s.date = %q{2011-03-03}
   s.description = %q{RSpec matches for Mongoid models, including association and validation matchers}
   s.email = %q{evansagge@gmail.com}
   s.extra_rdoc_files = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "lib/matchers/document.rb",
     "lib/matchers/validations.rb",
     "lib/matchers/validations/associated.rb",
+    "lib/matchers/validations/confirmation_of.rb",
     "lib/matchers/validations/format_of.rb",
     "lib/matchers/validations/inclusion_of.rb",
     "lib/matchers/validations/length_of.rb",
@@ -41,6 +42,7 @@ Gem::Specification.new do |s|
     "spec/models/article.rb",
     "spec/models/comment.rb",
     "spec/models/profile.rb",
+    "spec/models/record.rb",
     "spec/models/site.rb",
     "spec/models/user.rb",
     "spec/spec_helper.rb",
@@ -56,6 +58,7 @@ Gem::Specification.new do |s|
     "spec/models/article.rb",
     "spec/models/comment.rb",
     "spec/models/profile.rb",
+    "spec/models/record.rb",
     "spec/models/site.rb",
     "spec/models/user.rb",
     "spec/spec_helper.rb",
@@ -69,14 +72,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0"])
+      s.add_runtime_dependency(%q<mongoid-rspec>, [">= 0"])
+      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.rc.7"])
       s.add_runtime_dependency(%q<rspec>, ["~> 2"])
     else
-      s.add_dependency(%q<mongoid>, ["~> 2.0.0"])
+      s.add_dependency(%q<mongoid-rspec>, [">= 0"])
+      s.add_dependency(%q<mongoid>, ["~> 2.0.0.rc.7"])
       s.add_dependency(%q<rspec>, ["~> 2"])
     end
   else
-    s.add_dependency(%q<mongoid>, ["~> 2.0.0"])
+    s.add_dependency(%q<mongoid-rspec>, [">= 0"])
+    s.add_dependency(%q<mongoid>, ["~> 2.0.0.rc.7"])
     s.add_dependency(%q<rspec>, ["~> 2"])
   end
 end

data/spec/models/article.rb

@@ -6,7 +6,7 @@ class Article
   field :published, :type => Boolean, :default => false
   
   embeds_many :comments
-  referenced_in :user, :inverse_of => :articles
+  referenced_in :author, :class_name => 'User', :inverse_of => :articles
   
   validates :title, :presence => true
   

data/spec/models/profile.rb

@@ -7,5 +7,5 @@ class Profile
   
   embedded_in :user, :inverse_of => :profile
   
-  validates_numericality_of :age
+  validates_numericality_of :age, :greater_than => 0
 end

data/spec/models/record.rb

@@ -0,0 +1,5 @@
+class Record
+  include Mongoid::Document
+  
+  referenced_in :user, :inverse_of => :record
+end  

data/spec/models/user.rb

@@ -1,23 +1,24 @@
 class User
   include Mongoid::Document
-  
+
   field :login
   field :email
   field :role
-  
+
   referenced_in :site, :inverse_of => :users
-  references_many :articles
+  references_many :articles, :foreign_key => :author_id
   references_many :comments
-  references_many :children, :stored_as => :array, :class_name => "User"
-  
+  references_and_referenced_in_many :children, :class_name => "User"
+  references_one :record
+
   embeds_one :profile
-  
+
   validates :login, :presence => true, :uniqueness => { :scope => :site }, :format => { :with => /^[\w\-]+$/ }
-  validates :email, :uniqueness => { :case_sensitive => false, :scope => :site, :message => "is already taken" }
+  validates :email, :uniqueness => { :case_sensitive => false, :scope => :site, :message => "is already taken" }, :confirmation => true
   validates :role, :presence => true, :inclusion => { :in => ["admin", "moderator", "member"]}  
   validates :profile, :presence => true, :associated => true
-  
+
   def admin?
     false
   end
-end
+end

data/spec/unit/associations_spec.rb

@@ -2,23 +2,37 @@ require 'spec_helper'
 
 describe "Associations" do
   describe User do
-    it { should reference_many :articles }
-    it { should reference_many :comments }    
+    it { should reference_many(:articles).with_foreign_key(:author_id) }
+    it { should have_many(:articles).with_foreign_key(:author_id) }
+    
+    it { should reference_one(:record) }
+    it { should have_one(:record) }    
+    
+    it { should reference_many :comments }
+    it { should have_many :comments }
+    
     it { should embed_one :profile }
-    it { should reference_many(:children).stored_as(:array) }
+    
+    it { should reference_and_be_referenced_in_many(:children).of_type(User) }
+    it { should have_and_belong_to_many(:children) }
   end
-  
+
   describe Profile do
     it { should be_embedded_in(:user).as_inverse_of(:profile) }
   end
-  
+
   describe Article do
-    it { should be_referenced_in(:user).as_inverse_of(:articles) }
+    it { should be_referenced_in(:author).of_type(User).as_inverse_of(:articles) }
+    it { should belong_to(:author).of_type(User).as_inverse_of(:articles) }
     it { should embed_many(:comments) }
   end
-  
+
   describe Comment do
     it { should be_embedded_in(:article).as_inverse_of(:comments) }
     it { should be_referenced_in(:user).as_inverse_of(:comments) }
   end
-end
+  
+  describe Record do
+    it { should be_referenced_in(:user).as_inverse_of(:record) }
+  end
+end

data/spec/unit/validations_spec.rb

@@ -13,13 +13,14 @@ describe "Validations" do
     it { should validate_format_of(:login).to_allow("valid_login").not_to_allow("invalid login") }
     it { should validate_associated(:profile) }
     it { should validate_inclusion_of(:role).to_allow("admin", "member") }
+    it { should validate_confirmation_of(:email) }
   end
 
   describe Profile do
-    it { should validate_numericality_of(:age) }
+    it { should validate_numericality_of(:age).greater_than(0) }
   end
   
   describe Article do
-    it { should validate_length_of(:title) }
+    it { should validate_length_of(:title).within(8..16) }
   end
-end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 2
-  version: 1.3.2
+  - 4
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Evan Sagge
@@ -14,13 +14,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +08:00
+date: 2011-03-03 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mongoid
-  prerelease: false
+  name: mongoid-rspec
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -29,13 +41,15 @@ dependencies:
         - 2
         - 0
         - 0
-        version: 2.0.0
+        - rc
+        - 7
+        version: 2.0.0.rc.7
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,7 +58,8 @@ dependencies:
         - 2
         version: "2"
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *id003
 description: RSpec matches for Mongoid models, including association and validation matchers
 email: evansagge@gmail.com
 executables: []
@@ -68,6 +83,7 @@ files:
 - lib/matchers/document.rb
 - lib/matchers/validations.rb
 - lib/matchers/validations/associated.rb
+- lib/matchers/validations/confirmation_of.rb
 - lib/matchers/validations/format_of.rb
 - lib/matchers/validations/inclusion_of.rb
 - lib/matchers/validations/length_of.rb
@@ -79,6 +95,7 @@ files:
 - spec/models/article.rb
 - spec/models/comment.rb
 - spec/models/profile.rb
+- spec/models/record.rb
 - spec/models/site.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
@@ -121,6 +138,7 @@ test_files:
 - spec/models/article.rb
 - spec/models/comment.rb
 - spec/models/profile.rb
+- spec/models/record.rb
 - spec/models/site.rb
 - spec/models/user.rb
 - spec/spec_helper.rb