mongoid 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba5a14c6242427982c5072b4f2e56ab499ff7559
-  data.tar.gz: 39d47341e981c5facfd7360ae9a83c6b3bd2dc00
+  metadata.gz: ed08df05221cb2fd51ee6873d0057b4966a5c0b8
+  data.tar.gz: a741c71fcb479876d2ea795cecb20662732a2333
 SHA512:
-  metadata.gz: 9e932dbd7064df798fae822b792a82b5b387a9c8daa93826158b15e5cbffe0ee59a0f92eb5b003d1e051097f4b017d6fc6f0c989bc00b363f4a8853a45689ccc
-  data.tar.gz: 4121c17953fa7b3786e30ed6d3f0c473d5ed7bd26dc59e700c9d41061cd83e318d0c6a62c0539a4d74d7561f8b9bf9eaa437cce41421358d98c139705ad9325b
+  metadata.gz: 0cae8bddd78b2ede9c0a8ace4ce8c468699e2a9f3b4377b3af9dde6948a83d911271e5425944ff12a385a56f4c3316f360a313933db558e801b76cb1b23ecd47
+  data.tar.gz: 4611925c73babd6ec1b7b3297e764f78ecd3b49d8dea449dc43d45385151ca59b69dba0f8b454cd554583c4d5217fd1c24f83d7a16cddfd32e1e82611e7c0a95

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-X���Vlܲ:��Ut�$KlY�=߽�r�zc��8Bu�N�Jd�2?�1�v�+��t�g�ӽ�w���Κ	���=$9��>�����=���ΝU��5ܩ`6C���Bx�j�Bzp�<�6^G{�2�#[����&�^��O�	)b�zx�T��K\Hy�����V�a��S	ZUT7���H�Д,���,dW�ƴ�{W�����8mI���1&
 X�B�߁]c��
-��8쬏�a���j��%�R�Dv�bϋ
+Wǻ�fJw���
��� �<L���
��ڐ�5��
>�������1R9$�nPK)�M#����v��GM��q�?��S��j��YJA����{_�������%45f-{Hy�;BO�_M�$,��@S*i�HI}�З�����]���Dd~1���@��;����j}�����la���]~0��ob8-�����t�_h�:��f�jF��J��̀�R���T8)�w

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

@@ -336,7 +336,7 @@ module Mongoid
     end
 
     def lookup_attribute_presence(name, value)
-      if localized_fields.has_key?(name)
+      if localized_fields.has_key?(name) && value
         value = localized_fields[name].send(:lookup, value)
       end
       value.present?

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

@@ -245,9 +245,15 @@ module Mongoid
         return documents.first if cached? && cache_loaded?
         try_cache(:first) do
           if sort = view.sort || ({ _id: 1 } unless opts[:id_sort] == :none)
-            with_eager_loading(view.sort(sort).limit(-1).first)
+            if raw_doc = view.sort(sort).limit(-1).first
+              doc = Factory.from_db(klass, raw_doc, criteria.options[:fields])
+              eager_load([doc]).first
+            end
           else
-            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
@@ -260,7 +266,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.
@@ -348,7 +357,10 @@ module Mongoid
       def last(opts = {})
         try_cache(:last) do
           with_inverse_sorting(opts) 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
@@ -657,15 +669,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.
@@ -681,10 +687,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/copyable.rb

@@ -24,7 +24,7 @@ module Mongoid
       attrs = clone_document.except("_id", "id")
       dynamic_attrs = {}
       attrs.reject! do |attr_name, value|
-        dynamic_attrs[attr_name] = value unless self.attribute_names.include?(attr_name)
+        dynamic_attrs.merge!(attr_name => value) unless self.attribute_names.include?(attr_name)
       end
       self.class.new(attrs).tap do |object|
         dynamic_attrs.each do |attr_name, value|

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/criteria/queryable/selector.rb

@@ -21,7 +21,7 @@ module Mongoid
           other.each_pair do |key, value|
             if value.is_a?(Hash) && self[key.to_s].is_a?(Hash)
               value = self[key.to_s].merge(value) do |_key, old_val, new_val|
-                multi_value?(_key) ? (old_val + new_val).uniq : new_val
+                _key == '$in' ? new_val & old_val : old_val | new_val
               end
             end
             if multi_selection?(key)

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

@@ -107,10 +107,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.with(persistence_context) do |_class|

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

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "6.0.0"
+  VERSION = "6.0.1"
 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/attributes_spec.rb

@@ -1772,15 +1772,22 @@ describe Mongoid::Attributes do
 
     context 'when the attribute is localized' do
       let(:person) do
-        Person.create(desc: 'localized')
+        Person.create
       end
 
-      before do
-        person.desc = nil
+      context 'after initialization when the field is nil' do
+
+        it 'returns false' do
+          expect(person.desc?).to be(false)
+        end
       end
 
-      it 'applies the localization when checking the attribute' do
-        expect(person.desc?).to be(false)
+      context 'when setting the field to nil' do
+
+        it 'applies the localization when checking the attribute' do
+          person.desc = nil
+          expect(person.desc?).to be(false)
+        end
       end
 
       context 'when the field is a boolean' do

data/spec/mongoid/copyable_spec.rb

@@ -61,7 +61,8 @@ describe Mongoid::Copyable do
         end
 
         before do
-          Actor.collection.find(_id: actor.id).update_one("$set" => { "this_is_not_a_field" => 1 })
+          legacy_fields = { "this_is_not_a_field" => 1, "this_legacy_field_is_nil" => nil }
+          Actor.collection.find(_id: actor.id).update_one("$set" => legacy_fields)
         end
 
         let(:cloned) do
@@ -72,7 +73,11 @@ describe Mongoid::Copyable do
           expect(cloned.attributes['this_is_not_a_field']).to eq(1)
         end
 
-        it "copies the known attriutes" do
+        it "contains legacy attributes that are nil" do
+          expect(cloned.attributes.key?('this_legacy_field_is_nil')).to eq(true)
+        end
+
+        it "copies the known attributes" do
           expect(cloned.name).to eq('test')
         end
       end

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

@@ -70,6 +70,51 @@ describe Mongoid::Criteria::Queryable::Selector do
       end
     end
 
+    context "when selector contains a $in" do
+
+      let(:initial) do
+        { "$in" => [1, 2] }
+      end
+
+      before do
+        selector["field"] = initial
+      end
+
+      context "when merging in a new $in with an intersecting value" do
+
+        let(:other) do
+          { "field" => { "$in" => [1] } }
+        end
+
+        before do
+          selector.merge!(other)
+        end
+
+        it "intersects the $in values" do
+          expect(selector).to eq({
+                                     "field" => { "$in" => [1] }
+                                 })
+        end
+      end
+
+      context "when merging in a new $in with no intersecting values" do
+
+        let(:other) do
+          { "field" => { "$in" => [3] } }
+        end
+
+        before do
+          selector.merge!(other)
+        end
+
+        it "intersects the $in values" do
+          expect(selector).to eq({
+                                     "field" => { "$in" => [] }
+                                 })
+        end
+      end
+    end
+
     context "when selector is not nested" do
 
       before do

data/spec/mongoid/criteria_spec.rb

@@ -1148,6 +1148,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
@@ -1505,13 +1528,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
@@ -1567,13 +1583,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
@@ -1599,13 +1608,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
@@ -1699,7 +1701,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
@@ -1750,7 +1752,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
@@ -2129,7 +2131,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
@@ -2192,7 +2194,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

@@ -412,6 +412,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: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   ZIvvwAhgCjVW5QCi2I1noxXLmtZ3XDawWu8kaGtu8giHXcwL3941m8hvFZ/Wr9Yi
   JvcXJt2a4/JvwnIs2hmKuyfhZmB9HEE5wQQaCMnnC14=
   -----END CERTIFICATE-----
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -509,6 +509,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
@@ -999,6 +1000,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