mongoid 5.1.4 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79c4a036b0cdf460779fe1d838cd9c47fefa997a
-  data.tar.gz: f9eccd20ec1cf43dc5696e9f28b66ac1511b92cb
+  metadata.gz: abf3bc71acef310e6e22c9900a173ef44adcffe9
+  data.tar.gz: 3178495b48b2377e77929352b9349c02adee7017
 SHA512:
-  metadata.gz: 373ef0d42a812e2bd55b9f0c84fb4c40ef0720821127ad615b9fe1f30a15273dbe68126bb0e5c4981af9fbb30f90c51ba0dfba2dfae7738db75e3d128398acee
-  data.tar.gz: ea57593ae912660e765caaa3effce3b3355944fb77859ad8d52166b8f6ab8a6b013f2d01380ebb513ec67b4606040f2cd912894459558c8f7bc305d50349d673
+  metadata.gz: 16106f196625909b1bbefd3bea0ab5e7b3397cd8055108c01c7f5b1ae7dc485810a9fa78ab5975b3794e2db8a2fe2b82d9c8d3e18b69e762f2ff994727397eba
+  data.tar.gz: e08c0e8efaa17427d5d3e329322dd367b72a44eb5f3a5c9e2d0d1c9bf5d4bebcae313ee155dbb5f78578cd98a767f2a7e78fad5747c87221176da465321384ab

data/lib/config/locales/en.yml

@@ -115,10 +115,7 @@ en:
         invalid_includes:
           message: "Invalid includes directive: %{klass}.includes(%{args})"
           summary: "Eager loading in Mongoid only supports providing arguments
