mongoid 6.0.0.rc0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27ea8a75a0efde500417b73f4c4d38ab25f60c0b
-  data.tar.gz: 998d18056b79086719e963a84be38ca6d3682c6d
+  metadata.gz: ba5a14c6242427982c5072b4f2e56ab499ff7559
+  data.tar.gz: 39d47341e981c5facfd7360ae9a83c6b3bd2dc00
 SHA512:
-  metadata.gz: 1b948f4ba63c9fa1d749a71d5bb33856894736c3173bf52781702102ea90bdcb0b5b9f0547cc90d906589f1b1d088eef39b3a7f829c3dd7522142cb9f9113c51
-  data.tar.gz: 1e6feb48bf957d9596f6b3f150c1054f393f2ee0562e0be41e5827bc0518e73bd2d86c1344379729eea9c9f2660b05014a197c5721d2b40733eba9891cc69b2e
+  metadata.gz: 9e932dbd7064df798fae822b792a82b5b387a9c8daa93826158b15e5cbffe0ee59a0f92eb5b003d1e051097f4b017d6fc6f0c989bc00b363f4a8853a45689ccc
+  data.tar.gz: 4121c17953fa7b3786e30ed6d3f0c473d5ed7bd26dc59e700c9d41061cd83e318d0c6a62c0539a4d74d7561f8b9bf9eaa437cce41421358d98c139705ad9325b

data/README.md

@@ -21,7 +21,7 @@ Project Tracking
 Compatibility
 -------------
 
-Mongoid is tested against MRI 1.9.3, 2.0.0, 2.1.0. 2.2.0 and JRuby (1.9).
+Mongoid is tested against MRI 2.2, 2.3 and JRuby (9.1).
 
 Documentation
 -------------

data/lib/mongoid/contextual/map_reduce.rb

@@ -268,11 +268,29 @@ module Mongoid
       # @since 3.0.0
       def documents
         return results["results"] if results.has_key?("results")
-        view = client[output_collection].find
+        view = output_database[output_collection].find
         view.no_cursor_timeout if criteria.options[:timeout] == false
         view
       end
 
+      # Get the database that the map/reduce results were stored in.
+      #
+      # @api private
+      #
+      # @example Get the output database.
+      #   map_reduce.output_database
+      #
+      # @return [ Mongo::Database ] The output database.
+      #
+      # @since 6.0.0
+      def output_database
+        if db = command[:out].fetch(:db, command[:out]['db'])
+          client.with(database: db).database
+        else
+          client.database
+        end
+      end
+
       # Get the collection that the map/reduce results were stored in.
       #
       # @api private

data/lib/mongoid/document.rb

@@ -49,7 +49,7 @@ module Mongoid
     #
     # @since 2.0.0
     def freeze
-      as_document.freeze and self
+      as_attributes.freeze and self
     end
 
     # Checks if the document is frozen
@@ -172,20 +172,7 @@ module Mongoid
     #
     # @since 1.0.0
     def as_document
-      return attributes if frozen?
-      embedded_relations.each_pair do |name, meta|
-        without_autobuild do
-          relation, stored = send(name), meta.store_as
-          if attributes.key?(stored) || !relation.blank?
-            if relation
-              attributes[stored] = relation.as_document
-            else
-              attributes.delete(stored)
-            end
-          end
-        end
-      end
-      attributes
+      BSON::Document.new(as_attributes)
     end
 
     # Calls #as_json on the document with additional, Mongoid-specific options.
@@ -285,6 +272,25 @@ module Mongoid
       nil
     end
 
+    private
+
+    def as_attributes
+      return attributes if frozen?
+      embedded_relations.each_pair do |name, meta|
+        without_autobuild do
+          relation, stored = send(name), meta.store_as
+          if attributes.key?(stored) || !relation.blank?
+            if relation
+              attributes[stored] = relation.as_document
+            else
+              attributes.delete(stored)
+            end
+          end
+        end
+      end
+      attributes
+    end
+
     module ClassMethods
 
       # Performs class equality checking.

data/lib/mongoid/extensions/hash.rb

@@ -105,6 +105,7 @@ module Mongoid
         keys = string.split(".")
         value = self
         keys.each do |key|
+          return nil if value.nil?
           nested = value[key] || value[key.to_i]
           value = nested
         end

data/lib/mongoid/relations/eager/base.rb

@@ -48,7 +48,7 @@ module Mongoid
           @loaded = []
           while shift_metadata
             preload
