mongoid 5.2.0.rc0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe14c770935c2292f42dcab9a0198ecf778e2a0d
-  data.tar.gz: e5af1a0ceb58047b47420f3374d86f29a1243a51
+  metadata.gz: c45686b0e53c4e404c5f52563b399c2ae3909dce
+  data.tar.gz: aea6ea222ae4e97af3ec984a7cb185cce8de966a
 SHA512:
-  metadata.gz: f3c567925e7f39d74f08294de83e4e33a67973655cecf39184675c5b72dc80fb565c736d1e43c43012c2be5adcdf709bffe9bec543826a2491ffbb7fd635cd0b
-  data.tar.gz: 8e7c1b6d23eed2225b768b77c1025ab70f78e2581c70d55af31b063a44961577c9d4a0ff103553f98ab8fe97b78e7482db85fca998434343768cd59ab67d02d1
+  metadata.gz: 033d87560a04cdcae0e2353117eccaa5f14ab4ea273e9bc491cd4cef659ae3488008f17894161375d6910c7be9533d249722eda57a556b8d388419761863366e
+  data.tar.gz: df6a8a161d146fd07a8ddc9867b0105c8f5285273770b169cd280b47c211d54ae31b7bb1ca96f27c35cc43a5e7ccf9e12485592722522efae0541f43d5ac42cf

data/lib/mongoid/attributes/dynamic.rb

@@ -37,7 +37,7 @@ module Mongoid
       # @since 4.0.0
       def define_dynamic_reader(name)
         return unless name.valid_method_name?
