mongoid 5.0.2 → 5.1.0

data/lib/mongoid/criteria/modifiable.rb

@@ -55,6 +55,18 @@ module Mongoid
         create_document(:create!, attrs, &block)
       end
 
+      # Define attributes with which new documents will be created.
+      #
+      # @example Define attributes to be used when a new document is created.
+      #   Person.create_with(job: 'Engineer').find_or_create_by(employer: 'MongoDB')
+      #
+      # @return [ Mongoid::Criteria ] A criteria.
+      #
+      # @since 5.1.0
+      def create_with(attrs = {})
+        where(selector.merge(attrs))
+      end
+
       # Find the first +Document+ given the conditions, or creates a new document
       # with the conditions that were supplied.
       #
@@ -160,7 +172,7 @@ module Mongoid
       #
       # @since 3.0.0
       def create_document(method, attrs = nil, &block)
-        attributes = selector.reduce(attrs || {}) do |hash, (key, value)|
+        attributes = selector.reduce(attrs ? attrs.dup : {}) do |hash, (key, value)|
           unless key.to_s =~ /\$/ || value.is_a?(Hash)
             hash[key] = value
           end

data/lib/mongoid/document.rb

@@ -180,6 +180,27 @@ module Mongoid
       attributes
     end
 
+    # Calls #as_json on the document with additional, Mongoid-specific options.
+    #
+    # @example Get the document as json.
+    #   document.as_json(compact: true)
+    #
+    # @param [ Hash ] options The options.
+    #
+    # @option options [ true, false ] :compact Whether to include fields with
+    #   nil values in the json document.
+    #
+    # @return [ Hash ] The document as json.
+    #
+    # @since 5.1.0
+    def as_json(options = nil)
+      if options && (options[:compact] == true)
+        super(options).reject! { |k,v| v.nil? }
+      else
+        super(options)
+      end
+    end
+
     # Returns an instance of the specified class with the attributes,
     # errors, and embedded documents of the current document.
     #

data/lib/mongoid/fields/foreign_key.rb

@@ -63,7 +63,11 @@ module Mongoid
       # @since 3.0.0
       def evolve(object)
         if object_id_field? || object.is_a?(Document)
-          object.__evolve_object_id__
+          if metadata.polymorphic? && constraint
+            constraint.convert(object)
+          else
+            object.__evolve_object_id__
+          end
         else
           related_id_field.evolve(object)
         end

data/lib/mongoid/fields/localized.rb

@@ -48,6 +48,21 @@ module Mongoid
 
       private
 
+      # Are fallbacks being used for this localized field.
+      #
+      # @api private
+      #
+      # @example Should fallbacks be used.
+      #   field.fallbacks?
+      #
+      # @return [ true, false ] If fallbacks should be used.
+      #
+      # @since 5.1.0
+      def fallbacks?
+        return true if options[:fallbacks].nil?
+        !!options[:fallbacks]
+      end
+
       # Lookup the value from the provided object.
       #
       # @api private
@@ -62,7 +77,7 @@ module Mongoid
       # @since 3.0.0
       def lookup(object)
         locale = ::I18n.locale
-        if ::I18n.respond_to?(:fallbacks)
+        if fallbacks? && ::I18n.respond_to?(:fallbacks)
           object[::I18n.fallbacks[locale].map(&:to_s).find{ |loc| object.has_key?(loc) }]
         else
           object[locale.to_s]

data/lib/mongoid/fields/validators/macro.rb

@@ -13,6 +13,7 @@ module Mongoid
           :identity,
           :label,
           :localize,
+          :fallbacks,
           :metadata,
           :pre_processed,
           :subtype,

data/lib/mongoid/findable.rb

@@ -15,6 +15,7 @@ module Mongoid
     delegate \
       :aggregates,
       :avg,
+      :create_with,
       :distinct,
       :each,
       :each_with_index,

data/lib/mongoid/loggable.rb

@@ -48,7 +48,7 @@ module Mongoid
     # @since 3.0.0
     def default_logger
       logger = Logger.new($stdout)
-      logger.level = Logger::INFO
+      logger.level = Mongoid::Config.log_level
       logger
     end
 

data/lib/mongoid/matchable.rb

@@ -55,7 +55,12 @@ module Mongoid
       selector.each_pair do |key, value|
         if value.is_a?(Hash)
           value.each do |item|
-            return false unless matcher(self, key, Hash[*item]).matches?(Hash[*item])
+            if item[0].to_s == "$not".freeze
+              item = item[1]
+              return false if matcher(self, key, item).matches?(item)
+            else
+              return false unless matcher(self, key, Hash[*item]).matches?(Hash[*item])
+            end
           end
         else
           return false unless matcher(self, key, value).matches?(value)

data/lib/mongoid/persistable.rb

@@ -55,7 +55,7 @@ module Mongoid
     # @since 4.0.0
     def atomically
       begin