-            @loaded << @docs.collect { |d| d.send(@metadata.name) }
+            @loaded << @docs.collect { |d| d.send(@metadata.name) if d.respond_to?(@metadata.name) }
           end
           @loaded.flatten
         end
@@ -99,12 +99,12 @@ module Mongoid
         # @example Return a hash with the current documents grouped by key.
         #   loader.grouped_docs
         #
-        # @return [ Hash ] hash with groupd documents.
+        # @return [ Hash ] hash with grouped documents.
         #
         # @since 4.0.0
         def grouped_docs
           @grouped_docs[@metadata.name] ||= @docs.group_by do |doc|
-            doc.send(group_by_key)
+            doc.send(group_by_key) if doc.respond_to?(group_by_key)
           end
         end
 
@@ -145,7 +145,7 @@ module Mongoid
         #
         # @since 4.0.0
         def set_relation(doc, element)
-          doc.set_relation(@metadata.name, element)
+          doc.set_relation(@metadata.name, element) unless doc.blank?
         end
       end
     end

data/lib/mongoid/relations/eager/has_and_belongs_to_many.rb

@@ -31,7 +31,7 @@ module Mongoid
         end
 
         def set_relation(doc, element)
-          doc.__build__(@metadata.name, element, @metadata)
+          doc.__build__(@metadata.name, element, @metadata) unless doc.blank?
         end
 
         def group_by_key

data/lib/mongoid/relations/eager/has_many.rb

@@ -22,7 +22,7 @@ module Mongoid
         end
 
         def set_relation(doc, element)
-          doc.__build__(@metadata.name, element, @metadata)
+          doc.__build__(@metadata.name, element, @metadata) unless doc.blank?
         end
 
         def group_by_key

data/lib/mongoid/version.rb

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

data/spec/mongoid/contextual/mongo_spec.rb

@@ -115,21 +115,6 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
-    context "when provided a document" do
-
-      let(:context) do
-        described_class.new(criteria)
-      end
-
-      let(:count) do
-        context.count(depeche)
-      end
-
-      it "returns the number of documents that match" do
-        expect(count).to eq(1)
-      end
-    end
-
     context "when provided a block" do
 
       let(:context) do
@@ -1400,6 +1385,65 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
+    context "when the output specifies a different db" do
+
+      let(:criteria) do
+        Band.limit(1)
+      end
+
+      let(:context) do
+        described_class.new(criteria)
+      end
+
+      after do
+        Band.with(database: 'another-db') do |b|
+          b.all.delete
+        end
+      end
+
+      context 'when db is a string' do
+
+        let(:results) do
+          context.map_reduce(map, reduce).out(merge: :mr_output, db: 'another-db')
+        end
+
+        it "returns the correct number of documents" do
+          expect(results.count).to eq(1)
+        end
+
+        it "contains the entire results" do
+          expect(results).to eq([
+                                    { "_id" => "Depeche Mode", "value" => { "likes" => 200 }}
+                                ])
+        end
+
+        it 'writes to the specified db' do
+          expect(Band.mongo_client.with(database: 'another-db')[:mr_output].find.count).to eq(1)
+        end
+      end
+
+      context 'when db is a symbol' do
+
+        let(:results) do
+          context.map_reduce(map, reduce).out(merge: :mr_output, 'db' => 'another-db')
+        end
+
+        it "returns the correct number of documents" do
+          expect(results.count).to eq(1)
+        end
+
+        it "contains the entire results" do
+          expect(results).to eq([
+                                    { "_id" => "Depeche Mode", "value" => { "likes" => 200 }}
+                                ])
+        end
+
+        it 'writes to the specified db' do
+          expect(Band.mongo_client.with(database: 'another-db')[:mr_output].find.count).to eq(1)
+        end
+      end
+    end
+
     context "when providing no output" do
 
       let(:criteria) do

data/spec/mongoid/document_spec.rb

@@ -450,14 +450,26 @@ describe Mongoid::Document do
       expect(person.as_document).to have_key("name")
     end
 
+    it "includes embeds one attributes as a symbol" do
+      expect(person.as_document).to have_key(:name)
+    end
+
     it "includes embeds many attributes" do
       expect(person.as_document).to have_key("addresses")
     end
 
+    it "includes embeds many attributes as a symbol" do
+      expect(person.as_document).to have_key(:addresses)
+    end
+
     it "includes second level embeds many attributes" do
       expect(person.as_document["addresses"].first).to have_key("locations")
     end
 
+    it "includes second level embeds many attributes as a symbol" do
+      expect(person.as_document["addresses"].first).to have_key(:locations)
+    end
+
     context "with relation define store_as option in embeded_many" do
 
       let!(:phone) do
@@ -468,6 +480,10 @@ describe Mongoid::Document do
         expect(person.as_document).to have_key("mobile_phones")
       end
 
+      it 'includes the store_as key association as a symbol' do
+        expect(person.as_document).to have_key(:mobile_phones)
+      end
+
       it 'should not include the key of association' do
         expect(person.as_document).to_not have_key("phones")
       end

data/spec/mongoid/extensions/hash_spec.rb

@@ -247,6 +247,21 @@ describe Mongoid::Extensions::Hash do
     end
   end
 
+  context "when the parent key is not present" do
+
+    let(:hash) do
+      { "101" => { "name" => "hundred and one" } }
+    end
+
+    let(:nested) do
+      hash.__nested__("100.name")
+    end
+
+    it "should return nil" do
+      expect(nested).to eq(nil)
+    end
+  end
+
   describe ".demongoize" do
 
     let(:hash) do

data/spec/mongoid/query_cache_spec.rb

@@ -38,7 +38,7 @@ describe Mongoid::QueryCache do
         end
 
         it 'queries for each access to the base' do
-          expect(server).to receive(:context).exactly(relations.size).times.and_call_original
+          expect(server).to receive(:with_connection).exactly(relations.size).times.and_call_original
           relations.each do |object|
             object.person
           end
@@ -52,7 +52,7 @@ describe Mongoid::QueryCache do
         end
 
         it 'queries only once for the base' do
-          expect(server).to receive(:context).exactly(1).times.and_call_original
+          expect(server).to receive(:with_connection).exactly(1).times.and_call_original
           relations.each do |object|
             object.person
           end

data/spec/mongoid/relations/eager_spec.rb

@@ -181,6 +181,46 @@ describe Mongoid::Relations::Eager do
         expect(Mongoid::Relations::Eager::HasAndBelongsToMany).to receive(:new).with([houses_metadata], docs).once.and_call_original
         context.eager_load(docs)
       end
+
+      context 'when one of the eager loading definitions is nested' do
+
+        before do
+          class User
+            include Mongoid::Document
+          end
+
+          class Unit
+            include Mongoid::Document
+          end
+
+          class Booking
+            include Mongoid::Document
+            belongs_to :unit
+            has_many :vouchers
+          end
+
+          class Voucher
+            include Mongoid::Document
+            belongs_to :booking
+            belongs_to :created_by, class_name: 'User'
+          end
+        end
+
+        it 'successfully loads all relations' do
+          user = User.create
+          unit = Unit.create
+          booking = Booking.create(unit: unit)
+          Voucher.create(booking: booking, created_by: user)
+
+          vouchers = Voucher.includes(:created_by, booking: [:unit])
+
+          vouchers.each do |voucher|
+            expect(voucher.created_by).to eql(user)
+            expect(voucher.booking).to eql(booking)
+            expect(voucher.booking.unit).to eql(unit)
+          end
+        end
+      end
     end
 
     context "when including two of the same relation type" do

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

@@ -879,6 +879,36 @@ describe Mongoid::Relations::Embedded::Many do
       Person.create
     end
 
+    context 'when a string is used to access an attribute' do
+
+      let!(:address) do
+        person.addresses.create(street: "one")
+      end
+
+      let(:document) do
+        person.reload.addresses.as_document.first
+      end
+
+      it "returns the attribute value" do
+        expect(document['street']).to eq('one')
+      end
+    end
+
+    context 'when a symbol is used to access an attribute' do
+
+      let!(:address) do
+        person.addresses.create(street: "one")
+      end
+
+      let(:document) do
+        person.reload.addresses.as_document.first
+      end
+
+      it "returns the attribute value" do
+        expect(document[:street]).to eq('one')
+      end
+    end
+
     context "when the relation has no default scope" do
 
       let!(:address) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc0
+  version: 6.0.0
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   ZIvvwAhgCjVW5QCi2I1noxXLmtZ3XDawWu8kaGtu8giHXcwL3941m8hvFZ/Wr9Yi
   JvcXJt2a4/JvwnIs2hmKuyfhZmB9HEE5wQQaCMnnC14=
   -----END CERTIFICATE-----
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -52,14 +52,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email: