mongoid 5.1.5 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf3bc71acef310e6e22c9900a173ef44adcffe9
-  data.tar.gz: 3178495b48b2377e77929352b9349c02adee7017
+  metadata.gz: 30bdab646c31a7e88e39456de765a87455bbe1ff
+  data.tar.gz: d8ebddf7e3b5dc3838bbc57277e34c5abce7dfc1
 SHA512:
-  metadata.gz: 16106f196625909b1bbefd3bea0ab5e7b3397cd8055108c01c7f5b1ae7dc485810a9fa78ab5975b3794e2db8a2fe2b82d9c8d3e18b69e762f2ff994727397eba
-  data.tar.gz: e08c0e8efaa17427d5d3e329322dd367b72a44eb5f3a5c9e2d0d1c9bf5d4bebcae313ee155dbb5f78578cd98a767f2a7e78fad5747c87221176da465321384ab
+  metadata.gz: 1812af097622c5a03c8819da5e55c0ebba39f1aace28a394a4e72b05a71532f9f710dda776d72c734d5326daa918d890ac8991ca7a34cd94296630fbfd32dda3
+  data.tar.gz: 974bebd0d9e74d07c93c9b242328656fb572e21d1ed9de634c5e1268d736fe0e61dac80a6c99e16cfc7a1fbefd28a8d5553dc67360f051508bd83402b84a52df

data/lib/mongoid/contextual/aggregable/mongo.rb

@@ -124,7 +124,6 @@ module Mongoid
         def pipeline(field)
           db_field = "$#{database_field_name(field)}"
           pipeline = []
-          pipeline << { "$match" => criteria.selector }
           pipeline << { "$match" =>  criteria.exists(field => true).selector }
           pipeline << { "$sort" => criteria.options[:sort] } if criteria.options[:sort]
           pipeline << { "$skip" => criteria.options[:skip] } if criteria.options[:skip]

data/lib/mongoid/contextual/map_reduce.rb

@@ -299,7 +299,7 @@ module Mongoid
       # @since 3.0.0
       def results
         raise Errors::NoMapReduceOutput.new(command) unless command[:out]
-        @results ||= __client__.command(command).first
+        @results ||= __client__.command(command,__client__.options).first
       end
 
       # Get the client with the proper consistency.

data/lib/mongoid/contextual/mongo.rb

@@ -653,6 +653,7 @@ module Mongoid
       # @since 3.0.0
       def documents_for_iteration
         return documents if cached? && !documents.empty?
+        return view unless eager_loadable?
         docs = view.map{ |doc| Factory.from_db(klass, doc, criteria.options[:fields]) }
         eager_load(docs)
       end
@@ -670,8 +671,10 @@ module Mongoid
       #
       # @since 3.0.0
       def yield_document(document, &block)
-        yield(document)
-        documents.push(document) if cacheable?
+        doc = document.respond_to?(:_id) ?
+            document : Factory.from_db(klass, document, criteria.options[:fields])
+        yield(doc)
+        documents.push(doc) if cacheable?
       end
     end
   end

data/lib/mongoid/fields/localized.rb

@@ -77,9 +77,14 @@ module Mongoid
       # @since 3.0.0
       def lookup(object)
         locale = ::I18n.locale
-        if value = object[locale.to_s]
-          value
-        elsif fallbacks? && ::I18n.respond_to?(:fallbacks)
+
+        value = if object.key?(locale.to_s)
+          object[locale.to_s]
+        elsif object.key?(locale)
+          object[locale]
+        end
+        return value unless value.nil?
+        if fallbacks? && ::I18n.respond_to?(:fallbacks)
           object[::I18n.fallbacks[locale].map(&:to_s).find{ |loc| object.has_key?(loc) }]
         end
       end

data/lib/mongoid/query_cache.rb

@@ -70,6 +70,20 @@ module Mongoid
       ensure
         QueryCache.enabled = enabled
       end
