mongoid-rspec 2.1.0 → 4.1.0

data/lib/matchers/validations/numericality_of.rb

@@ -2,8 +2,19 @@ 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,
-          :even, :odd, :only_integer, :allow_nil, :nil]
+        ALLOWED_OPTIONS =
+          %i[
+            allow_nil
+            equal_to
+            even
+            greater_than
+            greater_than_or_equal_to
+            less_than
+            less_than_or_equal_to
+            nil
+            odd
+            only_integer
+          ].freeze
 
         def initialize(field)
           super(field, :numericality)
@@ -12,9 +23,15 @@ module Mongoid
 
         def to_allow(options)
           options[:equal_to] = options if options.is_a?(Numeric)
-          options[:allow_nil] = options.delete(:nil) if options.has_key?(:nil)
-          raise ArgumentError, "validate_numericality_of#to_allow requires a Hash parameter containing any of the following keys: " <<
-            @@allowed_options.map(&:inspect).join(", ") if !options.is_a?(Hash) or options.empty? or (options.keys - @@allowed_options).any?
+          options[:allow_nil] = options.delete(:nil) if options.key?(:nil)
+
+          if !options.is_a?(Hash) || options.empty? || (options.keys - ALLOWED_OPTIONS).any?
+            message =
+              'validate_numericality_of#to_allow requires a Hash parameter containing' \
+              "any of the following keys: #{ALLOWED_OPTIONS.map(&:inspect).join(', ')}"
+            raise ArgumentError, message
+          end
+
           @options.merge!(options)
           self
         end
@@ -22,11 +39,10 @@ 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])
-            end
+          @options.each do |comparator, expected_value|
+            result &= (@validator.options[comparator] == expected_value)
           end
+
           @positive_result_message <<= options_message(@validator.options)
           @negative_result_message <<= options_message(@validator.options)
           result
@@ -45,19 +61,19 @@ module Mongoid
             case key
             when :allow_nil
             when :only_integer
-              type_msg << "integer" if value
+              type_msg << 'integer' if value
             when :odd, :even
-              type_msg << "#{key.to_s}-numbered" if value
+              type_msg << "#{key}-numbered" if value
             else
-              comp_msg << "#{key.to_s.gsub("_", " ")} #{value.inspect}"
+              comp_msg << "#{key.to_s.tr('_', ' ')} #{value.inspect}"
             end
           end
-          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(" ")
+          allow_nil = (options[:allow_nil] ? 'nil' : 'non-nil') if options.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
 
         def method_missing(m, *args, &block)
-          if @@allowed_options.include?(m.to_sym)
+          if ALLOWED_OPTIONS.include?(m.to_sym)
             raise ArgumentError, "wrong number of arguments (#{args.length} for 1)" if args.length > 1
             send :to_allow, m.to_sym => args.first
           else
@@ -71,4 +87,4 @@ module Mongoid
       end
     end
   end
-end
+end

data/lib/matchers/validations/presence_of.rb

@@ -6,4 +6,4 @@ module Mongoid
       end
     end
   end
-end
+end

data/lib/matchers/validations/uniqueness_of.rb

@@ -2,7 +2,6 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateUniquenessOfMatcher < HaveValidationMatcher
-        include WithMessage
         def initialize(field)
           super(field, :uniqueness)
         end
@@ -11,7 +10,7 @@ module Mongoid
           @scope = [scope].flatten.map(&:to_sym)
           self
         end
-        alias_method :scoped_on, :scoped_to
+        alias scoped_on scoped_to
 
         def case_insensitive
           @case_insensitive = true
@@ -29,7 +28,6 @@ module Mongoid
           check_scope if @scope
           check_allow_blank if @allow_blank
           check_case_sensitivity if @case_insensitive
-          check_expected_message if @expected_message
 
           @result
         end
@@ -37,9 +35,8 @@ module Mongoid
         def description
           options_desc = []
           options_desc << " scoped to #{@scope.inspect}" if @scope
-          options_desc << " allowing blank values" if @allow_blank
-          options_desc << " allowing case insensitive values" if @case_insensitive
-          options_desc << " with message '#{@expected_message}'" if @expected_message
+          options_desc << ' allowing blank values' if @allow_blank
+          options_desc << ' allowing case insensitive values' if @case_insensitive
           super << options_desc.to_sentence
         end
 
@@ -47,9 +44,9 @@ module Mongoid
 
         def check_allow_blank
           if @validator.options[:allow_blank] == @allow_blank
