mongoid-rspec 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25fcea5e8cc5e8f247b099f60276d560a83c2538e47856a8063f6fae57bffa37
-  data.tar.gz: 291d75e35f982c38b7c58787d6127a0d693e850f3ef1840f02d45963304ad2c1
+  metadata.gz: 6c59448b4e72ebb718332a28e7ddf77de5b792a09ea273b75959930e2c6c2918
+  data.tar.gz: b1818ed7a513db7a4e31bcdd5a492504a75becfc866dd95505192da1db7a56cc
 SHA512:
-  metadata.gz: f53b92e750ceba490eecd7c492b6ffd967131566ffc228c887a35f3e202d75a337a7903cd1b35717e54243906e582306773e2b849f0aea9462448351b58e0594
-  data.tar.gz: d4e252e36a4b77b17b081e0e58176776c6c337a871864c1f805514c9da45cb8d0607fa42e518d08c28ecb8ce419008b1b85c4d07c2ee9f5c627642926775a324
+  metadata.gz: 995c284d71146d52d554e8eff18e48605e76546ebce9428674d1fcefe4c560a73973651f4eb4496d21a839fb35944c37f98cc21eb78ddd1e1eea80a57d1392c4
+  data.tar.gz: a2e400ead572f31c614a294f1d5d10116e08fa6f152b2f58cf112da45608a3d72be2c5893ceb035c8a6f514af8ef55bcfdffd0a55a81a2e0f97ad43fd0699cf2

data/README.md

@@ -18,7 +18,7 @@ end
 
 ## Compatibility
 
-This gem is compatible with Mongoid 3, 4, 5 and 6.
+This gem is compatible with Mongoid 3, 4, 5, 6 and 7.
 
 ## Configuration
 
@@ -261,6 +261,10 @@ end
 RSpec.describe Site do
   it { is_expected.to have_many(:users).as_inverse_of(:site).ordered_by(:email.asc).with_counter_cache }
 end
