mongoid 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d7943ffc77e9a6990cb063c1301476cd1d5b10cd8543f0e9861e96228ff8027
-  data.tar.gz: bc71866e339c29688dae94bdd8b4590b198ab25b503bc321802d6acea4af5c25
+  metadata.gz: 24a3c4aba84097db1be0810c29d175dfa6e69f6346efa857ac124aeb77bec1b1
+  data.tar.gz: b181a4840f966322895bf4dfe0b64cb136513412d8a3ca89b9aa28a342d27054
 SHA512:
-  metadata.gz: 51e00c706c33a552c148b768bf851042a2f5c46aecacd3aa6bed5105c8c9b002bf84f317b1d5d65ee209e153537af5fb7360560758aef34ca4cbc39ffa11b489
-  data.tar.gz: 81a21a9ee3e6aa381bb495eb098b7faba65f2fa32c304460ecb481356ab505bb1189c4850cf218680d93c269cb656360727d3ed3fd967de5525ff92bf510425d
+  metadata.gz: 12979183bf4d077b673beb7a57632fc73b7f1672be666401c68969ae675164b0d0641881cdcb8fb43bec283c4b4ca4d946f63a0c988bb58ac4065e677a5278c6
+  data.tar.gz: 3ae9210672c5c5dc3f8536983e814840fc823668373c9594d9a7cb834b533e945eca850c5840dbf0f90e7f707318c0a16823c0a54599d29b5f3a6308f5bf2dd1

data/lib/mongoid/association/embedded/batchable.rb

@@ -39,7 +39,7 @@ module Mongoid
           unless docs.empty?
             collection.find(selector).update_one(
                 positionally(selector, "$unset" => { path => true }),
-                session: session
+                session: _session
             )
             post_process_batch_remove(docs, :delete)
           end
@@ -60,7 +60,7 @@ module Mongoid
           if !docs.empty?
             collection.find(selector).update_one(
                 positionally(selector, "$pullAll" => { path => removals }),
-                session: session
+                session: _session
             )
             post_process_batch_remove(docs, method)
           end
@@ -136,7 +136,7 @@ module Mongoid
           if insertable?
             collection.find(selector).update_one(
                 positionally(selector, '$set' => { path => inserts }),
-                session: session
+                session: _session
             )
             post_process_batch_insert(docs)
           end
@@ -161,7 +161,7 @@ module Mongoid
           if insertable?
             collection.find(selector).update_one(
                 positionally(selector, '$push' => { path => { '$each' => pushes } }),
-                session: session
+                session: _session
             )
             post_process_batch_insert(docs)
           end

data/lib/mongoid/association/embedded/embeds_many/proxy.rb

@@ -271,6 +271,29 @@ module Mongoid
             end
           end
 
+          # Shift documents off the relation. This can be a single document or
+          # multiples, and will automatically persist the changes.
+          #
+          # @example Shift a single document.
+          #   relation.shift
+          #
+          # @example Shift multiple documents.
+          #   relation.shift(3)
+          #
+          # @param [ Integer ] count The number of documents to shift, or 1 if not
+          #   provided.
+          #
+          # @return [ Document, Array<Document> ] The shifted document(s).
+          def shift(count = nil)
+            if count
+              if _target.size > 0 && docs = _target[0, count]
+                docs.each { |doc| delete(doc) }
+              end
+            else
+              delete(_target[0])
+            end
+          end
+
           # Substitutes the supplied target documents for the existing documents
           # in the relation.
           #
@@ -526,4 +549,4 @@ module Mongoid
       end
     end
   end
-end
+end

data/lib/mongoid/association/many.rb

@@ -189,8 +189,8 @@ module Mongoid
 
       private
 
-      def session
-        _base.send(:session)
+      def _session
+        _base.send(:_session)
       end
 
       # Find the first object given the supplied attributes or create/initialize it.

data/lib/mongoid/association/referenced/has_many/proxy.rb

