mongoid 6.4.4 → 6.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccf32387a001233a1704c7c20281e25dfbb8262134114bbdfedef5dcd888032c
-  data.tar.gz: 25fecceb3036b5feb86d572e8994c60a8cbac0c47daabd1307788723bc8090f3
+  metadata.gz: 6df494597043866e131edd0f3ac733a2b9858819d0ea5e64dd71a876dc0f5c92
+  data.tar.gz: 11b00b2c3c74e486c605729487caacbad6b6790ad1168d9f9f25088018187c1d
 SHA512:
-  metadata.gz: 03be9dcb886f2bc83a7b57a93fecf2bf3e0732668ee173c30d810fb0459cc4ec4eae277717e4bd0695d969ec378d58e4767f5e99ea73b036eb764637da1cb8a6
-  data.tar.gz: fe0e129f059daabb83fd638455ea22fe0da7800b5095400210ee4d71acf6b02d78847f60e8393ae15815fbb57d4753bfbb2be0db76ca2351f75f075d3a65b5c7
+  metadata.gz: ef53e2257470d0ba736764568da53a4ccef25e525d1f5782c7e364f313be22f0b6c5bbabab354608da0de5887e7f505602936cc3e701fc1487c0969bcae3061e
+  data.tar.gz: 2fe686e8ad285385f787079a8a065e4ad7311dc1a034be6bcc722611d976b5b9b3bf421fc9a6fab861dce3d296178138c325998bada913e5b8f8d83298b3ee6c

data/Rakefile

@@ -33,3 +33,15 @@ RSpec::Core::RakeTask.new('spec:progress') do |spec|
 end
 
 task :default => :spec
+
+desc "Generate all documentation"
+task :docs => 'docs:yard'
+
+namespace :docs do
+  desc "Generate yard documention"
+  task :yard do
+    out = File.join('yard-docs', Mongoid::VERSION)
+    FileUtils.rm_rf(out)
+    system "yardoc -o #{out} --title mongoid-#{Mongoid::VERSION}"
+  end
+end

data/lib/mongoid.rb

@@ -101,5 +101,5 @@ module Mongoid
   #   Mongoid.database = Mongo::Connection.new.db("test")
   #
   # @since 1.0.0
-  delegate(*(Config.public_instance_methods(false) - [ :logger=, :logger ] << { to: Config }))
+  delegate(*(Config.public_instance_methods(false) - [ :logger=, :logger ]), to: Config)
 end

data/lib/mongoid/extensions/string.rb

@@ -82,7 +82,9 @@ module Mongoid
       #
       # @since 3.0.0
       def numeric?
-        true if Float(self) rescue (self =~ /^NaN|\-?Infinity$/)
+        !!Float(self)
+      rescue ArgumentError
+        (self =~ /\A(?:NaN|-?Infinity)\z/) == 0
       end
 
       # Get the string as a getter string.

data/lib/mongoid/version.rb

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

data/spec/app/models/delegating_patient.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class DelegatingPatient
+  include Mongoid::Document
+
+  embeds_one :email
+
+  # Instance level delegation
+  delegate :address, to: :email
+
+  class << self
+    # Class level delegation
+    delegate :default_client, to: ::Mongoid
+  end
+end

data/spec/integration/document_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Mongoid::Document do
+  context 'when including class uses delegate' do
+    let(:patient) do
+      DelegatingPatient.new(
+        email: Email.new(address: 'test@example.com'),
+      )
+    end
+
+    it 'works for instance level delegation' do
+      patient.address.should == 'test@example.com'
+    end
+
+    it 'works for class level delegation' do
+      DelegatingPatient.default_client.should be Mongoid.default_client
+    end
+  end
+end

data/spec/mongoid/clients/factory_spec.rb

@@ -1,7 +1,35 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Clients::Factory do
 
+  shared_examples_for 'includes seed address' do
+    let(:configured_address) do
+      address = SpecConfig.instance.addresses.first
+      unless address.include?(':')
+        address = "#{address}:27017"
+      end
+      address
+    end
+
+    let(:expected_addresses) do
+      [
+        configured_address,
+        configured_address.sub(/\Alocalhost:/, '127.0.0.1:'),
+        configured_address.sub(/\A127\.0\.0\.1:/, 'localhost:'),
+      ].uniq
+    end
+
+    it 'includes seed address' do
+      ok = cluster_addresses.any? do |address|
+        expected_addresses.include?(address)
+      end
+      expect(ok).to be true
+    end
+  end
+
   describe ".create" do
 
     context "when provided a name" do
