mongoid 7.1.0.rc0 → 7.1.0

data/spec/mongoid/attributes_spec.rb

@@ -1349,10 +1349,16 @@ describe Mongoid::Attributes do
     context "when attribute is a Hash" do
       let(:person) { Person.new map: { somekey: "somevalue" } }
 
-      it "raises an error when try to set an invalid value" do
-        expect {
+      it "raises an error when trying to set a value of invalid type - array" do
+        expect do
           person.map = []
-        }.to raise_error(Mongoid::Errors::InvalidValue)
+        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type Array cannot be written to a field of type Hash/)
+      end
+
+      it "raises an error when trying to set a value of invalid type - boolean" do
+        expect do
+          person.map = false
+        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type FalseClass cannot be written to a field of type Hash/)
       end
 
       it "can set a Hash value" do
@@ -1367,10 +1373,16 @@ describe Mongoid::Attributes do
         expect(person.aliases).to eq([ :alias_1 ])
       end
 
-      it "raises an error when try to set an invalid value" do
-        expect {
+      it "raises an error when trying to set a value of invalid type - hash" do
+        expect do
           person.aliases = {}
-        }.to raise_error(Mongoid::Errors::InvalidValue)
+        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type Hash cannot be written to a field of type Array/)
+      end
+
+      it "raises an error when trying to set a value of invalid type - boolean" do
+        expect do
+          person.aliases = false
+        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type FalseClass cannot be written to a field of type Array/)
       end
     end
 
@@ -1425,7 +1437,7 @@ describe Mongoid::Attributes do
   end
 
   describe "#typed_attributes"  do
-    
+
     let(:date_time) do
       DateTime.current
     end

data/spec/mongoid/changeable_spec.rb

@@ -949,6 +949,29 @@ describe Mongoid::Changeable do
       end
     end
 
+    context 'when habtm association changes' do
+
+      let(:person) do
+        Person.create!(title: "Grand Poobah")
+      end
+
+      let(:user_account) do
+        UserAccount.create!
+      end
+
+      before do
+        person.user_accounts << user_account
+      end
+
+      it 'returns a hash of changes' do
+        pending 'https://jira.mongodb.org/browse/MONGOID-4843'
+
+        person.changes.should == {
+          user_account_ids: [[], [user_account.id]]
+        }
+      end
+    end
+
     context "when the document has not changed" do
 
       let(:acolyte) do

data/spec/mongoid/document_fields_spec.rb

@@ -56,4 +56,33 @@ describe Mongoid::Document do
       end
     end
   end
+
+  describe 'Hash field' do
+    context 'with symbol key and value' do
+      let(:church) do
+        Church.create!(location: {state: :ny})
+      end
+
+      let(:found_church) do
+        Church.find(church.id)
+      end
+
+      it 'round-trips the value' do
+        found_church.location[:state].should == :ny
+      end
+
+      it 'stringifies the key' do
+        found_church.location.keys.should == %w(state)
+      end
+
+      it 'retrieves value as symbol via driver' do
+        Church.delete_all
+
+        church
+
+        v = Church.collection.find.first
+        v['location'].should == {'state' => :ny}
+      end
+    end
+  end
 end

data/spec/mongoid/interceptable_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require "spec_helper"
+require_relative './interceptable_spec_models'
 
 describe Mongoid::Interceptable do
 
@@ -1722,4 +1723,65 @@ describe Mongoid::Interceptable do
       end
     end
   end