@@ -456,7 +456,7 @@ module Mongoid
           # @since 3.0.0
           def persist_delayed(docs, inserts)
             unless docs.empty?
-              collection.insert_many(inserts, session: session)
+              collection.insert_many(inserts, session: _session)
               docs.each do |doc|
                 doc.new_record = false
                 doc.run_after_callbacks(:create, :save)

data/lib/mongoid/association/touchable.rb

@@ -32,7 +32,7 @@ module Mongoid
           touches = touch_atomic_updates(field)
           unless touches["$set"].blank?
             selector = atomic_selector
-            _root.collection.find(selector).update_one(positionally(selector, touches), session: session)
+            _root.collection.find(selector).update_one(positionally(selector, touches), session: _session)
           end
           run_callbacks(:touch)
           true

data/lib/mongoid/clients/sessions.rb

@@ -53,7 +53,7 @@ module Mongoid
 
       private
 
-      def session
+      def _session
         Threaded.get_session
       end
 
@@ -104,7 +104,7 @@ module Mongoid
 
         private
 
-        def session
+        def _session
           Threaded.get_session
         end
       end

data/lib/mongoid/contextual/aggregable/mongo.rb

@@ -23,7 +23,7 @@ module Mongoid
         #
         # @since 3.0.0
         def aggregates(field)
-          result = collection.find.aggregate(pipeline(field), session: session).to_a
+          result = collection.find.aggregate(pipeline(field), session: _session).to_a
           if result.empty?
             { "count" => 0, "sum" => nil, "avg" => nil, "min" => nil, "max" => nil }
           else

data/lib/mongoid/contextual/map_reduce.rb

@@ -166,7 +166,7 @@ module Mongoid
         validate_out!
         cmd = command
         opts = { read: cmd.delete(:read).options } if cmd[:read]
-        @map_reduce.database.command(cmd, (opts || {}).merge(session: session)).first
+        @map_reduce.database.command(cmd, (opts || {}).merge(session: _session)).first
       end
       alias :results :raw
 
@@ -250,8 +250,8 @@ module Mongoid
         raise Errors::NoMapReduceOutput.new({}) unless @map_reduce.out
       end
 
-      def session
-        criteria.send(:session)
+      def _session
+        criteria.send(:_session)
       end
     end
   end

data/lib/mongoid/contextual/memory.rb

@@ -49,7 +49,7 @@ module Mongoid
         unless removed.empty?
           collection.find(selector).update_one(
             positionally(selector, "$pullAll" => { path => removed }),
-            session: session
+            session: _session
           )
         end
         deleted
@@ -320,7 +320,7 @@ module Mongoid
           updates["$set"].merge!(doc.atomic_updates["$set"] || {})
           doc.move_changes
         end
-        collection.find(selector).update_one(updates, session: session) unless updates["$set"].empty?
+        collection.find(selector).update_one(updates, session: _session) unless updates["$set"].empty?
       end
 
       # Get the limiting value.
@@ -464,8 +464,8 @@ module Mongoid
 
       private
 
-      def session
-        @criteria.send(:session)
+      def _session
+        @criteria.send(:_session)
       end
     end
   end

data/lib/mongoid/contextual/mongo.rb

@@ -341,7 +341,7 @@ module Mongoid
         @criteria, @klass, @cache = criteria, criteria.klass, criteria.options[:cache]
         @collection = @klass.collection
         criteria.send(:merge_type_selection)
-        @view = collection.find(criteria.selector, session: session)
+        @view = collection.find(criteria.selector, session: _session)
         apply_options
       end
 
@@ -708,8 +708,8 @@ module Mongoid
 
       private
 
-      def session
-        @criteria.send(:session)
+      def _session
+        @criteria.send(:_session)
       end
 
       def acknowledged_write?

data/lib/mongoid/indexable.rb

@@ -35,10 +35,10 @@ module Mongoid
           key, options = spec.key, default_options.merge(spec.options)
           if database = options[:database]
             with(database: database) do |klass|