@@ -12,8 +40,8 @@ describe Mongoid::Clients::Factory do
 
           let(:config) do
             {
-              default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-              secondary: { hosts: [ "127.0.0.1:27017" ], database: database_id }
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              secondary: { hosts: SpecConfig.instance.addresses, database: database_id }
             }
           end
 
@@ -37,10 +65,12 @@ describe Mongoid::Clients::Factory do
             expect(client).to be_a(Mongo::Client)
           end
 
-          it "sets the cluster's seeds" do
-            expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+          let(:cluster_addresses) do
+            cluster.addresses.map(&:to_s)
           end
 
+          it_behaves_like 'includes seed address'
+
           it "sets the platform to Mongoid's platform constant" do
             expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
           end
@@ -80,11 +110,11 @@ describe Mongoid::Clients::Factory do
           end
 
           it "sets the cluster's seed ports to 27017" do
-            expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
           end
 
           it "sets ips with no ports to 27017" do
-            expect(default.cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
           end
         end
 
@@ -120,7 +150,7 @@ describe Mongoid::Clients::Factory do
             end
 
             it "sets the cluster's seeds" do
-              expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+              expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
             end
 
             it "sets the database" do
@@ -132,8 +162,8 @@ describe Mongoid::Clients::Factory do
 
             let(:config) do
               {
-                default: { hosts: [ "127.0.0.1:1234" ], database: database_id },
-                secondary: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/mongoid_test" }
+                default: { hosts: [ "127.0.0.1:1234" ], database: database_id, server_selection_timeout: 1 },
+                secondary: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/mongoid_test?serverSelectionTimeoutMS=1000" }
               }
             end
 
@@ -181,7 +211,7 @@ describe Mongoid::Clients::Factory do
     context "when no name is provided" do
 
       let(:config) do
-        { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
+        { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
       end
 
       before do
@@ -200,17 +230,15 @@ describe Mongoid::Clients::Factory do
         client.cluster
       end
 
-      let(:seeds) do
-        cluster.addresses.map{ |address| address.to_s }
+      let(:cluster_addresses) do
+        cluster.addresses.map(&:to_s)
       end
 
       it "returns the default client" do
         expect(client).to be_a(Mongo::Client)
       end
 
-      it "sets the cluster's seeds" do
-        expect(seeds).to eq([ "127.0.0.1:27017" ])
-      end
+      it_behaves_like 'includes seed address'
     end
 
     context "when nil is provided and no default config" do
@@ -230,7 +258,7 @@ describe Mongoid::Clients::Factory do
   describe ".default" do
 
     let(:config) do
-      { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
+      { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
     end
 
     before do
@@ -249,17 +277,15 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:seeds) do
-      cluster.addresses.map{ |address| address.to_s }
+    let(:cluster_addresses) do
+      cluster.addresses.map(&:to_s)
     end
 
     it "returns the default client" do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's seeds" do
-      expect(seeds).to eq([ "127.0.0.1:27017" ])
-    end
+    it_behaves_like 'includes seed address'
   end
 
   context "when options are provided with string keys" do
@@ -267,7 +293,7 @@ describe Mongoid::Clients::Factory do
     let(:config) do
       {
         default: {
-          hosts: [ "127.0.0.1:27017" ],
+          hosts: SpecConfig.instance.addresses,
           database: database_id,
           options: {
             "server_selection_timeout" => 10,
@@ -293,17 +319,15 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:seeds) do
-      cluster.addresses.map{ |address| address.to_s }
+    let(:cluster_addresses) do
+      cluster.addresses.map(&:to_s)
     end
 
     it "returns the default client" do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's seeds" do
-      expect(seeds).to eq([ "127.0.0.1:27017" ])
-    end
+    it_behaves_like 'includes seed address'
 
     it "sets the server selection timeout" do
       expect(cluster.options[:server_selection_timeout]).to eq(10)

data/spec/mongoid/clients/options_spec.rb

@@ -354,7 +354,7 @@ describe Mongoid::Clients::Options do
           band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
-        let!(:connections_and_cluster_during) do
+        let(:connections_and_cluster_during) do
           connections = nil
           cluster = band.with(options) do |b|
             b.reload
@@ -396,7 +396,7 @@ describe Mongoid::Clients::Options do
           end
 
           it 'disconnects the new cluster when the block exits' do
-            expect(connections_before).to eq(connections_after)
+            expect(connections_after).to eq(connections_before)
           end
         end
 

data/spec/mongoid/clients/sessions_spec.rb

@@ -16,17 +16,26 @@ describe Mongoid::Clients::Sessions do
   end
 
   let(:subscriber) do
-    Mongoid::Clients.with_name(:other).send(:monitoring).subscribers['Command'].find do |s|
+    client = Mongoid::Clients.with_name(:other)
+    monitoring = if client.respond_to?(:monitoring, true)
+      client.send(:monitoring)
+    else
+      # driver 2.5
+      client.instance_variable_get('@monitoring')
+    end
+    monitoring.subscribers['Command'].find do |s|
       s.is_a?(EventSubscriber)
     end
   end
 
   let(:insert_events) do
-    subscriber.started_events.select { |event| event.command_name == 'insert' }
+    # Driver 2.5 sends command_name as a symbol
+    subscriber.started_events.select { |event| event.command_name.to_s == 'insert' }
   end
 
   let(:update_events) do
-    subscriber.started_events.select { |event| event.command_name == 'update' }
+    # Driver 2.5 sends command_name as a symbol
+    subscriber.started_events.select { |event| event.command_name.to_s == 'update' }
   end
 
   context 'when a session is used on a model class' do

data/spec/mongoid/contextual/geo_near_spec.rb

@@ -1,6 +1,7 @@
 require "spec_helper"
 
 describe Mongoid::Contextual::GeoNear do
+  max_server_version '4.0'
 
   describe "#average_distance" do
 

data/spec/mongoid/contextual/mongo_spec.rb

@@ -451,7 +451,7 @@ describe Mongoid::Contextual::Mongo do
       end
 
       it "returns the distinct field values" do
-        expect(context.distinct(:years)).to eq([ 30, 25 ])
+        expect(context.distinct(:years).sort).to eq([ 25, 30 ])
       end
     end
 

data/spec/mongoid/criteria_spec.rb

@@ -975,6 +975,7 @@ describe Mongoid::Criteria do
   end
 
   describe "#geo_near" do
+    max_server_version '4.0'
 
     before do
       Bar.create_indexes
@@ -3321,6 +3322,8 @@ describe Mongoid::Criteria do
   end
 
   describe "#max_scan" do
+    max_server_version '4.0'
+
     let!(:band) do
       Band.create(name: "Depeche Mode")
     end

data/spec/mongoid/extensions/string_spec.rb

@@ -277,49 +277,77 @@ describe Mongoid::Extensions::String do
     context "when the string is an integer" do
 
       it "returns true" do
-        expect("1234").to be_numeric
+        expect("1234".numeric?).to eq(true)
       end
     end
 
     context "when string is a float" do
 
       it "returns true" do
-        expect("1234.123").to be_numeric
+        expect("1234.123".numeric?).to eq(true)
       end
     end
 
     context "when the string is has exponents" do
 
       it "returns true" do
-        expect("1234.123123E4").to be_numeric
+        expect("1234.123123E4".numeric?).to eq(true)
       end
     end
 
     context "when the string is non numeric" do
 
       it "returns false" do
-        expect("blah").to_not be_numeric
+        expect("blah".numeric?).to eq(false)
       end
     end
 
     context "when the string is NaN" do
 
       it "returns true" do
-        expect("NaN").to be_numeric
+        expect("NaN".numeric?).to eq(true)
+      end
+    end
+
+    context "when the string is NaN and junk in front" do
+
+      it "returns false" do
+        expect("a\nNaN".numeric?).to eq(false)
+      end
+    end
+
+    context "when the string is NaN and whitespace at end" do
+
+      it "returns false" do
+        expect("NaN\n".numeric?).to eq(false)
       end
     end
 
     context "when the string is Infinity" do
 
       it "returns true" do
-        expect("Infinity").to be_numeric
+        expect("Infinity".numeric?).to eq(true)
+      end
+    end
+
+    context "when the string contains Infinity and junk in front" do
+
+      it "returns false" do
+        expect("a\nInfinity".numeric?).to eq(false)
+      end
+    end
+
+    context "when the string contains Infinity and whitespace at end" do
+
+      it "returns false" do
+        expect("Infinity\n".numeric?).to eq(false)
       end
     end
 
     context "when the string is -Infinity" do
 
       it "returns true" do
-        expect("-Infinity").to be_numeric
+        expect("-Infinity".numeric?).to eq(true)
       end
     end
   end