mongoid-rspec 1.8.2 → 1.9.0

data/.travis.yml

@@ -1,4 +1,12 @@
 language: ruby
 rvm:
   - 1.9.3
-  - ruby-head
+  - 2.0.0
+  - ruby-head
+  - jruby-19mode
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-19mode
+    - rvm: rbx-19mode

data/README.md

@@ -17,160 +17,181 @@ Add to your Gemfile
 
 Drop in existing or dedicated support file in spec/support (spec/support/mongoid.rb)
 
-    RSpec.configure do |configuration|
-      configuration.include Mongoid::Matchers
-    end
+```ruby
+RSpec.configure do |configuration|
+  configuration.include Mongoid::Matchers
+end
+```
 
 Association Matchers
 -
-    describe User do
-      it { should have_many(:articles).with_foreign_key(:author_id).ordered_by(:title) }
 
-      it { should have_one(:record) }
-      #can verify autobuild is set to true
-      it { should have_one(:record).with_autobuild }
+```ruby
+describe User do
+  it { should have_many(:articles).with_foreign_key(:author_id).ordered_by(:title) }
 
-      it { should have_many :comments }
+  it { should have_one(:record) }
+  #can verify autobuild is set to true
+  it { should have_one(:record).with_autobuild }
 
-      #can also specify with_dependent to test if :dependent => :destroy/:destroy_all/:delete is set
-      it { should have_many(:comments).with_dependent(:destroy) }
-      #can verify autosave is set to true
-      it { should have_many(:comments).with_autosave }
+  it { should have_many :comments }
 
-      it { should embed_one :profile }
+  #can also specify with_dependent to test if :dependent => :destroy/:destroy_all/:delete is set
+  it { should have_many(:comments).with_dependent(:destroy) }
+  #can verify autosave is set to true
+  it { should have_many(:comments).with_autosave }
 
-      it { should have_and_belong_to_many(:children) }
-      it { should have_and_belong_to_many(:children).of_type(User) }
-    end
+  it { should embed_one :profile }
 
-    describe Profile do
-      it { should be_embedded_in(:user).as_inverse_of(:profile) }
-    end
+  it { should have_and_belong_to_many(:children) }
+  it { should have_and_belong_to_many(:children).of_type(User) }
+end
 
-    describe Article do
-      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 Profile do
+  it { should be_embedded_in(:user).as_inverse_of(:profile) }
+end
 
-    describe Comment do
-      it { should be_embedded_in(:article).as_inverse_of(:comments) }
-      it { should belong_to(:user).as_inverse_of(:comments) }
-    end
+describe Article do
+  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 Record do
-      it { should belong_to(:user).as_inverse_of(:record) }
-    end
+describe Comment do
+  it { should be_embedded_in(:article).as_inverse_of(:comments) }
+  it { should belong_to(:user).as_inverse_of(:comments) }
+end
 
-    describe Site do
-      it { should have_many(:users).as_inverse_of(:site).ordered_by(:email.asc) }
-    end
+describe Record do
+  it { should belong_to(:user).as_inverse_of(:record) }
+end
+
+describe Site do
+  it { should have_many(:users).as_inverse_of(:site).ordered_by(:email.asc) }
+end
+```
 
 Mass Assignment Matcher
 -
-    describe User do
-      it { should allow_mass_assignment_of(:login) }
-      it { should allow_mass_assignment_of(:email) }
-      it { should allow_mass_assignment_of(:age) }
-      it { should allow_mass_assignment_of(:password) }
-      it { should allow_mass_assignment_of(:password) }
-      it { should allow_mass_assignment_of(:role).as(:admin) }
 
-      it { should_not allow_mass_assignment_of(:role) }
-    end
+```ruby
+describe User do
+  it { should allow_mass_assignment_of(:login) }
+  it { should allow_mass_assignment_of(:email) }
+  it { should allow_mass_assignment_of(:age) }
+  it { should allow_mass_assignment_of(:password) }
+  it { should allow_mass_assignment_of(:password) }
+  it { should allow_mass_assignment_of(:role).as(:admin) }
+
+  it { should_not allow_mass_assignment_of(:role) }
+end
+```
 
 Validation Matchers
 -
-    describe Site do
-      it { should validate_presence_of(:name) }
-      it { should validate_uniqueness_of(:name) }
-    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_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) }
-      it { should validate_presence_of(:provider_uid).on(:create) }
-      it { should validate_inclusion_of(:locale).to_allow([:en, :ru]) }
-	  end
-
-    describe Article do
-      it { should validate_length_of(:title).within(8..16) }
-    end
-
-    describe Profile do
-      it { should validate_numericality_of(:age).greater_than(0) }
-    end
-
-    describe MovieArticle do
-      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) }
-    end
-
-    describe Person do
-       # in order to be able to use the custom_validate matcher, the custom validator class (in this case SsnValidator)
-       # should redefine the kind method to return :custom, i.e. "def self.kind() :custom end"
-      it { should custom_validate(:ssn).with_validator(SsnValidator) }
-    end
+
+```ruby
+describe Site do
+  it { should validate_presence_of(:name) }
+  it { should validate_uniqueness_of(:name) }
+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_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) }
+  it { should validate_presence_of(:provider_uid).on(:create) }
+  it { should validate_inclusion_of(:locale).to_allow([:en, :ru]) }
+end
+
+describe Article do
+  it { should validate_length_of(:title).within(8..16) }
+end
+
+describe Profile do
+  it { should validate_numericality_of(:age).greater_than(0) }
+end
+
+describe MovieArticle do
+  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) }
+end
+
+describe Person do
+   # in order to be able to use the custom_validate matcher, the custom validator class (in this case SsnValidator)
+   # should redefine the kind method to return :custom, i.e. "def self.kind() :custom end"
+  it { should custom_validate(:ssn).with_validator(SsnValidator) }
+end
+```
 
 Accepts Nested Attributes Matcher
 -
-    describe User do
-      it { should accept_nested_attributes_for(:articles) }
-      it { should accept_nested_attributes_for(:comments) }
-    end
 
-    describe Article do
-      it { should accept_nested_attributes_for(:permalink) }
-    end
+```ruby
+describe User do
+  it { should accept_nested_attributes_for(:articles) }
+  it { should accept_nested_attributes_for(:comments) }
+end
+
+describe Article do
+  it { should accept_nested_attributes_for(:permalink) }
+end
+```
 
 Index Matcher
 -
-    describe Article do
-      it { should have_index_for(published: 1) }
-      it { should have_index_for(title: 1).with_options(unique: true, background: true) }
-    end
 
-    describe Profile do
-      it { should have_index_for(first_name: 1, last_name: 1) }
-    end
+```ruby
+describe Article do
+  it { should have_index_for(published: 1) }
+  it { should have_index_for(title: 1).with_options(unique: true, background: true) }
+end
+
+describe Profile do
+  it { should have_index_for(first_name: 1, last_name: 1) }
+end
+```
 
 Others
 -
-    describe User do
-      it { should have_fields(:email, :login) }
-      it { should have_field(:s).with_alias(:status) }
-      it { should have_fields(:birthdate, :registered_at).of_type(DateTime) }
-
-      it { should be_timestamped_document } # if you're declaring `include
-      Mongoid::Timestamps` or any of `include Mongoid::Timestamps::Created` and `Mongoid::Timestamps::Updated`
-      it { should be_timestamped_document.with(:created) }
-      it { should_not be_timestamped_document.with(:updated) }
-
-      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
-      it { should be_stored_in :logs }
-    end
-
-    describe Article do
-      it { should have_field(:published).of_type(Boolean).with_default_value_of(false) }
-      it { should have_field(:allow_comments).of_type(Boolean).with_default_value_of(true) }
-      it { should_not have_field(:allow_comments).of_type(Boolean).with_default_value_of(false) }
-      it { should_not have_field(:number_of_comments).of_type(Integer).with_default_value_of(1) }
-    end
+
+```ruby
+describe User do
+  it { should have_fields(:email, :login) }
+  it { should have_field(:s).with_alias(:status) }
+  it { should have_fields(:birthdate, :registered_at).of_type(DateTime) }
+
+  # if you're declaring 'include Mongoid::Timestamps'
+  # or any of 'include Mongoid::Timestamps::Created' and 'Mongoid::Timestamps::Updated'
+  it { should be_timestamped_document }
+  it { should be_timestamped_document.with(:created) }
+  it { should_not be_timestamped_document.with(:updated) }
+
+  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
+  it { should be_stored_in :logs }
+end
+
+describe Article do
+  it { should have_field(:published).of_type(Boolean).with_default_value_of(false) }
+  it { should have_field(:allow_comments).of_type(Boolean).with_default_value_of(true) }
+  it { should_not have_field(:allow_comments).of_type(Boolean).with_default_value_of(false) }
+  it { should_not have_field(:number_of_comments).of_type(Integer).with_default_value_of(1) }
+end
+```
 
 Known issues
 -

data/lib/matchers/associations.rb

@@ -76,8 +76,28 @@ module Mongoid
           self
         end
 
+        def with_polymorphism
+          @association[:polymorphic] = true
+          @expectation_message << " which specifies polymorphic as #{@association[:polymorphic].to_s}"
+          self
+        end
+
+        def with_cascading_callbacks
+          @association[:cascade_callbacks] = true
+          @expectation_message << " which specifies cascade_callbacks as #{@association[:cascade_callbacks].to_s}"
+          self
+        end
+
+        def cyclic
+          @association[:cyclic] = true
+          @expectation_message << " which specifies cyclic as #{@association[:cyclic].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"
+          @association[:store_as] = store_as.to_s
+          @expectation_message << " which is stored as #{@association[:store_as].inspect}"
+          self
         end
 
         def with_foreign_key(foreign_key)
@@ -166,6 +186,42 @@ module Mongoid
             end
           end
 
+          if @association[:polymorphic]
+            if metadata.polymorphic? != true
+              @negative_result_message = "#{@positive_result_message} which did not set polymorphic"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which set polymorphic"
+            end
+          end
+
+          if @association[:cascade_callbacks]
+            if metadata.cascading_callbacks? != true
+              @negative_result_message = "#{@positive_result_message} which did not set cascade_callbacks"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which set cascade_callbacks"
+            end
+          end
+
+          if @association[:cyclic]
+            if metadata.cyclic? != true
+              @negative_result_message = "#{@positive_result_message} which did not set cyclic"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which set cyclic"
+            end
+          end
+
+          if @association[:store_as]
+            if metadata.store_as != @association[:store_as]
+              @negative_result_message = "#{@positive_result_message} which is stored as #{metadata.store_as}"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which is stored as #{metadata.store_as}"
+            end
+          end
+
           if @association[:index]
             if metadata.index != true
               @negative_result_message = "#{@positive_result_message} which did not set index"
@@ -202,22 +258,22 @@ module Mongoid
         def type_description(type = nil, passive = true)
           type ||= @association[:type]
           case type.name
-          when EMBEDS_ONE.name
-            (passive ? 'embed' : 'embeds') << ' one'
-          when EMBEDS_MANY.name
-            (passive ? 'embed' : 'embeds') << ' many'
-          when EMBEDDED_IN.name
-            (passive ? 'be' : 'is') << ' embedded in'
-          when HAS_ONE.name
-            (passive ? 'reference' : 'references') << ' one'
-          when HAS_MANY.name
-            (passive ? 'reference' : 'references') << ' many'
-          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
+            when EMBEDS_ONE.name
+              (passive ? 'embed' : 'embeds') << ' one'
+            when EMBEDS_MANY.name
+              (passive ? 'embed' : 'embeds') << ' many'
+            when EMBEDDED_IN.name
+              (passive ? 'be' : 'is') << ' embedded in'
+            when HAS_ONE.name
+              (passive ? 'reference' : 'references') << ' one'
+            when HAS_MANY.name
+              (passive ? 'reference' : 'references') << ' many'
+            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
 

data/lib/matchers/document.rb

@@ -14,7 +14,7 @@ module Mongoid
         @type = type
         self
       end
-      
+
       def with_alias(field_alias)
         @field_alias = field_alias
         self
@@ -54,7 +54,7 @@ module Mongoid
                 @errors.push "is not localized #{attr.inspect}"
               end
             end
-            
+
           else
             @errors.push "no field named #{attr.inspect}"
           end

data/lib/matchers/indexes.rb

@@ -43,7 +43,7 @@ module Mongoid
         desc
       end
     end
-    
+
     def have_index_for(index_fields)
       HaveIndexForMatcher.new(index_fields)
     end

data/lib/matchers/validations/acceptance_of.rb

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

data/lib/matchers/validations/associated.rb

@@ -1,19 +1,19 @@
 module Mongoid
   module Matchers
-    module Validations  
+    module Validations
       class ValidateAssociatedMatcher < HaveValidationMatcher
         def initialize(name)
           super(name, :associated)
         end
-        
+
         def description
           "validate associated #{@field.inspect}"
         end
       end
-      
+
       def validate_associated(association_name)
         ValidateAssociatedMatcher.new(association_name)
-      end           
+      end
     end
   end
-end  
+end

data/lib/matchers/validations/confirmation_of.rb

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

data/lib/matchers/validations/exclusion_of.rb

@@ -15,7 +15,14 @@ module Mongoid
           return false unless result = super(actual)
 
           if @not_allowed_values
-            allowed_values = @not_allowed_values - @validator.options[:in]
+            raw_validator_not_allowed_values = @validator.options[:in]
+
+            validator_not_allowed_values = case raw_validator_not_allowed_values
+            when Range then raw_validator_not_allowed_values.to_a
+            when Proc then raw_validator_not_allowed_values.call(actual)
+            else raw_validator_not_allowed_values end
+
+            allowed_values = @not_allowed_values - validator_not_allowed_values
             if allowed_values.empty?
               @positive_result_message = @positive_result_message << " not allowing all values mentioned"
             else

data/lib/matchers/validations/format_of.rb

@@ -1,71 +1,71 @@
 module Mongoid
   module Matchers
-    module Validations  
+    module Validations
       class ValidateFormatOfMatcher < HaveValidationMatcher
         def initialize(field)
           super(field, :format)
         end
-        
+
         def with_format(format)
           @format = format
           self
         end
-        
+
         def to_allow(valid_value)
           @valid_value = valid_value
-          self          
+          self
         end
-        
+
         def not_to_allow(invalid_value)
           @invalid_value = invalid_value
-          self          
+          self
         end
-        
+
         def matches?(actual)
           return false unless result = super(actual)
-          
+
           if @format
             if @validator.options[:with] == @format
               @positive_result_message = @positive_result_message << " with format #{@validator.options[:format].inspect}"
             else
               @negative_result_message = @negative_result_message << " with format #{@validator.options[:format].inspect}"
               result = false
-            end 
+            end
           end
-          
+
           if @valid_value
             if @validator.options[:with] =~ @valid_value
               @positive_result_message = @positive_result_message << " with #{@valid_value.inspect} as a valid value"
             else
               @negative_result_message = @negative_result_message << " with #{@valid_value.inspect} as an invalid value"
               result = false
-            end 
+            end
           end
-          
-          if @invalid_value  
+
+          if @invalid_value
             if !(@invalid_value =~ @validator.options[:with])
               @positive_result_message = @positive_result_message << " with #{@invalid_value.inspect} as an invalid value"
             else
               @negative_result_message = @negative_result_message << " with #{@invalid_value.inspect} as a valid value"
               result = false
-            end 
+            end
           end
-          
-          result          
+
+          result
         end
-        
+
         def description
           options_desc = []
           options_desc << " with format #{@format.inspect}" if @format
           options_desc << " allowing the value #{@valid_value.inspect}" if @valid_value
-          options_desc << " not allowing the value #{@invalid_value.inspect}" if @invalid_value                    
+          options_desc << " not allowing the value #{@invalid_value.inspect}" if @invalid_value
           super << options_desc.to_sentence
-        end        
+        end
       end
 
       def validate_format_of(field)
         ValidateFormatOfMatcher.new(field)
-      end           
+      end
     end
   end
-end  
+end

data/lib/matchers/validations/numericality_of.rb

@@ -2,14 +2,14 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateNumericalityOfMatcher < HaveValidationMatcher
-        @@allowed_options = [:equal_to, :greater_than, :greater_than_or_equal_to, :less_than, :less_than_or_equal_to, 
+        @@allowed_options = [:equal_to, :greater_than, :greater_than_or_equal_to, :less_than, :less_than_or_equal_to,
           :even, :odd, :only_integer, :allow_nil, :nil]
-        
+
         def initialize(field)
           super(field, :numericality)
           @options = {}
         end
-        
+
         def to_allow(options)
           options[:equal_to] = options if options.is_a?(Numeric)
           options[:allow_nil] = options.delete(:nil) if options.has_key?(:nil)
@@ -21,7 +21,7 @@ module Mongoid
 
         def matches?(actual)
           return false unless result = super(actual)
-          
+
           @@allowed_options.each do |comparator|
             if @options.has_key?(comparator) and !([:even, :odd, :only_integer].include?(comparator) and !@validator.options.include?(comparator))
               result &= (@validator.options[comparator] == @options[comparator])
@@ -35,12 +35,12 @@ module Mongoid
         def description
           super << options_message(@options)
         end
-        
+
         protected
-        
+
         def options_message(options)
           type_msg = []
-          comp_msg = []          
+          comp_msg = []
           options.each_pair do |key, value|
             case key
             when :allow_nil
@@ -52,10 +52,10 @@ module Mongoid
               comp_msg << "#{key.to_s.gsub("_", " ")} #{value.inspect}"
             end
           end
-          allow_nil = (options[:allow_nil] ? "nil" : "non-nil") if options.has_key?(:allow_nil)          
+          allow_nil = (options[:allow_nil] ? "nil" : "non-nil") if options.has_key?(:allow_nil)
           ["", "allowing", allow_nil, type_msg.any? ? type_msg.to_sentence : nil, "values", comp_msg.any? ? comp_msg.to_sentence : nil].compact.join(" ")
-        end        
-        
+        end
+
         def method_missing(m, *args, &block)
           if @@allowed_options.include?(m.to_sym)
             raise ArgumentError, "wrong number of arguments (#{args.length} for 1)" if args.length > 1

data/lib/matchers/validations/presence_of.rb

@@ -1,9 +1,9 @@
 module Mongoid
   module Matchers
-    module Validations  
+    module Validations
       def validate_presence_of(field)
         HaveValidationMatcher.new(field, :presence)
       end
     end
   end
-end  
+end

data/lib/matchers/validations/uniqueness_of.rb

@@ -1,23 +1,23 @@
 module Mongoid
   module Matchers
-    module Validations  
+    module Validations
       class ValidateUniquenessOfMatcher < HaveValidationMatcher
         include WithMessage
         def initialize(field)
           super(field, :uniqueness)
         end
-        
+
         def scoped_to(*scope)
           @scope = [scope].flatten.map(&:to_sym)
           self
-        end        
+        end
         alias_method :scoped_on, :scoped_to
-        
+
         def case_insensitive
           @case_insensitive = true
           self
         end
-        
+
         def allow_blank?(allow_blank)
           @allow_blank = allow_blank
           self
@@ -25,12 +25,12 @@ module Mongoid
 
         def matches?(actual)
           return false unless @result = super(actual)
-          
+
           check_scope if @scope
           check_allow_blank if @allow_blank
           check_case_sensitivity if @case_insensitive
           check_expected_message if @expected_message
-          
+
           @result
         end
 
@@ -42,7 +42,7 @@ module Mongoid
           options_desc << " with message '#{@expected_message}'" if @expected_message
           super << options_desc.to_sentence
         end
-        
+
         private
 
         def check_allow_blank
@@ -63,7 +63,7 @@ module Mongoid
             @result = false
           end
         end
-        
+
         def check_case_sensitivity
           if @validator.options[:case_sensitive] == false
             @positive_result_message << " with case insensitive values"
@@ -73,10 +73,10 @@ module Mongoid
           end
         end
       end
-      
+
       def validate_uniqueness_of(field)
         ValidateUniquenessOfMatcher.new(field)
-      end       
+      end
     end
   end
-end  
+end

data/lib/mongoid-rspec/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Rspec
-    VERSION = "1.8.2"
+    VERSION = "1.9.0"
   end
 end

data/mongoid-rspec.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rake'
   s.add_dependency 'mongoid', '>= 3.0.1'
-  s.add_dependency 'rspec', '>= 2.9'
+  s.add_dependency 'rspec', '>= 2.14'
 end

data/spec/models/article.rb

@@ -5,24 +5,24 @@ class Article
   include Mongoid::Versioning
   include Mongoid::MultiParameterAttributes
 
-  field :title, :localize => true
+  field :title, localize: true
   field :content
-  field :published, :type => Boolean, :default => false
-  field :allow_comments, :type => Boolean, :default => true
-  field :number_of_comments, :type => Integer
-  field :status, :type => Symbol
+  field :published, type: Boolean, default: false
+  field :allow_comments, type: Boolean, default: true
+  field :number_of_comments, type: Integer
+  field :status, type: Symbol
 
-  embeds_many :comments
+  embeds_many :comments, cascade_callbacks: true
   embeds_one :permalink
-  belongs_to :author, :class_name => 'User', :inverse_of => :articles, :index => true
+  belongs_to :author, class_name: 'User', inverse_of: :articles, index: true
 
-  validates :title, :presence => true
+  validates :title, presence: true
 
-  validates_inclusion_of :status, :in => [:pending], :on => :create
-  validates_inclusion_of :status, :in => [:approved, :rejected ], :on => :update
+  validates_inclusion_of :status, in: [:pending], on: :create
+  validates_inclusion_of :status, in: [:approved, :rejected ], on: :update
 
-  validates_length_of :title, :within => 8..16
-  validates_length_of :content, :minimum => 200
+  validates_length_of :title, within: 8..16
+  validates_length_of :content, minimum: 200
 
   index({ title: 1 }, { unique: true, background: true })
   index({ published: 1 })

data/spec/models/comment.rb

@@ -1,6 +1,6 @@
 class Comment
   include Mongoid::Document
 
-  embedded_in :article, :inverse_of => :comments
-  belongs_to :user, :inverse_of => :comments
+  embedded_in :article, inverse_of: :comments, polymorphic: true
+  belongs_to :user, inverse_of: :comments
 end

data/spec/models/movie_article.rb

@@ -1,7 +1,8 @@
 class MovieArticle < Article
-  field :rating, :type => Float
-  field :classification, :type => Integer
-  
-  validates_numericality_of :rating, :greater_than => 0, :less_than_or_equal_to => 5
-  validates_numericality_of :classification, :even => true, :only_integer => true, :allow_nil => false
+
+  field :rating, type: Float
+  field :classification, type: Integer
+
+  validates :rating, numericality: { greater_than: 0, less_than_or_equal_to: 5 }
+  validates :classification, numericality: { even: true, only_integer: true, allow_nil: false }
 end

data/spec/models/permalink.rb

@@ -1,5 +1,5 @@
 class Permalink
   include Mongoid::Document
 
-  embedded_in :linkable, :inverse_of => :link
+  embedded_in :linkable, inverse_of: :link
 end

data/spec/models/person.rb

@@ -1,13 +1,10 @@
 require 'ssn_validator.rb'
 
 class Person
-
   include Mongoid::Document
 
   field :name
   field :ssn
 
   validates :ssn, ssn: true
-
-
 end

data/spec/models/profile.rb

@@ -1,16 +1,16 @@
 class Profile
   include Mongoid::Document
-  
+
   field :first_name
   field :last_name
   field :age
   field :hobbies, type: Array, default: []
 
-  embedded_in :user, :inverse_of => :profile
-  
-  validates_numericality_of :age, :greater_than => 0
-  validates_acceptance_of :terms_of_service
-  validates_length_of :hobbies, minimum: 1, message: "requires at least one hobby"
+  embedded_in :user, inverse_of: :profile
+
+  validates :age, numericality: { greater_than: 0 }
+  validates :terms_of_service, acceptance: true
+  validates :hobbies, length: { minimum: 1, message: "requires at least one hobby" }
 
-  index({first_name: 1, last_name: 1 })
+  index({ first_name: 1, last_name: 1 })
 end

data/spec/models/record.rb

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

data/spec/models/site.rb

@@ -3,8 +3,7 @@ class Site
 
   field :name
 
-  has_many :users, :inverse_of => :site, :order => :email.desc
+  has_many :users, inverse_of: :site, order: :email.desc
 
-  validates :name, :presence => true, :uniqueness => true
-
-end
+  validates :name, presence: true, uniqueness: true
+end

data/spec/models/user.rb

@@ -10,25 +10,26 @@ class User
   field :provider_uid
   field :locale
 
-  belongs_to :site, :inverse_of => :users
-  has_many :articles, :foreign_key => :author_id, :order => :title
-  has_many :comments, :dependent => :destroy, :autosave => true
-  has_and_belongs_to_many :children, :class_name => "User"
-  has_one :record, :autobuild => true
+  belongs_to :site, inverse_of: :users
+  has_many :articles, foreign_key: :author_id, order: :title
+  has_many :comments, dependent: :destroy, autosave: true
+  has_and_belongs_to_many :children, class_name: "User"
+  has_one :record, autobuild: true
 
   embeds_one :profile
 
-  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 :profile, :presence => true, :associated => true
-  validates :age, :presence => true, :numericality => true, :inclusion => { :in => 23..42 }, :on => [:create, :update]
-  validates :password, :presence => true, :on => [:create, :update]
+  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 :profile, presence: true, associated: true
+  validates :age, presence: true, numericality: true, inclusion: { in: 23..42 }, on: [:create, :update]
+  validates :password, presence: true, on: [:create, :update]
+  validates :password, exclusion: { in: ->(user) { ['password'] } }
   validates :provider_uid, presence: true
-  validates :locale, :inclusion => {:in => lambda { |user| [:en, :ru] } }
+  validates :locale, inclusion: { in: ->(user) { [:en, :ru] } }
 
   attr_accessible :login, :email, :age, :password
-  attr_accessible :role, :as => :admin
+  attr_accessible :role, as: :admin
 
   accepts_nested_attributes_for :articles, :comments
 

data/spec/unit/allow_mass_assignment_spec.rb

@@ -8,7 +8,7 @@ describe "AllowMassAssignment" do
     it { should allow_mass_assignment_of(:password) }
     it { should allow_mass_assignment_of(:password) }
     it { should allow_mass_assignment_of(:role).as(:admin) }
-    
+
     it { should_not allow_mass_assignment_of(:role) }
   end
 end

data/spec/unit/associations_spec.rb

@@ -19,12 +19,12 @@ describe "Associations" do
 
   describe Article do
     it { should belong_to(:author).of_type(User).as_inverse_of(:articles).with_index }
-    it { should embed_many(:comments) }
+    it { should embed_many(:comments).with_cascading_callbacks }
     it { should embed_one(:permalink) }
   end
 
   describe Comment do
-    it { should be_embedded_in(:article).as_inverse_of(:comments) }
+    it { should be_embedded_in(:article).as_inverse_of(:comments).with_polymorphism }
     it { should belong_to(:user).as_inverse_of(:comments) }
   end
 

data/spec/unit/indexes_spec.rb

@@ -6,7 +6,7 @@ describe "Indexes" do
     it { should have_index_for(title: 1).with_options(unique: true, background: true) }
     it { should have_index_for('permalink._id' => 1) }
   end
-  
+
   describe Profile do
     it { should have_index_for(first_name: 1, last_name: 1) }
   end

data/spec/unit/validations_spec.rb

@@ -13,6 +13,7 @@ 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_exclusion_of(:login).to_not_allow("super", "index", "edit") }
+    it { should validate_exclusion_of(:password).to_not_allow("password") }
     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) }

data/spec/validators/ssn_validator.rb

@@ -1,7 +1,9 @@
 class SsnValidator <  ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    record.errors[attribute] << "#{value} is not a valid Social Security Number" unless valid_ssn?(record, attribute, value)
+    unless valid_ssn?(record, attribute, value)
+      record.errors[attribute] << "#{value} is not a valid Social Security Number"
+    end
   end
 
   def self.kind() :custom end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-rspec
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.14'
 description: RSpec matches for Mongoid models, including association and validation
   matchers
 email: evansagge@gmail.com
@@ -130,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1210204238905216362
+      hash: 2533253103994848490
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1210204238905216362
+      hash: 2533253103994848490
 requirements: []
 rubyforge_project: mongoid-rspec
 rubygems_version: 1.8.25