+
+      # Execute the block with the query cache disabled.
+      #
+      # @example Execute without the cache.
+      #   QueryCache.uncached { collection.find }
+      #
+      # @return [ Object ] The result of the block.
+      def uncached
+        enabled = QueryCache.enabled?
+        QueryCache.enabled = false
+        yield
+      ensure
+        QueryCache.enabled = enabled
+      end
     end
 
     # The middleware to be added to a rack application in order to activate the
@@ -222,7 +236,7 @@ module Mongoid
 
       def cached_cursor
         if limit
-          key = [ collection.namespace, selector, nil, skip, projection ]
+          key = [ collection.namespace, selector, nil, skip, sort, projection ]
           cursor = QueryCache.cache_table[key]
           if cursor
             limited_docs = cursor.to_a[0...limit.abs]
@@ -233,7 +247,7 @@ module Mongoid
       end
 
       def cache_key
-        [ collection.namespace, selector, limit, skip, projection ]
+        [ collection.namespace, selector, limit, skip, sort, projection ]
       end
 
       def system_collection?
@@ -252,8 +266,16 @@ module Mongoid
         alias_query_cache_clear :insert_one, :insert_many
       end
     end
+
+    # Bypass the query cache when reloading a document.
+    module Document
+      def reload
+        QueryCache.uncached { super }
+      end
+    end
   end
 end
 
 Mongo::Collection.__send__(:include, Mongoid::QueryCache::Collection)
 Mongo::Collection::View.__send__(:include, Mongoid::QueryCache::View)
+Mongoid::Document.__send__(:include, Mongoid::QueryCache::Document)

data/lib/mongoid/version.rb

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

data/spec/mongoid/contextual/map_reduce_spec.rb

@@ -331,6 +331,31 @@ describe Mongoid::Contextual::MapReduce do
     end
   end
 
+  describe "#raw" do
+    let(:criteria) { Band.all }
+    let(:client) { collection.database.client }
+    let(:map_reduce) { described_class.new(collection, criteria, map, reduce) }
+
+    subject { map_reduce.raw }
+
+    it { expect{subject}.to raise_error(Mongoid::Errors::NoMapReduceOutput) }
+
+    context "when providing inline" do
+      let!(:out) { map_reduce.out(inline: 1) }
+
+      before { allow(client).to receive(:command).and_return(['result', 'from', 'client.command']) }
+
+      it "passes the command to the client, using the client options" do
+        expect(client).to receive(:command).with(out.command, client.options)
+        subject
+      end
+
+      it "returns the first element from the result array of client.command" do
+        expect(subject).to eq('result')
+      end
+    end
+  end
+
   describe "#reduced" do
 
     let(:criteria) do

data/spec/mongoid/contextual/mongo_spec.rb

@@ -398,9 +398,22 @@ describe Mongoid::Contextual::Mongo do
 
         context "when iterating with next" do
 
+          before do
+            10.times { |i| Band.create(name: "Test #{i}") }
+          end
+
+          let(:criteria) do
+            Band.batch_size(5)
+          end
+
           it "yields mongoid documents" do
             expect(enum.next).to be_a(Mongoid::Document)
           end
+
+          it "does not load all documents" do
+            expect(Mongo::Logger.logger).to receive(:debug?).exactly(2).times.and_call_original
+            enum.next
+          end
         end
       end
     end
@@ -1715,26 +1728,31 @@ describe Mongoid::Contextual::Mongo do
 
   describe '#pipeline' do
 
-    context 'when the criteria has a selector' do
+    context 'when the criteria has a selector', if: non_legacy_server? do
+
+      before do
+        Artist.index(name: "text")
+        Artist.create_indexes
+      end
 
       let(:criteria) do
-        Band.where(name: "New Order")
+        Artist.text_search("New Order")
       end
 
       let(:context) do
         described_class.new(criteria)
       end
 
-      let(:matches_operators) do
-        context.send(:pipeline, 'name').select { |o| o['$match'] }
+      let(:pipeline_match) do
+        context.send(:pipeline, :some_field).first['$match']
       end
 
       it 'creates a pipeline with the selector as one of the $match criteria' do
-        expect(matches_operators).to include('$match' => criteria.selector)
+        expect(pipeline_match).to include({ :'$text' => { :'$search' => "New Order" } })
       end
 
       it 'creates a pipeline with the $exists operator as one of the $match criteria' do
-        expect(matches_operators).to include('$match' => { 'name' => { '$exists' => true } })
+        expect(pipeline_match).to include({ 'some_field' => { '$exists' => true } })
       end
     end
   end

data/spec/mongoid/criteria_spec.rb

@@ -3078,14 +3078,14 @@ describe Mongoid::Criteria do
       context "when not including private methods" do
 
         it "returns false" do
-          expect(criteria).to_not respond_to(:fork)
+          expect(criteria).to_not respond_to(:initialize_copy)
         end
       end
 
       context "when including private methods" do
 
         it "returns true" do
-          expect(criteria.respond_to?(:fork, true)).to be true
+          expect(criteria.respond_to?(:initialize_copy, true)).to be true
         end
       end
     end

data/spec/mongoid/extensions/time_spec.rb

@@ -281,7 +281,7 @@ describe Mongoid::Extensions::Time do
       end
 
       it "does not alter seconds with fractions" do
-        expect(DateTime.mongoize(11.11).to_f).to eq(11.11)
+        expect(DateTime.mongoize(1.11).to_f).to eq(1.11)
       end
 
       context "when using the ActiveSupport time zone" do
@@ -344,7 +344,7 @@ describe Mongoid::Extensions::Time do
       end
 
       it "does not alter seconds with fractions" do
-        expect(Time.mongoize(102.63).to_f).to eq(102.63)
+        expect(Time.mongoize(102.25).to_f).to eq(102.25)
       end
     end
 

data/spec/mongoid/fields/localized_spec.rb

@@ -430,6 +430,97 @@ describe Mongoid::Fields::Localized do
           expect(value).to eq({ "de" => 100 })
         end
       end
+
+      context 'when the type is Boolean' do
+
+        before do
+          I18n.enforce_available_locales = false
+          ::I18n.locale = :de
+        end
+
+        after do
+          ::I18n.locale = :en
+        end
+
+        context "when the value is false" do
+
+          let(:field) do
+            described_class.new(:boolean_value, localize: true, type: Boolean)
+          end
+
+          let(:value) do
+            field.demongoize({ "de" => false })
+          end
+
+          it "returns the boolean value from the set locale" do
+            expect(value).to eq(false)
+          end
+        end
+
+        context "when the value is true" do
+
+          let(:field) do
+            described_class.new(:boolean_value, localize: true, type: Boolean)
+          end
+
+          let(:value) do
+            field.demongoize({"de" => true})
+          end
+
+          it "returns the boolean value from the set locale" do
+            expect(value).to eq(true)
+          end
+        end
+
+        context "when fallbacks are defined" do
+
+          before(:all) do
+            require "i18n/backend/fallbacks"
+            I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+          end
+
+          context "when the lookup does not need to use fallbacks" do
+
+            context "when the value is false" do
+
+              before do
+                ::I18n.fallbacks[:de] = [:en, :es]
+              end
+
+              let(:field) do
+                described_class.new(:boolean_value, localize: true, type: Boolean)
+              end
+
+              let(:value) do
+                field.demongoize({"de" => false})
+              end
+
+              it "returns the boolean value from the set locale" do
+                expect(value).to eq(false)
+              end
+            end
+
+            context "when the value is true" do
+
+              before do
+                ::I18n.fallbacks[:de] = [:en, :es]
+              end
+
+              let(:field) do
+                described_class.new(:boolean_value, localize: true, type: Boolean)
+              end
+
+              let(:value) do
+                field.demongoize({"de" => true})
+              end
+
+              it "returns the boolean value from the set locale" do
+                expect(value).to eq(true)
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

data/spec/mongoid/indexable_spec.rb

@@ -149,6 +149,7 @@ describe Mongoid::Indexable do
       Class.new do
         include Mongoid::Document
         field :a, as: :authentication_token
+        store_in collection: :specs
       end
     end
 

data/spec/mongoid/query_cache_spec.rb

@@ -173,6 +173,27 @@ describe Mongoid::QueryCache do
       end
     end
 
+    context "when sorting documents" do
+      before do
+        Band.asc(:id).to_a
+      end
+
+      context "with different selector" do
+
+        it "queries again" do
+          expect_query(1) do
+            Band.desc(:id).to_a
+          end
+        end
+      end
+
+      it "does not query again" do
+        expect_query(0) do
+          Band.asc(:id).to_a
+        end
+      end
+    end
+
     context "when query caching is enabled and the batch_size is set" do
 
       around(:each) do |example|
@@ -250,6 +271,37 @@ describe Mongoid::QueryCache do
     end
   end
 
+  context "when reloading a document" do
+
+    let!(:band_id) do
+      Band.create.id
+    end
+
+    context 'when query cache is disabled' do
+
+      before do
+        Mongoid::QueryCache.enabled = false
+      end
+
+      it "queries again" do
+        band = Band.find(band_id)
+        expect_query(1) do
+          band.reload
+        end
+      end
+    end
+
+    context 'when query cache is enabled' do
+
+      it "queries again" do
+        band = Band.find(band_id)
+        expect_query(1) do
+          band.reload
+        end
+      end
+    end
+  end
+
   context "when querying a very large collection" do
 
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 5.1.5
+  version: 5.1.6
 platform: ruby
 authors:
 - Durran Jordan
@@ -12,7 +12,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
   ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTE1MTEwMzE0NTUwNFoXDTE2MTEwMjE0NTUwNFowQjEUMBIGA1UEAwwL
+  Y29tMB4XDTE2MTIwMTE0MDcxMloXDTE3MTIwMTE0MDcxMlowQjEUMBIGA1UEAwwL
   ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
   ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
   bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
@@ -23,14 +23,14 @@ cert_chain:
   u8KAcPHm5KkCAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
   BBYEFFt3WbF+9JpUjAoj62cQBgNb8HzXMCAGA1UdEQQZMBeBFWRyaXZlci1ydWJ5
   QDEwZ2VuLmNvbTAgBgNVHRIEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5jb20wDQYJ
-  KoZIhvcNAQEFBQADggEBAMwy++EdX3KKnivddRt3S9et0WVYusH2PwDRX9o4REcF
-  mNcAtKnhN8OQ+irEGVNrqJFiHhUmuMo+v9FWJ5OA0/gKRUfFJAWj4WfBi3sRCPxv
-  7Hmy3V7Cz+nLCdUl4uoe0bn6wY/zpX8tHCtcLBLCy2aQ0ijbDwA5TdlkV8q5vPId
-  ZS0pBTqHap4VMl2F63o6+qWdqhvikKM1NVYkTxUmvRlDjKM5sQAph7JOAaWjA6Fh
-  ZIvvwAhgCjVW5QCi2I1noxXLmtZ3XDawWu8kaGtu8giHXcwL3941m8hvFZ/Wr9Yi
-  JvcXJt2a4/JvwnIs2hmKuyfhZmB9HEE5wQQaCMnnC14=
+  KoZIhvcNAQEFBQADggEBAKBDaVkycCUC1zMfpAkXIgWtji2Nr2ZygYQR53AgxOaE
+  7nqxdh5Lh8pnfwa71/ucrZFJt+g/mEhen9lFNmcizvpP43Hh4rYf8j6T8Y+mQ6tr
+  sp5xWiv93DlLXGmas0hv9VRYDvV1vLFaG05FHOAZKdo6pD2t6jNyMSAn4fMHKctw
+  UoYN5FLt84jacRQF5nhy9gBhfgvA19LcjeMLQC11x3fykDLzCXF2wEe5Q5iYaWvb
+  cGiNQIiHBj/9/xHfOyOthBPUevTiVnuffarDr434z/LGLwYzgaG5EcJFvZqpvUpP
+  fGcAPtAZUMGLXwcOB1BJEFkDxUQIJiEpSmf4YzzZhEM=
   -----END CERTIFICATE-----
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -812,7 +812,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.5.1
 signing_key: 
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.