mongoid 6.3.0 → 6.4.0

data/spec/mongoid/contextual/mongo_spec.rb

@@ -275,6 +275,23 @@ describe Mongoid::Contextual::Mongo do
           expect(Band.count).to eq(0)
         end
       end
+
+      context 'when the write concern is unacknowledged' do
+
+        let(:criteria) do
+          Band.all
+        end
+
+        let!(:deleted) do
+          criteria.with(write: { w: 0 }) do |crit|
+            crit.send(method)
+          end
+        end
+
+        it 'returns 0' do
+          expect(deleted).to eq(0)
+        end
+      end
     end
   end
 
@@ -363,6 +380,27 @@ describe Mongoid::Contextual::Mongo do
         end
       end
     end
+
+    context 'when the write concern is unacknowledged' do
+
+      before do
+        2.times { Band.create }
+      end
+
+      let(:criteria) do
+        Band.all
+      end
+
+      let!(:deleted) do
+        criteria.with(write: { w: 0 }) do |crit|
+          crit.send(method)
+        end
+      end
+
+      it 'returns 0' do
+        expect(deleted).to eq(0)
+      end
+    end
   end
 
   describe "#distinct" do

data/spec/mongoid/criteria/queryable/selectable_spec.rb

@@ -1449,7 +1449,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
       context "when the criterion are on the same field" do
 
-        context "when the stretegy is the default (intersection)" do
+        context "when the strategy is the default (intersection)" do
 
           let(:selection) do
             query.in(first: [ 1, 2 ].freeze).in(first: [ 2, 3 ])
@@ -1466,6 +1466,35 @@ describe Mongoid::Criteria::Queryable::Selectable do
           end
         end
 
+        context 'when the field is aliased' do
+
+          before(:all) do
+            class TestModel
+              include Mongoid::Document
+            end
+          end
+
+          after(:all) do
+            Object.send(:remove_const, :TestModel)
+          end
+
+          let(:bson_object_id) do
+            BSON::ObjectId.new
+          end
+
+          let(:selection) do
+            TestModel.in(id: [bson_object_id.to_s]).in(id: [bson_object_id.to_s])
+          end
+
+          it "intersects the $in selectors" do
+            expect(selection.selector).to eq("_id" =>  { "$in" => [ bson_object_id ] })
+          end
+
+          it "returns a cloned query" do
+            expect(selection).to_not equal(query)
+          end
+        end
+
         context "when the stretegy is intersect" do
 
           let(:selection) do
@@ -1483,7 +1512,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
           end
         end
 
-        context "when the stretegy is override" do
+        context "when the strategy is override" do
 
           let(:selection) do
             query.in(first: [ 1, 2 ]).override.in(first: [ 3, 4 ])
@@ -1500,7 +1529,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
           end
         end
 
-        context "when the stretegy is union" do
+        context "when the strategy is union" do
 
           let(:selection) do
             query.in(first: [ 1, 2 ]).union.in(first: [ 3, 4 ])

data/spec/mongoid/interceptable_spec.rb

@@ -526,7 +526,7 @@ describe Mongoid::Interceptable do
           end
 
           after(:all) do
-            Band.reset_callbacks(:rearrange)
+            begin; Band.reset_callbacks(:rearrange); rescue; end
           end
 
           let(:attributes) do

data/spec/mongoid/persistable/deletable_spec.rb

@@ -228,6 +228,25 @@ describe Mongoid::Persistable::Deletable do
           expect(removed).to eq(1)
         end
       end
+
+      context 'when the write concern is unacknowledged' do
+
+        before do
+          Person.create(title: 'miss')
+        end
+
+        let!(:deleted) do
+          Person.with(write: { w: 0 }) { |klass| klass.delete_all(title: "sir") }
+        end
+
+        it "removes the matching documents" do
+          expect(Person.where(title: 'miss').count).to eq(1)
+        end
+
+        it "returns 0" do
+          expect(deleted).to eq(0)
+        end
+      end
     end
   end
 end

data/spec/mongoid/persistable/destroyable_spec.rb

@@ -222,6 +222,25 @@ describe Mongoid::Persistable::Destroyable do
       end
     end
 
+    context 'when the write concern is unacknowledged' do
+
+      before do
+        Person.create(title: 'miss')
+      end
+
+      let!(:removed) do
+        Person.with(write: { w: 0 }) { |klass| klass.destroy_all(title: "sir") }
+      end
+
+      it "removes the matching documents" do
+        expect(Person.where(title: 'miss').count).to eq(1)
+      end
+
+      it "returns 0" do
+        expect(removed).to eq(0)
+      end
+    end
+
     context 'when removing a list of embedded documents' do
 
       context 'when the embedded documents list is reversed in memory' do

data/spec/mongoid/persistable_spec.rb

@@ -52,16 +52,16 @@ describe Mongoid::Persistable do
       context "when not chaining the operations" do
 
         let(:operations) do
-          {
+          [{
             "$inc" => { "member_count" => 10 },
             "$bit" => { "likes" => { :and => 13 }},
             "$set" => { "name" => "Placebo" },
-            "$unset" => { "origin" => true }
-          }
+            "$unset" => { "origin" => true }},
+           { session: nil }]
         end
 
         before do
-          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(operations).and_call_original
+          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(*operations).and_call_original
         end
 
         let!(:update) do
@@ -79,16 +79,16 @@ describe Mongoid::Persistable do
       context "when chaining the operations" do
 
         let(:operations) do