+
+RSpec.describe Message do
+  it { is_expected.to belong_to(:user).with_optional }
+end
 ```
 
 ### Validation Matchers
@@ -290,6 +294,7 @@ end
 
 RSpec.describe Article do
   it { is_expected.to validate_length_of(:title).within(8..16) }
+  it { is_expected.to validate_absence_of(:deletion_date) }
 end
 
 RSpec.describe Visitor do

data/lib/matchers/associations.rb

@@ -1,15 +1,29 @@
-require 'mongoid/relations'
+if Mongoid::Compatibility::Version.mongoid7_or_newer?
+  require 'mongoid/association'
+else
+  require 'mongoid/relations'
+end
 
 module Mongoid
   module Matchers
     module Associations
-      HAS_MANY = Mongoid::Relations::Referenced::Many
-      HAS_AND_BELONGS_TO_MANY = Mongoid::Relations::Referenced::ManyToMany
-      HAS_ONE = Mongoid::Relations::Referenced::One
-      BELONGS_TO = Mongoid::Relations::Referenced::In
-      EMBEDS_MANY = Mongoid::Relations::Embedded::Many
-      EMBEDS_ONE = Mongoid::Relations::Embedded::One
-      EMBEDDED_IN = Mongoid::Relations::Embedded::In
+      if Mongoid::Compatibility::Version.mongoid7_or_newer?
+        HAS_MANY = Mongoid::Association::Referenced::HasMany
+        HAS_AND_BELONGS_TO_MANY = Mongoid::Association::Referenced::HasAndBelongsToMany
+        HAS_ONE = Mongoid::Association::Referenced::HasOne
+        BELONGS_TO = Mongoid::Association::Referenced::BelongsTo
+        EMBEDS_MANY = Mongoid::Association::Embedded::EmbedsMany
+        EMBEDS_ONE = Mongoid::Association::Embedded::EmbedsOne
+        EMBEDDED_IN = Mongoid::Association::Embedded::EmbeddedIn
+      else
+        HAS_MANY = Mongoid::Relations::Referenced::Many
+        HAS_AND_BELONGS_TO_MANY = Mongoid::Relations::Referenced::ManyToMany
+        HAS_ONE = Mongoid::Relations::Referenced::One
+        BELONGS_TO = Mongoid::Relations::Referenced::In
+        EMBEDS_MANY = Mongoid::Relations::Embedded::Many
+        EMBEDS_ONE = Mongoid::Relations::Embedded::One
+        EMBEDDED_IN = Mongoid::Relations::Embedded::In
+      end
 
       class HaveAssociationMatcher
         def initialize(name, association_type)
@@ -37,7 +51,7 @@ module Mongoid
           @association[:order] = association_field_name.to_s
           @expectation_message << " ordered by #{@association[:order].inspect}"
 
-          if association_field_name.is_a? Mongoid::Criteria::Queryable::Key
+          if association_field_name.is_a? association_kind_of
             @association[:order_operator] = association_field_name.operator
             @expectation_message << " #{order_way(@association[:order_operator])}"
           end
@@ -105,6 +119,12 @@ module Mongoid
           self
         end
 
+        def with_optional
+          @association[:optional] = true
+          @expectation_message << " which specifies optional as #{@association[:optional]}"
+          self
+        end
+
         def matches?(actual)
           @actual = actual.is_a?(Class) ? actual : actual.class
           metadata = @actual.relations[@association[:name]]
@@ -116,7 +136,11 @@ module Mongoid
             @positive_result_message = "association named #{@association[:name]}"
           end
 
-          relation = metadata.relation
+          relation = if Mongoid::Compatibility::Version.mongoid7_or_newer?
+                       metadata.class
+                     else
+                       metadata.relation
+                     end
           if relation != @association[:type]
             @negative_result_message = "#{@actual.inspect} #{type_description(relation, false)} #{@association[:name]}"
             return false
@@ -222,11 +246,11 @@ module Mongoid
           end
 
           if @association[:index]
-            if metadata.index != true
+            if metadata.indexed?
+              @positive_result_message = "#{@positive_result_message} which set index"
+            else
               @negative_result_message = "#{@positive_result_message} which did not set index"
               return false
-            else
-              @positive_result_message = "#{@positive_result_message} which set index"
             end
           end
 
@@ -248,6 +272,15 @@ module Mongoid
             end
           end
 
+          if @association[:optional]
+            if metadata.options[:optional] != true
+              @negative_result_message = "#{@positive_result_message} which did not set optional"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which set optional"
+            end
+          end
+
           true
         end
 
@@ -293,6 +326,10 @@ module Mongoid
         def order_way(operator)
           [nil, 'ascending', 'descending'][operator]
         end
+
+        def association_kind_of
+          Mongoid::Compatibility::Version.mongoid5_or_older? ? Origin::Key : Mongoid::Criteria::Queryable::Key
+        end
       end
 
       def embed_one(association_name)

data/lib/matchers/validations/absence_of.rb

@@ -0,0 +1,11 @@
+if Mongoid::Compatibility::Version.mongoid4_or_newer?
+  module Mongoid
+    module Matchers
+      module Validations
+        def validate_absence_of(field)
+          HaveValidationMatcher.new(field, :absence)
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/rspec/version.rb

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

data/lib/mongoid/rspec.rb

@@ -6,7 +6,7 @@ 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?
+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'
 
@@ -25,6 +25,7 @@ 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'

data/spec/models/article.rb

@@ -8,6 +8,7 @@ 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, inverse_of: :article
   embeds_one :permalink, inverse_of: :linkable
@@ -21,6 +22,8 @@ class Article
   validates_length_of :title, within: 8..16
   validates_length_of :content, minimum: 200
 
+  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)

data/spec/models/message.rb

@@ -5,6 +5,12 @@ class Message
   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' }

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,6 +13,7 @@ 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_many :messages, dependent: :destroy
   has_and_belongs_to_many :children, class_name: 'User'
   has_one :record, autobuild: true, inverse_of: :user
 

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ require 'bundler'
 Bundler.setup
 
 require 'mongoid'
-require 'rspec'
 require 'rspec/core'
 require 'rspec/expectations'
 require 'mongoid/compatibility'

data/spec/unit/associations_spec.rb

@@ -39,8 +39,16 @@ RSpec.describe 'Associations' do
   end
 
   describe Site do
-    if Mongoid::Compatibility::Version.mongoid6_or_newer?
+    if Mongoid::Compatibility::Version.mongoid6_or_older?
       it { is_expected.to have_many(:users).as_inverse_of(:site).ordered_by(:email.desc).with_counter_cache }
+    elsif Mongoid::Compatibility::Version.mongoid7_or_newer?
+      it { is_expected.to have_many(:users).as_inverse_of(:site).ordered_by(:email.desc) }
+    end
+  end
+
+  describe Message do
+    if Mongoid::Compatibility::Version.mongoid6_or_newer?
+      it { is_expected.to belong_to(:user).with_optional }
     end
   end
 end

data/spec/unit/validations_spec.rb

@@ -39,6 +39,7 @@ RSpec.describe 'Validations' do
     it { is_expected.to validate_length_of(:content).greater_than(200) }
     it { is_expected.to validate_inclusion_of(:status).to_allow([:pending]).on(:create) }
     it { is_expected.to validate_inclusion_of(:status).to_allow(%i[approved rejected]).on(:update) }
+    it { is_expected.to validate_absence_of(:deletion_date) } if Mongoid::Compatibility::Version.mongoid4_or_newer?
   end
 
   describe MovieArticle do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-rspec
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Evan Sagge
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,16 +31,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: mongoid-compatibility
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -54,33 +68,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '3.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: mongoid-compatibility
+  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: RSpec matches for Mongoid models, including association and validation
   matchers.
 email: evansagge@gmail.com contato@rodrigopinto.me
@@ -103,6 +145,7 @@ files:
 - lib/matchers/indexes/v3/have_index_for.rb
 - lib/matchers/indexes/v4/have_index_for.rb
 - lib/matchers/validations.rb
+- lib/matchers/validations/absence_of.rb
 - lib/matchers/validations/acceptance_of.rb
 - lib/matchers/validations/associated.rb
 - lib/matchers/validations/confirmation_of.rb
@@ -158,31 +201,30 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: mongoid-rspec
-rubygems_version: 2.7.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for Mongoid
 test_files:
-- spec/models/article.rb
-- spec/models/comment.rb
-- spec/models/log.rb
-- spec/models/message.rb
-- spec/models/movie_article.rb
-- spec/models/permalink.rb
-- spec/models/person.rb
-- spec/models/profile.rb
-- spec/models/record.rb
-- spec/models/site.rb
-- spec/models/user.rb
 - spec/spec_helper.rb
-- spec/unit/accept_nested_attributes_spec.rb
 - spec/unit/associations_spec.rb
 - spec/unit/be_dynamic_document_spec.rb
-- spec/unit/be_mongoid_document_spec.rb
+- spec/unit/validations_spec.rb
 - spec/unit/be_stored_in.rb
-- spec/unit/document_spec.rb
 - spec/unit/have_index_for_spec.rb
+- spec/unit/accept_nested_attributes_spec.rb
+- spec/unit/document_spec.rb
+- spec/unit/be_mongoid_document_spec.rb
 - spec/unit/have_timestamps_spec.rb
-- spec/unit/validations_spec.rb
+- spec/models/article.rb
+- spec/models/movie_article.rb
+- spec/models/record.rb
+- spec/models/site.rb
+- spec/models/message.rb
+- spec/models/permalink.rb
+- spec/models/profile.rb
+- spec/models/comment.rb
+- spec/models/person.rb
+- spec/models/log.rb
+- spec/models/user.rb
 - spec/validators/ssn_validator.rb