mongoid 6.1.0.rc0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd1c5f3e10aa8f29d9a04da6580f7b2bd22b67e1
-  data.tar.gz: 0244eacd65adceb037276b870846e0a5fca9407a
+  metadata.gz: c57e0133222699f9072fe67b609e7212327028ff
+  data.tar.gz: f2f799925ab8ca3b9126b16fe5a8d52c03fb1146
 SHA512:
-  metadata.gz: 28d80be687ea4b751298f72401eb18a45a3350c362cd78d83bd2a7fe6f51be41259dabec2ba856c752747b071dd4c18b41661325d7ba6f9e015a29557eb641f9
-  data.tar.gz: 22091327a5876754cba1a2cfaea2362e07abbf9e5613ac1a272637f06e379ca9d72878379ceb52e0bc2687baf5e007b27bb1569112c6545abc1e29682bc031ef
+  metadata.gz: 8139bde85b47d8920a022f4f1a3c68796c446192128be7a7ceb59607c82be58404a956e89676e61ce61a6f39fd691b4b8f39bf2a31663ef64f482a5271986484
+  data.tar.gz: d500146fa38cbdf1e5d915fa164ef465f4b0ba3ffc7568d77fc85bc9576b61dab8efdbffa42ff8fb2b72063997b8207c264ec52a2f11c04140f09c2a5532b778

data.tar.gz.sig

@@ -1,3 +1 @@
-V����
J���R���Q���b#��YĐ�3�Z=խ7��>�Zh3����� Wt���F63�@�$>�"(bh�5��n)SW�j���� B()�_�
-�����8XOGi�7w���_[��݁�Ҟ��H��pļ\	D�0��৔@�WU=������j.���
-�3�������U%��h�:w2A���R����(٘0�PbK����:Q4( ���)Q����T�ݧ~�F��:�[�U��=@:�<̯�1�.�
+xp���ewE���lSeCQݔ�oNѨ+jSF7���0p�*=-2U
����?ЌG�E��`a#K�|#�i�e��Z���cB�?��l=�LL�Q��K�>�bB#w�{B �q�b>$2��(ٛL� k��G���_	˸,,��%Z�}n��k�2빎$Ґ��&I���"�$oͮ,cIt&b2 :�ܭ���y����vz؟��k�;����l�w>��\�=E��<�ˬ����o��a��

data/README.md

@@ -26,12 +26,12 @@ Mongoid is tested against MRI 2.2, 2.3 and JRuby (9.1).
 Documentation
 -------------
 
-Please see the [MongoDB website](http://docs.mongodb.org/ecosystem/tutorial/ruby-mongoid-tutorial/#ruby-mongoid-tutorial) for up-to-date documentation on 5.0.0:
+Please see the [MongoDB website](http://docs.mongodb.org/ecosystem/tutorial/ruby-mongoid-tutorial/#ruby-mongoid-tutorial) for up-to-date documentation.
 
 License
 -------
 
-Copyright (c) 2009-2016 Durran Jordan
+Copyright (c) 2009-2017 Durran Jordan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/mongoid/attributes.rb

@@ -242,6 +242,18 @@ module Mongoid
         (selection.values.first == 1 && !selection_included?(name, selection, field))
     end
 
+    # Return type-casted attributes.
+    #
+    # @example Type-casted attributes.
+    #   document.typed_attributes
+    #
+    # @return [ Object ] The hash with keys and values of the type-casted attributes.
+    #
+    # @since 6.1.0
+    def typed_attributes
+      attribute_names.map { |name| [name, send(name)] }.to_h
+    end
+
     private
 
     def selection_excluded?(name, selection, field)

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

@@ -196,6 +196,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/criteria/queryable.rb

@@ -65,6 +65,7 @@ module Mongoid
         @options = Options.new(aliases, serializers)
         @selector = Selector.new(aliases, serializers)
         @pipeline = Pipeline.new(aliases)
+        @aggregating = nil
         yield(self) if block_given?
       end
 

data/lib/mongoid/criteria/queryable/forwardable.rb

@@ -46,13 +46,13 @@ module Mongoid
         # @since 1.0.0
         def __forward__(name, receiver)
           if self.class == Module
-            module_eval <<-SEL
+            module_eval <<-SEL, __FILE__, __LINE__ + 1
               def #{name}(*args, &block)
                 #{receiver}.__send__(:#{name}, *args, &block)
               end
             SEL
           else
-            (class << self; self; end).class_eval <<-SEL
+            singleton_class.class_eval <<-SEL, __FILE__, __LINE__ + 1
               def #{name}(*args, &block)
                 #{receiver}.__send__(:#{name}, *args, &block)
               end

data/lib/mongoid/document.rb

@@ -110,6 +110,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/persistable/updatable.rb

@@ -26,12 +26,7 @@ module Mongoid
       def update_attribute(name, value)
         as_writable_attribute!(name, value) do |access|
           normalized = name.to_s
-          setter = "#{normalized}="
-          if respond_to?(setter)
-            send(setter, value)
-          else
-            write_attribute(access, value)
-          end
+          process_attribute(normalized, value)
           save(validate: false)
         end
       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

@@ -81,7 +81,7 @@ module Mongoid
         # @return [ Symbol ] The method name.
         def define_relation_touch_method(name, extra_field = nil)
           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 = "6.1.0.rc0"
+  VERSION = "6.1.0"
 end

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

@@ -51,8 +51,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/app/models/dokument.rb

@@ -2,4 +2,5 @@ class Dokument
   include Mongoid::Document
   include Mongoid::Timestamps
   embeds_many :addresses, as: :addressable, validate: false
+  field :title
 end

data/spec/app/models/subscription.rb

@@ -1,4 +1,5 @@
 class Subscription
   include Mongoid::Document
   has_many :packs, class_name: "ShippingPack"
+  field :packs_count, type: Integer
 end

data/spec/mongoid/attributes_spec.rb

@@ -1385,6 +1385,21 @@ describe Mongoid::Attributes do
     end
   end
 
+  describe "#typed_attributes"  do
+    
+    let(:date_time) do
+      DateTime.current
+    end
+
+    let(:user) do
+      User.new(last_login: date_time)
+    end
+
+    it 'returns typecasted attributes' do
+      expect(user.typed_attributes).to include("last_login" => date_time)
+    end
+  end
+
   [:attributes=, :write_attributes].each do |method|
 
     describe "##{method}" do

data/spec/mongoid/persistable/settable_spec.rb

@@ -261,6 +261,50 @@ describe Mongoid::Persistable::Settable do
         expect(church.reload.location).to eq({ 'city' => 'Berlin', 'street' => 'Yorckstr.'})
       end
     end
+
+    context 'when the field is a bested 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
   end
 
   context 'when the field is not already set locally' do

data/spec/mongoid/persistable/updatable_spec.rb

@@ -112,6 +112,24 @@ describe Mongoid::Persistable::Updatable do
       end
     end
 
+    context "when dynamic attributes are not enabled" do
+
+      it "raises exception for an unknown attribute " do
+        account = Account.create
+
+        expect {
+          account.update_attribute(:somethingnew, "somethingnew")
+        }.to raise_error(Mongoid::Errors::UnknownAttribute)
+      end
+
+      it "will update value of aliased field" do
+        person = Person.create
+        person.update_attribute(:t, "test_value")
+        expect(person.reload.t).to eq "test_value"
+        expect(person.test).to eq "test_value"
+      end
+    end
+
     context "when provided a symbol attribute name" do
 
       let(:post) 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: 6.1.0.rc0
+  version: 6.1.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
@@ -862,7 +862,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.