mongoid 7.1.0.rc0 → 7.1.5

data/spec/mongoid/shardable_models.rb

@@ -0,0 +1,61 @@
+class SmMovie
+  include Mongoid::Document
+
+  field :year, type: Integer
+
+  index year: 1
+  shard_key :year
+end
+
+class SmTrailer
+  include Mongoid::Document
+
+  index year: 1
+  shard_key 'year'
+end
+
+class SmActor
+  include Mongoid::Document
+
+  # This is not a usable shard configuration for the server.
+  # We just have it for unit tests.
+  shard_key age: 1, 'gender' => :hashed, 'hello' => :hashed
+end
+
+class SmAssistant
+  include Mongoid::Document
+
+  field :gender, type: String
+
+  index gender: 1
+  shard_key 'gender' => :hashed
+end
+
+class SmProducer
+  include Mongoid::Document
+
+  index age: 1, gender: 1
+  shard_key({age: 1, gender: 'hashed'}, unique: true, numInitialChunks: 2)
+end
+
+class SmDirector
+  include Mongoid::Document
+
+  belongs_to :agency
+
+  index age: 1
+  shard_key :agency
+end
+
+class SmDriver
+  include Mongoid::Document
+
+  belongs_to :agency
+
+  index age: 1, agency: 1
+  shard_key age: 1, agency: :hashed
+end
+
+class SmNotSharded
+  include Mongoid::Document
+end

data/spec/mongoid/shardable_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require "spec_helper"
+require_relative './shardable_models'
 
 describe Mongoid::Shardable do
 
@@ -24,30 +25,82 @@ describe Mongoid::Shardable do
 
   describe ".shard_key" do
 
-    let(:klass) do
-      Band
-    end
+    context 'when full syntax is used' do
+      context 'with symbol value' do
+        it 'sets shard key fields to symbol value' do
+          SmProducer.shard_key_fields.should == %i(age gender)
+        end
 
-    before do
-      Band.shard_key(:name)
-    end
+        it 'sets shard config' do
+          SmProducer.shard_config.should == {
+            key: {age: 1, gender: 'hashed'},
+            options: {
+              unique: true,
+              numInitialChunks: 2,
+            },
+          }
+        end
 
-    it "specifies a shard key on the collection" do
-      expect(klass.shard_key_fields).to eq([:name])
-    end
+        it 'keeps hashed as string' do
+          SmProducer.shard_config[:key][:gender].should == 'hashed'
+        end
+      end
+
+      context 'with string value' do
+        it 'sets shard key fields to symbol value' do
+          SmActor.shard_key_fields.should == %i(age gender hello)
+        end
 
-    context 'when a relation is used as the shard key' do
+        it 'sets shard config' do
+          SmActor.shard_config.should == {
+            key: {age: 1, gender: 'hashed', hello: 'hashed'},
+            options: {},
+          }
+        end
 
-      let(:klass) do
-        Game
+        it 'sets hashed to string' do
+          SmActor.shard_config[:key][:gender].should == 'hashed'
+        end
       end
 
-      before do
-        Game.shard_key(:person)
+      context 'when passed association name' do
+        it 'uses foreign key as shard key in shard config' do
+          SmDriver.shard_config.should == {
+            key: {age: 1, agency_id: 'hashed'},
+            options: {},
+          }
+        end
+
+        it 'uses foreign key as shard key in shard key fields' do
+          SmDriver.shard_key_fields.should == %i(age agency_id)
+        end
+      end
+    end
+
+    context 'when shorthand syntax is used' do
+      context 'with symbol value' do
+        it 'sets shard key fields to symbol value' do
+          SmMovie.shard_key_fields.should == %i(year)
+        end
       end
 
-      it "converts the shard key to the foreign key field" do
-        expect(klass.shard_key_fields).to eq([:person_id])
+      context 'with string value' do
+        it 'sets shard key fields to symbol value' do
+          SmTrailer.shard_key_fields.should == %i(year)
+        end
+      end
+
+      context 'when passed association name' do
+        it 'uses foreign key as shard key in shard config' do
+          SmDirector.shard_config.should == {
+            key: {agency_id: 1},
+            options: {},
+          }
+        end
+
+        it 'uses foreign key as shard key in shard key fields' do
+          SmDirector.shard_key_fields.should == %i(agency_id)
+        end
       end
     end
   end

data/spec/mongoid/tasks/database_rake_spec.rb

@@ -48,7 +48,7 @@ shared_context "rails rake task" do
   end
 end
 
-describe "db:drop", if: non_legacy_server? do
+describe "db:drop" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -61,7 +61,7 @@ describe "db:drop", if: non_legacy_server? do
   end
 end
 
-describe "db:purge", if: non_legacy_server? do
+describe "db:purge" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -74,7 +74,7 @@ describe "db:purge", if: non_legacy_server? do
   end
 end
 