-            @positive_result_message << " with blank values allowed"
+            @positive_result_message << ' with blank values allowed'
           else
-            @negative_result_message << " with no blank values allowed"
+            @negative_result_message << ' with no blank values allowed'
             @result = false
           end
         end
@@ -66,9 +63,9 @@ module Mongoid
 
         def check_case_sensitivity
           if @validator.options[:case_sensitive] == false
-            @positive_result_message << " with case insensitive values"
+            @positive_result_message << ' with case insensitive values'
           else
-            @negative_result_message << " without case insensitive values"
+            @negative_result_message << ' without case insensitive values'
             @result = false
           end
         end

data/lib/mongoid-rspec.rb

@@ -1,33 +1 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'mongoid'
-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'
-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'
-require 'matchers/validations/custom_validation_of'
-
-module Mongoid
-  module Matchers
-    include Mongoid::Matchers::Associations
-    include Mongoid::Matchers::Validations
-  end
-end
+require 'mongoid/rspec'

data/lib/mongoid/rspec.rb

@@ -0,0 +1,46 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'mongoid'
+require 'mongoid-compatibility'
+require 'rspec/core'
+require 'rspec/expectations'
+require 'rspec/mocks'
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/hash/transform_values' if Mongoid::Compatibility::Version.mongoid4_or_newer? && ActiveSupport.version < Gem::Version.new('6')
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/string/inflections'
+
+require 'matchers/associations'
+require 'matchers/allow_mass_assignment'
+require 'matchers/accept_nested_attributes'
+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'
+require 'matchers/validations/custom_validation_of'
+require 'matchers/validations/absence_of'
+require 'matchers/be_mongoid_document'
+require 'matchers/be_dynamic_document'
+require 'matchers/be_stored_in'
+require 'matchers/have_field'
+require 'matchers/indexes/have_index_for'
+if Mongoid::Compatibility::Version.mongoid3?
+  require 'matchers/indexes/v3/have_index_for'
+else
+  require 'matchers/indexes/v4/have_index_for'
+end
+require 'matchers/have_timestamps'
+
+module Mongoid
+  module Matchers
+    include Mongoid::Matchers::Associations
+    include Mongoid::Matchers::Validations
+  end
+end

data/lib/mongoid/rspec/version.rb

@@ -0,0 +1,5 @@
+module Mongoid
+  module RSpec
+    VERSION = '4.1.0'.freeze
+  end
+end

data/spec/models/article.rb

@@ -8,22 +8,25 @@ class Article
   field :allow_comments, type: Boolean, default: true
   field :number_of_comments, type: Integer
   field :status, type: Symbol
+  field :deletion_date, type: DateTime, default: nil
 
-  embeds_many :comments, cascade_callbacks: true
-  embeds_one :permalink
+  embeds_many :comments, cascade_callbacks: true, inverse_of: :article
+  embeds_one :permalink, inverse_of: :linkable
   belongs_to :author, class_name: 'User', inverse_of: :articles, index: 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: %i[approved rejected], on: :update
 
   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 })
-  index({ 'permalink._id' => 1 })
+  validates_absence_of :deletion_date if Mongoid::Compatibility::Version.mongoid4_or_newer?
+
+  index({ title: 1 }, unique: true, background: true, drop_dups: true)
+  index(published: 1)
+  index('permalink._id' => 1)
 
   accepts_nested_attributes_for :permalink
 end

data/spec/models/comment.rb

@@ -3,4 +3,4 @@ class Comment
 
   embedded_in :article, inverse_of: :comments, polymorphic: true
   belongs_to :user, inverse_of: :comments
-end
+end

data/spec/models/log.rb

@@ -1,9 +1,9 @@
 class Log
   include Mongoid::Document
   include Mongoid::Timestamps
-  include Mongoid::Attributes::Dynamic
+  include Mongoid::Attributes::Dynamic if Mongoid::Compatibility::Version.mongoid4_or_newer?
 
-  store_in collection: "logs"
+  store_in collection: 'logs'
 
-  index({ created_at: 1 }, { bucket_size: 100, expire_after_seconds: 3600 } )
+  index({ created_at: 1 }, bucket_size: 100, expire_after_seconds: 3600)
 end

data/spec/models/message.rb

@@ -0,0 +1,17 @@
+class Message
+  include Mongoid::Document
+
+  field :identifier
+  field :from
+  field :to
+
+  if Mongoid::Compatibility::Version.mongoid6_or_newer?
+    belongs_to :user, optional: true
+  else
+    belongs_to :user
+  end
+
+  validates :identifier, uniqueness: { message: 'uniqueness' }
+  validates :from, presence: { message: 'required' }
+  validates :to, format: { with: /[a-z]+/, message: 'format' }
+end

