mongoid-rspec 1.5.3 → 2.0.0

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
@@ -10,11 +12,13 @@ module Mongoid
           @maximum = value
           self
         end
+        alias :less_than :with_maximum
 
         def with_minimum(value)
           @minimum = value
           self
         end
+        alias :greater_than :with_minimum
 
         def within(value)
           @within = value
@@ -28,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)
 
@@ -35,61 +44,99 @@ module Mongoid
           check_minimum if @minimum
           check_range if @within
           check_exact if @is
+          check_expected_message if @expected_message
 
           @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
+          options_desc << "with minimum of #{@minimum}" if @minimum
+          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
 
         private
 
         def check_maximum
-          actual = @validator.options[:maximum]
-          if actual == @maximum
+          if actual_max.nil?
+            @negative_result_message << " with no maximum"
+            @result = false
+          elsif actual_max == @maximum
             @positive_result_message << " with maximum of #{@maximum}"
           else
-            @negative_result_message << " with maximum of #{actual}"
+            @negative_result_message << " with maximum of #{actual_max}"
             @result = false
           end
         end
 
         def check_minimum
-          actual = @validator.options[:minimum]
-          if actual == @minimum
+          if actual_min.nil?
+            @negative_result_message << " with no minimum"
+            @result = false
+          elsif actual_min == @minimum
             @positive_result_message << " with minimum of #{@minimum}"
           else
-            @negative_result_message << " with minimum of #{actual}"
+            @negative_result_message << " with minimum of #{actual_min}"
             @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}"
+          if !actual_min.nil? and actual_max.nil?
+            @negative_result_message << " with no minimum but with maximum of #{actual_max}"
+            @result = false
+          elsif actual_min.nil? and !actual_max.nil?
+            @negative_result_message << " with minimum_of #{actual_min} but no maximum"
+            @result = false
+          elsif actual_min.nil? and actual_max.nil?
+            @negative_result_message << " with no minimum and maximum"
+            @result = false
+          elsif actual_min == min && actual_max == max
+            @positive_result_message << " within the range of #{@within.inspect}"
           else
-            @negative_result_message << " with range #{(actual[:minimum]..actual[:maximum]).inspect}"
+            @negative_result_message << " within the range of #{(actual_min..actual_max).inspect}"
             @result = false
           end
         end
 
         def check_exact
-          actual = @validator.options[:is]
-          if actual == @is
-            @positive_result_message << " is exactly #{@is}"
+          if actual_is == @is
+            @positive_result_message << " as exactly #{@is}"
           else
-            @negative_result_message << " is exactly #{actual}"
+            @negative_result_message << " as exactly #{actual_is}"
             @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
+
+        def actual_is
+          actual_is = @validator.options[:is]
+        end
+
+        def actual_min
+          @validator.options[:minimum] || ((@validator.options[:in] || @validator.options[:within]).try(&:min))
+        end
+
+        def actual_max
+          @validator.options[:maximum] || ((@validator.options[:in] || @validator.options[:within]).try(&:max))
+        end
       end
 
       def validate_length_of(field)

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}"
@@ -35,8 +37,11 @@ module Mongoid
           "Expected #{@klass.inspect} to not #{description}; instead got #{@positive_result_message}"
         end
 
+        alias :failure_message :failure_message_for_should
+        alias :failure_message_when_negated :failure_message_for_should_not
+
         def description
-          desc = "validate #{@type} of #{@field.inspect}"
+          desc = "have #{@type.inspect} validator on #{@field.inspect}"
           desc << " on #{@options[:on]}" if @options[:on]
           desc
         end
@@ -52,7 +57,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 +65,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.5.3"
+    VERSION = "2.0.0"
   end
 end

data/lib/mongoid-rspec.rb

@@ -1,14 +1,18 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'mongoid'
-require 'rspec'
+require 'rspec/core'
+require 'rspec/expectations'
+require 'rspec/mocks'
 require "active_model"
 require 'matchers/document'
 require 'matchers/associations'
 require 'matchers/collections'
 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

@@ -6,9 +6,9 @@ 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.authors     = ["Evan Sagge", "Rodrigo Pinto"]
+  s.email       = %q{evansagge@gmail.com contato@rodrigopinto.me}
+  s.homepage    = %q{http://github.com/mongoid-rspec/mongoid-rspec}
   s.summary     = %q{RSpec matchers for Mongoid}
   s.description = %q{RSpec matches for Mongoid models, including association and validation matchers}
 
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'rake'
-  s.add_dependency 'mongoid', '>= 3.0.1'
-  s.add_dependency 'rspec', '>= 2.9'
+  s.add_dependency 'mongoid', '~> 4.0.0'
+  s.add_dependency 'rspec',   '~> 3.1'
 end

data/spec/models/article.rb

@@ -1,23 +1,29 @@
 class Article
   include Mongoid::Document
   include Mongoid::Timestamps
-  include Mongoid::Paranoia
-  include Mongoid::Versioning
-  include Mongoid::MultiParameterAttributes
 
-  field :title
+  field :title, localize: true
   field :content
-  field :published, :type => Boolean, :default => false
-  field :allow_comments, :type => Boolean, :default => true
+  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, :minimum => 8, :maximum => 16
+  validates_inclusion_of :status, in: [:pending], on: :create
+  validates_inclusion_of :status, in: [:approved, :rejected ], on: :update
 
-  index({ title: 1 }, { unique: true, background: true })
+  validates_length_of :title, within: 8..16
+  validates_length_of :content, minimum: 200
+
+  index({ title: 1 }, { unique: true, background: true, drop_dups: true })
   index({ published: 1 })
-end
+  index({ 'permalink._id' => 1 })
+
+  accepts_nested_attributes_for :permalink
+end

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,25 @@ class User
   field :provider_uid
   field :locale
 
-  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
+  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: /\A[\w\-]+\z/ }, 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
+  accepts_nested_attributes_for :articles, :comments
 
   def admin?
     false

data/spec/unit/accept_nested_attributes_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe "AcceptsNestedAttributes" do
+  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
+end