+
+  context 'when creating a parent and embedded child' do
+    let(:registry) { InterceptableSpec::CallbackRegistry.new }
+    let(:parent) do
+      InterceptableSpec::CbParent.new(registry).tap do |parent|
+        parent.cb_children << InterceptableSpec::CbChild.new(registry, cb_parent: parent)
+      end
+    end
+
+    let(:expected) do
+      [
+        [InterceptableSpec::CbParent, :before_validation],
+        [InterceptableSpec::CbChild, :before_validation],
+        [InterceptableSpec::CbChild, :after_validation],
+        [InterceptableSpec::CbParent, :after_validation],
+        [InterceptableSpec::CbParent, :before_save],
+        [InterceptableSpec::CbParent, :before_create],
+        [InterceptableSpec::CbParent, :after_create],
+        [InterceptableSpec::CbParent, :after_save],
+      ]
+    end
+
+    it 'calls callbacks in the right order' do
+      parent.save!
+      expect(registry.calls).to eq expected
+    end
+  end
+
+  context 'when creating a parent and embedded child with cascading callbacks' do
+    let(:registry) { InterceptableSpec::CallbackRegistry.new }
+    let(:parent) do
+      InterceptableSpec::CbParent.new(registry).tap do |parent|
+        parent.cb_cascaded_children <<
+          InterceptableSpec::CbCascadedChild.new(registry, cb_parent: parent)
+      end
+    end
+
+    let(:expected) do
+      [
+        [InterceptableSpec::CbParent, :before_validation],
+        [InterceptableSpec::CbCascadedChild, :before_validation],
+        [InterceptableSpec::CbCascadedChild, :after_validation],
+        [InterceptableSpec::CbParent, :after_validation],
+        [InterceptableSpec::CbParent, :before_save],
+        [InterceptableSpec::CbCascadedChild, :before_save],
+        [InterceptableSpec::CbParent, :before_create],
+        [InterceptableSpec::CbCascadedChild, :before_create],
+        [InterceptableSpec::CbParent, :after_create],
+        [InterceptableSpec::CbCascadedChild, :after_create],
+        [InterceptableSpec::CbParent, :after_save],
+        [InterceptableSpec::CbCascadedChild, :after_save],
+      ]
+    end
+
+    it 'calls callbacks in the right order' do
+      pending 'MONGOID-3795'
+
+      parent.save!
+      expect(registry.calls).to eq expected
+    end
+  end
 end

data/spec/mongoid/interceptable_spec_models.rb

@@ -0,0 +1,76 @@
+module InterceptableSpec
+  class CallbackRegistry
+    def initialize
+      @calls = []
+    end
+
+    def record_call(cls, cb)
+      @calls << [cls, cb]
+    end
+
+    attr_reader :calls
+  end
+
+  module CallbackTracking
+    extend ActiveSupport::Concern
+
+    included do
+      %i(
+        validation save create update
+      ).each do |what|
+        %i(before after).each do |whn|
+          send("#{whn}_#{what}", "#{whn}_#{what}_stub".to_sym)
+          define_method("#{whn}_#{what}_stub") do
+            callback_registry.record_call(self.class, "#{whn}_#{what}".to_sym)
+          end
+        end
+      end
+    end
+  end
+
+  class CbParent
+    include Mongoid::Document
+
+    def initialize(callback_registry)
+      @callback_registry = callback_registry
+      super()
+    end
+
+    attr_reader :callback_registry
+
+    embeds_many :cb_children
+    embeds_many :cb_cascaded_children, cascade_callbacks: true
+
+    include CallbackTracking
+  end
+
+  class CbChild
+    include Mongoid::Document
+
+    embedded_in :cb_parent
+
+    def initialize(callback_registry, options)
+      @callback_registry = callback_registry
+      super(options)
+    end
+
+    attr_reader :callback_registry
+
+    include CallbackTracking
+  end
+
+  class CbCascadedChild
+    include Mongoid::Document
+
+    embedded_in :cb_parent
+
+    def initialize(callback_registry, options)
+      @callback_registry = callback_registry
+      super(options)
+    end
+
+    attr_reader :callback_registry
+
+    include CallbackTracking
+  end
+end

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
+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)
+        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'},
+            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/support/lite_constraints.rb

@@ -0,0 +1,22 @@
+module LiteConstraints
+  # Constrain tests that use TimeoutInterrupt to MRI (and Unix)
+  def only_mri
+    before do
+      unless SpecConfig.instance.mri?
+        skip "MRI required, we have #{SpecConfig.instance.platform}"
+      end
+    end
+  end
+
+  # This is for marking tests that fail on jruby that should
+  # in principle work (as opposed to being fundamentally incompatible
+  # with jruby).
+  # Often times these failures happen only in Evergreen.
+  def fails_on_jruby
+    before do
+      unless SpecConfig.instance.mri?
+        skip "Fails on jruby"
+      end
+    end
+  end
+end