data/spec/models/movie_article.rb

@@ -1,8 +1,7 @@
 class MovieArticle < Article
-
   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
+end

data/spec/models/person.rb

@@ -7,4 +7,4 @@ class Person
   field :ssn
 
   validates :ssn, ssn: true
-end
+end

data/spec/models/profile.rb

@@ -10,7 +10,7 @@ class Profile
 
   validates :age, numericality: { greater_than: 0 }
   validates :terms_of_service, acceptance: true
-  validates :hobbies, length: { minimum: 1, message: "requires at least one hobby" }
+  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

@@ -2,4 +2,4 @@ class Record
   include Mongoid::Document
 
   belongs_to :user, inverse_of: :record
-end
+end

data/spec/models/site.rb

@@ -3,7 +3,11 @@ class Site
 
   field :name
 
-  has_many :users, inverse_of: :site, order: :email.desc, counter_cache: true
+  if Mongoid::Compatibility::Version.mongoid6_or_older?
+    has_many :users, inverse_of: :site, order: :email.desc, counter_cache: true
+  else
+    has_many :users, inverse_of: :site, order: :email.desc
+  end
 
   validates :name, presence: true, uniqueness: true
 end

data/spec/models/user.rb

@@ -13,20 +13,22 @@ class User
   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
+  has_many :messages, dependent: :destroy
+  has_and_belongs_to_many :children, class_name: 'User'
+  has_one :record, autobuild: true, inverse_of: :user
 
-  embeds_one :profile
+  embeds_one :profile, inverse_of: :user
 
-  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 :login, presence: true, uniqueness: { scope: :site }, format: { with: /\A[\w\-]+\z/ }, exclusion: { in: %w[super index edit] }
+  validates :email, uniqueness: { case_sensitive: false, scope: :site, message: 'is already taken' }, confirmation: true
+  validates :role, presence: true, inclusion: { in: %w[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 :age, presence: true, numericality: true, inclusion: { in: 23..42 }, on: %i[create update]
+  validates :password, presence: true, on: %i[create update]
+  validates :password, exclusion: { in: ->(_user) { ['password'] } }
+  validates :password, confirmation: { message: 'Password confirmation must match given password' }
   validates :provider_uid, presence: true
-  validates :locale, inclusion: { in: ->(user) { [:en, :ru] } }
+  validates :locale, inclusion: { in: ->(_user) { %i[en ru] } }
 
   accepts_nested_attributes_for :articles, :comments
 

data/spec/spec_helper.rb

@@ -1,24 +1,23 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
-MODELS = File.join(File.dirname(__FILE__), "models")
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
+MODELS = File.join(File.dirname(__FILE__), 'models')
 $LOAD_PATH.unshift(MODELS)
-VALIDATORS = File.join(File.dirname(__FILE__), "validators")
+VALIDATORS = File.join(File.dirname(__FILE__), 'validators')
 $LOAD_PATH.unshift(VALIDATORS)
 
-require "rubygems"
-require "bundler"
+require 'rubygems'
+require 'bundler'
 Bundler.setup
 
 require 'mongoid'
-require 'rspec'
 require 'rspec/core'
 require 'rspec/expectations'
+require 'mongoid/compatibility'
 
-Mongoid.configure do |config|
-  config.connect_to("mongoid-rspec-test")
-end
+Mongoid::Config.connect_to('mongoid-rspec-test') if Mongoid::Compatibility::Version.mongoid3_or_newer?
+Mongo::Logger.logger.level = ::Logger::INFO if Mongoid::Compatibility::Version.mongoid5_or_newer?
 
-Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require File.basename(file) }
+Dir[File.join(MODELS, '*.rb')].sort.each { |file| require File.basename(file) }
 
 require 'mongoid-rspec'
 
@@ -29,5 +28,8 @@ RSpec.configure do |config|
   config.after :all do
     Mongoid::Config.purge!
   end
+  config.after :suite do
+    print "\n# Mongoid v#{Mongoid::VERSION}"
+  end
   config.disable_monkey_patching!
 end

data/spec/unit/accept_nested_attributes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe "AcceptsNestedAttributes" do
+RSpec.describe 'AcceptsNestedAttributes' do
   describe User do
     it { is_expected.to accept_nested_attributes_for(:articles) }
     it { is_expected.to accept_nested_attributes_for(:comments) }