-        @atomic_updates_to_execute = {}
+        @atomic_updates_to_execute = @atomic_updates_to_execute || {}
         yield(self) if block_given?
         persist_atomic_operations(@atomic_updates_to_execute)
         true
@@ -207,7 +207,7 @@ module Mongoid
     #
     # @since 4.0.0
     def persist_atomic_operations(operations)
-      if persisted?
+      if persisted? && operations
         selector = atomic_selector
         _root.collection.find(selector).update_one(positionally(selector, operations))
       end

data/lib/mongoid/relations/eager.rb

@@ -34,11 +34,18 @@ module Mongoid
       end
 
       def preload(relations, docs)
-
-        relations.group_by do |metadata|
-          metadata.relation
-        end.each do |relation, associations|
-          relation.eager_load_klass.new(associations, docs).run
+        grouped_relations = relations.group_by do |metadata|
+          metadata.inverse_class_name
+        end
+        grouped_relations.keys.each do |_klass|
+          grouped_relations[_klass] = grouped_relations[_klass].group_by do |metadata|
+            metadata.relation
+          end
+        end
+        grouped_relations.each do |_klass, associations|
+          docs = associations.collect do |_relation, association|
+            _relation.eager_load_klass.new(association, docs).run
+          end.flatten
         end
       end
     end

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

@@ -45,10 +45,12 @@ module Mongoid
         #
         # @since 4.0.0
         def run
+          @loaded = []
           while shift_metadata
             preload
+            @loaded << @docs.collect { |d| d.send(@metadata.name) }
           end
-          @docs
+          @loaded.flatten
         end
 
         # Preload the current relation.

data/lib/mongoid/relations/referenced/many.rb

@@ -320,14 +320,47 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def append(document)
-          # @todo: remove?
           document.with(@persistence_options) if @persistence_options
+          with_add_callbacks(document, already_related?(document)) do
+            target.push(document)
+            characterize_one(document)
+            bind_one(document)
+          end
+        end
 
-          execute_callback :before_add, document
-          target.push(document)
-          characterize_one(document)
-          bind_one(document)
-          execute_callback :after_add, document
+        # Execute before/after add callbacks around the block unless the objects
+        # already have a persisted relation.
+        #
+        # @example Execute before/after add callbacks around the block.
+        #   relation.with_add_callbacks(document, false)
+        #
+        # @param [ Document ] document The document to append to the target.
+        # @param [ true, false ] already_related Whether the document is already related
+        #   to the target.
+        #
+        # @since 5.1.0
+        def with_add_callbacks(document, already_related)
+          execute_callback :before_add, document unless already_related
+          yield
+          execute_callback :after_add, document unless already_related
+        end
+
+        # Whether the document and the base already have a persisted relation.
+        #
+        # @example Is the document already related to the base.
+        #   relation.already_related?(document)
+        #
+        # @param [ Document ] document The document to possibly append to the target.
+        #
+        # @return [ true, false ] Whether the document is already related to the base and the
+        #   relation is persisted.
+        #
+        # @since 5.1.0
+        def already_related?(document)
+          document.persisted? &&
+            document.__metadata &&
+              document.respond_to?(document.__metadata.foreign_key) &&
+                document.__send__(document.__metadata.foreign_key) == base.id
         end
 
         # Instantiate the binding associated with this relation.

data/lib/mongoid/relations/targets/enumerable.rb

@@ -241,7 +241,7 @@ module Mongoid
           else
             @_added, @executed = {}, true
             @_loaded = target.inject({}) do |_target, doc|
-              _target[doc._id] = doc
+              _target[doc._id] = doc if doc
               _target
             end
           end
@@ -340,7 +340,7 @@ module Mongoid
         #
         # @since 3.0.15
         def marshal_dump
-          [ _added, _loaded, _unloaded ]
+          [ _added, _loaded, _unloaded, @executed]
         end
 
         # Loads the data needed to Marshal.load an enumerable proxy.
@@ -352,7 +352,7 @@ module Mongoid
         #
         # @since 3.0.15
         def marshal_load(data)
-          @_added, @_loaded, @_unloaded = data
+          @_added, @_loaded, @_unloaded, @executed = data
         end
 
         # Reset the enumerable back to its persisted state.

data/lib/mongoid/scopable.rb

@@ -87,7 +87,8 @@ module Mongoid
       # @return [ Proc ] The default scope.
       #
       # @since 1.0.0
-      def default_scope(value)
+      def default_scope(value = nil)
+        value = Proc.new { yield } if block_given?
         check_scope_validity(value)
         self.default_scoping = process_default_scope(value)
       end
@@ -115,7 +116,9 @@ module Mongoid
       #
       # @since 3.0.0
       def queryable
-        Threaded.current_scope(self) || Criteria.new(self)
+        crit = Threaded.current_scope(self) || Criteria.new(self)
+        crit.embedded = true if crit.klass.embedded?
+        crit
       end
 
       # Create a scope that can be accessed from the class level or chained to

data/lib/mongoid/version.rb

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

data/spec/app/models/address.rb

@@ -44,6 +44,8 @@ class Address
   belongs_to :band
 
   scope :without_postcode, ->{ where(postcode: nil) }
+  scope :ordered, ->{ order_by(state: 1) }
+  scope :without_postcode_ordered, ->{ without_postcode.ordered }
   scope :rodeo, ->{ where(street: "Rodeo Dr") } do
     def mansion?
       all? { |address| address.street == "Rodeo Dr" }

data/spec/app/models/agent.rb

@@ -5,8 +5,10 @@ class Agent
   field :number, type: String
   field :dob, type: Time
   embeds_many :names, as: :namable
+  embeds_one :address
   belongs_to :game
   belongs_to :agency, touch: true, autobuild: true
 
   has_and_belongs_to_many :accounts
+  has_and_belongs_to_many :basics
 end

data/spec/app/models/alert.rb

@@ -2,4 +2,6 @@ class Alert
   include Mongoid::Document
   field :message, type: String
   belongs_to :account
+  has_many :items
+  belongs_to :post
 end

data/spec/app/models/post.rb

@@ -14,6 +14,7 @@ class Post
   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
+  has_many :alerts
 
   belongs_to :posteable, polymorphic: true
   accepts_nested_attributes_for :posteable, autosave: true

data/spec/config/mongoid.yml

@@ -21,3 +21,4 @@ test:
     raise_not_found_error: true
     use_activesupport_time_zone: true
     use_utc: false
+    log_level: :warn

data/spec/mongoid/changeable_spec.rb

@@ -940,7 +940,7 @@ describe Mongoid::Changeable do
       end
 
       it "returns a hash with indifferent access" do
-        expect(person.changes["title"]).to eq(
+        expect(person.changes[:title]).to eq(
           [ nil, "Captain Obvious" ]
         )
       end

data/spec/mongoid/clients/options_spec.rb

@@ -28,6 +28,41 @@ describe Mongoid::Clients::Options do
         expect(Band.new.persistence_options).to be_nil
       end
 
+      context 'when passed a block', if: testing_locally? do
+
+        let!(:connections_before) do
+          Band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+        end
+
+        before do
+          Band.with(options) do |klass|
+            klass.where(name: 'emily').to_a
+          end
+        end
+
+        let(:connections_after) do
+          Band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+        end
+
+        context 'when a new cluster is created by the driver' do
+
+          let(:options) { { connect_timeout: 2 } }
+
+          it 'disconnects the new cluster' do
+            expect(connections_after).to eq(connections_before)
+          end
+        end
+
+        context 'when the same cluster is used by the new client' do
+
+          let(:options) { { database: 'same-cluster' } }
+
+          it 'does not disconnect the original cluster' do
+            expect(connections_after).to eq(connections_before)
+          end
+        end
+      end
+
       context "when calling .collection method" do
 
         before do
@@ -82,6 +117,28 @@ describe Mongoid::Clients::Options do
     it "passes down the options to collection" do
       expect(instance.collection.database.name).to eq('test')
     end
+
+    context "when the object is shared between threads" do
+
+      before do
+        threads = []
+        doc = Band.create(name: "Beatles")
+        100.times do |i|
+          threads << Thread.new do
+            if i % 2 == 0
+              doc.with(nil).set(name: "Rolling Stones")
+            else
+              doc.with(options).set(name: "Beatles")
+            end
+          end
+        end
+        threads.join
+      end
+
+      it "does not share the persistence options" do
+        expect(Band.persistence_options).to eq(nil)
+      end
+    end
   end
 
   describe "#persistence_options" do

data/spec/mongoid/config_spec.rb

@@ -60,6 +60,23 @@ describe Mongoid::Config do
     end
   end
 
+  context "when the log level is not set in the configuration" do
+
+    before do
+      Mongoid.configure do |config|
+        config.load_configuration(CONFIG)
+      end
+    end
+
+    it "sets the Mongoid logger level to the default" do
+      expect(Mongoid.logger.level).to eq(Logger::INFO)
+    end
+
+    it "sets the Mongo driver logger level to the default" do
+      expect(Mongo::Logger.logger.level).to eq(Logger::INFO)
+    end
+  end
+
   describe "#load!" do
 
     before(:all) do
@@ -89,6 +106,27 @@ describe Mongoid::Config do
       end
     end
 
+    context "when the log level is set in the configuration" do
+
+      before do
+        described_class.load!(file, :test)
+      end
+
+      after do
+        Mongoid.configure do |config|
+          config.load_configuration(CONFIG)
+        end
+      end
+
+      it "sets the Mongoid logger level" do
+        expect(Mongoid.logger.level).to eq(Logger::WARN)
+      end
+
+      it "sets the Mongo driver logger level" do
+        expect(Mongo::Logger.logger.level).to eq(Logger::WARN)
+      end
+    end
+
     context "when provided an environment" do
 
       before do