mongoid-rspec 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 25fcea5e8cc5e8f247b099f60276d560a83c2538e47856a8063f6fae57bffa37
-  data.tar.gz: 291d75e35f982c38b7c58787d6127a0d693e850f3ef1840f02d45963304ad2c1
+SHA1:
+  metadata.gz: 801c33ba9bd350eeb1595c57509601084b983ae5
+  data.tar.gz: 1f47a9a328b9d58e5cdaaebf7dbfd91420ed4ca7
 SHA512:
-  metadata.gz: f53b92e750ceba490eecd7c492b6ffd967131566ffc228c887a35f3e202d75a337a7903cd1b35717e54243906e582306773e2b849f0aea9462448351b58e0594
-  data.tar.gz: d4e252e36a4b77b17b081e0e58176776c6c337a871864c1f805514c9da45cb8d0607fa42e518d08c28ecb8ce419008b1b85c4d07c2ee9f5c627642926775a324
+  metadata.gz: 91cf1c6e8b0d356bbece0657fe9f5cf1df218f8ec5fa9171a96dd2cef02781654390bcd47f6bea9e62192564d144c1489541dcb54bcc016c596e73578f1b4d18
+  data.tar.gz: af5c81412000da22a464b6982dab00e652b34c052ca46cc3fb596439c3e7dde204851b769dbd28b788ffcd67e2331dc847455b613b226ae2cf2a7e2f2a4a0d82

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
 
@@ -290,6 +290,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)
@@ -116,7 +130,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 +240,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
 

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

@@ -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/lib/mongoid/rspec/version.rb

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

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/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/unit/associations_spec.rb

@@ -39,8 +39,10 @@ RSpec.describe 'Associations' do
   end
 
   describe Site do
-    if Mongoid::Compatibility::Version.mongoid6_or_newer?
+    if Mongoid::Compatibility::Version.mongoid6?
       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
 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.0.1
 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: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,14 +31,14 @@ 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
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 description: RSpec matches for Mongoid models, including association and validation
   matchers.
 email: evansagge@gmail.com contato@rodrigopinto.me
@@ -103,6 +103,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
@@ -159,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid-rspec
-rubygems_version: 2.7.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for Mongoid