mongoid-rspec 1.4.4 → 1.4.5

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2
+rvm use --create 1.9.3@mongoid-rspec

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.8.7 # (current default)
+  - 1.9.2
+  - rbx
+  - rbx-2.0
+  - ree
+  - jruby
+  - ruby-head

data/README.md

@@ -6,13 +6,10 @@ RSpec matchers for Mongoid.
 Association Matchers
 -
     describe User do
-      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 }
       
       #can also specify with_dependent to test if :dependent => :destroy/:destroy_all/:delete is set
@@ -21,9 +18,9 @@ Association Matchers
       it { should have_many(:comments).with_autosave }
   
       it { should embed_one :profile }
-  
-      it { should reference_and_be_referenced_in_many(:children).of_type(User) }
-      it { should have_and_belong_to_many(:children) }
+
+      it { should have_and_belong_to_many(:children) }  
+      it { should have_and_belong_to_many(:children).of_type(User) }
     end
 
     describe Profile do
@@ -31,18 +28,18 @@ Association Matchers
     end
 
     describe Article do
-      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 belong_to(:author).of_type(User).as_inverse_of(:articles).with_index }
       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) }
+      it { should belong_to(:user).as_inverse_of(:comments) }
     end
 
     describe Record do
-      it { should be_referenced_in(:user).as_inverse_of(:record) }
+      it { should belong_to(:user).as_inverse_of(:record) }
     end
 
 Validation Matchers
@@ -53,14 +50,20 @@ Validation Matchers
     end
 
     describe User do
-      it { should validate_presence_of(:login) }
-      it { should validate_uniqueness_of(:login).scoped_to(:site) }
-      it { should validate_uniqueness_of(:email).case_insensitive.with_message("is already taken") }
-      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
+	    it { should validate_presence_of(:login) }
+	    it { should validate_uniqueness_of(:login).scoped_to(:site) }
+	    it { should validate_uniqueness_of(:email).case_insensitive.with_message("is already taken") }
+	    it { should validate_format_of(:login).to_allow("valid_login").not_to_allow("invalid login") }
+	    it { should validate_associated(:profile) }
+	    it { should validate_exclusion_of(:login).to_not_allow("super", "index", "edit") }
+	    it { should validate_inclusion_of(:role).to_allow("admin", "member") }
+	    it { should validate_confirmation_of(:email) }
+	    it { should validate_presence_of(:age).on(:create, :update) }
+		# The on matcher can take var args or an array. Validations do not fail if on is not specified.
+	    it { should validate_numericality_of(:age).on(:create, :update) }
+	    it { should validate_inclusion_of(:age).to_allow(23..42).on([:create, :update]) }
+	    it { should validate_presence_of(:password).on(:create) }
+	  end
 
     describe Article do
       it { should validate_length_of(:title).within(8..16) }
@@ -82,12 +85,16 @@ Others
       it { should have_field(:active).of_type(Boolean).with_default_value_of(false) }
       it { should have_fields(:birthdate, :registered_at).of_type(DateTime) }
 
+      it { should have_index_for(:last_name) }
+      it { should have_index_for(:email).with_options(:unique => true) }
+
       # useful if you use factory_girl and have Factory(:user) defined for User
       it { should save }
       
       it { should be_timestamped_document } # if you're declaring `include Mongoid::Timestamps`
       it { should be_versioned_document } # if you're declaring `include Mongoid::Versioning`
       it { should be_paranoid_document } # if you're declaring `include Mongoid::Paranoia`
+      it { should be_multiparameted_document } # if you're declaring `include Mongoid::MultiParameterAttributes`
     end
     
     describe Log do
@@ -110,4 +117,4 @@ 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.
+to this project.

data/Rakefile

@@ -4,16 +4,14 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-task :test => :spec
 
-require 'rake/rdoctask'
-require "mongoid-rspec/version"
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mongoid-rspec #{Mongoid::Rspec::VERSION}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = "./spec/**/*_spec.rb"
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = "./spec/**/*_spec.rb"
+  spec.rcov = true
 end

data/lib/matchers/associations.rb