-              klass.collection.indexes(session: session).create_one(key, options.except(:database))
+              klass.collection.indexes(session: _session).create_one(key, options.except(:database))
             end
           else
-            collection.indexes(session: session).create_one(key, options)
+            collection.indexes(session: _session).create_one(key, options)
           end
         end and true
       end
@@ -56,9 +56,9 @@ module Mongoid
         indexed_database_names.each do |database|
           with(database: database) do |klass|
             begin
-              klass.collection.indexes(session: session).each do |spec|
+              klass.collection.indexes(session: _session).each do |spec|
                 unless spec["name"] == "_id_"
-                  klass.collection.indexes(session: session).drop_one(spec["key"])
+                  klass.collection.indexes(session: _session).drop_one(spec["key"])
                   logger.info(
                     "MONGOID: Removed index '#{spec["name"]}' on collection " +
                     "'#{klass.collection.name}' in database '#{database}'."

data/lib/mongoid/persistable.rb

@@ -203,7 +203,7 @@ module Mongoid
     def persist_atomic_operations(operations)
       if persisted? && operations && !operations.empty?
         selector = atomic_selector
-        _root.collection.find(selector).update_one(positionally(selector, operations), session: session)
+        _root.collection.find(selector).update_one(positionally(selector, operations), session: _session)
       end
     end
   end

data/lib/mongoid/persistable/creatable.rb

@@ -63,7 +63,7 @@ module Mongoid
           selector = _parent.atomic_selector
           _root.collection.find(selector).update_one(
               positionally(selector, atomic_inserts),
-              session: session)
+              session: _session)
         end
       end
 
@@ -78,7 +78,7 @@ module Mongoid
       #
       # @since 4.0.0
       def insert_as_root
-        collection.insert_one(as_attributes, session: session)
+        collection.insert_one(as_attributes, session: _session)
       end
 
       # Post process an insert, which sets the new record attribute to false

data/lib/mongoid/persistable/deletable.rb

@@ -66,7 +66,7 @@ module Mongoid
           selector = _parent.atomic_selector
           _root.collection.find(selector).update_one(
               positionally(selector, atomic_deletes),
-              session: session)
+              session: _session)
         end
         true
       end
@@ -82,7 +82,7 @@ module Mongoid
       #
       # @since 4.0.0
       def delete_as_root
-        collection.find(atomic_selector).delete_one(session: session)
+        collection.find(atomic_selector).delete_one(session: _session)
         true
       end
 

data/lib/mongoid/persistable/updatable.rb

@@ -134,9 +134,9 @@ module Mongoid
           unless updates.empty?
             coll = collection(_root)
             selector = atomic_selector
-            coll.find(selector).update_one(positionally(selector, updates), session: session)
+            coll.find(selector).update_one(positionally(selector, updates), session: _session)
             conflicts.each_pair do |key, value|
-              coll.find(selector).update_one(positionally(selector, { key => value }), session: session)
+              coll.find(selector).update_one(positionally(selector, { key => value }), session: _session)
             end
           end
         end

data/lib/mongoid/persistable/upsertable.rb

@@ -22,7 +22,7 @@ module Mongoid
       def upsert(options = {})
         prepare_upsert(options) do
           collection.find(atomic_selector).update_one(
-              as_attributes, upsert: true, session: session)
+              as_attributes, upsert: true, session: _session)
         end
       end
 

data/lib/mongoid/reloadable.rb

@@ -58,7 +58,7 @@ module Mongoid
     #
     # @since 2.3.2
     def reload_root_document
-      {}.merge(collection.find({ _id: _id }, session: session).read(mode: :primary).first || {})
+      {}.merge(collection.find({ _id: _id }, session: _session).read(mode: :primary).first || {})
     end
 
     # Reload the embedded document.

data/lib/mongoid/tasks/database.rb

@@ -44,7 +44,7 @@ module Mongoid
         models.each do |model|
           unless model.embedded?
             begin
-              model.collection.indexes(session: model.send(:session)).each do |index|
+              model.collection.indexes(session: model.send(:_session)).each do |index|
                 # ignore default index
                 unless index['name'] == '_id_'
                   key = index['key'].symbolize_keys
@@ -77,7 +77,7 @@ module Mongoid
           indexes.each do |index|
             key = index['key'].symbolize_keys
             collection = model.collection
-            collection.indexes(session: model.send(:session)).drop_one(key)
+            collection.indexes(session: model.send(:_session)).drop_one(key)
             logger.info(
               "MONGOID: Removed index '#{index['name']}' on collection " +
               "'#{collection.name}' in database '#{collection.database.name}'."

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "7.0.0"
+  VERSION = "7.0.1"
 end

data/spec/mongoid/association/embedded/embeds_many/proxy_spec.rb

@@ -2544,6 +2544,25 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
         person.addresses.create(street: "hermannstr")
       end
 
+      context "when the number is zero" do
+
+        let!(:popped) do
+          person.addresses.pop(0)
+        end
+
+        it "returns an empty array" do
+          expect(popped).to eq([])
+        end
+
+        it "does not remove the document from the relation" do
+          expect(person.addresses).to eq([ address_one, address_two ])
+        end
+
+        it "does not persist the pop" do
+          expect(person.reload.addresses).to eq([ address_one, address_two ])
+        end
+      end
+
       context "when the number is not larger than the relation" do
 
         let!(:popped) do
@@ -2601,6 +2620,125 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
     end
   end
 
+  describe "#shift" do
+
+    let(:person) do
+      Person.create
+    end
+
+    context "when no argument is provided" do
+
+      let!(:address_one) do
+        person.addresses.create(street: "sonnenallee")
+      end
+
+      let!(:address_two) do
+        person.addresses.create(street: "hermannstr")
+      end
+
+      let!(:shifted) do
+        person.addresses.shift
+      end
+
+      it "returns the shifted document" do
+        expect(shifted).to eq(address_one)
+      end
+
+      it "removes the document from the relation" do
+        expect(person.addresses).to eq([ address_two ])
+      end
+
+      it "persists the shift" do
+        expect(person.reload.addresses).to eq([ address_two ])
+      end
+    end
+
+    context "when an integer is provided" do
+
+      let!(:address_one) do
+        person.addresses.create(street: "sonnenallee")
+      end
+
+      let!(:address_two) do
+        person.addresses.create(street: "hermannstr")
+      end
+
+      context "when the number is zero" do
+
+        let!(:shifted) do
+          person.addresses.shift(0)
+        end
+
+        it "returns an empty array" do
+          expect(shifted).to eq([])
+        end
+
+        it "does not remove the document from the relation" do
+          expect(person.addresses).to eq([ address_one, address_two ])
+        end
+
+        it "does not persist the shift" do
+          expect(person.reload.addresses).to eq([ address_one, address_two ])
+        end
+      end
+
+      context "when the number is not larger than the relation" do
+
+        let!(:shifted) do
+          person.addresses.shift(2)
+        end
+
+        it "returns the shifted documents" do
+          expect(shifted).to eq([ address_one, address_two ])
+        end
+
+        it "removes the document from the relation" do
+          expect(person.addresses).to be_empty
+        end
+
+        it "persists the shift" do
+          expect(person.reload.addresses).to be_empty
+        end
+      end
+
+      context "when the number is larger than the relation" do
+
+        let!(:shifted) do
+          person.addresses.shift(4)
+        end
+
+        it "returns the shifted documents" do
+          expect(shifted).to eq([ address_one, address_two ])
+        end
+
+        it "removes the document from the relation" do
+          expect(person.addresses).to be_empty
+        end
+
+        it "persists the shift" do
+          expect(person.reload.addresses).to be_empty
+        end
+      end
+    end
+
+    context "when the relation is empty" do
+
+      context "when providing no number" do
+
+        it "returns nil" do
+          expect(person.addresses.shift).to be_nil
+        end
+      end
+
+      context "when providing a number" do
+
+        it "returns nil" do
+          expect(person.addresses.shift(2)).to be_nil
+        end
+      end
+    end
+  end
+
   describe "#scoped" do
 
     let(:person) do
@@ -3788,7 +3926,7 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
     end
   end
 
-  context "#delete or #clear with before_remove callback" do
+  context "#delete, or #clear, or #pop, or #shift with before_remove callback" do
 
     let(:artist) do
       Artist.new
@@ -3834,35 +3972,81 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
         end
       end
 
-      context "when errors are raised" do
+      describe "#pop" do
 
         before do
-          expect(artist).to receive(:before_remove_song).and_raise
+          artist.songs.pop
         end
 
-        describe "#delete" do
+        it "executes the callback" do
+          artist.songs.pop
+          expect(artist.before_remove_embedded_called).to be true
+        end
+      end
 
-          it "does not remove the document from the relation" do
-            begin; artist.songs.delete(song); rescue; end
-            expect(artist.songs).to eq([ song ])
-          end
+      describe "#shift" do
+
+        before do
+          artist.songs.shift
         end
 
-        describe "#clear" do
+        it "executes the callback" do
+          artist.songs.shift
+          expect(artist.before_remove_embedded_called).to be true
+        end
+      end
+    end
 
-          before do
-            begin; artist.songs.clear; rescue; end
-          end
+    context "when errors are raised" do
 
-          it "removes the documents from the relation" do
-            expect(artist.songs).to eq([ song ])
-          end
+      before do
+        expect(artist).to receive(:before_remove_song).and_raise
+      end
+
+      describe "#delete" do
+
+        it "does not remove the document from the relation" do
+          begin; artist.songs.delete(song); rescue; end
+          expect(artist.songs).to eq([ song ])
+        end
+      end
+
+      describe "#clear" do
+
+        before do
+          begin; artist.songs.clear; rescue; end
+        end
+
+        it "removes the documents from the relation" do
+          expect(artist.songs).to eq([ song ])
+        end
+      end
+
+      describe "#pop" do
+
+        before do
+          begin; artist.songs.pop; rescue; end
+        end
+
+        it "should remove from collection" do
+          expect(artist.songs).to eq([ song ])
+        end
+      end
+
+      describe "#shift" do
+
+        before do
+          begin; artist.songs.shift; rescue; end
+        end
+
+        it "should remove from collection" do
+          expect(artist.songs).to eq([ song ])
         end
       end
     end
   end
 
-  context "#delete or #clear with after_remove callback" do
+  context "#delete, or #clear, or #pop, or #shift with after_remove callback" do
 
     let(:artist) do
       Artist.new
@@ -3899,6 +4083,30 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
           expect(artist.after_remove_embedded_called).to be true
         end
       end
+
+      describe "#pop" do
+
+        before do
+          artist.labels.pop
+        end
+
+        it "executes the callback" do
+          artist.labels.pop
+          expect(artist.after_remove_embedded_called).to be true
+        end
+      end
+
+      describe "#shift" do
+
+        before do
+          artist.labels.shift
+        end
+
+        it "executes the callback" do
+          artist.labels.shift
+          expect(artist.after_remove_embedded_called).to be true
+        end
+      end
     end
 
     context "when errors are raised" do
@@ -3928,6 +4136,28 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
           expect(artist.labels).to be_empty
         end
       end
+
+      describe "#pop" do
+
+        before do
+          begin; artist.labels.pop; rescue; end
+        end
+
+        it "should remove from collection" do
+          expect(artist.labels).to be_empty
+        end
+      end
+
+      describe "#shift" do
+
+        before do
+          begin; artist.labels.shift; rescue; end
+        end
+
+        it "should remove from collection" do
+          expect(artist.labels).to be_empty
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   fxN/GvhskJEgmdQToxEBRLOu5/udtPpVe/hb3gk5hzsxcWuKN/VTi4SbtFQdz9cq
   fqd6ctFDOqcJmOYdlSRgb9g8zm4BiNgFWPBSk8NsP7c=
   -----END CERTIFICATE-----
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel