mongoid 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a87057b0667e0b764ac4cd7816d93ecbbacbed
-  data.tar.gz: 7ca89da136c467233031ddec0c17eb77cb103019
+  metadata.gz: d24616c46c93a31777a37b97c93cca0b10df2625
+  data.tar.gz: 000fc93a80cfc7e296f305a1ddca2d77517578aa
 SHA512:
-  metadata.gz: ebbee26a46ea97357737bdccad4cf96a1f6e57d815a8d68f1bac91d5c62c40b3c31812e90266860d5da23b65cccc540a62f5aba0d728ab64ba604405925cf8d2
-  data.tar.gz: 3abd08faeb591bd9cf71cd976f5d8e99063fed8f2830ea916fb720464eebf4e0525b6135963f0a9c0f674fbf154091b185f0372285c9980e088dc63b1e271f56
+  metadata.gz: 71d177604ae5df43f63a5f45b1fa68ea2bedf263009ca58406e23ef6c3fdbe09f0b76bdf5e4c70a9612c515f3aa2fca8ae384d62ede1e86629f788905822e483
+  data.tar.gz: f840e9a8796efaa27b3536c95270c9e5abcbe233718a546095cc09671fd1d6edb8c7d16b55505ad33e1737ab610fb422b04318d0486c37841a2b9c495959ca2f

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/en/mongoid/docs/upgrading.html).
 
+## 3.1.6
+
+### Resolved Issues
+
+* \#3337 Ensure localized fields map is cloned with inheritance.
+
+* \#3262 Fixed atomic array operations on HABTM foreign key fields from turning
+  single elements into arrays.
+
+* \#3282 Fixed .timeless option to use a thread local instead of a class attribute.
+  Also remove the timeless methods from all docs, and only add to timestamps docs.
+  (Arthur Neves)
+
 ## 3.1.5
 
 ### Resolved Issues

data/lib/mongoid/components.rb

@@ -38,7 +38,6 @@ module Mongoid
     include Mongoid::Sharding
     include Mongoid::State
     include Mongoid::Threaded::Lifecycle
-    include Mongoid::Timestamps::Timeless
     include Mongoid::Validations
     include Mongoid::Callbacks
     include Mongoid::Copyable

data/lib/mongoid/dirty.rb

@@ -97,7 +97,6 @@ module Mongoid
     def post_persist
       reset_persisted_children
       move_changes
-      clear_timeless_option
     end
 
     # Get the previous changes on the document.

data/lib/mongoid/extensions/hash.rb

@@ -40,11 +40,11 @@ module Mongoid
         each_pair do |key, value|
           if key =~ /\$/
             value.each_pair do |_key, _value|
-              value[_key] = mongoize_for(klass, _key, _value)
+              value[_key] = mongoize_for(key, klass, _key, _value)
             end
             (consolidated[key] ||= {}).merge!(value)
           else
-            (consolidated["$set"] ||= {}).merge!(key => mongoize_for(klass, key, value))
+            (consolidated["$set"] ||= {}).merge!(key => mongoize_for(key, klass, key, value))
           end
         end
         consolidated
@@ -166,9 +166,17 @@ module Mongoid
       # @return [ Object ] The mongoized value.
       #
       # @since 3.1.0
-      def mongoize_for(klass, key, value)
+      def mongoize_for(operator, klass, key, value)
         field = klass.fields[key.to_s]
-        field ? field.mongoize(value) : value
+        if field
+          val = field.mongoize(value)
+          if Mongoid::Persistence::LIST_OPERATIONS.include?(operator) && field.resizable?
+            val = val.first if !value.is_a?(Array)
+          end
+          val
+        else
+          value
+        end
       end
 
       module ClassMethods

data/lib/mongoid/hierarchy.rb

@@ -169,6 +169,7 @@ module Mongoid
         super
         @_type = nil
         subclass.aliased_fields = aliased_fields.dup
+        subclass.localized_fields = localized_fields.dup
         subclass.fields = fields.dup
         subclass.pre_processed_defaults = pre_processed_defaults.dup
         subclass.post_processed_defaults = post_processed_defaults.dup

data/lib/mongoid/paranoia.rb

@@ -64,7 +64,6 @@ module Mongoid
         update({ "$set" => { paranoid_field => time }})
       @destroyed = true
       IdentityMap.remove(self)
-      clear_timeless_option
       true
     end
     alias :delete :remove

data/lib/mongoid/persistence.rb

@@ -21,6 +21,11 @@ module Mongoid
     include Atomic
     include Mongoid::Atomic::Positionable
 
+    # The atomic operations that deal with arrays or sets in the db.
+    #
+    # @since 4.0.0
+    LIST_OPERATIONS = [ "$addToSet", "$push", "$pull", "$pullAll" ].freeze
+
     # Remove the document from the database with callbacks.
     #
     # @example Destroy a document.

data/lib/mongoid/persistence/deletion.rb

@@ -24,7 +24,6 @@ module Mongoid
         document.freeze
         document.destroyed = true
         IdentityMap.remove(document)
-        document.clear_timeless_option
         true
       end
     end

data/lib/mongoid/relations/embedded/batchable.rb

@@ -304,7 +304,6 @@ module Mongoid
             _unscoped.delete_one(doc)
             unbind_one(doc)
             execute_callback :after_remove, doc
-            doc.clear_timeless_option
             doc.as_document
           end
         end

data/lib/mongoid/timestamps.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
+require "mongoid/timestamps/timeless"
 require "mongoid/timestamps/created"
 require "mongoid/timestamps/updated"
 require "mongoid/timestamps/short"
-require "mongoid/timestamps/timeless"
 
 module Mongoid
 

data/lib/mongoid/timestamps/created.rb

@@ -9,8 +9,10 @@ module Mongoid
       extend ActiveSupport::Concern
 
       included do
+        include Mongoid::Timestamps::Timeless
+
         field :created_at, type: Time
-        set_callback :create, :before, :set_created_at, if: :timestamping?
+        set_callback :create, :before, :set_created_at
       end
 
       # Update the created_at field on the Document to the current time. This is
@@ -19,11 +21,13 @@ module Mongoid
       # @example Set the created at time.
       #   person.set_created_at
       def set_created_at
-        if !created_at
+        if !timeless? && !created_at
           time = Time.now.utc
           self.updated_at = time if is_a?(Updated) && !updated_at_changed?
           self.created_at = time
         end
+
+        self.class.clear_timeless_option
       end
     end
   end

data/lib/mongoid/timestamps/timeless.rb

@@ -7,11 +7,6 @@ module Mongoid
     module Timeless
       extend ActiveSupport::Concern
 
-      included do
-        class_attribute :timestamping
-        self.timestamping = true
-      end
-
       # Clears out the timeless option.
       #
       # @example Clear the timeless option.
@@ -21,7 +16,7 @@ module Mongoid
       #
       # @since 3.1.4
       def clear_timeless_option
-        self.class.timestamping = true
+        self.class.clear_timeless_option
       end
 
       # Begin an execution that should skip timestamping.
@@ -33,10 +28,22 @@ module Mongoid
       #
       # @since 2.3.0
       def timeless
-        self.class.timestamping = false
+        self.class.timeless
         self
       end
 
+      def timeless?
+        self.class.timeless?
+      end
+
+      class << self
+
+        def timeless_table
+          Thread.current['[mongoid]:timeless'] ||= Hash.new
+        end
+        delegate :[]=, :[], to: :timeless_table
+      end
+
       private
 
       module ClassMethods
@@ -50,9 +57,24 @@ module Mongoid
         #
         # @since 2.3.0
         def timeless
-          self.timestamping = false
+          counter = 0
+          counter += 1 if self < Mongoid::Timestamps::Created
+          counter += 1 if self < Mongoid::Timestamps::Updated
+          Timeless[name] = counter
           self
         end
+
+        def clear_timeless_option
+          if counter = Timeless[name]
+            counter -= 1
+            Timeless[name] = (counter == 0) ? nil : counter
+          end
+          true
+        end
+
+        def timeless?
+          !!Timeless[name]
+        end
       end
     end
   end

data/lib/mongoid/timestamps/updated.rb

@@ -9,9 +9,11 @@ module Mongoid
       extend ActiveSupport::Concern
 
       included do
+        include Mongoid::Timestamps::Timeless
+
         field :updated_at, type: Time
-        set_callback :create, :before, :set_updated_at, if: :able_to_set_updated_at?
-        set_callback :update, :before, :set_updated_at, if: :able_to_set_updated_at?
+        set_callback :create, :before, :set_updated_at
+        set_callback :update, :before, :set_updated_at
       end
 
       # Update the updated_at field on the Document to the current time.
@@ -20,7 +22,11 @@ module Mongoid
       # @example Set the updated at time.
       #   person.set_updated_at
       def set_updated_at
-        self.updated_at = Time.now.utc unless updated_at_changed?
+        if able_to_set_updated_at?
+          self.updated_at = Time.now.utc unless updated_at_changed?
+        end
+
+        self.class.clear_timeless_option
       end
 
       # Is the updated timestamp able to be set?
@@ -32,7 +38,7 @@ module Mongoid
       #
       # @since 2.4.0
       def able_to_set_updated_at?
-        !frozen? && timestamping? && (new_record? || changed?)
+        !frozen? && !timeless? && (new_record? || changed?)
       end
     end
   end

data/lib/mongoid/version.rb

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

data/spec/app/models/definition.rb

@@ -4,5 +4,6 @@ class Definition
   field :p, as: :part, type: String
   field :regular, type: Boolean
   field :syn, as: :synonyms, localize: true, type: String
+  field :active, type: Boolean, localize: true, default: true
   embedded_in :word
 end

data/spec/mongoid/contextual/mongo_spec.rb

@@ -1500,6 +1500,26 @@ describe Mongoid::Contextual::Mongo do
       described_class.new(criteria)
     end
 
+    context "when adding an element to a HABTM set" do
+
+      let(:person) do
+        Person.create
+      end
+
+      let(:preference) do
+        Preference.create
+      end
+
+      before do
+        Person.where(id: person.id).
+          update("$addToSet" => { preference_ids: preference.id })
+      end
+
+      it "adds a single element to the array" do
+        expect(person.reload.preference_ids).to eq([ preference.id ])
+      end
+    end
+
     context "when providing attributes" do
 
       context "when the attributes are of the correct type" do

data/spec/mongoid/fields_spec.rb

@@ -1250,4 +1250,18 @@ describe Mongoid::Fields do
       end
     end
   end
+
+  context "when a localized field is a boolean" do
+
+    context "when the default is true" do
+
+      let(:definition) do
+        Definition.new
+      end
+
+      it "returns the proper predicate result" do
+        expect(definition).to be_active
+      end
+    end
+  end
 end

data/spec/mongoid/hierarchy_spec.rb

@@ -100,6 +100,13 @@ describe Mongoid::Hierarchy do
     end
   end
 
+  describe "#inherited" do
+
+    it "duplicates the localized fields" do
+      expect(Actress.localized_fields).to_not equal(Actor.localized_fields)
+    end
+  end
+
   describe "#parentize" do
 
     let(:address) do

data/spec/mongoid/relations/referenced/many_spec.rb

@@ -18,6 +18,25 @@ describe Mongoid::Relations::Referenced::Many do
 
     describe "##{method}" do
 
+      context "when providing the base class in child contructor" do
+
+        let(:person) do
+          Person.create
+        end
+
+        let!(:post) do
+          person.posts.send(method, Post.new(person: person))
+        end
+
+        it "only adds the relation once" do
+          expect(person.posts.size).to eq(1)
+        end
+
+        it "only persists the relation once" do
+          expect(person.reload.posts.size).to eq(1)
+        end
+      end
+
       context "when the relations are not polymorphic" do
 
         context "when the parent is a new record" do

data/spec/mongoid/timestamps/timeless_spec.rb

@@ -81,7 +81,7 @@ describe Mongoid::Timestamps::Timeless do
         end
 
         it "clears out the timeless option after save" do
-          expect(document).to be_timestamping
+          expect(document).to_not be_timeless
         end
 
         context "when subsequently persisting" do
@@ -111,7 +111,7 @@ describe Mongoid::Timestamps::Timeless do
         end
 
         it "clears out the timeless option after save" do
-          expect(document).to be_timestamping
+          expect(document).to_not be_timeless
         end
 
         context "when subsequently persisting" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -774,7 +774,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Elegant Persistance in Ruby for MongoDB.