@@ -38,19 +38,25 @@ module Mongoid
           @expectation_message << " which is an inverse of #{@association[:inverse_of].inspect}"
           self
         end
-        
+
         def with_dependent(method_name)
-          @association[:dependent] = method_name  
+          @association[:dependent] = method_name
           @expectation_message << " which specifies dependent as #{@association[:dependent].to_s}"
           self
         end
 
         def with_autosave
-          @association[:autosave] = true  
+          @association[:autosave] = true
           @expectation_message << " which specifies autosave as #{@association[:autosave].to_s}"
           self
         end
-        
+
+        def with_index
+          @association[:index] = true
+          @expectation_message << " which specifies index as #{@association[:index].to_s}"
+          self
+        end
+
         def stored_as(store_as)
           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
@@ -113,7 +119,16 @@ module Mongoid
               @positive_result_message = "#{@positive_result_message} which set autosave"
             end
           end
-          
+
+          if @association[:index]
+            if metadata.index != true
+              @negative_result_message = "#{@positive_result_message} which did not set index"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which set index"
+            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}"
@@ -176,24 +191,20 @@ module Mongoid
       def have_one_related(association_name)
         HaveAssociationMatcher.new(association_name, HAS_ONE)
       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
       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
       alias :belong_to :belong_to_related
     end
   end

data/lib/matchers/document.rb

@@ -24,9 +24,9 @@ module Mongoid
             if @type and @klass.fields[attr].type != @type
               error << " of type #{@klass.fields[attr].type}"
             end
-            
-            if !@default.nil? and !@klass.fields[attr].default.nil? and @klass.fields[attr].default != @default
-              error << " with default value of #{@klass.fields[attr].default}"
+
+            if !@default.nil? and !@klass.fields[attr].default_val.nil? and @klass.fields[attr].default_val != @default
+              error << " with default value of #{@klass.fields[attr].default_val}"
             end
 
             @errors.push("field #{attr.inspect}" << error) unless error.blank?
@@ -74,38 +74,48 @@ RSpec::Matchers.define :be_mongoid_document do
   match do |doc|
     doc.class.included_modules.include?(Mongoid::Document)
   end
-  
+
   description do
     "be a Mongoid document"
-  end  
+  end
 end
 
 RSpec::Matchers.define :be_versioned_document do
   match do |doc|
     doc.class.included_modules.include?(Mongoid::Versioning)
   end
-  
+
   description do
     "be a versioned Mongoid document"
-  end    
+  end
 end
 
 RSpec::Matchers.define :be_timestamped_document do
   match do |doc|
     doc.class.included_modules.include?(Mongoid::Timestamps)
   end
-  
+
   description do
     "be a timestamped Mongoid document"
-  end      
+  end
 end
 
 RSpec::Matchers.define :be_paranoid_document do
   match do |doc|
     doc.class.included_modules.include?(Mongoid::Paranoia)
   end
-  
+
   description do
     "be a paranoid Mongoid document"
-  end      
+  end
+end
+
+RSpec::Matchers.define :be_multiparameted_document do
+  match do |doc|
+    doc.class.included_modules.include?(Mongoid::MultiParameterAttributes)
+  end
+
+  description do
+    "be a multiparameted Mongoid document"
+  end
 end

data/lib/matchers/indexes.rb

@@ -0,0 +1,51 @@
+module Mongoid
+  module Matchers
+    class HaveIndexForMatcher # :nodoc:
+      def initialize(index_fields)
+        @index_fields = index_fields
+      end
+      
+      def with_options(options = {})
+        @options = options
+        self
+      end
+      
+      def matches?(klass)
+        @klass = klass.is_a?(Class) ? klass : klass.class
+        @errors = []
+        
+        unless @klass.index_options[@index_fields]
+          @errors.push "no index for #{@index_fields}"
+        else
+          if !@options.nil? && !@options.empty?
+            @options.each do |option, option_value|
+              if @klass.index_options[@index_fields].include?(option) && @klass.index_options[@index_fields][option] != option_value
+                @errors.push "index for #{@index_fields.inspect} with options of #{@klass.index_options[@index_fields].inspect}"
+              end
+            end
+          end
+        end
+        
+        @errors.empty?
+      end
+      
+      def failure_message_for_should
+        "Expected #{@klass.inspect} to #{description}, got #{@errors.to_sentence}"
+      end
+
+      def failure_message_for_should_not
+        "Expected #{@klass.inspect} to not #{description}, got #{@klass.inspect} to #{description}"
+      end
+
+      def description
+        desc = "have an index for #{@index_fields.inspect}"
+        desc << " with options of #{@options.inspect}" if @options
+        desc
+      end
+    end
+    
+    def have_index_for(index_fields)
+      HaveIndexForMatcher.new(index_fields)
+    end
+  end
+end