-        class_eval <<-READER
+        class_eval <<-READER, __FILE__, __LINE__ + 1
           def #{name}
             attribute_will_change!(#{name.inspect})
             read_attribute(#{name.inspect})
@@ -56,7 +56,7 @@ module Mongoid
       #
       # @since 4.0.0
       def define_dynamic_before_type_cast_reader(name)
-        class_eval <<-READER
+        class_eval <<-READER, __FILE__, __LINE__ + 1
           def #{name}_before_type_cast
             attribute_will_change!(#{name.inspect})
             read_attribute_before_type_cast(#{name.inspect})
@@ -77,7 +77,7 @@ module Mongoid
       def define_dynamic_writer(name)
         return unless name.valid_method_name?
 
-        class_eval <<-WRITER
+        class_eval <<-WRITER, __FILE__, __LINE__ + 1
           def #{name}=(value)
             write_attribute(#{name.inspect}, value)
           end

data/lib/mongoid/config/options.rb

@@ -31,7 +31,7 @@ module Mongoid
       def option(name, options = {})
         defaults[name] = settings[name] = options[:default]
 
-        class_eval <<-RUBY
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{name}
             settings[#{name.inspect}]
           end

data/lib/mongoid/criteria.rb

@@ -193,6 +193,8 @@ module Mongoid
     # @since 1.0.0
     def initialize(klass)
       @klass = klass
+      @embedded = nil
+      @none = nil
       klass ? super(klass.aliased_fields, klass.fields) : super({}, {})
     end
 

data/lib/mongoid/document.rb

@@ -101,6 +101,7 @@ module Mongoid
     #
     # @since 1.0.0
     def initialize(attrs = nil)
+      @__parent = nil
       _building do
         @new_record = true
         @attributes ||= {}

data/lib/mongoid/persistable/settable.rb

@@ -27,7 +27,9 @@ module Mongoid
             field = field_and_value_hash.keys.first.to_s
 
             if fields[field] && fields[field].type == Hash && attributes.key?(field)
-              process_attribute(field.to_s, attributes[field].merge(field_and_value_hash[field]))
+              merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+              value = attributes[field].merge(field_and_value_hash[field], &merger)
+              process_attribute(field.to_s, value)
             else
               process_attribute(field.to_s, field_and_value_hash[field])
             end

data/lib/mongoid/relations/accessors.rb

@@ -160,7 +160,7 @@ module Mongoid
         #
         # @since 3.0.0
         def existence_check(name)
-          module_eval <<-END
+          module_eval <<-END, __FILE__, __LINE__ + 1
             def #{name}?
               without_autobuild { !__send__(:#{name}).blank? }
             end

data/lib/mongoid/relations/builders.rb

@@ -64,7 +64,7 @@ module Mongoid
         # @since 2.0.0.rc.1
         def builder(name, metadata)
           re_define_method("build_#{name}") do |*args|
-            attributes, options = parse_args(*args)
+            attributes, _options = parse_args(*args)
             document = Factory.build(metadata.klass, attributes)
             _building do
               child = send("#{name}=", document)
@@ -89,7 +89,7 @@ module Mongoid
         # @since 2.0.0.rc.1
         def creator(name, metadata)
           re_define_method("create_#{name}") do |*args|
-            attributes, options = parse_args(*args)
+            attributes, _options = parse_args(*args)
             document = Factory.build(metadata.klass, attributes)
             doc = _assigning do
               send("#{name}=", document)

data/lib/mongoid/relations/eager.rb

@@ -14,9 +14,9 @@ module Mongoid
       end
 
       def eager_load(docs)
-        docs.tap do |docs|
+        docs.tap do |d|
           if eager_loadable?
-            preload(criteria.inclusions, docs)
+            preload(criteria.inclusions, d)
           end
         end
       end

data/lib/mongoid/relations/reflections.rb

@@ -24,7 +24,7 @@ module Mongoid
       # @example Find multiple relation metadata by macro.
       #   person.reflect_on_all_associations(:embeds_many)
       #
-      # @param [ Array<String, Symbol> ] *macros The relation macros.
+      # @param [ Array<Symbol> ] *macros The relation macros.
       #
       # @return [ Array<Metadata> ] The matching relation metadata.
       def reflect_on_all_associations(*macros)
@@ -50,11 +50,13 @@ module Mongoid
         # @example Find multiple relation metadata by macro.
         #   Person.reflect_on_all_associations(:embeds_many)
         #
-        # @param [ Array<String, Symbol> ] *macros The relation macros.
+        # @param [ Array<Symbol> ] *macros The relation macros.
         #
         # @return [ Array<Metadata> ] The matching relation metadata.
         def reflect_on_all_associations(*macros)
-          relations.values.select { |meta| macros.include?(meta.macro) }
+          association_reflections = relations.values
+          association_reflections.select! { |reflection| macros.include?(reflection.macro) } unless macros.empty?
+          association_reflections
         end
       end
     end

data/lib/mongoid/relations/touchable.rb

@@ -78,7 +78,7 @@ module Mongoid
         # @return [ Symbol ] The method name.
         def define_relation_touch_method(name)
           method_name = "touch_#{name}_after_create_or_destroy"
-          class_eval <<-TOUCH
+          class_eval <<-TOUCH, __FILE__, __LINE__ + 1
             def #{method_name}
               without_autobuild do
                 relation = __send__(:#{name})

data/lib/mongoid/scopable.rb

@@ -117,7 +117,7 @@ module Mongoid
       # @since 3.0.0
       def queryable
         crit = Threaded.current_scope(self) || Criteria.new(self)
-        crit.embedded = true if crit.klass.embedded?
+        crit.embedded = true if (crit.klass.embedded? && !crit.klass.cyclic?)
         crit
       end
 

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "5.2.0.rc0"
+  VERSION = "5.2.0"
 end

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

@@ -50,8 +50,8 @@ development:
         # via ismaster commands. (default: 10)
         # heartbeat_frequency: 10
 
-        # The time in seconds for selecting servers for a near read preference. (default: 5)
-        # local_threshold: 5
+        # The time in seconds for selecting servers for a near read preference. (default: 0.015)
+        # local_threshold: 0.015
 
         # The timeout in seconds for selecting a server for an operation. (default: 30)
         # server_selection_timeout: 30

data/spec/mongoid/persistable/settable_spec.rb

@@ -263,6 +263,50 @@ describe Mongoid::Persistable::Settable do
     end
   end
 
+  context 'when the field is a nested hash' do
+
+    context 'when a leaf value in the nested hash is updated' do
+
+      let(:church) do
+        Church.new.tap do |a|
+          a.location = {'address' => {'city' => 'Berlin', 'street' => 'Yorckstr'}}
+          a.name = 'Church1'
+          a.save
+        end
+      end
+
+      before do
+        church.set('location.address.city' => 'Munich')
+      end
+
+      it 'does not reset the nested hash' do
+        expect(church.name).to eq('Church1')
+        expect(church.location).to eql({'address' => {'city' => 'Munich', 'street' => 'Yorckstr'}})
+      end
+    end
+
+
+    context 'when the nested hash is many levels deep' do
+
+      let(:church) do
+        Church.new.tap do |a|
+          a.location = {'address' => {'state' => {'address' => {'city' => 'Berlin', 'street' => 'Yorckstr'}}}}
+          a.name = 'Church1'
+          a.save
+        end
+      end
+
+      before do
+        church.set('location.address.state.address.city' => 'Munich')
+      end
+
+      it 'does not reset the nested hash' do
+        expect(church.name).to eq('Church1')
+        expect(church.location).to eql({'address' => {'state' => {'address' => {'city' => 'Munich', 'street' => 'Yorckstr'}}}})
+      end
+    end
+  end
+
   context 'when the field is not already set locally' do
 
     let(:church) do

data/spec/mongoid/relations/cyclic_spec.rb

@@ -21,6 +21,17 @@ describe Mongoid::Relations::Cyclic do
       it "sets cyclic to true" do
         expect(document.cyclic).to be true
       end
+
+      context "when a query is executed" do
+
+        before do
+          document.save
+        end
+
+        it "queries the database, not memory" do
+          expect(Role.first).to be_a(Role)
+        end
+      end
     end
 
     context "when the name is not inflected easily" do
@@ -133,6 +144,17 @@ describe Mongoid::Relations::Cyclic do
         expect(document.class.relations['child_mango']).to be_cascading_callbacks
       end
     end
+
+    context "when a query is executed" do
+
+      before do
+        document.save
+      end
+
+      it "queries the database, not memory" do
+        expect(Shelf.first).to be_a(Shelf)
+      end
+    end
   end
 
   context "when building a namespaced hierarchy" do

data/spec/mongoid/relations/reflections_spec.rb

@@ -74,23 +74,23 @@ describe Mongoid::Relations::Reflections do
           expect(relations.size).to eq(1)
         end
       end
-    end
 
-    context "when no relations exist for the macros" do
+      context "when no argument supplied" do
 
-      let(:relations) do
-        klass.reflect_on_all_associations(:embeds_one)
-      end
+        let(:relations) do
+          klass.reflect_on_all_associations
+        end
 
-      it "returns an empty array" do
-        expect(relations).to be_empty
+        it "returns an array of all relations" do
+          expect(relations.size).to eq(3)
+        end
       end
     end
 
-    context "when no argument supplied" do
+    context "when no relations exist for the macros" do
 
       let(:relations) do
-        klass.reflect_on_all_associations
+        klass.reflect_on_all_associations(:embeds_one)
       end
 
       it "returns an empty array" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 5.2.0.rc0
+  version: 5.2.0
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   cGiNQIiHBj/9/xHfOyOthBPUevTiVnuffarDr434z/LGLwYzgaG5EcJFvZqpvUpP
   fGcAPtAZUMGLXwcOB1BJEFkDxUQIJiEpSmf4YzzZhEM=
   -----END CERTIFICATE-----
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -821,7 +821,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.