mongoid 5.1.3 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4fed172bb6af11ba2b149b79f186088e927654b
-  data.tar.gz: 5a773064e7b4e5b53b299763cc224376e1c2b982
+  metadata.gz: 79c4a036b0cdf460779fe1d838cd9c47fefa997a
+  data.tar.gz: f9eccd20ec1cf43dc5696e9f28b66ac1511b92cb
 SHA512:
-  metadata.gz: c0acac4c15262c18ada59b3297588f8ad173f9a3729ecb8b2bbffdb43276549c7e9f7ea94856141c7dde36c028964373d3a27e7bba21990fb8958f6051931b0a
-  data.tar.gz: 70a79115a1c45102070577281ad7664b89a34a284c14bb08a6b79af4bd385d544c4f9bce177b9babedfb13734dcfd480e1c2ca7e9676b5b405a77ed21e588788
+  metadata.gz: 373ef0d42a812e2bd55b9f0c84fb4c40ef0720821127ad615b9fe1f30a15273dbe68126bb0e5c4981af9fbb30f90c51ba0dfba2dfae7738db75e3d128398acee
+  data.tar.gz: ea57593ae912660e765caaa3effce3b3355944fb77859ad8d52166b8f6ab8a6b013f2d01380ebb513ec67b4606040f2cd912894459558c8f7bc305d50349d673

data/lib/mongoid/attributes.rb

@@ -259,7 +259,7 @@ module Mongoid
       if field && field.localized?
         selection.key?("#{name}.#{::I18n.locale}")
       else
-        selection.keys.collect { |k| k.partition('.').first }.include?(name)
+        selection.key?(name) || selection.keys.collect { |k| k.partition('.').first }.include?(name)
       end
     end
 

data/lib/mongoid/contextual/mongo.rb

@@ -294,8 +294,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

@@ -45,7 +45,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
 
@@ -60,12 +60,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/fields/localized.rb

@@ -77,10 +77,10 @@ module Mongoid
       # @since 3.0.0
       def lookup(object)
         locale = ::I18n.locale
-        if fallbacks? && ::I18n.respond_to?(:fallbacks)
+        if value = object[locale.to_s]
+          value
+        elsif fallbacks? && ::I18n.respond_to?(:fallbacks)
           object[::I18n.fallbacks[locale].map(&:to_s).find{ |loc| object.has_key?(loc) }]
-        else
-          object[locale.to_s]
         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/version.rb

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

data/spec/mongoid/attributes_spec.rb

@@ -38,6 +38,42 @@ describe Mongoid::Attributes do
             it "does not raise an error" do
               expect(from_db.desc).to eq("test")
             end
+
+            context "accessing via []" do
+
+              it "does not raise an error" do
+                expect(from_db["desc"]).to eq("en" => "test")
+              end
+            end
+
+            context "when calling only on a sub-document" do
+
+              let(:title) {"Executive"}
+              let(:city) {"NYC"}
+              let!(:agent) do
+                agent = Agent.new(:title => title)
+                agent.build_address(:city => city)
+                agent.save()
+                agent
+              end
+              let(:from_db) do
+                Agent.only(:title, "address.city").first
+              end
+
+              context "when the field is in the only" do
+
+                it "does not raise an error" do
+                  expect(from_db.address.city).to eq(city)
+                end
+              end
+
+              context "accessing via []" do
+
+                it "does not raise an error" do
+                  expect(from_db["address.city"]).to eq(city)
+                end
+              end
+            end
           end
 
           context 'when the attribute is a hash field' do
@@ -86,6 +122,15 @@ describe Mongoid::Attributes do
             from_db.title
           }.to raise_error(ActiveModel::MissingAttributeError)
         end
+
+        context "accessing via []" do
+
+          it "raises an error" do
+            expect {
+              from_db["title"]
+            }.to raise_error(ActiveModel::MissingAttributeError)
+          end
+        end
       end
 
       context "when excluding with without" do

data/spec/mongoid/contextual/mongo_spec.rb

@@ -1003,11 +1003,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
@@ -93,6 +93,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
 
@@ -122,6 +123,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/fields/localized_spec.rb

@@ -174,6 +174,21 @@ describe Mongoid::Fields::Localized do
                 expect(value).to be_nil
               end
             end
+
+            context 'when fallbacks are empty' do
+
+              before do
+                ::I18n.fallbacks[:de] = [ ]
+              end
+
+              let(:value) do
+                field.demongoize({ 'de' => 'testen' })
+              end
+
+              it "returns the value" do
+                expect(value).to eq('testen')
+              end
+            end
           end
         end
       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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 5.1.4
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   ZIvvwAhgCjVW5QCi2I1noxXLmtZ3XDawWu8kaGtu8giHXcwL3941m8hvFZ/Wr9Yi
   JvcXJt2a4/JvwnIs2hmKuyfhZmB9HEE5wQQaCMnnC14=
   -----END CERTIFICATE-----
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -811,7 +811,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.