data/lib/matchers/validations.rb

@@ -7,12 +7,13 @@ module Mongoid
         def initialize(field, validation_type)
           @field = field.to_s
           @type = validation_type.to_s
+          @options = {}
         end
                 
         def matches?(actual)
           @klass = actual.is_a?(Class) ? actual : actual.class
           
-          @validator = @klass.validators_on(@field).detect{|v| v.kind.to_s == @type }
+          @validator = @klass.validators_on(@field).detect{|v| v.kind.to_s == @type}
           
           if @validator
             @negative_result_message = "#{@type.inspect} validator on #{@field.inspect}"
@@ -21,8 +22,9 @@ module Mongoid
             @negative_result_message = "no #{@type.inspect} validator on #{@field.inspect}"
             return false
           end
-          
-          true
+          @result = true
+          check_on if @options[:on]          
+          @result
         end
         
         def failure_message_for_should  
@@ -36,6 +38,21 @@ module Mongoid
         def description
           "validate #{@type} of #{@field.inspect}"
         end
+        
+        def on(*on_method)
+          @options[:on] = on_method.flatten
+          self
+        end  
+        
+        def check_on
+          message = " on methods: #{@validator.options[:on]}"
+          if [@validator.options[:on]].flatten == @options[:on]
+            @positive_result_message << message
+          else
+            @negative_result_message << message
+            @result = false
+          end
+        end
       end     
     end
   end

data/lib/matchers/validations/acceptance_of.rb

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

data/lib/matchers/validations/exclusion_of.rb

@@ -0,0 +1,42 @@
+module Mongoid
+  module Matchers
+    module Validations
+      class ValidateExclusionOfMatcher < HaveValidationMatcher
+        def initialize(name)
+          super(name, :exclusion)
+        end
+
+        def to_not_allow(*values)
+          @not_allowed_values = [values].flatten
+          self
+        end
+
+        def matches?(actual)
+          return false unless result = super(actual)
+
+          if @not_allowed_values
+            allowed_values = @not_allowed_values - @validator.options[:in]
+            if allowed_values.empty?
+              @positive_result_message = @positive_result_message << " not allowing all values mentioned"
+            else
+              @negative_result_message = @negative_result_message << " allowing the following the ff. values: #{allowed_values.inspect}"
+              result = false
+            end
+          end
+
+          result
+        end
+
+        def description
+          options_desc = []
+          options_desc << " not allowing the ff. values: #{@not_allowed_values}" if @not_allowed_values
+          super << options_desc.to_sentence
+        end
+      end
+
+      def validate_exclusion_of(field)
+        ValidateExclusionOfMatcher.new(field)
+      end
+    end
+  end
+end

data/lib/matchers/validations/inclusion_of.rb

@@ -7,7 +7,7 @@ module Mongoid
         end
         
         def to_allow(*values)
-          @allowed_values = [values].flatten
+          @allowed_values = values.map(&:to_a).flatten
           self
         end
         
@@ -15,7 +15,7 @@ module Mongoid
           return false unless result = super(actual)
           
           if @allowed_values
-            not_allowed_values = @allowed_values - @validator.options[:in]
+            not_allowed_values = @allowed_values - @validator.options[:in].to_a
             if not_allowed_values.empty?
               @positive_result_message = @positive_result_message << " allowing all values mentioned"
             else

data/lib/matchers/validations/uniqueness_of.rb