-          {
+          [{
             "$inc" => { "member_count" => 10 },
             "$bit" => { "likes" => { :and => 13 }},
             "$set" => { "name" => "Placebo" },
-            "$unset" => { "origin" => true }
-          }
+            "$unset" => { "origin" => true }},
+           { :session => nil } ]
         end
 
         before do
-          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(operations).and_call_original
+          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(*operations).and_call_original
         end
 
         let!(:update) do
@@ -107,16 +107,16 @@ describe Mongoid::Persistable do
       context "when given multiple operations of the same type" do
 
         let(:operations) do
-          {
+          [{
             "$inc" => { "member_count" => 10, "other_count" => 10 },
             "$bit" => { "likes" => { :and => 13 }},
             "$set" => { "name" => "Placebo" },
-            "$unset" => { "origin" => true }
-          }
+            "$unset" => { "origin" => true }},
+            { session: nil }]
         end
 
         before do
-          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(operations).and_call_original
+          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(*operations).and_call_original
         end
 
         let!(:update) do
@@ -144,16 +144,16 @@ describe Mongoid::Persistable do
       context "when expecting the document to be yielded" do
 
         let(:operations) do
-          {
+          [{
             "$inc" => { "member_count" => 10 },
             "$bit" => { "likes" => { :and => 13 }},
             "$set" => { "name" => "Placebo" },
-            "$unset" => { "origin" => true }
-          }
+            "$unset" => { "origin" => true }},
+            { session: nil }]
         end
 
         before do
-          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(operations).and_call_original
+          expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).with(*operations).and_call_original
         end
 
         let!(:update) do

data/spec/spec_helper.rb

@@ -90,6 +90,7 @@ end
 def array_filters_supported?
   Mongoid::Clients.default.cluster.next_primary.features.array_filters_enabled?
 end
+alias :sessions_supported? :array_filters_supported?
 
 # Set the database that the spec suite connects to.
 Mongoid.configure do |config|
@@ -145,3 +146,72 @@ RSpec.configure do |config|
     Mongoid.purge!
   end
 end
+
+# A subscriber to be used with the Ruby driver for testing.
+#
+# @since 6.4.0
+class EventSubscriber
+
+  # The started events.
+  #
+  # @since 6.4.0
+  attr_reader :started_events
+
+  # The succeeded events.
+  #
+  # @since 6.4.0
+  attr_reader :succeeded_events
+
+  # The failed events.
+  #
+  # @since 6.4.0
+  attr_reader :failed_events
+
+  # Create the test event subscriber.
+  #
+  # @example Create the subscriber
+  #   EventSubscriber.new
+  #
+  # @since 6.4.0
+  def initialize
+    @started_events = []
+    @succeeded_events = []
+    @failed_events = []
+  end
+
+  # Cache the succeeded event.
+  #
+  # @param [ Event ] event The event.
+  #
+  # @since 6.4.0
+  def succeeded(event)
+    @succeeded_events.push(event)
+  end
+
+  # Cache the started event.
+  #
+  # @param [ Event ] event The event.
+  #
+  # @since 6.4.0
+  def started(event)
+    @started_events.push(event)
+  end
+
+  # Cache the failed event.
+  #
+  # @param [ Event ] event The event.
+  #
+  # @since 6.4.0
+  def failed(event)
+    @failed_events.push(event)
+  end
+
+  # Clear all cached events.
+  #
+  # @since 6.4.0
+  def clear_events!
+    @started_events = []
+    @succeeded_events = []
+    @failed_events = []
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.0
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,29 +30,35 @@ cert_chain:
   fxN/GvhskJEgmdQToxEBRLOu5/udtPpVe/hb3gk5hzsxcWuKN/VTi4SbtFQdz9cq
   fqd6ctFDOqcJmOYdlSRgb9g8zm4BiNgFWPBSk8NsP7c=
   -----END CERTIFICATE-----
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -62,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -97,6 +103,7 @@ files:
 - lib/mongoid/clients.rb
 - lib/mongoid/clients/factory.rb
 - lib/mongoid/clients/options.rb
+- lib/mongoid/clients/sessions.rb
 - lib/mongoid/clients/storage_options.rb
 - lib/mongoid/clients/validators.rb
 - lib/mongoid/clients/validators/storage.rb
@@ -179,6 +186,7 @@ files:
 - lib/mongoid/errors/invalid_persistence_option.rb
 - lib/mongoid/errors/invalid_relation.rb
 - lib/mongoid/errors/invalid_scope.rb
+- lib/mongoid/errors/invalid_session_use.rb
 - lib/mongoid/errors/invalid_set_polymorphic_relation.rb
 - lib/mongoid/errors/invalid_storage_options.rb
 - lib/mongoid/errors/invalid_storage_parent.rb
@@ -598,6 +606,7 @@ files:
 - spec/mongoid/changeable_spec.rb
 - spec/mongoid/clients/factory_spec.rb
 - spec/mongoid/clients/options_spec.rb
+- spec/mongoid/clients/sessions_spec.rb
 - spec/mongoid/clients_spec.rb
 - spec/mongoid/composable_spec.rb
 - spec/mongoid/config/environment_spec.rb
@@ -863,7 +872,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.
@@ -872,6 +881,7 @@ test_files:
 - spec/mongoid/scopable_spec.rb
 - spec/mongoid/clients/factory_spec.rb
 - spec/mongoid/clients/options_spec.rb
+- spec/mongoid/clients/sessions_spec.rb
 - spec/mongoid/matchable_spec.rb
 - spec/mongoid/copyable_spec.rb
 - spec/mongoid/changeable_spec.rb