mongoid 6.0.0.beta → 6.0.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57db37f3ffe123d41531a6c93d9ae52e37cb81d2
-  data.tar.gz: bdd70c57cb017f481fa796c8a86dc34599c1a05c
+  metadata.gz: 27ea8a75a0efde500417b73f4c4d38ab25f60c0b
+  data.tar.gz: 998d18056b79086719e963a84be38ca6d3682c6d
 SHA512:
-  metadata.gz: 7c6b4a55f532af6dfd8c2593bb8bd05244a5916235ed9512487b7d45952e37a06e9eb50f61958d4b63da826d9631ca6422e0febb638da45e122246ead03e1461
-  data.tar.gz: 15cbe1acb92704217bb2f2f084d14c076dce7c6c7aa5afcd6955f724825f2e6e72a89c6e0c62170c4ba4d60d04866052ce041d37ee3ea4f1be8a4d15d38070b9
+  metadata.gz: 1b948f4ba63c9fa1d749a71d5bb33856894736c3173bf52781702102ea90bdcb0b5b9f0547cc90d906589f1b1d088eef39b3a7f829c3dd7522142cb9f9113c51
+  data.tar.gz: 1e6feb48bf957d9596f6b3f150c1054f393f2ee0562e0be41e5827bc0518e73bd2d86c1344379729eea9c9f2660b05014a197c5721d2b40733eba9891cc69b2e

data/lib/mongoid/attributes.rb

@@ -245,19 +245,11 @@ module Mongoid
     private
 
     def selection_excluded?(name, selection, field)
-      if field && field.localized?
-        selection["#{name}.#{::I18n.locale}"] == 0
-      else
-        selection[name] == 0
-      end
+      selection[name] == 0
     end
 
     def selection_included?(name, selection, field)
-      if field && field.localized?
-        selection.key?("#{name}.#{::I18n.locale}")
-      else
-        selection.key?(name) || selection.keys.collect { |k| k.partition('.').first }.include?(name)
-      end
+      selection.key?(name) || selection.keys.collect { |k| k.partition('.').first }.include?(name)
     end
 
     # Does the string contain dot syntax for accessing hashes?

data/lib/mongoid/contextual/mongo.rb

@@ -305,8 +305,7 @@ module Mongoid
         if block_given?
           super(&block)
         else
-          field = field.to_sym
-          criteria.only(field).map(&field.to_proc)
+          criteria.pluck(field)
         end
       end
 

data/lib/mongoid/copyable.rb

@@ -52,7 +52,7 @@ module Mongoid
     # @since 3.0.22
     def clone_document
       attrs = as_document.__deep_copy__
-      process_localized_attributes(attrs)
+      process_localized_attributes(self, attrs)
       attrs
     end
 
@@ -67,12 +67,23 @@ module Mongoid
     # @param [ Hash ] attrs The attributes.
     #
     # @since 3.0.20
-    def process_localized_attributes(attrs)
-      localized_fields.keys.each do |name|
+    def process_localized_attributes(klass, attrs)
+      klass.localized_fields.keys.each do |name|
         if value = attrs.delete(name)
           attrs["#{name}_translations"] = value
         end
       end
+      klass.embedded_relations.each do |_, metadata|
+        next unless attrs.present? && attrs[metadata.key].present?
+
+        if metadata.macro == :embeds_many
+          attrs[metadata.key].each do |attr|
+            process_localized_attributes(metadata.klass, attr)
+          end
+        else
+          process_localized_attributes(metadata.klass, attrs[metadata.key])
+        end
+      end
     end
   end
 end

data/lib/mongoid/criteria/queryable/optional.rb

@@ -147,7 +147,9 @@ module Mongoid
           args = args.flatten
           option(*args) do |options|
             options.store(
-              :fields, args.inject(options[:fields] || {}){ |sub, field| sub.tap { sub[field] = 1 }}
+              :fields,
+              args.inject(options[:fields] || {}){ |sub, field| sub.tap { sub[field] = 1 }},
+              false
             )
           end
         end
@@ -279,7 +281,9 @@ module Mongoid
           args = args.flatten
           option(*args) do |options|
             options.store(
-              :fields, args.inject(options[:fields] || {}){ |sub, field| sub.tap { sub[field] = 0 }}
+              :fields,
+              args.inject(options[:fields] || {}){ |sub, field| sub.tap { sub[field] = 0 }},
+              false
             )
           end
         end

data/lib/mongoid/criteria/queryable/options.rb

@@ -67,8 +67,8 @@ module Mongoid
         # @return [ Object ] The stored object.
         #
         # @since 1.0.0
-        def store(key, value)
-          super(key, evolve(value))
+        def store(key, value, localize = true)
+          super(key, evolve(value, localize))
         end
         alias :[]= :store
 
@@ -102,10 +102,10 @@ module Mongoid
         # @return [ Object ] The serialized object.
         #
         # @since 1.0.0
-        def evolve(value)
+        def evolve(value, localize = true)
           case value
           when Hash
-            evolve_hash(value)
+            evolve_hash(value, localize)
           else
             value
           end
@@ -123,10 +123,11 @@ module Mongoid
         # @return [ Object ] The serialized hash.
         #
         # @since 1.0.0
-        def evolve_hash(value)
+        def evolve_hash(value, localize = true)
           value.inject({}) do |hash, (field, _value)|
             name, serializer = storage_pair(field)
-            hash[normalized_key(name, serializer)] = _value
+            name = localized_key(name, serializer) if localize
+            hash[name] = _value
             hash
           end
         end

data/lib/mongoid/criteria/queryable/selector.rb

@@ -48,7 +48,7 @@ module Mongoid
           if multi_selection?(name)
             super(name, evolve_multi(value))
           else
-            super(normalized_key(name, serializer), evolve(serializer, value))
+            super(localized_key(name, serializer), evolve(serializer, value))
           end
         end
         alias :[]= :store
@@ -87,7 +87,7 @@ module Mongoid
             Hash[val.map do |key, _value|
               _value = evolve_multi(_value) if multi_selection?(key)
               name, serializer = storage_pair(key)
-              [ normalized_key(name, serializer), evolve(serializer, _value) ]
+              [ localized_key(name, serializer), evolve(serializer, _value) ]
             end]
           end.uniq
         end

data/lib/mongoid/criteria/queryable/smash.rb

@@ -60,13 +60,14 @@ module Mongoid
 
         private
 
-        # Get the normalized value for the key. If localization is in play the
-        # current locale will be appended to the key in MongoDB dot notation.
+        # Get the localized value for the key if needed. If the field uses
+        # localization the current locale will be appended to the key in
+        # MongoDB dot notation.
         #
         # @api private
         #
         # @example Get the normalized key name.
-        #   smash.normalized_key("field", serializer)
+        #   smash.localized_key("field", serializer)
         #
         # @param [ String ] name The name of the field.
         # @param [ Object ] serializer The optional field serializer.
@@ -74,7 +75,7 @@ module Mongoid
         # @return [ String ] The normalized key.
         #
         # @since 1.0.0
-        def normalized_key(name, serializer)
+        def localized_key(name, serializer)
           serializer && serializer.localized? ? "#{name}.#{::I18n.locale}" : name
         end
 

data/lib/mongoid/matchable.rb

@@ -12,6 +12,7 @@ require "mongoid/matchable/ne"
 require "mongoid/matchable/nin"
 require "mongoid/matchable/or"
 require "mongoid/matchable/size"
+require "mongoid/matchable/elem_match"
 
 module Mongoid
 
@@ -27,6 +28,7 @@ module Mongoid
     # @since 1.0.0
     MATCHERS = {
       "$all" => All,
+      "$elemMatch" => ElemMatch,
       "$and" => And,
       "$exists" => Exists,
       "$gt" => Gt,
@@ -149,7 +151,11 @@ module Mongoid
             end
           end
         else
-          document.attributes[key_string]
+          if document.is_a?(Hash)
+            document[key_string]
+          else
+            document.attributes[key_string]
+          end
         end
       end
     end

data/lib/mongoid/matchable/elem_match.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+module Mongoid
+  module Matchable
+
+    class ElemMatch < Default
+
+      # Return true if a given predicate matches a sub document entirely
+      #
+      # @example Do the values match?
+      #   matcher.matches?({"$elemMatch" => {"a" => 1, "b" => 2}})
+      #
+      # @param [ Hash ] value The values to check.
+      #
+      # @return [ true, false ] If the values match.
+      def matches?(value)
+        if !@attribute.is_a?(Array) || !value.kind_of?(Hash) || !value["$elemMatch"].kind_of?(Hash)
+          return false
+        end
+
+        return @attribute.any? do |sub_document|
+          value["$elemMatch"].all? do |k, v|
+            Matchable.matcher(sub_document, k, v).matches?(v)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/persistable/settable.rb

@@ -23,9 +23,11 @@ module Mongoid
         prepare_atomic_operation do |ops|
           process_atomic_operations(setters) do |field, value|
             process_attribute(field.to_s, value)
-            ops[atomic_attribute_name(field)] = attributes[field]
+            unless relations.include?(field.to_s)
+              ops[atomic_attribute_name(field)] = attributes[field]
+            end
           end
-          { "$set" => ops }
+          { "$set" => ops } unless ops.empty?
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Mongoid
 
           @docs.each do |d|
             keys = d.send(group_by_key)
-            docs = entries.values_at(*keys)
+            docs = entries.values_at(*keys).compact
             set_relation(d, docs)
           end
         end

data/lib/mongoid/relations/proxy.rb

@@ -12,7 +12,7 @@ module Mongoid
       # We undefine most methods to get them sent through to the target.
       instance_methods.each do |method|
         undef_method(method) unless
-          method =~ /(^__|^send|^object_id|^respond_to|^tap|^public_send|extend_proxy|extend_proxies)/
+          method =~ /^(__.*|send|object_id|equal\?|respond_to\?|tap|public_send|extend_proxy|extend_proxies)$/
       end
 
       include Threaded::Lifecycle

data/lib/mongoid/relations/touchable.rb

@@ -53,7 +53,8 @@ module Mongoid
         def touchable(metadata)
           if metadata.touchable?
             name = metadata.name
-            method_name = define_relation_touch_method(name)
+            field = metadata[:touch].is_a?(Symbol) ? metadata[:touch] : nil
+            method_name = define_relation_touch_method(name, field)
             after_save method_name
             after_destroy method_name
             after_touch method_name
@@ -70,19 +71,21 @@ module Mongoid
         #
         # @example Define the touch relation.
         #   Model.define_relation_touch_method(:band)
+        #   Model.define_relation_touch_method(:band, :band_updated_at)
         #
         # @param [ Symbol ] name The name of the relation.
+        # @param [ Symbol ] extra_field Additional timestamp field to update.
         #
         # @since 3.1.0
         #
         # @return [ Symbol ] The method name.
-        def define_relation_touch_method(name)
+        def define_relation_touch_method(name, extra_field = nil)
           method_name = "touch_#{name}_after_create_or_destroy"
           class_eval <<-TOUCH
             def #{method_name}
               without_autobuild do
                 relation = __send__(:#{name})
-                relation.touch if relation
+                relation.touch #{":#{extra_field}" if extra_field} if relation
               end
             end
           TOUCH

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "6.0.0.beta"
+  VERSION = "6.0.0.rc0"
 end

data/spec/app/models/person.rb

@@ -44,8 +44,6 @@ class Person
   index name: 1
   index title: 1
 
-  index({ ssn: 1 }, { unique: true })
-
   attr_reader :rescored
 
   embeds_many :favorites, order: :title.desc, inverse_of: :perp, validate: false

data/spec/mongoid/clients/factory_spec.rb

@@ -21,6 +21,10 @@ describe Mongoid::Clients::Factory do
             Mongoid::Config.send(:clients=, config)
           end
 
+          after do
+            client.close
+          end
+
           let(:client) do
             described_class.create(:secondary)
           end
@@ -51,6 +55,10 @@ describe Mongoid::Clients::Factory do
             Mongoid::Config.send(:clients=, config)
           end
 
+          after do
+            client.close
+          end
+
           let(:client) do
             described_class.create(:secondary)
           end
@@ -91,6 +99,10 @@ describe Mongoid::Clients::Factory do
               Mongoid::Config.send(:clients=, config)
             end
 
+            after do
+              client.close
+            end
+
             let(:client) do
               described_class.create(:secondary)
             end
@@ -125,6 +137,10 @@ describe Mongoid::Clients::Factory do
               Mongoid::Config.send(:clients=, config)
             end
 
+            after do
+              client.close
+            end
+
             let(:client) do
               described_class.create(:secondary)
             end
@@ -168,6 +184,10 @@ describe Mongoid::Clients::Factory do
         Mongoid::Config.send(:clients=, config)
       end
 
+      after do
+        client.close
+      end
+
       let(:client) do
         described_class.create
       end
@@ -213,6 +233,10 @@ describe Mongoid::Clients::Factory do
       Mongoid::Config.send(:clients=, config)
     end
 
+    after do
+      client.close
+    end
+
     let(:client) do
       described_class.default
     end
@@ -253,6 +277,10 @@ describe Mongoid::Clients::Factory do
       Mongoid::Config.send(:clients=, config)
     end
 
+    after do
+      client.close
+    end
+
     let(:client) do
       described_class.default
     end

data/spec/mongoid/clients/options_spec.rb

@@ -143,6 +143,10 @@ describe Mongoid::Clients::Options do
             Mongoid::Config.send(:clients=, config)
           end
 
+          after do
+            persistence_context.client.close
+          end
+
           let(:persistence_context) do
             Band.with(client: :secondary) do |klass|
               klass.persistence_context

data/spec/mongoid/clients_spec.rb

@@ -318,6 +318,10 @@ describe Mongoid::Clients do
 
     shared_examples_for "an overridden database name" do
 
+      after do
+        class_mongo_client.close
+      end
+
       context "when accessing from the instance" do
 
         it "returns the overridden value" do
@@ -380,6 +384,7 @@ describe Mongoid::Clients do
 
       after do
         Band.reset_storage_options!
+        class_mongo_client.close
       end
 
       it_behaves_like "an overridden database name"
@@ -411,6 +416,7 @@ describe Mongoid::Clients do
 
       after do
         Band.reset_storage_options!
+        class_mongo_client.close
       end
 
       it_behaves_like "an overridden database name"
@@ -471,6 +477,7 @@ describe Mongoid::Clients do
 
         after do
           Band.reset_storage_options!
+          class_mongo_client.close
         end
 
         it_behaves_like "an overridden database name"
@@ -502,6 +509,10 @@ describe Mongoid::Clients do
         Mongoid.clients[:default][:database] = database_id
       end
 
+      after do
+        mongo_client.close
+      end
+
       let!(:band) do
         Band.new
       end
@@ -728,10 +739,15 @@ describe Mongoid::Clients do
       describe ".create" do
 
         before do
+          Person.index({ ssn: 1 }, { unique: true })
           Person.create_indexes
           Person.create(ssn: "432-97-1111")
         end
 
+        after do
+          Person.collection.drop
+        end
+
         context "when no error occurs" do
 
           it "inserts the document" do
@@ -755,6 +771,10 @@ describe Mongoid::Clients do
           Person.create!(ssn: "432-97-1112")
         end
 
+        after do
+          Person.collection.drop
+        end
+
         context "when no error occurs" do
 
           it "inserts the document" do
@@ -765,9 +785,14 @@ describe Mongoid::Clients do
         context "when a mongodb error occurs" do
 
           before do
+            Person.index({ ssn: 1 }, { unique: true })
             Person.create_indexes
           end
 
+          after do
+            Person.collection.drop
+          end
+
           it "bubbles up to the caller" do
             expect {
               Person.create!(ssn: "432-97-1112")
@@ -798,9 +823,14 @@ describe Mongoid::Clients do
           end
 
           before do
+            Person.index({ ssn: 1 }, { unique: true })
             Person.create_indexes
           end
 
+          after do
+            Person.collection.drop
+          end
+
           it "bubbles up to the caller" do
             expect {
               person.save
@@ -822,9 +852,14 @@ describe Mongoid::Clients do
           end
 
           before do
+            Person.index({ ssn: 1 }, { unique: true })
             Person.create_indexes
           end
 
+          after do
+            Person.collection.drop
+          end
+
           it "bubbles up to the caller" do
             expect {
               person.save!
@@ -866,6 +901,7 @@ describe Mongoid::Clients do
 
       after do
         Band.delete_all
+        Band.mongo_client.close
         Mongoid.override_database(nil)
       end
 

data/spec/mongoid/config_spec.rb

@@ -163,6 +163,10 @@ describe Mongoid::Config do
         described_class.load!(file, :test)
       end
 
+      after do
+        client.close
+      end
+
       it "clears the previous clients" do
         expect(Mongoid::Clients.clients[:test]).to be_nil
       end

data/spec/mongoid/contextual/mongo_spec.rb

@@ -1089,11 +1089,6 @@ describe Mongoid::Contextual::Mongo do
 
     context "when passed the symbol field name" do
 
-      it "limits query to that field" do
-        expect(criteria).to receive(:only).with(:name).and_call_original
-        context.map(:name)
-      end
-
       it "performs mapping" do
         expect(context.map(:name)).to eq ["Depeche Mode", "New Order"]
       end

data/spec/mongoid/copyable_spec.rb

@@ -20,7 +20,7 @@ describe Mongoid::Copyable do
       end
 
       let!(:address) do
-        person.addresses.build(street: "Bond")
+        person.addresses.build(street: "Bond", name: "Bond")
       end
 
       let!(:name) do
@@ -97,6 +97,7 @@ describe Mongoid::Copyable do
           I18n.enforce_available_locales = false
           I18n.locale = 'pt_BR'
           person.desc = "descrição"
+          person.addresses.first.name = "descrição"
           person.save
         end
 
@@ -126,6 +127,16 @@ describe Mongoid::Copyable do
           I18n.locale = :fr
           expect(copy.desc).to be_nil
         end
+
+        it 'sets embedded translations' do
+          I18n.locale = 'pt_BR'
+          expect(copy.addresses.first.name).to eq("descrição")
+        end
+
+        it 'sets embedded english version' do
+          I18n.locale = :en
+          expect(copy.addresses.first.name).to eq("Bond")
+        end
       end
 
       context "when cloning a loaded document" do

data/spec/mongoid/criteria_spec.rb

@@ -2802,6 +2802,93 @@ describe Mongoid::Criteria do
         end
       end
     end
+
+    context 'when the field is localized' do
+
+      before do
+        I18n.locale = :en
+        d = Dictionary.create(description: 'english-text')
+        I18n.locale = :de
+        d.description = 'deutsch-text'
+        d.save
+      end
+
+      after do
+        I18n.locale = :en
+      end
+
+      context 'when entire field is included' do
+
+        let(:dictionary) do
+          Dictionary.only(:description).first
+
+        end
+
+        it 'loads all translations' do
+          expect(dictionary.description_translations.keys).to include('de', 'en')
+        end
+
+        it 'returns the field value for the current locale' do
+          I18n.locale = :en
+          expect(dictionary.description).to eq('english-text')
+          I18n.locale = :de
+          expect(dictionary.description).to eq('deutsch-text')
+        end
+      end
+
+      context 'when a specific locale is included' do
+
+        let(:dictionary) do
+          Dictionary.only(:'description.de').first
+        end
+
+        it 'loads translations only for the included locale' do
+          expect(dictionary.description_translations.keys).to include('de')
+          expect(dictionary.description_translations.keys).to_not include('en')
+        end
+
+        it 'returns the field value for the included locale' do
+          I18n.locale = :en
+          expect(dictionary.description).to be_nil
+          I18n.locale = :de
+          expect(dictionary.description).to eq('deutsch-text')
+        end
+      end
+
+      context 'when entire field is excluded' do
+
+        let(:dictionary) do
+          Dictionary.without(:description).first
+        end
+
+        it 'does not load all translations' do
+          expect(dictionary.description_translations.keys).to_not include('de', 'en')
+        end
+
+        it 'raises an ActiveModel::MissingAttributeError when attempting to access the field' do
+          expect{dictionary.description}.to raise_error ActiveModel::MissingAttributeError
+        end
+      end
+
+      context 'when a specific locale is excluded' do
+
+        let(:dictionary) do
+          Dictionary.without(:'description.de').first
+        end
+
+        it 'does not load excluded translations' do
+          expect(dictionary.description_translations.keys).to_not include('de')
+          expect(dictionary.description_translations.keys).to include('en')
+        end
+
+        it 'returns nil for excluded translations' do
+          I18n.locale = :en
+          expect(dictionary.description).to eq('english-text')
+          I18n.locale = :de
+          expect(dictionary.description).to be_nil
+        end
+      end
+    end
   end
 
   [ :or, :any_of ].each do |method|
@@ -2889,7 +2976,7 @@ describe Mongoid::Criteria do
         end
 
         it "returns the values" do
-          expect(plucked).to eq([ "Depeche Mode", "Tool", "Photek" ])
+          expect(plucked).to contain_exactly("Depeche Mode", "Tool", "Photek")
         end
 
         context "when subsequently executing the criteria without a pluck" do
@@ -2954,14 +3041,14 @@ describe Mongoid::Criteria do
         end
       end
 
-      context "when plucking mult-fields" do
+      context "when plucking multi-fields" do
 
         let(:plucked) do
           Band.where(:name.exists => true).pluck(:name, :likes)
         end
 
         it "returns the values" do
-          expect(plucked).to eq([ ["Depeche Mode", 3], ["Tool", 3], ["Photek", 1] ])
+          expect(plucked).to contain_exactly(["Depeche Mode", 3], ["Tool", 3], ["Photek", 1])
         end
       end
 
@@ -2972,7 +3059,7 @@ describe Mongoid::Criteria do
         end
 
         it "returns the duplicates" do
-          expect(plucked).to eq([ 3, 3, 1 ])
+          expect(plucked).to contain_exactly(3, 3, 1)
         end
       end
     end
@@ -3034,6 +3121,43 @@ describe Mongoid::Criteria do
         end
       end
     end
+
+    context 'when plucking a localized field' do
+
+      before do
+        I18n.locale = :en
+        d = Dictionary.create(description: 'english-text')
+        I18n.locale = :de
+        d.description = 'deutsch-text'
+        d.save
+      end
+
+      after do
+        I18n.locale = :en
+      end
+
+      context 'when plucking the entire field' do
+
+        let(:plucked) do
+          Dictionary.all.pluck(:description)
+        end
+
+        it 'returns all translations' do
+          expect(plucked.first).to eq({'en' => 'english-text', 'de' => 'deutsch-text'})
+        end
+      end
+
+      context 'when plucking a specific locale' do
+
+        let(:plucked) do
+          Dictionary.all.pluck(:'description.de')
+        end
+
+        it 'returns the specific translations' do
+          expect(plucked.first).to eq({'de' => 'deutsch-text'})
+        end
+      end
+    end
   end
 
   describe "#respond_to?" do

data/spec/mongoid/indexable_spec.rb

@@ -2,6 +2,10 @@ require "spec_helper"
 
 describe Mongoid::Indexable do
 
+  after do
+    Person.collection.drop
+  end
+
   describe ".included" do
 
     let(:klass) do
@@ -156,6 +160,10 @@ describe Mongoid::Indexable do
       end
     end
 
+    after do
+      klass.collection.drop
+    end
+
     context "when indexing a field that is aliased" do
 
       before do

data/spec/mongoid/matchable/elem_match_spec.rb

@@ -0,0 +1,86 @@
+require "spec_helper"
+
+describe Mongoid::Matchable::ElemMatch do
+
+  let(:attribute) {[{"a" => 1, "b" => 2}, {"a" => 2, "b" => 2}, {"a" => 3, "b" => 1}]}
+  let(:matcher) do
+    described_class.new(attribute)
+  end
+
+  describe "#matches?" do
+
+    context "when the attribute is not an array" do
+
+      let(:attribute) {"string"}
+
+      it "returns false" do
+        expect(matcher.matches?("$elemMatch" => {"a" => 1})).to be false
+      end
+    end
+
+    context "when the $elemMatch is not a hash" do
+
+      let(:attribute) {"string"}
+
+      it "returns false" do
+        expect(matcher.matches?("$elemMatch" => [])).to be false
+      end
+    end
+
+    context "when there is a sub document that matches the criteria" do
+
+      it "returns true" do
+        expect(matcher.matches?("$elemMatch" => {"a" => 1})).to be true
+      end
+
+      context "when evaluating multiple fields of the subdocument" do
+
+        it "returns true" do
+          expect(matcher.matches?("$elemMatch" => {"a" => 1, "b" => 2})).to be true
+        end
+
+        context "when the $elemMatch document keys are out of order" do
+
+          it "returns true" do
+            expect(matcher.matches?("$elemMatch" => {"b" => 2, "a" => 1})).to be true
+          end
+        end
+      end
+
+      context "when using other operators that match" do
+
+        it "returns true" do
+          expect(matcher.matches?("$elemMatch" => {"a" => {"$in" => [1]}, "b" => {"$gt" => 1}})).to be true
+        end
+      end
+    end
+
+    context "when there is not a sub document that matches the criteria" do
+
+      it "returns false" do
+        expect(matcher.matches?("$elemMatch" => {"a" => 10})).to be false
+      end
+
+      context "when evaluating multiple fields of the subdocument" do
+
+        it "returns false" do
+          expect(matcher.matches?("$elemMatch" => {"a" => 1, "b" => 3})).to be false
+        end
+      end
+
+      context "when using other operators that do not match" do
+
+        it "returns true" do
+          expect(matcher.matches?("$elemMatch" => {"a" => {"$in" => [1]}, "b" => {"$gt" => 10}})).to be false
+        end
+      end
+    end
+
+    context "when using a criteria that matches partially but not a single sub document" do
+
+      it "returns false" do
+        expect(matcher.matches?("$elemMatch" => {"a" => 3, "b" => 2})).to be false
+      end
+    end
+  end
+end

data/spec/mongoid/matchable_spec.rb

@@ -112,6 +112,126 @@ describe Mongoid::Matchable do
         end
       end
 
+      context "when using $elemMatch" do
+
+        context "one predicate" do
+
+          let(:selector) do
+            {
+              "occupants" => {"$elemMatch" => {"name" => "Tim"}}
+            }
+          end
+
+          context "and there is a matching sub document" do
+
+            it "returns true" do
+              expect(document.locations.first.matches?(selector)).to be true
+            end
+
+            context "using $in" do
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Tim", "Alice"]}}}
+                }
+              end
+
+              it "returns true" do
+                expect(document.locations.first.matches?(selector)).to be true
+              end
+            end
+          end
+
+          context "and there is not a matching sub document" do
+
+            let(:selector) do
+              {
+                "occupants" => {"$elemMatch" => {"name" => "Lyle"}}
+              }
+            end
+
+            it "returns false" do
+              expect(document.locations.first.matches?(selector)).to be false
+            end
+
+            context "using $in" do
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Lyfe", "Alice"]}}}
+                }
+              end
+
+              it "returns false" do
+                expect(document.locations.first.matches?(selector)).to be false
+              end
+            end
+          end
+        end
+
+        context "multiple predicates" do
+
+          before do
+            document.locations = [
+              Location.new(
+                name: 'No.1',
+                info: { 'door' => 'Red'},
+                occupants: [{'name' => 'Tim', 'eye_color' => 'brown'}, {'name' => 'Alice', 'eye_color' => 'blue'}]
+              )
+            ]
+          end
+
+          let(:selector) do
+            {
+              "occupants" => {"$elemMatch" => {"name" => "Tim", "eye_color" => "brown"}}
+            }
+          end
+
+          context "and there is a matching sub document" do
+
+            it "returns true" do
+              expect(document.locations.first.matches?(selector)).to be true
+            end
+
+            context "using $in and $ne in the $elemMatch to include the element" do
+
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Tim"]}, "eye_color" => {"$ne" => "blue"}}}
+                }
+              end
+
+              it "returns true" do
+                expect(document.locations.first.matches?(selector)).to be true
+              end
+            end
+          end
+
+          context "and there is not a matching sub document" do
+
+            let(:selector) do
+              {
+                "occupants" => {"$elemMatch" => {"name" => "Tim", "eye_color" => "blue"}}
+              }
+            end
+
+            it "returns false" do
+              expect(document.locations.first.matches?(selector)).to be false
+            end
+
+            context "using $ne in the $elemMatch to exclude the element" do
+
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Tim"]}, "eye_color" => {"$ne" => "brown"}}}
+                }
+              end
+
+              it "returns false" do
+                expect(document.locations.first.matches?(selector)).to be false
+              end
+            end
+          end
+        end
+      end
     end
 
     context "when performing simple matching" do

data/spec/mongoid/persistable/creatable_spec.rb

@@ -523,9 +523,14 @@ describe Mongoid::Persistable::Creatable do
       context "when a unique index exists" do
 
         before do
+          Person.index({ ssn: 1 }, { unique: true })
           Person.create_indexes
         end
 
+        after do
+          Person.collection.drop
+        end
+
         it "raises an error" do
           expect {
             4.times { Person.create!(ssn: "555-55-1029") }

data/spec/mongoid/persistable/savable_spec.rb

@@ -370,10 +370,15 @@ describe Mongoid::Persistable::Savable do
         end
 
         before do
+          Person.index({ ssn: 1 }, { unique: true })
           Person.create_indexes
           Person.create!(ssn: "555-55-9999")
         end
 
+        after do
+          Person.collection.drop
+        end
+
         it "raises an OperationFailure" do
           expect { person.save! }.to raise_error(Mongo::Error::OperationFailure)
         end

data/spec/mongoid/persistable/settable_spec.rb

@@ -134,6 +134,35 @@ describe Mongoid::Persistable::Settable do
 
         it_behaves_like "a settable embedded document"
       end
+
+      context 'when the field is a relation' do
+
+        let(:person) do
+          Person.create
+        end
+
+        let(:pet) do
+          Animal.new(name: "somepet")
+        end
+
+        let(:home_phone) do
+          Phone.new(number: "555-555-5555")
+        end
+
+        let(:office_phone) do
+          Phone.new(number: "666-666-6666")
+        end
+
+        it "should persist changes of embeds_one field" do
+          person.set(pet: pet)
+          expect(person.reload.pet).to eq(pet)
+        end
+
+        it "should persist changes of embeds_many fields" do
+          person.set({ phone_numbers: [home_phone, office_phone].map { |p| p.as_document} })
+          expect(person.reload.phone_numbers).to eq([home_phone, office_phone])
+        end
+      end
     end
   end
 

data/spec/mongoid/persistence_context_spec.rb

@@ -514,6 +514,10 @@ describe Mongoid::PersistenceContext do
         { client: :alternative }
       end
 
+      after do
+        persistence_context.client.close
+      end
+
       it 'uses the client option' do
         expect(persistence_context.client).to eq(Mongoid::Clients.with_name(:alternative))
       end
@@ -525,6 +529,7 @@ describe Mongoid::PersistenceContext do
         end
 
         after do
+          persistence_context.client.close
           Mongoid::Threaded.client_override = nil
         end
 

data/spec/mongoid/relations/eager/has_and_belongs_to_many_spec.rb

@@ -113,5 +113,21 @@ describe Mongoid::Relations::Eager::HasAndBelongsToMany do
         end
       end
     end
+
+    context "when some related documents no longer exist" do
+      before do
+        # Deleting the first one to meet Builders::Referenced::ManyToMany#query?
+        House.collection.find(_id: Person.first.house_ids.first).delete_one
+      end
+
+      it "does not accidentally trigger an extra query" do
+        expect_query(2) do
+          Person.asc(:_id).includes(:houses).each do |person|
+            expect(person.houses).to_not be_nil
+            expect(person.houses.length).to be(2)
+          end
+        end
+      end
+    end
   end
 end

data/spec/mongoid/relations/metadata_spec.rb

@@ -1896,6 +1896,21 @@ describe Mongoid::Relations::Metadata do
       end
     end
 
+    context "when touch specifies additional field" do
+
+      let(:metadata) do
+        described_class.new(
+          name: :versions,
+          relation: Mongoid::Relations::Referenced::In,
+          touch: :changed_at
+        )
+      end
+
+      it "returns true" do
+        expect(metadata).to be_touchable
+      end
+    end
+
     context "when touch is nil" do
 
       let(:metadata) do

data/spec/mongoid/relations/proxy_spec.rb

@@ -97,4 +97,28 @@ describe Mongoid::Relations::Proxy do
       end
     end
   end
+
+  describe "equality" do
+    let(:messages) do
+      Person.create.messages
+    end
+
+    it "is #equal? to itself" do
+      expect(messages.equal?(messages)).to eq(true)
+    end
+
+    it "is == to itself" do
+      expect(messages == messages).to eq(true)
+    end
+
+    it "is not #equal? to its target" do
+      expect(messages.equal?(messages.target)).to eq(false)
+      expect(messages.target.equal?(messages)).to eq(false)
+    end
+
+    it "is == to its target" do
+      expect(messages == messages.target).to eq(true)
+      expect(messages.target == messages).to eq(true)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta
+  version: 6.0.0.rc0
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   ZIvvwAhgCjVW5QCi2I1noxXLmtZ3XDawWu8kaGtu8giHXcwL3941m8hvFZ/Wr9Yi
   JvcXJt2a4/JvwnIs2hmKuyfhZmB9HEE5wQQaCMnnC14=
   -----END CERTIFICATE-----
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -240,6 +240,7 @@ files:
 - lib/mongoid/matchable/all.rb
 - lib/mongoid/matchable/and.rb
 - lib/mongoid/matchable/default.rb
+- lib/mongoid/matchable/elem_match.rb
 - lib/mongoid/matchable/exists.rb
 - lib/mongoid/matchable/gt.rb
 - lib/mongoid/matchable/gte.rb
@@ -721,6 +722,7 @@ files:
 - spec/mongoid/matchable/all_spec.rb
 - spec/mongoid/matchable/and_spec.rb
 - spec/mongoid/matchable/default_spec.rb
+- spec/mongoid/matchable/elem_match_spec.rb
 - spec/mongoid/matchable/exists_spec.rb
 - spec/mongoid/matchable/gt_spec.rb
 - spec/mongoid/matchable/gte_spec.rb
@@ -1210,6 +1212,7 @@ test_files:
 - spec/mongoid/matchable/all_spec.rb
 - spec/mongoid/matchable/and_spec.rb
 - spec/mongoid/matchable/default_spec.rb
+- spec/mongoid/matchable/elem_match_spec.rb
 - spec/mongoid/matchable/exists_spec.rb
 - spec/mongoid/matchable/gt_spec.rb
 - spec/mongoid/matchable/gte_spec.rb