-describe "db:seed", if: non_legacy_server? do
+describe "db:seed" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -88,7 +88,7 @@ describe "db:seed", if: non_legacy_server? do
   end
 end
 
-describe "db:setup", if: non_legacy_server? do
+describe "db:setup" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -120,7 +120,7 @@ describe "db:setup", if: non_legacy_server? do
   end
 end
 
-describe "db:reset", if: non_legacy_server? do
+describe "db:reset" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -138,7 +138,7 @@ describe "db:reset", if: non_legacy_server? do
   end
 end
 
-describe "db:create", if: non_legacy_server? do
+describe "db:create" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -147,7 +147,7 @@ describe "db:create", if: non_legacy_server? do
   end
 end
 
-describe "db:migrate", if: non_legacy_server? do
+describe "db:migrate" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -156,7 +156,7 @@ describe "db:migrate", if: non_legacy_server? do
   end
 end
 
-describe "db:test:prepare", if: non_legacy_server? do
+describe "db:test:prepare" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -177,7 +177,7 @@ describe "db:test:prepare", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:create_indexes", if: non_legacy_server? do
+describe "db:mongoid:create_indexes" do
   include_context "rake task"
 
   it_behaves_like "create_indexes"
@@ -201,7 +201,7 @@ describe "db:mongoid:create_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:remove_undefined_indexes", if: non_legacy_server? do
+describe "db:mongoid:remove_undefined_indexes" do
   include_context "rake task"
 
   it "receives remove_undefined_indexes" do
@@ -227,7 +227,7 @@ describe "db:mongoid:remove_undefined_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:remove_indexes", if: non_legacy_server? do
+describe "db:mongoid:remove_indexes" do
   include_context "rake task"
 
   it "receives remove_indexes" do
@@ -253,7 +253,7 @@ describe "db:mongoid:remove_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:drop", if: non_legacy_server? do
+describe "db:mongoid:drop" do
   include_context "rake task"
 
   it "works" do
@@ -269,7 +269,7 @@ describe "db:mongoid:drop", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:purge", if: non_legacy_server? do
+describe "db:mongoid:purge" do
   include_context "rake task"
 
   it "receives a purge" do

data/spec/mongoid/tasks/database_spec.rb

@@ -136,7 +136,7 @@ describe "Mongoid::Tasks::Database" do
       expect(removed_indexes).to be_empty
     end
 
-    context 'when the index is a text index', if: non_legacy_server? do
+    context 'when the index is a text index' do
 
       before do
         class Band

data/spec/spec_helper.rb

@@ -31,6 +31,7 @@ end
 
 require 'support/authorization'
 require 'support/expectations'
+require 'support/helpers'
 require 'support/macros'
 require 'support/cluster_config'
 require 'support/constraints'
@@ -76,37 +77,6 @@ CONFIG = {
   }
 }
 
-def non_legacy_server?
-  Mongoid::Clients.default.cluster.servers.first.features.write_command_enabled?
-end
-
-def testing_replica_set?
-  Mongoid::Clients.default.cluster.replica_set?
-end
-
-def collation_supported?
-  Mongoid::Clients.default.cluster.next_primary.features.collation_enabled?
-end
-alias :decimal128_supported? :collation_supported?
-
-def array_filters_supported?
-  Mongoid::Clients.default.cluster.next_primary.features.array_filters_enabled?
-end
-alias :sessions_supported? :array_filters_supported?
-
-def transactions_supported?
-  features = Mongoid::Clients.default.cluster.next_primary.features
-  features.respond_to?(:transactions_enabled?) && features.transactions_enabled?
-end
-
-def testing_transactions?
-  transactions_supported? && if Gem::Version.new(ClusterConfig.instance.fcv_ish) >= Gem::Version.new('4.2')
-    %i(replica_set sharded).include?(ClusterConfig.instance.topology)
-  else
-    ClusterConfig.instance.topology == :replica_set
-  end
-end
-
 # Set the database that the spec suite connects to.
 Mongoid.configure do |config|
   config.load_configuration(CONFIG)
@@ -156,6 +126,7 @@ end
 
 RSpec.configure do |config|
   config.raise_errors_for_deprecations!
+  config.include(Helpers)
   config.include(Mongoid::Expectations)
   config.extend(Constraints)
   config.extend(Mongoid::Macros)

