mongoid 5.0.0.beta → 5.0.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da1ad4f848fcad2ee5ad4eee51d2d31eb444d900
-  data.tar.gz: a373cbfa6a5541b9bbc3dd37b119458c91bb16fc
+  metadata.gz: 54ef20325b3cd2e53ac0f9f3ab587fdef250af88
+  data.tar.gz: 3a2230b51c21767e0d0255f83b0d26cfd016585c
 SHA512:
-  metadata.gz: 1ff95e684aca5bc7a4b1d3293a3f1dd6feb5ad24e1d711f86db32a6d7b5cd86159846ee23524376ecfccf8638d837928a10f8514ed015e65d38be5b8bf466f9a
-  data.tar.gz: fba913e1cdb0a81796016bb266d8fbd14173f044e53ad94de35576f017b2373009302d57f9ab736458e7fdda5587391a505e1ba6de47a880ac0a6d3f2942e01a
+  metadata.gz: d5922a0735e4a5245b095e28abd81ebed7513169a0586dfc8b137cb645adce577d202f2928746f2d87c0cf4f384928dfbd2e3f93402e21cafc88f0a9bfb4c178
+  data.tar.gz: 6b8aef5ac85b8715ee9106bc018ca2abda954766b8277e98d6e9a7134e6986d5645c83291b4ee520cf294687816d0c52cd0ddebae7a51e1ee31341b6f13d175b

data/README.md

@@ -1,23 +1,15 @@
 # Mongoid
-[![Build Status](https://travis-ci.org/mongoid/mongoid.svg?branch=master)](https://travis-ci.org/mongoid/mongoid) 
-[![Code Climate](https://codeclimate.com/github/mongoid/mongoid.svg)](https://codeclimate.com/github/mongoid/mongoid)
-[![Coverage Status](https://img.shields.io/coveralls/mongoid/mongoid/master.svg)](https://coveralls.io/r/mongoid/mongoid?branch=master)
+[![Build Status](https://travis-ci.org/mongodb/mongoid.svg?branch=master)](https://travis-ci.org/mongodb/mongoid)
+[![Code Climate](https://codeclimate.com/github/mongodb/mongoid.svg)](https://codeclimate.com/github/mongodb/mongoid)
+[![Coverage Status](https://img.shields.io/coveralls/mongodb/mongoid/master.svg)](https://coveralls.io/r/mongodb/mongoid?branch=master)
 [![Dependency Status](https://www.versioneye.com/ruby/mongoid/4.0.0/badge.svg)](https://www.versioneye.com/ruby/mongoid/4.0.0)
 
-
 Mongoid is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.
 
-Project Move and Support
-------------------------
-
-For the upcoming 5.0.0 release, the repository will be getting moved to the MongoDB
-organization. Please pay special attention to the following information with regards
-to this move:
+Issues
+------
 
-* 5.0.0 and higher releases of Mongoid will be officially supported by MongoDB with a dedicated team.
-* Issues tagged 5.0.0 and higher in Github will be migrated to the [Mongoid Jira project](https://jira.mongodb.org/browse/MONGOID/) upon the release. There will be no more Github issues.
-* 4.x and 3.x releases will no longer be supported. Fixes to these branches will need to be maintained in community forks, although not recommended.
-* 5.0.0 release will still be supporting Rails 4.x, although there will be some backwards incompatible changes with respect to the configuration options. The Mongoid public API itself will not be changed.
+Issues are now in the [Mongoid Jira project](https://jira.mongodb.org/browse/MONGOID/).
 
 Project Tracking
 ----------------
@@ -35,8 +27,7 @@ Mongoid is tested against MRI 1.9.3, 2.0.0, 2.1.0. 2.2.0 and JRuby (1.9).
 Documentation
 -------------
 
-Please see the new Mongoid website for up-to-date documentation:
-[mongoid.org](http://mongoid.org)
+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:
 
 License
 -------

data/lib/config/locales/en.yml

@@ -4,6 +4,9 @@ en:
       messages:
         blank_in_locale:
           "can't be blank in %{location}"
+        message_title: "message"
+        summary_title: "summary"
+        resolution_title: "resolution"
         ambiguous_relationship:
           message: "Ambiguous relations %{candidates} defined on %{klass}."
           summary:
@@ -442,8 +445,8 @@ en:
         unsaved_document:
           message: "Attempted to save %{document} before the parent %{base}."
           summary: "You cannot call create or create! through the
-            relation (%{document}) who's parent (%{base}) is
-            not already saved. This would case the database to be out of sync
+            relation (%{document}) whose parent (%{base}) is
+            not already saved. This would cause the database to be out of sync
             since the child could potentially reference a nonexistant parent."
           resolution: "Make sure to only use create or create! when the parent
             document %{base} is persisted."

data/lib/mongoid/clients.rb

@@ -118,8 +118,7 @@ module Mongoid
         name = client_name
         client = Clients.with_name(name)
         client = client.use(database_name)
-        client = client.with(self.persistence_options)
-        Clients.set(name, client)
+        client.with(self.persistence_options)
       end
       alias :mongo_session :mongo_client
       deprecate :mongo_session, :mongo_client, 2015, 12

data/lib/mongoid/config/validators/option.rb

@@ -9,7 +9,7 @@ module Mongoid
 
         # Validate a configuration option.
         #
-        # @example Validate a configuraiton option.
+        # @example Validate a configuration option.
         #
         # @param [ String ] option The name of the option.
         #

data/lib/mongoid/criteria.rb

@@ -195,7 +195,7 @@ module Mongoid
     end
 
     # Eager loads all the provided relations. Will load all the documents
-    # into the identity map who's ids match based on the extra query for the
+    # into the identity map whose ids match based on the extra query for the
     # ids.
     #
     # @note This will work for embedded relations that reference another

data/lib/mongoid/errors/mongoid_error.rb

@@ -21,10 +21,14 @@ module Mongoid
         @problem = problem(key, attributes)
         @summary = summary(key, attributes)
         @resolution = resolution(key, attributes)
+        @problem_title = translate("message_title", {})
+        @summary_title = translate("summary_title", {})
+        @resolution_title = translate("resolution_title", {})
 
-        "\nProblem:\n  #{@problem}"+
-        "\nSummary:\n  #{@summary}"+
-        "\nResolution:\n  #{@resolution}"
+
+        "\n#{@problem_title}:\n  #{@problem}"+
+        "\n#{@summary_title}:\n  #{@summary}"+
+        "\n#{@resolution_title}:\n  #{@resolution}"
       end
 
       private

data/lib/mongoid/railtie.rb

@@ -60,11 +60,11 @@ module Rails
             ::Mongoid.load!(config_file)
           rescue ::Mongoid::Errors::NoClientsConfig => e
             handle_configuration_error(e)
-          rescue ::Mongoid::Errors::NoDefaultSession => e
+          rescue ::Mongoid::Errors::NoDefaultClient => e
             handle_configuration_error(e)
-          rescue ::Mongoid::Errors::NoSessionDatabase => e
+          rescue ::Mongoid::Errors::NoClientDatabase => e
             handle_configuration_error(e)
-          rescue ::Mongoid::Errors::NoSessionHosts => e
+          rescue ::Mongoid::Errors::NoClientHosts => e
             handle_configuration_error(e)
           end
         end

data/lib/mongoid/relations/embedded/one.rb

@@ -20,6 +20,7 @@ module Mongoid
             characterize_one(target)
             bind_one
             characterize_one(target)
+            base._reset_memoized_children!
             target.save if persistable?
           end
         end

data/lib/mongoid/tasks/database.rb

@@ -107,7 +107,7 @@ module Mongoid
 
       private
       def logger
-        @logger ||= Logger.new($stdout)
+        Mongoid.logger
       end
     end
   end

data/lib/mongoid/traversable.rb

@@ -139,6 +139,7 @@ module Mongoid
     #
     # @since 5.0.0
     def _reset_memoized_children!
+      _parent._reset_memoized_children! if _parent
       @__children = nil
     end
 

data/lib/mongoid/version.rb

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

data/spec/app/models/code.rb

@@ -2,4 +2,10 @@ class Code
   include Mongoid::Document
   field :name, type: String
   embedded_in :address
+  embeds_one :deepest
+end
+
+class Deepest
+  include Mongoid::Document
+  embedded_in :code
 end

data/spec/mongoid/changeable_spec.rb

@@ -1625,4 +1625,90 @@ describe Mongoid::Changeable do
       expect(person.setters).to_not eq({ "addresses" => nil })
     end
   end
+
+  context 'when nesting deeply embedded documents' do
+
+    context 'when persisting the root document' do
+
+      let!(:person) do
+        Person.create
+      end
+
+      it 'is not marked as changed' do
+        expect(person).to_not be_changed
+      end
+
+      context 'when creating a new first level embedded document' do
+
+        let!(:address) do
+          person.addresses.new(street: 'goltzstr.')
+        end
+
+        it 'flags the root document as changed' do
+          expect(person).to be_changed
+        end
+
+        it 'flags the first level child as changed' do
+          expect(address).to be_changed
+        end
+
+        context 'when building the lowest level document' do
+
+          before do
+            person.save
+          end
+
+          let!(:code) do
+            address.build_code
+          end
+
+          it 'flags the root document as changed' do
+            expect(person).to be_changed
+          end
+
+          it 'flags the first level embedded document as changed' do
+            expect(address).to be_changed
+          end
+
+          it 'flags the lowest level embedded document as changed' do
+            expect(code).to be_changed
+          end
+
+          context 'when saving the hierarchy' do
+
+            before do
+              person.save
+            end
+
+            let(:reloaded) do
+              Person.find(person.id)
+            end
+
+            it 'saves the first embedded document' do
+              expect(reloaded.addresses.first).to eq(address)
+            end
+
+            it 'saves the lowest level embedded document' do
+              expect(reloaded.addresses.first.code).to eq(code)
+            end
+
+            context 'when embedding further' do
+
+              let!(:deepest) do
+                reloaded.addresses.first.code.build_deepest
+              end
+
+              before do
+                reloaded.save
+              end
+
+              it 'saves the deepest embedded document' do
+                expect(reloaded.reload.addresses.first.code.deepest).to eq(deepest)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/clients_spec.rb

@@ -519,6 +519,21 @@ describe Mongoid::Clients do
 
   describe ".with", if: non_legacy_server? do
 
+    context "when changing write concern options" do
+
+      let(:client_one) do
+        Band.with(write: { w: 2 }).mongo_client
+      end
+
+      let(:client_two) do
+        Band.mongo_client
+      end
+
+      it "does not carry over the options" do
+        expect(client_one.write_concern).to_not eq(client_two.write_concern)
+      end
+    end
+
     context "when sending operations to a different database" do
 
       after do

data/spec/mongoid/errors/mongoid_error_spec.rb

@@ -7,6 +7,10 @@ describe Mongoid::Errors::MongoidError do
   let(:options) { {} }
 
   before do
+    {"message_title" => "message", "summary_title" => "summary", "resolution_title" => "resolution"}.each do |key, name|
+      expect(::I18n).to receive(:translate).with("mongoid.errors.messages.#{key}", {}).and_return(name)
+    end
+
     ["message", "summary", "resolution"].each do |name|
       expect(::I18n).to receive(:translate).
         with("mongoid.errors.messages.#{key}.#{name}", {}).
@@ -29,6 +33,18 @@ describe Mongoid::Errors::MongoidError do
     it "sets ivar resolution" do
       expect(error.instance_variable_get(:@resolution)).to be
     end
+
+    it "sets ivar problem_title" do
+      expect(error.instance_variable_get(:@problem_title)).to be
+    end
+
+    it "sets ivar summary_title" do
+      expect(error.instance_variable_get(:@summary_title)).to be
+    end
+
+    it "sets ivar resolution_title" do
+      expect(error.instance_variable_get(:@resolution_title)).to be
+    end
   end
 
   describe "#to_json" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta
+  version: 5.0.0.rc0
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0.beta
+        version: 2.1.0.rc0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0.beta
+        version: 2.1.0.rc0
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement