mongoid-rspec 1.8.0 → 1.9.0

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/length_of.rb

@@ -2,6 +2,8 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateLengthOfMatcher < HaveValidationMatcher
+        include WithMessage
+
         def initialize(name)
           super(name, :length)
         end
@@ -30,6 +32,11 @@ module Mongoid
         end
         alias :is :as_exactly
 
+        def with_message(message)
+          @expected_message = message
+          self
+        end
+
         def matches?(actual)
           return false unless @result = super(actual)
 
@@ -37,6 +44,7 @@ module Mongoid
           check_minimum if @minimum
           check_range if @within
           check_exact if @is
+          check_expected_message if @expected_message
 
           @result
         end
@@ -47,6 +55,7 @@ module Mongoid
           options_desc << "with maximum of #{@maximum}" if @maximum
           options_desc << "within the range of #{@within}" if @within
           options_desc << "as exactly #{@is}" if @is
+          options_desc << "with message '#{@expected_message}'" if @expected_message
           super << " #{options_desc.to_sentence}"
         end
 
@@ -104,6 +113,19 @@ module Mongoid
           end
         end
 
+        def check_expected_message
+          actual_message = @validator.options[:message]
+          if actual_message.nil?
+            @negative_result_message << " with no custom message"
+            @result = false
+          elsif actual_message == @expected_message
+            @positive_result_message << " with custom message '#{@expected_message}'"
+          else
+            @negative_result_message << " got message '#{actual_message}'"
+            @result = false
+          end
+        end
+
         def actual_is
           actual_is = @validator.options[:is]
         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,40 +1,36 @@
 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
         end
 
-        def with_message(message)
-          @expected_message = message
-          self
-        end
-
         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
 
@@ -46,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
@@ -67,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"
@@ -76,24 +72,11 @@ module Mongoid
             @result = false
           end
         end
-
-        def check_expected_message
-          actual_message = @validator.options[:message]
-          if actual_message.nil?
-            @negative_result_message << " with no custom message"
-            @result = false
-          elsif actual_message == @expected_message
-            @positive_result_message << " with custom message '#{@expected_message}'"
-          else
-            @negative_result_message << " got message '#{actual_message}'"
-            @result = false
-          end
-        end
       end
-      
+
       def validate_uniqueness_of(field)
         ValidateUniquenessOfMatcher.new(field)
-      end       
+      end
     end
   end
-end  
+end

data/lib/matchers/validations/with_message.rb

@@ -0,0 +1,27 @@
+module Mongoid
+  module Matchers
+    module Validations
+      module WithMessage
+        def with_message(message)
+          @expected_message = message
+          self
+        end
+
+        private
+
+        def check_expected_message
+          actual_message = @validator.options[:message]
+          if actual_message.nil?
+            @negative_result_message << " with no custom message"
+            @result = false
+          elsif actual_message == @expected_message
+            @positive_result_message << " with custom message '#{@expected_message}'"
+          else
+            @negative_result_message << " got message '#{actual_message}'"
+            @result = false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/matchers/validations.rb

@@ -13,7 +13,9 @@ module Mongoid
         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 and (!v.options[:on] or on_options_matches?(v))
+          }
 
           if @validator
             @negative_result_message = "#{@type.inspect} validator on #{@field.inspect}"
@@ -52,7 +54,7 @@ module Mongoid
           if validator_on_methods.any?
             message = " on methods: #{validator_on_methods}"
 
-            if (@options[:on] - validator_on_methods).empty?
+            if on_options_covered_by?( @validator )
               @positive_result_message << message
             else
               @negative_result_message << message
@@ -60,6 +62,16 @@ module Mongoid
             end
           end
         end
+
+        private
+
+        def on_options_matches?(validator)
+          @options[:on] and validator.options[:on] and on_options_covered_by?(validator)
+        end
+
+        def on_options_covered_by?(validator)
+          ([@options[:on]].flatten - [validator.options[:on]].flatten).empty?
+        end
       end
     end
   end

data/lib/mongoid-rspec/version.rb

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

data/lib/mongoid-rspec.rb

@@ -10,6 +10,7 @@ require 'matchers/indexes'
 require 'matchers/allow_mass_assignment'
 require 'matchers/accept_nested_attributes'
 require 'matchers/validations'
+require 'matchers/validations/with_message'
 require 'matchers/validations/associated'
 require 'matchers/validations/confirmation_of'
 require 'matchers/validations/exclusion_of'

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,20 +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 :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_length_of :title, :within => 8..16
-  validates_length_of :content, :minimum => 200
+  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
 
   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,14 +1,16 @@
 class Profile
   include Mongoid::Document
-  
+
   field :first_name
   field :last_name
   field :age
-  
-  embedded_in :user, :inverse_of => :profile
-  
-  validates_numericality_of :age, :greater_than => 0
-  validates_acceptance_of :terms_of_service
+  field :hobbies, type: Array, default: []
+
+  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
-
-  validates :name, :presence => true, :uniqueness => true
+  has_many :users, inverse_of: :site, order: :email.desc
 
+  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
 
@@ -37,6 +37,6 @@ describe "Associations" do
   end
 
   describe Site do
-    it { should have_many(:users).as_inverse_of(:site) }
+    it { should have_many(:users).as_inverse_of(:site).ordered_by(:email.desc) }
   end
 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) }
@@ -26,12 +27,15 @@ describe "Validations" do
   describe Profile do
     it { should validate_numericality_of(:age).greater_than(0) }
     it { should validate_acceptance_of(:terms_of_service) }
+    it { should validate_length_of(:hobbies).with_minimum(1).with_message("requires at least one hobby") }
   end
 
   describe Article do
     it { should validate_length_of(:title).within(8..16) }
     it { should_not validate_length_of(:content).greater_than(200).less_than(16) }
     it { should validate_length_of(:content).greater_than(200) }
+    it { should validate_inclusion_of(:status).to_allow([:pending]).on( :create ) }
+    it { should validate_inclusion_of(:status).to_allow([:approved, :rejected]).on( :update ) }
   end
 
   describe MovieArticle do

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