-            to %{klass}.includes that are the names of relations on the %{klass}
-            model, and only supports one level of eager loading. (ie, eager loading
-            associations not on the %{klass} but one step away via another relation
-            is not allowed."
+            to %{klass}.includes that are the names of relations on the %{klass}."
           resolution: "Ensure that each parameter passed to %{klass}.includes is
             a valid name of a relation on the %{klass} model. These are: %{relations}."
         invalid_index:

data/lib/mongoid/clients/options.rb

@@ -44,12 +44,12 @@ module Mongoid
 
       def mongo_client
         tmp = persistence_options
-        if opts = tmp && tmp.dup
+        if (opts = tmp && !tmp.empty? && tmp.dup)
           if opts[:client]
             client = Clients.with_name(opts[:client])
           else
             client = Clients.with_name(self.class.client_name)
-            client.use(self.class.database_name)
+            client = client.use(self.class.database_name)
           end
           client.with(opts.reject{ |k, v| k == :collection || k == :client })
         end

data/lib/mongoid/contextual/memory.rb

@@ -130,9 +130,7 @@ module Mongoid
       #
       # @since 3.0.0
       def first
-        doc = documents.first
-        eager_load_one(doc)
-        doc
+        eager_load([documents.first]).first
       end
       alias :one :first
       alias :find_first :first
@@ -165,9 +163,7 @@ module Mongoid
       #
       # @since 3.0.0
       def last
-        doc = documents.last
-        eager_load_one(doc)
-        doc
+        eager_load([documents.last]).first
       end
 
       # Get the length of matching documents in the context.

data/lib/mongoid/contextual/mongo.rb

@@ -237,7 +237,10 @@ module Mongoid
       def first
         return documents.first if cached? && cache_loaded?
         try_cache(:first) do
-          with_eager_loading(view.limit(-1).first)
+          if raw_doc = view.limit(-1).first
+            doc = Factory.from_db(klass, raw_doc, criteria.options[:fields])
+            eager_load([doc]).first
+          end
         end
       end
       alias :one :first
@@ -249,7 +252,10 @@ module Mongoid
       # @since 4.0.2
       def find_first
         return documents.first if cached? && cache_loaded?
-        with_eager_loading(view.first)
+        if raw_doc = view.first
+          doc = Factory.from_db(klass, raw_doc, criteria.options[:fields])
+          eager_load([doc]).first
+        end
       end
 
       # Execute a $geoNear command against the database.
@@ -334,7 +340,10 @@ module Mongoid
       def last
         try_cache(:last) do
           with_inverse_sorting do
-            with_eager_loading(view.limit(-1).first)
+            if raw_doc = view.limit(-1).first
+              doc = Factory.from_db(klass, raw_doc, criteria.options[:fields])
+              eager_load([doc]).first
+            end
           end
         end
       end
@@ -643,15 +652,9 @@ module Mongoid
       #
       # @since 3.0.0
       def documents_for_iteration
-        if cached? && !documents.empty?
-          documents
-        elsif eager_loadable?
-          docs = view.map{ |doc| Factory.from_db(klass, doc, criteria.options[:fields]) }
-          eager_load(docs)
-          docs
-        else
-          view
-        end
+        return documents if cached? && !documents.empty?
+        docs = view.map{ |doc| Factory.from_db(klass, doc, criteria.options[:fields]) }
+        eager_load(docs)
       end
 
       # Yield to the document.
@@ -667,10 +670,8 @@ module Mongoid
       #
       # @since 3.0.0
       def yield_document(document, &block)
-        doc = document.respond_to?(:_id) ?
-          document : Factory.from_db(klass, document, criteria.options[:fields])
-        yield(doc)
-        documents.push(doc) if cacheable?
+        yield(document)
+        documents.push(document) if cacheable?
       end
     end
   end

data/lib/mongoid/criteria/includable.rb

@@ -27,13 +27,7 @@ module Mongoid
       #
       # @since 2.2.0
       def includes(*relations)
-        relations.flatten.each do |relation|
-          if relation.is_a?(Hash)
-            extract_nested_inclusion(klass, relation)
-          else
-            add_inclusion(klass, relation)
-          end
-        end
+        extract_includes_list(klass, relations)
         clone
       end
 
@@ -76,67 +70,26 @@ module Mongoid
       # @raise [ Errors::InvalidIncludes ] If no relation is found.
       #
       # @since 5.1.0
-      def add_inclusion(_klass, relation)
-        metadata = get_inclusion_metadata(_klass, relation)
-        raise Errors::InvalidIncludes.new(_klass, [ relation ]) unless metadata
+      def add_inclusion(_klass, metadata)
         inclusions.push(metadata) unless inclusions.include?(metadata)
       end
 
-      # Extract inclusion definitions from a list.
-      #
-      # @example Extract the inclusions from a list.
-      #   criteria.extract_relations_list(:posts, [{ :alerts => :items }])
-      #
-      # @param [ Symbol ] association The name of the association.
-      # @param [ Array ] relations A list of associations.
-      #
-      # @since 5.1.0
-      def extract_relations_list(association, relations)
-        relations.each do |relation|
-          if relation.is_a?(Hash)
-            extract_nested_inclusion(association, relation)
+      def extract_includes_list(_parent_class, *relations_list)
+        relations_list.flatten.each do |relation_object|
+          if relation_object.is_a?(Hash)
+            relation_object.each do |relation, _includes|
+              metadata = _parent_class.reflect_on_association(relation)
+              raise Errors::InvalidIncludes.new(_klass, [ relation ]) unless metadata
+              add_inclusion(_parent_class, metadata)
+              extract_includes_list(metadata.klass, _includes)
+            end
           else
-            add_inclusion(association, relation)
+            metadata = _parent_class.reflect_on_association(relation_object)
+            raise Errors::InvalidIncludes.new(_parent_class, [ relation_object ]) unless metadata
+            add_inclusion(_parent_class, metadata)
           end
         end
       end
-
-      # Extract nested inclusion.
-      #
-      # @example Extract the inclusions from a nested definition.
-      #   criteria.extract_nested_inclusion(User, { :posts => [:alerts] })
-      #
-      # @param [ Class, Symbol ] _klass The class for which the inclusion should be added.
-      # @param [ Hash ] relation The nested inclusion.
-      #
-      # @since 5.1.0
-      def extract_nested_inclusion(_klass, relation)
-        relation.each do |association, _inclusion|
-          add_inclusion(_klass, association)
-          if _inclusion.is_a?(Array)
-            extract_relations_list(association, _inclusion)
-          else
-            add_inclusion(association, _inclusion)
-          end
-        end
-      end
-
-      # Get the metadata for an inclusion.
-      #
-      # @example Get the metadata for an inclusion definition.
-      #   criteria.get_inclusion_metadata(User, :posts)
-      #
-      # @param [ Class, Symbol, String ] _klass The class for determining the association metadata
-      # @param [ Symbol  ] association The name of the association.
-      #
-      # @since 5.1.0
-      def get_inclusion_metadata(_klass, association)
-        if _klass.is_a?(Class)
-          _klass.reflect_on_association(association)
-        else
-          _klass.to_s.classify.constantize.reflect_on_association(association)
-        end
-      end
     end
   end
 end

data/lib/mongoid/persistable/settable.rb

@@ -22,7 +22,16 @@ module Mongoid
       def set(setters)
         prepare_atomic_operation do |ops|
           process_atomic_operations(setters) do |field, value|
-            process_attribute(field.to_s, value)
+
+            field_and_value_hash = hasherizer(field.split('.'), value)
+            field = field_and_value_hash.keys.first.to_s
+
+            if fields[field] && fields[field].type == Hash && attributes.key?(field)
+              process_attribute(field.to_s, attributes[field].merge(field_and_value_hash[field]))
+            else
+              process_attribute(field.to_s, field_and_value_hash[field])
+            end
+
             unless relations.include?(field.to_s)
               ops[atomic_attribute_name(field)] = attributes[field]
             end

data/lib/mongoid/relations/counter_cache.rb

@@ -105,10 +105,10 @@ module Mongoid
 
           after_update do
             if record = __send__(name)
-              id_field = "#{name}_id"
+              foreign_key = meta.foreign_key
 
-              if attribute_changed?(id_field)
-                original, current = attribute_change(id_field)
+              if attribute_changed?(foreign_key)
+                original, current = attribute_change(foreign_key)
 
                 unless original.nil?
                   record.class.decrement_counter(cache_column, original)

data/lib/mongoid/relations/eager.rb

@@ -9,28 +9,16 @@ module Mongoid
   module Relations
     module Eager
 
-      attr_accessor :eager_loaded
-
-      def with_eager_loading(document)
-        return nil unless document
-        doc = Factory.from_db(klass, document, criteria.options[:fields])
-        eager_load_one(doc)
-        doc
-      end
-
-      def eager_load_one(doc)
-        eager_load([doc])
-      end
-
-      def eager_loadable?(document = nil)
-        return false if criteria.inclusions.empty?
-        !eager_loaded
+      def eager_loadable?
+        !criteria.inclusions.empty?
       end
 
       def eager_load(docs)
-        return false unless eager_loadable?
-        preload(criteria.inclusions, docs)
-        self.eager_loaded = true
+        docs.tap do |docs|
+          if eager_loadable?
+            preload(criteria.inclusions, docs)
+          end
+        end
       end
 
       def preload(relations, docs)

data/lib/mongoid/relations/eager/base.rb

@@ -145,7 +145,7 @@ module Mongoid
         #
         # @since 4.0.0
         def set_relation(doc, element)
-          doc.set_relation(@metadata.name, element)
+          doc.set_relation(@metadata.name, element) unless doc.blank?
         end
       end
     end

data/lib/mongoid/version.rb

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

data/spec/app/models/church.rb

@@ -1,4 +1,6 @@
 class Church
   include Mongoid::Document
   has_many :acolytes, validate: false
+  field :location, type: Hash
+  field :name, type: String
 end

data/spec/app/models/post.rb

@@ -11,6 +11,7 @@ class Post
 
   belongs_to :person, counter_cache: true
   belongs_to :author, foreign_key: :author_id, class_name: "User"
+  belongs_to :post_genre, foreign_key: :genre_id, counter_cache: true
   has_and_belongs_to_many :tags, before_add: :before_add_tag, after_add: :after_add_tag, before_remove: :before_remove_tag, after_remove: :after_remove_tag
   has_many :videos, validate: false
   has_many :roles, validate: false

data/spec/app/models/post_genre.rb

@@ -0,0 +1,6 @@
+class PostGenre
+  include Mongoid::Document
+  field :posts_count, type: Integer, default: 0
+
+  has_many :posts, inverse_of: :genre
+end

data/spec/mongoid/clients_spec.rb

@@ -731,27 +731,42 @@ describe Mongoid::Clients do
 
     context "when the override is global" do
 
-      before do
-        Mongoid.override_database(:mongoid_optional)
-      end
+      shared_examples_for "a global database override" do
 
-      after do
-        Band.delete_all
-        Mongoid.override_database(nil)
-      end
+        before do
+          Mongoid.override_database(:mongoid_optional)
+        end
 
-      let!(:band) do
-        Band.create(name: "Tool")
-      end
+        after do
+          Band.delete_all
+          Mongoid.override_database(nil)
+        end
+
+        let!(:band) do
+          klass.create(name: "Tool")
+        end
+
+        it "persists to the overridden database" do
+          mongo_client = Band.mongo_client.with(database: :mongoid_optional)
+          expect(mongo_client[:bands].count(name: "Tool")).to eq(1)
+        end
 
-      it "persists to the overridden database" do
-        Band.mongo_client.with(database: :mongoid_optional) do |sess|
-          expect(sess[:bands].find(name: "Tool")).to_not be_nil
+        it 'uses that database for the model mongo_client' do
+          expect(Band.mongo_client.database.name).to eq('mongoid_optional')
         end
       end
 
-      it 'uses that database for the model mongo_client' do
-        expect(Band.mongo_client.database.name).to eq('mongoid_optional')
+      context "when normal usage" do
+        let(:klass) { Band }
+
+        it_behaves_like "a global database override"
+      end
+
+      context "when overriding the persistence options" do
+
+        let(:klass) { Band.with(connect_timeout: 10) }
+
+        it_behaves_like "a global database override"
       end
     end
   end

data/spec/mongoid/contextual/mongo_spec.rb

@@ -115,21 +115,6 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
-    context "when provided a document" do
-
-      let(:context) do
-        described_class.new(criteria)
-      end
-
-      let(:count) do
-        context.count(depeche)
-      end
-
-      it "returns the number of documents that match" do
-        expect(count).to eq(1)
-      end
-    end
-
     context "when provided a block" do
 
       let(:context) do

data/spec/mongoid/criteria_spec.rb

@@ -1147,6 +1147,29 @@ describe Mongoid::Criteria do
       end
     end
 
+    context "when providing one association" do
+
+      let!(:user) do
+        User.create(posts: [ post1 ])
+      end
+
+      let!(:post1) do
+        Post.create
+      end
+
+      let(:result) do
+        User.includes(:posts).first
+      end
+
+      it "executes the query" do
+        expect(result).to eq(user)
+      end
+
+      it "includes the related objects" do
+        expect(result.posts).to eq([ post1 ])
+      end
+    end
+
     context "when providing a list of associations" do
 
       let!(:user) do
@@ -1504,13 +1527,6 @@ describe Mongoid::Criteria do
             end
           end
 
-          it "does not eager load the first document" do
-            doc = criteria.first
-            expect_query(1) do
-              expect(doc.person).to eq(person)
-            end
-          end
-
           it "returns the last document" do
             expect(document).to eq(post_two)
           end
@@ -1566,13 +1582,6 @@ describe Mongoid::Criteria do
             end
           end
 
-          it "does not eager load the last document" do
-            doc = criteria.last
-            expect_query(1) do
-              expect(doc.band).to eq(tool)
-            end
-          end
-
           it "returns the document" do
             expect(document).to eq(address_one)
           end
@@ -1598,13 +1607,6 @@ describe Mongoid::Criteria do
             end
           end
 
-          it "does not eager load the first document" do
-            doc = criteria.first
-            expect_query(1) do
-              expect(doc.band).to eq(depeche)
-            end
-          end
-
           it "returns the document" do
             expect(document).to eq(address_two)
           end
@@ -1698,7 +1700,7 @@ describe Mongoid::Criteria do
           end
 
           before do
-            expect(new_context).to receive(:eager_load_one).with(person).once.and_call_original
+            expect(new_context).to receive(:eager_load).with([person]).once.and_call_original
           end
 
           let!(:from_db) do
@@ -1749,7 +1751,7 @@ describe Mongoid::Criteria do
         end
 
         before do
-          expect(context).to receive(:eager_load_one).with(person).once.and_call_original
+          expect(context).to receive(:eager_load).with([person]).once.and_call_original
         end
 
         let!(:from_db) do
@@ -2128,7 +2130,7 @@ describe Mongoid::Criteria do
         end
 
         before do
-          expect(context).to receive(:eager_load).with([ game_one, game_two ]).once.and_call_original
+          expect(context).to receive(:preload).twice.and_call_original
         end
 
         let!(:documents) do
@@ -2191,7 +2193,7 @@ describe Mongoid::Criteria do
       end
 
       before do
-        expect(context).to receive(:eager_load).with([ person ]).once.and_call_original
+        expect(context).to receive(:preload).twice.and_call_original
       end
 
       let!(:documents) do

data/spec/mongoid/persistable/settable_spec.rb

@@ -204,4 +204,116 @@ describe Mongoid::Persistable::Settable do
       expect(agent.reload.title).to eq title
     end
   end
+
+  context 'when the field is already set locally' do
+
+    let(:church) do
+      Church.new.tap do |a|
+        a.location = { 'city' => 'Berlin' }
+        a.name = 'Church1'
+        a.save
+      end
+    end
+
+    context 'when the field is a Hash type' do
+
+      before do
+        church.set('location.neighborhood' => 'Kreuzberg')
+      end
+
+      it 'updates the hash while keeping existing key and values locally' do
+        expect(church.location).to eq({ 'city' => 'Berlin', 'neighborhood' => 'Kreuzberg'})
+      end
+
+      it 'updates the hash in the database' do
+        expect(church.reload.location).to eq({ 'city' => 'Berlin', 'neighborhood' => 'Kreuzberg'})
+      end
+    end
+
+    context 'when the field type is String' do
+
+      before do
+        church.set('name' => 'Church2')
+      end
+
+      it 'updates the field locally' do
+        expect(church.name).to eq('Church2')
+      end
+
+      it 'updates the field in the database' do
+        expect(church.reload.name).to eq('Church2')
+      end
+    end
+
+    context 'when there are two fields of type Hash and String' do
+
+      before do
+        church.set('name' => 'Church2', 'location.street' => 'Yorckstr.')
+      end
+
+      it 'updates the fields locally' do
+        expect(church.name).to eq('Church2')
+        expect(church.location).to eq({ 'city' => 'Berlin', 'street' => 'Yorckstr.'})
+      end
+
+      it 'updates the fields in the database' do
+        expect(church.reload.name).to eq('Church2')
+        expect(church.reload.location).to eq({ 'city' => 'Berlin', 'street' => 'Yorckstr.'})
+      end
+    end
+  end
+
+  context 'when the field is not already set locally' do
+
+    let(:church) do
+      Church.create
+    end
+
+    context 'when the field is a Hash type' do
+
+      before do
+        church.set('location.neighborhood' => 'Kreuzberg')
+      end
+
+      it 'sets the hash locally' do
+        expect(church.location).to eq({ 'neighborhood' => 'Kreuzberg'})
+      end
+
+      it 'sets the hash in the database' do
+        expect(church.reload.location).to eq({ 'neighborhood' => 'Kreuzberg'})
+      end
+    end
+
+    context 'when the field type is String' do
+
+      before do
+        church.set('name' => 'Church2')
+      end
+
+      it 'sets the field locally' do
+        expect(church.name).to eq('Church2')
+      end
+
+      it 'sets the field in the database' do
+        expect(church.reload.name).to eq('Church2')
+      end
+    end
+
+    context 'when there are two fields of type Hash and String' do
+
+      before do
+        church.set('name' => 'Church2', 'location.street' => 'Yorckstr.')
+      end
+
+      it 'sets the fields locally' do
+        expect(church.name).to eq('Church2')
+        expect(church.location).to eq({ 'street' => 'Yorckstr.'})
+      end
+
+      it 'sets the fields in the database' do
+        expect(church.reload.name).to eq('Church2')
+        expect(church.reload.location).to eq({ 'street' => 'Yorckstr.'})
+      end
+    end
+  end
 end

data/spec/mongoid/relations/counter_cache_spec.rb

@@ -351,6 +351,18 @@ describe Mongoid::Relations::CounterCache do
         it "updates the original object's counter cache" do
           expect(person1.reload.drugs_count).to eq(1)
         end
+
+        context 'when foreign_key differs from model name' do
+
+          let(:genre) { PostGenre.create }
+
+          let(:post) { Post.create }
+
+          it 'updates correct counter cache' do
+            post.update post_genre: genre
+            expect(genre.reload.posts_count).to eq 1
+          end
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.5
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   ZIvvwAhgCjVW5QCi2I1noxXLmtZ3XDawWu8kaGtu8giHXcwL3941m8hvFZ/Wr9Yi
   JvcXJt2a4/JvwnIs2hmKuyfhZmB9HEE5wQQaCMnnC14=
   -----END CERTIFICATE-----
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -503,6 +503,7 @@ files:
 - spec/app/models/pizza.rb
 - spec/app/models/player.rb
 - spec/app/models/post.rb
+- spec/app/models/post_genre.rb
 - spec/app/models/powerup.rb
 - spec/app/models/preference.rb
 - spec/app/models/princess.rb
@@ -958,6 +959,7 @@ test_files:
 - spec/app/models/pizza.rb
 - spec/app/models/player.rb
 - spec/app/models/post.rb
+- spec/app/models/post_genre.rb
 - spec/app/models/powerup.rb
 - spec/app/models/preference.rb
 - spec/app/models/princess.rb