mongoid 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca6e4c501995a1483885dd73ee311c6f1ef818db
-  data.tar.gz: 7637900bde88e2c32c0b40e4f6ad09b82f1fd409
+  metadata.gz: 922955f679b61344863a31c45286a9e6a98fef4c
+  data.tar.gz: 70619f1566afa0b012a1125fd19532cb8e7ab7b1
 SHA512:
-  metadata.gz: a471975f86db1e3f63fca5267f86722946ca19352445e22003b2181b279dfce7510d141037da8f14ccd4f81b8477dcecc07772ea61fbfe424f412ba637aabf0d
-  data.tar.gz: 42232d489eb95693bc6e0fcc49fa84b19e7b1ce5365b3a16fb2c3e676019208b50b3791139463a3d7d60089c1d7ae5ca1554046427a4f177c7feb06b861ec80c
+  metadata.gz: 200a3e9686b108018cc53c8278333f71ad8aff307a730d7e5ab5c09d1849b56a34dfd3e59f48af397314d2b936261ed4d482a26ca5d83e8f0b1bc7ebb9b962eb
+  data.tar.gz: c4daaaa77a96197384841ba4849621a63b9ea8add033cd691ff3323285d0221ffec05dce0024e8b59f012f1e0a56548da40158b5c76184b1baa1d9333a853cfa

data/lib/mongoid/atomic.rb

@@ -374,7 +374,8 @@ module Mongoid
       return {} unless atomic_updates.key?("$set")
       touches = {}
       updates["$set"].each_pair do |key, value|
-        touches.merge!({ key => value }) if key =~ /updated_at|#{field}/
+        key_regex = /updated_at|u_at#{"|" + field if field.present?}/
+        touches.merge!({ key => value }) if key =~ key_regex
       end
       { "$set" => touches }
     end

data/lib/mongoid/attributes.rb

@@ -259,7 +259,7 @@ module Mongoid
       if field && field.localized?
         selection.key?("#{name}.#{::I18n.locale}")
       else
-        selection.key?(name)
+        selection.keys.collect { |k| k.partition('.').first }.include?(name)
       end
     end
 
@@ -345,5 +345,12 @@ module Mongoid
         end
       end
     end
+
+    def lookup_attribute_presence(name, value)
+      if localized_fields.has_key?(name)
+        value = localized_fields[name].send(:lookup, value)
+      end
+      !!value
+    end
   end
 end

data/lib/mongoid/criteria/modifiable.rb

@@ -173,7 +173,7 @@ module Mongoid
       # @since 3.0.0
       def create_document(method, attrs = nil, &block)
         attributes = selector.reduce(attrs ? attrs.dup : {}) do |hash, (key, value)|
-          unless key.to_s =~ /\$/ || value.is_a?(Hash)
+          unless key.to_s =~ /\$/ || (value.is_a?(Hash) && !attribute_names.include?(key))
             hash[key] = value
           end
           hash

data/lib/mongoid/fields.rb

@@ -480,8 +480,8 @@ module Mongoid
       def create_field_check(name, meth)
         generated_methods.module_eval do
           re_define_method("#{meth}?") do
-            attr = read_attribute(name)
-            attr == true || attr.present?
+            value = read_attribute(name)
+            lookup_attribute_presence(name, value)
           end
         end
       end

data/lib/mongoid/persistable/settable.rb

@@ -22,9 +22,7 @@ module Mongoid
       def set(setters)
         prepare_atomic_operation do |ops|
           process_atomic_operations(setters) do |field, value|
-            field_and_value_hash = hasherizer(field.split('.'), value)
-            field = field_and_value_hash.keys.first
-            process_attribute(field, field_and_value_hash[field])
+            process_attribute(field.to_s, value)
             ops[atomic_attribute_name(field)] = attributes[field]
           end
           { "$set" => ops }

data/lib/mongoid/relations/constraint.rb

@@ -34,7 +34,7 @@ module Mongoid
       #
       # @since 2.0.0.rc.7
       def convert(object)
-        return object if metadata.polymorphic?
+        return convert_polymorphic(object) if metadata.polymorphic?
         klass, field = metadata.klass, metadata.klass.fields["_id"]
         if klass.using_object_ids?
           BSON::ObjectId.mongoize(object)
@@ -44,6 +44,12 @@ module Mongoid
           field.mongoize(object)
         end
       end
+
+      private
+      
+      def convert_polymorphic(object)
+        object.respond_to?(:id) ? object.id : object
+      end
     end
   end
 end

data/lib/mongoid/relations/touchable.rb

@@ -29,7 +29,7 @@ module Mongoid
         write_attribute(field, current) if field
 
         touches = touch_atomic_updates(field)
-        unless touches.empty?
+        unless touches["$set"].blank?
           selector = atomic_selector
           _root.collection.find(selector).update_one(positionally(selector, touches))
         end

data/lib/mongoid/version.rb

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

data/spec/mongoid/attributes_spec.rb

@@ -39,6 +39,25 @@ describe Mongoid::Attributes do
               expect(from_db.desc).to eq("test")
             end
           end
+
+          context 'when the attribute is a hash field' do
+
+            before do
+              person.update_attribute(:map, map)
+            end
+
+            let(:map) do
+              { 'dates' => { 'y' => { '2016' => 'Berlin' } } }
+            end
+
+            let(:from_db) do
+              Person.only('map.dates.y.2016').first
+            end
+
+            it "does not raise an error" do
+              expect(from_db.map).to eq(map)
+            end
+          end
         end
 
         context "when the context excludes" do
@@ -1630,4 +1649,46 @@ describe Mongoid::Attributes do
       end
     end
   end
+
+  context 'when calling the attribute check method' do
+
+    context 'when the attribute is localized' do
+      let(:person) do
+        Person.create(desc: 'localized')
+      end
+
+      before do
+        person.desc = nil
+      end
+
+      it 'applies the localization when checking the attribute' do
+        expect(person.desc?).to be(false)
+      end
+
+      context 'when the field is a boolean' do
+
+        before do
+          person.desc = false
+        end
+
+        it 'applies the localization when checking the attribute' do
+          expect(person.desc?).to be(false)
+        end
+      end
+    end
+
+    context 'when the attribute is not localized' do
+      let(:person) do
+        Person.create(username: 'localized')
+      end
+
+      before do
+        person.username = nil
+      end
+
+      it 'does not apply localization when checking the attribute' do
+        expect(person.name?).to be(false)
+      end
+    end
+  end
 end

data/spec/mongoid/criteria/modifiable_spec.rb

@@ -612,6 +612,17 @@ describe Mongoid::Criteria::Modifiable do
           end
         end
       end
+
+      context 'when the criteria selector includes a hash field' do
+
+        let(:document) do
+          Person.where(map: { foo: :bar }).first_or_create
+        end
+
+        it 'sets the hash field' do
+          expect(document.map).to eq({ foo: :bar })
+        end
+      end
     end
   end
 
@@ -736,6 +747,17 @@ describe Mongoid::Criteria::Modifiable do
           end
         end
       end
+
+      context 'when the criteria selector includes a hash field' do
+
+        let(:document) do
+          Person.where(map: { foo: :bar }).first_or_create
+        end
+
+        it 'sets the hash field' do
+          expect(document.map).to eq({ foo: :bar })
+        end
+      end
     end
   end
 

data/spec/mongoid/criteria_spec.rb

@@ -3349,6 +3349,21 @@ describe Mongoid::Criteria do
           expect(from_db).to eq(band)
         end
       end
+
+      context 'when querying on a polymorphic relation' do
+
+        let(:movie) do
+          Movie.create
+        end
+
+        let(:selector) do
+          Rating.where(ratable: movie).selector
+        end
+
+        it 'properly converts the object to an ObjectId' do
+          expect(selector['ratable_id']).to eq(movie.id)
+        end
+      end
     end
   end
 

data/spec/mongoid/persistable_spec.rb

@@ -227,21 +227,4 @@ describe Mongoid::Persistable do
       }.to raise_error(Mongoid::Errors::Callback)
     end
   end
-
-  example "able use set value using dot notation" do
-    class Customer
-      include Mongoid::Document
-
-      field :address, type: Hash, default: -> {{}}
-    end
-
-    customer = Customer.new 
-    customer.save
-    customer.set 'address.country' => 'India'
-    expect(customer.address).to eql({ 'country' => 'India' })
-    customer.set 'address.country.state' => 'MH'
-    expect(customer.address).to eql({'country' => { 'state' => 'MH' }})
-    customer.set 'address' => { 'country' => 'India'}
-    expect(customer.address).to eql({ 'country' => 'India' })
-  end
 end

data/spec/mongoid/relations/touchable_spec.rb

@@ -329,5 +329,34 @@ describe Mongoid::Relations::Touchable do
         end
       end
     end
+
+    context "when other document attributes have been changed" do
+
+      let(:band) do
+        Band.create(name: "Placebo")
+      end
+
+      context "when an attribute is provided" do
+        before do
+          band.name = 'Nocebo'
+          band.touch(:last_release)
+        end
+
+        it "does not persist other attribute changes" do
+          expect(band.reload.name).not_to eq('Nocebo')
+        end
+      end
+
+      context "when an attribute is not provided" do
+        before do
+          band.name = 'Nocebo'
+          band.touch
+        end
+
+        it "does not persist other attribute changes" do
+          expect(band.reload.name).not_to eq('Nocebo')
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   ZIvvwAhgCjVW5QCi2I1noxXLmtZ3XDawWu8kaGtu8giHXcwL3941m8hvFZ/Wr9Yi
   JvcXJt2a4/JvwnIs2hmKuyfhZmB9HEE5wQQaCMnnC14=
   -----END CERTIFICATE-----
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel