mongoid 5.0.0 → 5.0.1

data/lib/mongoid/relations/proxy.rb

@@ -84,7 +84,7 @@ module Mongoid
         target
       end
 
-      # Tell the next persistance operation to store in a specific collection,
+      # Tell the next persistence operation to store in a specific collection,
       # database or client.
       #
       # @example Save the current document to a different collection.

data/lib/mongoid/relations/touchable.rb

@@ -31,7 +31,7 @@ module Mongoid
         touches = touch_atomic_updates(field)
         unless touches.empty?
           selector = atomic_selector
-          _root.collection.find(selector).update_one(touches)
+          _root.collection.find(selector).update_one(positionally(selector, touches))
         end
         run_callbacks(:touch)
         true

data/lib/mongoid/scopable.rb

@@ -115,7 +115,7 @@ module Mongoid
       #
       # @since 3.0.0
       def queryable
-        Threaded.current_scope || Criteria.new(self)
+        Threaded.current_scope(self) || Criteria.new(self)
       end
 
       # Create a scope that can be accessed from the class level or chained to
@@ -222,11 +222,11 @@ module Mongoid
       #
       # @since 1.0.0
       def with_scope(criteria)
-        Threaded.current_scope = criteria
+        Threaded.set_current_scope(criteria, self)
         begin
           yield criteria
         ensure
-          Threaded.current_scope = nil
+          Threaded.set_current_scope(nil, self)
         end
       end
 
@@ -311,11 +311,12 @@ module Mongoid
       # @since 3.0.0
       def define_scope_method(name)
         singleton_class.class_eval do
-          define_method name do |*args|
+          define_method(name) do |*args|
             scoping = _declared_scopes[name]
             scope = instance_exec(*args, &scoping[:scope])
             extension = scoping[:extension]
-            criteria = with_default_scope.merge(scope || queryable)
+            to_merge = scope || queryable
+            criteria = to_merge.empty_and_chainable? ? to_merge : with_default_scope.merge(to_merge)
             criteria.extend(extension)
             criteria
           end

data/lib/mongoid/selectable.rb

@@ -18,7 +18,42 @@ module Mongoid
     #
     # @since 1.0.0
     def atomic_selector
-      @atomic_selector ||= { "_id" => _root._id }.merge!(shard_key_selector)
+      @atomic_selector ||=
+        (embedded? ? embedded_atomic_selector : root_atomic_selector)
+    end
+
+    private
+
+    # Get the atomic selector for an embedded document.
+    #
+    # @api private
+    #
+    # @example Get the embedded atomic selector.
+    #   document.embedded_atomic_selector
+    #
+    # @return [ Hash ] The embedded document selector.
+    #
+    # @since 4.0.0
+    def embedded_atomic_selector
+      if persisted? && _id_changed?
+        _parent.atomic_selector
+      else
+        _parent.atomic_selector.merge("#{atomic_path}._id" => _id)
+      end
+    end
+
+    # Get the atomic selector for a root document.
+    #
+    # @api private
+    #
+    # @example Get the root atomic selector.
+    #   document.root_atomic_selector
+    #
+    # @return [ Hash ] The root document selector.
+    #
+    # @since 4.0.0
+    def root_atomic_selector
+      { "_id" => _id }.merge!(shard_key_selector)
     end
   end
 end

data/lib/mongoid/threaded.rb

@@ -197,13 +197,22 @@ module Mongoid
     # Get the current Mongoid scope.
     #
     # @example Get the scope.
+    #   Threaded.current_scope(klass)
     #   Threaded.current_scope
     #
+    # @param [ Klass ] klass The class type of the scope.
+    #
     # @return [ Criteria ] The scope.
     #
     # @since 5.0.0
-    def current_scope
-      Thread.current[CURRENT_SCOPE_KEY]
+    def current_scope(klass = nil)
+      if klass && Thread.current[CURRENT_SCOPE_KEY].respond_to?(:keys)
+        Thread.current[CURRENT_SCOPE_KEY][
+            Thread.current[CURRENT_SCOPE_KEY].keys.find { |k| k <= klass }
+        ]
+      else
+        Thread.current[CURRENT_SCOPE_KEY]
+      end
     end
 
     # Set the current Mongoid scope.
@@ -220,6 +229,29 @@ module Mongoid
       Thread.current[CURRENT_SCOPE_KEY] = scope
     end
 
+    # Set the current Mongoid scope. Safe for multi-model scope chaining.
+    #
+    # @example Set the scope.
+    #   Threaded.current_scope(scope, klass)
+    #
+    # @param [ Criteria ] scope The current scope.
+    # @param [ Class ] klass The current model class.
+    #
+    # @return [ Criteria ] The scope.
+    #
+    # @since 5.0.1
+    def set_current_scope(scope, klass)
+      if scope.nil?
+        if Thread.current[CURRENT_SCOPE_KEY]
+          Thread.current[CURRENT_SCOPE_KEY].delete(klass)
+          Thread.current[CURRENT_SCOPE_KEY] = nil if Thread.current[CURRENT_SCOPE_KEY].empty?
+        end
+      else
+        Thread.current[CURRENT_SCOPE_KEY] ||= {}
+        Thread.current[CURRENT_SCOPE_KEY][klass] = scope
+      end
+    end
+
     # Is the document autosaved on the current thread?
     #
     # @example Is the document autosaved?

data/lib/mongoid/timestamps/created.rb

@@ -26,8 +26,7 @@ module Mongoid
           self.updated_at = time if is_a?(Updated) && !updated_at_changed?
           self.created_at = time
         end
-
-        self.class.clear_timeless_option
+        clear_timeless_option
       end
     end
   end

data/lib/mongoid/timestamps/timeless.rb

@@ -16,7 +16,12 @@ module Mongoid
       #
       # @since 3.1.4
       def clear_timeless_option
-        self.class.clear_timeless_option
+        if self.persisted?
+          self.class.clear_timeless_option_on_update
+        else
+          self.class.clear_timeless_option
+        end
+        true
       end
 
       # Begin an execution that should skip timestamping.
@@ -67,11 +72,23 @@ module Mongoid
         def clear_timeless_option
           if counter = Timeless[name]
             counter -= 1
-            Timeless[name] = (counter == 0) ? nil : counter
+            set_timeless_counter(counter)
           end
           true
         end
 
+        def clear_timeless_option_on_update
+          if counter = Timeless[name]
+            counter -= 1 if self < Mongoid::Timestamps::Created
+            counter -= 1 if self < Mongoid::Timestamps::Updated
+            set_timeless_counter(counter)
+          end
+        end
+
+        def set_timeless_counter(counter)
+          Timeless[name] = (counter == 0) ? nil : counter
+        end
+
         def timeless?
           !!Timeless[name]
         end

data/lib/mongoid/timestamps/updated.rb

@@ -26,7 +26,7 @@ module Mongoid
           self.updated_at = Time.now.utc unless updated_at_changed?
         end
 
-        self.class.clear_timeless_option
+        clear_timeless_option
       end
 
       # Is the updated timestamp able to be set?

data/lib/mongoid/traversable.rb

@@ -153,7 +153,7 @@ module Mongoid
     def _root
       object = self
       while (object._parent) do object = object._parent; end
-      object || self
+      object.with(@persistence_options) || self
     end
 
     # Is this document the root document of the hierarchy?

data/lib/mongoid/version.rb

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

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -20,6 +20,8 @@ development:
         # (default: primary)
         # read:
         #   mode: :secondary_preferred
+        #   tag_sets:
+        #     - use: web
 
         # The name of the user for authentication.
         # user: 'user'
@@ -131,5 +133,5 @@ test:
         - localhost:27017
       options:
         read:
-          mode: primary
+          mode: :primary
         max_pool_size: 1

data/spec/app/models/account.rb

@@ -25,4 +25,12 @@ class Account
   def overridden
     self[:overridden] = "not recommended"
   end
+
+  # MONGOID-3365
+  field :period_started_at, type: Time
+  has_many :consumption_periods, dependent: :destroy, validate: false
+
+  def current_consumption
+    consumption_periods.find_or_create_by(started_at: period_started_at)
+  end
 end

data/spec/app/models/answer.rb

@@ -1,4 +1,6 @@
 class Answer
   include Mongoid::Document
   embedded_in :question
+
+  field :position, type: Integer
 end

data/spec/app/models/article.rb

@@ -1,6 +1,8 @@
 class Article
   include Mongoid::Document
 
+  field :author_id, type: Integer
+  field :public, type: Mongoid::Boolean
   field :title, type: String
   field :is_rss, type: Mongoid::Boolean, default: false
   field :user_login, type: String

data/spec/app/models/author.rb

@@ -1,4 +1,6 @@
 class Author
   include Mongoid::Document
+  field :id, type: Integer
+  field :author, type: Mongoid::Boolean
   field :name, type: String
 end

data/spec/app/models/baby.rb

@@ -0,0 +1,4 @@
+class Baby
+  include Mongoid::Document
+  embedded_in :kangaroo
+end

data/spec/app/models/book.rb

@@ -10,4 +10,6 @@ class Book
   after_initialize do |doc|
     doc.chapters = 5
   end
+
+  embeds_many :pages
 end

data/spec/app/models/consumption_period.rb

@@ -0,0 +1,7 @@
+class ConsumptionPeriod
+  include Mongoid::Document
+
+  belongs_to :account
+
+  field :started_at, type: Time
+end

data/spec/app/models/exhibitor.rb

@@ -1,5 +1,6 @@
 class Exhibitor
   include Mongoid::Document
+  field :status, type: String
   belongs_to :exhibition
   has_and_belongs_to_many :artworks
 end

data/spec/app/models/kaleidoscope.rb

@@ -0,0 +1,6 @@
+class Kaleidoscope
+  include Mongoid::Document
+  field :active, type: Mongoid::Boolean, default: true
+
+  scope :activated, -> { where(active: true) }
+end

data/spec/app/models/kangaroo.rb

@@ -0,0 +1,4 @@
+class Kangaroo
+  include Mongoid::Document
+  embeds_one :baby
+end

data/spec/app/models/note.rb

@@ -11,4 +11,7 @@ class Note
   def update_saved
     self.saved = true
   end
+
+  embedded_in :page
+  field :message, :type => String
 end

data/spec/app/models/page.rb

@@ -2,4 +2,15 @@ class Page
   include Mongoid::Document
   embedded_in :quiz
   embeds_many :page_questions
+
+  embedded_in :book
+  embeds_many :notes
+  field :content, :type => String
+
+  after_initialize do
+    if self[:content]
+      self[:text] = self[:content]
+      self.remove_attribute(:content)
+    end
+  end
 end

data/spec/app/models/simple.rb

@@ -0,0 +1,5 @@
+class Simple
+  include Mongoid::Document
+  field :name, type: String
+  scope :nothing, -> { none }
+end

data/spec/config/mongoid.yml

@@ -9,7 +9,9 @@ test:
         password: "password"
         auth_source: "admin"
         read:
-          mode: :primary
+          mode: :primary_preferred
+          tag_sets:
+            - use: web
         max_pool_size: 1
   options:
     include_root_in_json: false

data/spec/mongoid/atomic/paths_spec.rb

@@ -18,7 +18,7 @@ describe Mongoid::Atomic::Paths do
     Name.new
   end
 
-  describe "#.atomic_delete_modifier" do
+  describe "#atomic_delete_modifier" do
 
     before do
       person.addresses << address
@@ -40,7 +40,7 @@ describe Mongoid::Atomic::Paths do
     end
   end
 
-  describe "#.atomic_insert_modifier" do
+  describe "#atomic_insert_modifier" do
 
     before do
       person.addresses << address
@@ -62,7 +62,7 @@ describe Mongoid::Atomic::Paths do
     end
   end
 
-  describe "#.atomic_path" do
+  describe "#atomic_path" do
 
     context "when the document is a parent" do
 
@@ -95,7 +95,7 @@ describe Mongoid::Atomic::Paths do
     end
   end
 
-  describe "#.atomic_selector" do
+  describe "#atomic_selector" do
 
     context "when the document is a parent" do
 
@@ -111,7 +111,9 @@ describe Mongoid::Atomic::Paths do
       end
 
       it "returns the association with id.atomic_selector" do
-        expect(address.atomic_selector).to eq({ "_id" => person.id })
+        expect(address.atomic_selector).to eq(
+          { "_id" => person.id, "addresses._id" => address.id }
+        )
       end
     end
 
@@ -122,13 +124,19 @@ describe Mongoid::Atomic::Paths do
         person.addresses << address
       end
 
-      it "returns the JSON notation to the document with id" do
-        expect(location.atomic_selector).to eq({ "_id" => person.id })
+      it "returns the JSON notation to the document with ids" do
+        expect(location.atomic_selector).to eq(
+          {
+            "_id" => person.id,
+            "addresses._id" => address.id,
+            "addresses.locations._id" => location.id
+          }
+        )
       end
     end
   end
 
-  describe "#.atomic_position" do
+  describe "#atomic_position" do
 
     context "when the document is a parent" do
 
@@ -194,7 +202,7 @@ describe Mongoid::Atomic::Paths do
     end
   end
 
-  describe "#.atomic_path" do
+  describe "#atomic_path" do
 
     context "when the document is a parent" do
 
@@ -255,7 +263,6 @@ describe Mongoid::Atomic::Paths do
         it "returns the.atomic_path plus index" do
           expect(location.atomic_path).to eq("addresses.0.locations")
         end
-
       end
     end
   end