data/spec/support/child_process_helper.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+autoload :ChildProcess, 'childprocess'
+autoload :Tempfile, 'tempfile'
+
+module ChildProcessHelper
+  module_function def call(cmd, env: nil, cwd: nil)
+    process = ChildProcess.new(*cmd)
+    process.io.inherit!
+    if cwd
+      process.cwd = cwd
+    end
+    if env
+      env.each do |k, v|
+        process.environment[k.to_s] = v
+      end
+    end
+    process.start
+    process.wait
+    process
+  end
+
+  module_function def check_call(cmd, env: nil, cwd: nil)
+    process = call(cmd, env: env, cwd: cwd)
+    unless process.exit_code == 0
+      raise "Failed to execute: #{cmd}"
+    end
+  end
+
+  module_function def get_output(cmd, env: nil, cwd: nil)
+    process = ChildProcess.new(*cmd)
+    process.io.inherit!
+    if cwd
+      process.cwd = cwd
+    end
+    if env
+      env.each do |k, v|
+        process.environment[k.to_s] = v
+      end
+    end
+
+    output = ''
+    r, w = IO.pipe
+
+    begin
+      process.io.stdout = w
+      process.start
+      w.close
+
+      thread = Thread.new do
+        begin
+          loop do
+            output << r.readpartial(16384)
+          end
+        rescue EOFError
+        end
+      end
+
+      process.wait
+      thread.join
+    ensure
+      r.close
+    end
+
+    [process, output]
+  end
+
+  module_function def check_output(*args)
+    process, output = get_output(*args)
+    unless process.exit_code == 0
+      raise "Failed to execute: #{args}"
+    end
+    output
+  end
+end

data/spec/support/cluster_config.rb

@@ -99,7 +99,7 @@ class ClusterConfig
         if topology == :sharded
           shards = client.use(:admin).command(listShards: 1).first
           shard = shards['shards'].first
-          address_str = shard['host'].sub(/^.*\//, '').sub(/,.*/, '')
+          address_str = shard['host'].sub(/\A.*\//, '').sub(/,.*/, '')
           client = ClusterTools.instance.direct_client(address_str,
             SpecConfig.instance.test_options.merge(SpecConfig.instance.auth_options).merge(connect: :direct))
         end
@@ -133,8 +133,8 @@ class ClusterConfig
 
     @topology ||= begin
       topology = client.cluster.topology.class.name.sub(/.*::/, '')
-      topology = topology.gsub(/([A-Z])/) { |match| '_' + match.downcase }.sub(/^_/, '')
-      if topology =~ /^replica_set/
+      topology = topology.gsub(/([A-Z])/) { |match| '_' + match.downcase }.sub(/\A_/, '')
+      if topology =~ /\Areplica_set/
         topology = 'replica_set'
       end
       topology.to_sym

data/spec/support/constraints.rb

@@ -5,11 +5,11 @@ module Constraints
   RAILS_VERSION = ActiveSupport.version.to_s.split('.')[0..1].join('.').freeze
 
   def min_rails_version(version)
-    unless version =~ /^\d+\.\d+$/
+    unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"
     end
 
-    before do
+    before(:all) do
       if version > RAILS_VERSION
         skip "Rails version #{version} or higher required, we have #{RAILS_VERSION}"
       end
@@ -17,11 +17,11 @@ module Constraints
   end
 
   def max_rails_version(version)
-    unless version =~ /^\d+\.\d+$/
+    unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"
     end
 
-    before do
+    before(:all) do
       if version < RAILS_VERSION
         skip "Rails version #{version} or lower required, we have #{RAILS_VERSION}"
       end
@@ -29,11 +29,11 @@ module Constraints
   end
 
   def min_server_version(version)
-    unless version =~ /^\d+\.\d+$/
+    unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"
     end
 
-    before do
+    before(:all) do
       if version > ClusterConfig.instance.server_version
         skip "Server version #{version} or higher required, we have #{ClusterConfig.instance.server_version}"
       end
@@ -41,11 +41,11 @@ module Constraints
   end
 
   def max_server_version(version)
-    unless version =~ /^\d+\.\d+$/
+    unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"
     end
 
-    before do
+    before(:all) do
       if version < ClusterConfig.instance.short_server_version
         skip "Server version #{version} or lower required, we have #{ClusterConfig.instance.server_version}"
       end
@@ -54,9 +54,11 @@ module Constraints
 
   def require_topology(*topologies)
     invalid_topologies = topologies - [:single, :replica_set, :sharded]
+
     unless invalid_topologies.empty?
       raise ArgumentError, "Invalid topologies requested: #{invalid_topologies.join(', ')}"
     end
+
     before(:all) do
       unless topologies.include?(topology = ClusterConfig.instance.topology)
         skip "Topology #{topologies.join(' or ')} required, we have #{topology}"
@@ -73,8 +75,22 @@ module Constraints
   end
 
   def require_transaction_support
-    min_server_fcv '4.0'
-    require_topology :replica_set
+    before(:all) do
+      case ClusterConfig.instance.topology
+      when :single
+        skip 'Transactions tests require a replica set (4.0+) or a sharded cluster (4.2+)'
+      when :replica_set
+        unless ClusterConfig.instance.server_version >= '4.0'
+          skip 'Transactions tests in a replica set topology require server 4.0+'
+        end
+      when :sharded
+        unless ClusterConfig.instance.server_version >= '4.2'
+          skip 'Transactions tests in a sharded cluster topology require server 4.2+'
+        end
+      else
+        raise NotImplementedError
+      end
+    end
   end
 
   def require_tls