mongoid 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d93faa3fdc0513cf6d8daafdf1ab90fd4744fd8
-  data.tar.gz: 77316de1b6bdd99154eacba90bd510b2ca636fdb
+  metadata.gz: ca6e4c501995a1483885dd73ee311c6f1ef818db
+  data.tar.gz: 7637900bde88e2c32c0b40e4f6ad09b82f1fd409
 SHA512:
-  metadata.gz: 9397767bc7a5cfb49438682bea971816f69a6053beb740cc2ab17fec5add3e59f08d72958464b762d3ad399612479b99810b629969ca184c1bebc65fb661c1b2
-  data.tar.gz: 0725f14ab25f26b0bc29e73b721d9bfe84de5a83119a7fd390957ef4c81c90d8a270725bb42d56b7f3e782cf059e9292815ba8c683585d80ba813ed20e20f809
+  metadata.gz: a471975f86db1e3f63fca5267f86722946ca19352445e22003b2181b279dfce7510d141037da8f14ccd4f81b8477dcecc07772ea61fbfe424f412ba637aabf0d
+  data.tar.gz: 42232d489eb95693bc6e0fcc49fa84b19e7b1ce5365b3a16fb2c3e676019208b50b3791139463a3d7d60089c1d7ae5ca1554046427a4f177c7feb06b861ec80c

data/lib/mongoid/config.rb

@@ -246,7 +246,7 @@ module Mongoid
     private
 
     def set_log_levels
-      Mongoid.logger.level = Mongoid::Config.log_level
+      Mongoid.logger.level = Mongoid::Config.log_level unless defined?(::Rails)
       Mongo::Logger.logger.level = Mongoid.logger.level
     end
 

data/lib/mongoid/matchable/and.rb

@@ -20,7 +20,7 @@ module Mongoid
           condition.keys.each do |k|
             key = k
             value = condition[k]
-            return false unless Matchable.matcher(document, key, value).matches?(value)
+            return false unless document.matches?(key => value)
           end
         end
         true

data/lib/mongoid/matchable/or.rb

@@ -21,7 +21,7 @@ module Mongoid
           condition.keys.each do |k|
             key = k
             value = condition[k]
-            res &&= Matchable.matcher(document, key, value).matches?(value)
+            res &&= document.matches?(key => value)
             break unless res
           end
           return res if res

data/lib/mongoid/relations/builders/nested_attributes/many.rb

@@ -97,14 +97,7 @@ module Mongoid
           def process_attributes(parent, attrs)
             return if reject?(parent, attrs)
             if id = attrs.extract_id
-              first = existing.first
-              converted = first ? convert_id(first.class, id) : id
-              doc = existing.find(converted)
-              if destroyable?(attrs)
-                destroy(parent, existing, doc)
-              else
-                update_document(doc, attrs)
-              end
+              update_nested_relation(parent, id, attrs)
             else
               existing.push(Factory.build(metadata.klass, attrs)) unless destroyable?(attrs)
             end
@@ -167,6 +160,38 @@ module Mongoid
               doc.update_attributes(attrs)
             end
           end
+
+          # Update nested relation.
+          #
+          # @api private
+          #
+          # @example Update nested relation.
+          #   builder.update_nested_relation(parent, id, attrs)
+          #
+          # @param [ Document ] parent The parent document.
+          # @param [ String, BSON::ObjectId ] id of the related document.
+          # @param [ Hash ] attrs The single document attributes to process.
+          #
+          # @since 6.0.0
+          def update_nested_relation(parent, id, attrs)
+            first = existing.first
+            converted = first ? convert_id(first.class, id) : id
+
+            if existing.where(id: converted).exists?
+              # document exists in relation
+              doc = existing.find(converted)
+              if destroyable?(attrs)
+                destroy(parent, existing, doc)
+              else
+                update_document(doc, attrs)
+              end
+            else
+              # push existing document to relation
+              doc = existing.unscoped.find(converted)
+              update_document(doc, attrs)
+              existing.push(doc) unless destroyable?(attrs)
+            end
+          end
         end
       end
     end

data/lib/mongoid/reloadable.rb

@@ -26,6 +26,7 @@ module Mongoid
       @attributes = reloaded
       @attributes_before_type_cast = {}
       changed_attributes.clear
+      reset_readonly
       apply_defaults
       reload_relations
       run_callbacks(:find) unless _find_callbacks.empty?

data/lib/mongoid/stateful.rb

@@ -104,5 +104,11 @@ module Mongoid
     def updateable?
       persisted? && changed?
     end
+
+    private
+
+    def reset_readonly
+      self.__selected_fields = nil
+    end
   end
 end

data/lib/mongoid/version.rb

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

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

@@ -92,7 +92,7 @@ development:
         # A passphrase for the private key.
         # ssl_key_pass_phrase: password
 
-        # Whether or not to do peer certification validation. (default: false)
+        # Whether or not to do peer certification validation. (default: true)
         # ssl_verify: true
 
         # The file containing a set of concatenated certification authority certifications
@@ -125,6 +125,11 @@ development:
 
     # Ensure all times are UTC in the app side. (default: false)
     # use_utc: false
+
+    # Set the Mongoid and Ruby driver log levels when not in a Rails
+    # environment. The Mongoid logger will be set to the Rails logger
+    # otherwise.(default: :info)
+    # log_level: :info
 test:
   clients:
     default:

data/spec/mongoid/attributes/nested_spec.rb

@@ -176,6 +176,27 @@ describe Mongoid::Attributes::Nested do
       it "sets the nested attributes" do
         expect(person.preferences.first.name).to eq("First")
       end
+
+      context "when adding existing document to a relation" do
+        let(:preference) { Preference.create(name: 'sample preference') }
+        let(:person) do
+          Person.new(
+            preferences_attributes: { 0 => { id: preference.id, name: preference.name } }
+          )
+        end
+
+        it "sets the nested attributes" do
+          expect(person.preferences.map(&:name)).to eq([preference.name])
+        end
+
+        it "updates attributes of existing document which is added to relation" do
+          preference_name = 'updated preference'
+          person = Person.new(
+            preferences_attributes: { 0 => { id: preference.id, name: preference_name } }
+          )
+          expect(person.preferences.map(&:name)).to eq([preference_name])
+        end
+      end
     end
 
     context "when the relation is a referenced in" do

data/spec/mongoid/config_spec.rb

@@ -63,6 +63,11 @@ describe Mongoid::Config do
   context "when the log level is not set in the configuration" do
 
     before do
+      if defined?(Rails)
+        RailsTemp = Rails
+        Object.send(:remove_const, :Rails)
+      end
+
       Mongoid.configure do |config|
         config.load_configuration(CONFIG)
       end
@@ -125,6 +130,35 @@ describe Mongoid::Config do
       it "sets the Mongo driver logger level" do
         expect(Mongo::Logger.logger.level).to eq(Logger::WARN)
       end
+
+      context "when in a Rails environment" do
+
+        before do
+          module Rails
+            def self.logger
+              ::Logger.new($stdout)
+            end
+          end
+          Mongoid.logger = Rails.logger
+          described_class.load!(file, :test)
+        end
+
+        after do
+          if defined?(Rails)
+            RailsTemp = Rails
+            Object.send(:remove_const, :Rails)
+          end
+        end
+
+        it "keeps the Mongoid logger level the same as the Rails logger" do
+          expect(Mongoid.logger.level).to eq(Rails.logger.level)
+          expect(Mongoid.logger.level).not_to eq(Mongoid::Config.log_level)
+        end
+
+        it "sets the Mongo driver logger level to Mongoid's logger level" do
+          expect(Mongo::Logger.logger.level).to eq(Mongoid.logger.level)
+        end
+      end
     end
 
     context "when provided an environment" do

data/spec/mongoid/matchable/and_spec.rb

@@ -31,6 +31,31 @@ describe Mongoid::Matchable::And do
           end
         end
 
+        context "when the expression is a $not" do
+
+          let(:matches) do
+            matcher.matches?([ { title: {:$not => /Foobar/ } }])
+          end
+
+          context "when the value matches" do
+
+            it "returns true" do
+              expect(matches).to be true
+            end
+          end
+
+          context "when the value does not match" do
+
+            before do
+              person.title = "Foobar baz"
+            end
+
+            it "returns false" do
+              expect(matches).to be false
+            end
+          end
+        end
+
         context "when the value does not match" do
 
           let(:matches) do

data/spec/mongoid/matchable/or_spec.rb

@@ -37,6 +37,31 @@ describe Mongoid::Matchable::Or do
           expect(matcher.matches?([])).to be false
         end
       end
+
+      context "when the expression is a $not" do
+
+        let(:matches) do
+          matcher.matches?([ { title: {:$not => /Foobar/ } }])
+        end
+
+        context "when the value matches" do
+
+          it "returns true" do
+            expect(matches).to be true
+          end
+        end
+
+        context "when the value does not match" do
+
+          before do
+            person.title = "Foobar baz"
+          end
+
+          it "returns false" do
+            expect(matches).to be false
+          end
+        end
+      end
     end
 
     context "when provided a complex expression" do

data/spec/mongoid/reloadable_spec.rb

@@ -284,5 +284,20 @@ describe Mongoid::Reloadable do
         expect(object.reload).to eq(from_db)
       end
     end
+
+    context 'when the document is readonly' do
+
+      before do
+        Person.create
+      end
+
+      let(:reloaded) do
+        Person.only(:name).first.reload
+      end
+
+      it 'resets the readonly state after reloading' do
+        expect(reloaded.readonly?).to be(false)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   ZIvvwAhgCjVW5QCi2I1noxXLmtZ3XDawWu8kaGtu8giHXcwL3941m8hvFZ/Wr9Yi
   JvcXJt2a4/JvwnIs2hmKuyfhZmB9HEE5wQQaCMnnC14=
   -----END CERTIFICATE-----
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-18 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.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.