@@ -7,7 +7,7 @@ module Mongoid
         end
         
         def scoped_to(*scope)
-          @scope = [scope].flatten
+          @scope = [scope].flatten.map(&:to_sym)
           self
         end        
         alias_method :scoped_on, :scoped_to
@@ -59,8 +59,8 @@ module Mongoid
         end
 
         def check_scope
-          message = "scope to #{@validator.options[:scope]}"
-          if [@validator.options[:scope]].flatten == @scope
+          message = " scope to #{@validator.options[:scope]}"
+          if [@validator.options[:scope]].flatten.map(&:to_sym) == @scope
             @positive_result_message << message
           else
             @negative_result_message << message

data/lib/mongoid-rspec.rb

@@ -5,15 +5,18 @@ require 'rspec'
 require 'matchers/document'
 require 'matchers/associations'
 require 'matchers/collections'
+require 'matchers/indexes'
 require 'matchers/validations'
 require 'matchers/validations/associated'
 require 'matchers/validations/confirmation_of'
+require 'matchers/validations/exclusion_of'
 require 'matchers/validations/format_of'
 require 'matchers/validations/inclusion_of'
 require 'matchers/validations/length_of'
 require 'matchers/validations/numericality_of'
 require 'matchers/validations/presence_of'
 require 'matchers/validations/uniqueness_of'
+require 'matchers/validations/acceptance_of'
 
 module Mongoid
   module Matchers

data/lib/mongoid-rspec/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Rspec
-    VERSION = "1.4.4"
+    VERSION = "1.4.5"
   end
 end

data/mongoid-rspec.gemspec

@@ -6,19 +6,20 @@ Gem::Specification.new do |s|
   s.name        = "mongoid-rspec"
   s.version     = Mongoid::Rspec::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors = ["Evan Sagge"]
-  s.email = %q{evansagge@gmail.com}  
-  s.homepage = %q{http://github.com/evansagge/mongoid-rspec}    
-  s.summary = %q{RSpec matchers for Mongoid}  
+  s.authors     = ["Evan Sagge"]
+  s.email       = %q{evansagge@gmail.com}
+  s.homepage    = %q{http://github.com/evansagge/mongoid-rspec}
+  s.summary     = %q{RSpec matchers for Mongoid}
   s.description = %q{RSpec matches for Mongoid models, including association and validation matchers}
-    
+
   s.rubyforge_project = "mongoid-rspec"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
-  s.add_runtime_dependency(%q<mongoid>, ["~> 2.0"])
-  s.add_runtime_dependency(%q<rspec>, ["~> 2"])    
-end
+
+  s.add_dependency 'rake'
+  s.add_dependency 'mongoid', '>= 2.4.6'
+  s.add_dependency 'rspec', '>= 2.9'
+end

data/spec/models/article.rb

@@ -3,18 +3,21 @@ class Article
   include Mongoid::Timestamps
   include Mongoid::Paranoia
   include Mongoid::Versioning
-  
+  include Mongoid::MultiParameterAttributes
+
   field :title
   field :content
   field :published, :type => Boolean, :default => false
   field :allow_comments, :type => Boolean, :default => true
-  
+
   embeds_many :comments
   embeds_one :permalink
-  referenced_in :author, :class_name => 'User', :inverse_of => :articles
-  
+  belongs_to :author, :class_name => 'User', :inverse_of => :articles, :index => true
+
   validates :title, :presence => true
-  
+
   validates_length_of :title, :minimum => 8, :maximum => 16
-end
-  
+
+  index :title, :unique => true, :background => true
+  index :published
+end

data/spec/models/comment.rb

@@ -2,5 +2,5 @@ class Comment
   include Mongoid::Document
 
   embedded_in :article, :inverse_of => :comments
-  referenced_in :user, :inverse_of => :comments
+  belongs_to :user, :inverse_of => :comments
 end

data/spec/models/movie_article.rb

@@ -1,5 +1,5 @@
 class MovieArticle < Article
-  field :rating, :type => Numeric
+  field :rating, :type => Float
   field :classification, :type => Integer
   
   validates_numericality_of :rating, :greater_than => 0, :less_than_or_equal_to => 5

data/spec/models/profile.rb

@@ -8,4 +8,12 @@ class Profile
   embedded_in :user, :inverse_of => :profile
   
   validates_numericality_of :age, :greater_than => 0
-end
+  validates_acceptance_of :terms_of_service
+
+  index(
+      [
+        [ :first_name, Mongo::ASCENDING ],
+        [ :last_name, Mongo::ASCENDING ]
+      ]
+  )
+end

data/spec/models/record.rb

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

data/spec/models/site.rb

@@ -1,10 +1,10 @@
 class Site
   include Mongoid::Document
-  
+
   field :name
-  
-  references_many :users, :inverse_of => :site
-  
+
+  has_many :users, :inverse_of => :site
+
   validates :name, :presence => true, :uniqueness => true
-  
+
 end

data/spec/models/user.rb

@@ -4,19 +4,23 @@ class User
   field :login
   field :email
   field :role
+  field :age, type: Integer
+  field :password, type: String
 
-  referenced_in :site, :inverse_of => :users
-  references_many :articles, :foreign_key => :author_id
-  references_many :comments, :dependent => :destroy, :autosave => true
-  references_and_referenced_in_many :children, :class_name => "User"
-  references_one :record
+  belongs_to :site, :inverse_of => :users
+  has_many :articles, :foreign_key => :author_id
+  has_many :comments, :dependent => :destroy, :autosave => true
+  has_and_belongs_to_many :children, :class_name => "User"
+  has_one :record
 
   embeds_one :profile
 
-  validates :login, :presence => true, :uniqueness => { :scope => :site }, :format => { :with => /^[\w\-]+$/ }
+  validates :login, :presence => true, :uniqueness => { :scope => :site }, :format => { :with => /^[\w\-]+$/ }, :exclusion => { :in => ["super", "index", "edit"]}
   validates :email, :uniqueness => { :case_sensitive => false, :scope => :site, :message => "is already taken" }, :confirmation => true
-  validates :role, :presence => true, :inclusion => { :in => ["admin", "moderator", "member"]}  
+  validates :role, :presence => true, :inclusion => { :in => ["admin", "moderator", "member"]}
   validates :profile, :presence => true, :associated => true
+  validates :age, :presence => true, :numericality => true, :inclusion => { :in => 23..42 }, :on => [:create, :update]
+  validates :password, :presence => true, :on => :create
 
   def admin?
     false

data/spec/unit/associations_spec.rb

@@ -2,19 +2,15 @@ require 'spec_helper'
 
 describe "Associations" do
   describe User do
-    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).with_dependent(:destroy).with_autosave }
+
+    it { should have_one(:record) }
+
     it { should have_many(:comments).with_dependent(:destroy).with_autosave }
-    
+
     it { should embed_one :profile }
-    
-    it { should reference_and_be_referenced_in_many(:children).of_type(User) }
-    it { should have_and_belong_to_many(:children) }
+
+    it { should have_and_belong_to_many(:children).of_type(User) }
   end
 
   describe Profile do
@@ -22,19 +18,18 @@ describe "Associations" do
   end
 
   describe Article do
-    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 belong_to(:author).of_type(User).as_inverse_of(:articles).with_index }
     it { should embed_many(:comments) }
-    it { should embed_one(:permalink) }    
+    it { should embed_one(:permalink) }
   end
 
   describe Comment do
     it { should be_embedded_in(:article).as_inverse_of(:comments) }
-    it { should be_referenced_in(:user).as_inverse_of(:comments) }
+    it { should belong_to(:user).as_inverse_of(:comments) }
   end
-  
+
   describe Record do
-    it { should be_referenced_in(:user).as_inverse_of(:record) }
+    it { should belong_to(:user).as_inverse_of(:record) }
   end
 
   describe Permalink do
@@ -42,6 +37,6 @@ describe "Associations" do
   end
 
   describe Site do
-    it { should reference_many(:users).as_inverse_of(:site) }
+    it { should have_many(:users).as_inverse_of(:site) }
   end
 end

data/spec/unit/document_spec.rb

@@ -16,5 +16,6 @@ describe "Document" do
     it { should be_versioned_document }
     it { should be_timestamped_document }
     it { should be_paranoid_document }
+    it { should be_multiparameted_document }
   end
-end
+end

data/spec/unit/indexes_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe "Indexes" do
+  describe Article do
+    it { should have_index_for(:published) }
+    it { should have_index_for(:title).with_options(:unique => true, :background => true) }
+  end
+  
+  describe Profile do
+    it { should have_index_for([ [ :first_name, Mongo::ASCENDING ], [ :last_name, Mongo::ASCENDING ] ]) }
+  end
+end

data/spec/unit/validations_spec.rb

@@ -12,12 +12,18 @@ describe "Validations" do
     it { should validate_uniqueness_of(:email).case_insensitive.with_message("is already taken") }
     it { should validate_format_of(:login).to_allow("valid_login").not_to_allow("invalid login") }
     it { should validate_associated(:profile) }
+    it { should validate_exclusion_of(:login).to_not_allow("super", "index", "edit") }
     it { should validate_inclusion_of(:role).to_allow("admin", "member") }
     it { should validate_confirmation_of(:email) }
+    it { should validate_presence_of(:age).on(:create, :update) }
+    it { should validate_numericality_of(:age).on(:create, :update) }
+    it { should validate_inclusion_of(:age).to_allow(23..42).on([:create, :update]) }
+    it { should validate_presence_of(:password).on(:create) }
   end
 
   describe Profile do
     it { should validate_numericality_of(:age).greater_than(0) }
+    it { should validate_acceptance_of(:terms_of_service) }
   end
 
   describe Article do
@@ -27,6 +33,6 @@ describe "Validations" do
   describe MovieArticle do
     it { should validate_numericality_of(:rating).greater_than(0) }
     it { should validate_numericality_of(:rating).to_allow(:greater_than => 0).less_than_or_equal_to(5) }
-    it { should validate_numericality_of(:classification).to_allow(:even => true, :only_integer => true, :nil => false) }    
+    it { should validate_numericality_of(:classification).to_allow(:even => true, :only_integer => true, :nil => false) }
   end
 end

metadata

@@ -1,63 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongoid-rspec
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.4.5
   prerelease: 
-  version: 1.4.4
 platform: ruby
-authors: 
+authors:
 - Evan Sagge
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mongoid
+date: 2012-05-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70235030173460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70235030173460
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &70235030172800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70235030172800
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70235030172220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.9'
   type: :runtime
-  version_requirements: *id002
-description: RSpec matches for Mongoid models, including association and validation matchers
+  prerelease: false
+  version_requirements: *70235030172220
+description: RSpec matches for Mongoid models, including association and validation
+  matchers
 email: evansagge@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .bundle/config
 - .document
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - lib/matchers/associations.rb
 - lib/matchers/collections.rb
 - lib/matchers/document.rb
+- lib/matchers/indexes.rb
 - lib/matchers/validations.rb
+- lib/matchers/validations/acceptance_of.rb
 - lib/matchers/validations/associated.rb
 - lib/matchers/validations/confirmation_of.rb
+- lib/matchers/validations/exclusion_of.rb
 - lib/matchers/validations/format_of.rb
 - lib/matchers/validations/inclusion_of.rb
 - lib/matchers/validations/length_of.rb
@@ -80,35 +91,33 @@ files:
 - spec/unit/associations_spec.rb
 - spec/unit/collections_spec.rb
 - spec/unit/document_spec.rb
+- spec/unit/indexes_spec.rb
 - spec/unit/validations_spec.rb
 homepage: http://github.com/evansagge/mongoid-rspec
 licenses: []
-
 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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mongoid-rspec
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RSpec matchers for Mongoid
-test_files: 
+test_files:
 - spec/models/article.rb
 - spec/models/comment.rb
 - spec/models/log.rb
@@ -122,4 +131,5 @@ test_files:
 - spec/unit/associations_spec.rb
 - spec/unit/collections_spec.rb
 - spec/unit/document_spec.rb
+- spec/unit/indexes_spec.rb
 - spec/unit/validations_spec.rb