mongoid 7.2.0.rc1 → 7.2.0

data/spec/integration/stringified_symbol_field_spec.rb

@@ -0,0 +1,190 @@
+require "spec_helper"
+
+describe "StringifiedSymbol fields" do
+
+  before do
+    Order.destroy_all
+  end
+
+  context "when querying the database" do
+
+    let!(:document) do
+      Order.create!(saved_status: :test)
+    end
+
+    let(:string_query) do
+      {'saved_status' => {'$eq' => 'test'}}
+    end
+
+    let(:symbol_query) do
+      {'saved_status' => {'$eq' => :test}}
+    end
+
+    it "can be queried with a string" do
+      doc = Order.where(string_query).first
+      expect(doc.saved_status).to eq(:test)
+    end
+
+    it "can be queried with a symbol" do
+      doc = Order.where(symbol_query).first
+      expect(doc.saved_status).to eq(:test)
+    end
+  end
+
+# Using command monitoring to test that StringifiedSymbol sends a string and returns a symbol
+let(:client) { Order.collection.client }
+
+  before do
+    client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+  end
+
+  after do
+    client.unsubscribe(Mongo::Monitoring::COMMAND, subscriber)
+  end
+
+  let(:subscriber) do
+    EventSubscriber.new
+  end
+
+  let(:find_events) do
+    subscriber.started_events.select { |event| event.command_name.to_s == 'find' }
+  end
+
+  let(:insert_events) do
+    subscriber.started_events.select { |event| event.command_name.to_s == 'insert' }
+  end
+
+  let(:update_events) do
+    subscriber.started_events.select { |event| event.command_name.to_s == 'update' }
+  end
+
+  before do
+    subscriber.clear_events!
+  end
+
+  let(:query) do
+    {'saved_status' => {'$eq' => 'test'}}
+  end
+
+  let!(:document1) do
+    Order.create!(saved_status: :test)
+  end
+
+  let!(:document2) do
+    Order.where(query).first
+  end
+
+  context "when inserting document" do
+
+    it "sends the value as a string" do
+      Order.create!(saved_status: :test)
+      event = insert_events.first
+      doc = event.command["documents"].first
+      expect(doc["saved_status"]).to eq("test")
+    end
+
+    it "sends the value as a string" do
+      Order.create!(saved_status: 42)
+      event = insert_events.second
+      doc = event.command["documents"].first
+      expect(doc["saved_status"]).to eq("42")
+    end
+
+    it "sends the value as a string" do
+      Order.create(saved_status: [0, 1, 2])
+      event = insert_events.second
+      doc = event.command["documents"].first
+      expect(doc["saved_status"]).to eq("[0, 1, 2]")
+    end
+  end
+
+  context "when finding document" do
+
+    it "receives the value as a symbol" do
+      event = find_events.first
+      expect(document2.saved_status).to eq(:test)
+    end
+  end
+
+  context "when reading a BSON Symbol field" do
+
+    before do
+      client["orders"].insert_one(saved_status: BSON::Symbol::Raw.new("test"), _id: 12)
+    end
+
+    it "receives the value as a symbol" do
+      expect(Order.find(12).saved_status).to eq(:test)
+    end
+
+    it "saves the value as a string" do
+      s = Order.find(12)
+      s.saved_status = :other
+      s.save!
+      event = update_events.first
+      expect(event.command["updates"].first["u"]["$set"]["saved_status"]).to eq("other")
+    end
+  end
+
+  context "when value is nil" do
+
+    before do
+      client["orders"].insert_one(saved_status: nil, _id: 15)
+    end
+
+    it "returns nil" do
+      expect(Order.find(15).saved_status).to be_nil
+    end
+  end
+
+  context "when writing nil" do
+
+    before do
+      client["orders"].insert_one(saved_status: "hello", _id: 16)
+    end
+
+    it "saves the value as nil" do
+      s = Order.find(16)
+      s.saved_status = nil
+      s.save!
+      event = update_events.first
+      expect(event.command["updates"].first["u"]["$set"]["saved_status"]).to be_nil
+    end
+  end
+
+  context "when reading an integer" do
+
+    before do
+      client["orders"].insert_one(saved_status: 42, _id: 13)
+    end
+
+    it "receives the value as a symbol" do
+      expect(Order.find(13).saved_status).to eq(:"42")
+    end
+
+    it "saves the value as a string" do
+      s = Order.find(13)
+      s.saved_status = 24
+      s.save!
+      event = update_events.first
+      expect(event.command["updates"].first["u"]["$set"]["saved_status"]).to eq("24")
+    end
+  end
+
+  context "when reading an array" do
+    before do
+      client["orders"].insert_one(saved_status: [0, 1, 2], _id: 14)
+    end
+
+    it "receives the value as a symbol" do
+      expect(Order.find(14).saved_status).to be(:"[0, 1, 2]")
+    end
+
+    it "saves the value as a string" do
+      s = Order.find(14)
+      s.saved_status = [3, 4, 5]
+      s.save!
+      event = update_events.first
+      expect(event.command["updates"].first["u"]["$set"]["saved_status"]).to eq("[3, 4, 5]")
+    end
+  end
+end

data/spec/lite_spec_helper.rb

@@ -3,6 +3,7 @@
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "shared", "lib"))
 
 # Load byebug before mongoid, to place breakpoints in the lib methods.
 # But SpecConfig needs the driver code - require the driver here.
@@ -15,8 +16,8 @@ require "mongo"
 require 'pp'
 
 require 'support/spec_config'
-require 'support/lite_constraints'
-require "support/session_registry" 
+require 'mrss/lite_constraints'
+require "support/session_registry"
 
 unless SpecConfig.instance.ci?
   begin
@@ -68,7 +69,7 @@ RSpec.configure do |config|
     end
   end
 
-  config.extend(LiteConstraints)
+  config.extend(Mrss::LiteConstraints)
 end
 
 # require all shared examples

data/spec/mongoid/association/referenced/has_many_models.rb

@@ -47,3 +47,15 @@ class HmmTicket
 
   belongs_to :person
 end
+
+class HmmBus
+  include Mongoid::Document
+
+  has_many :seats, class_name: 'HmmBusSeat'
+end
+
+class HmmBusSeat
+  include Mongoid::Document
+
+  # No belongs_to :bus
+end

data/spec/mongoid/association/referenced/has_one_models.rb

@@ -58,3 +58,15 @@ class HomPolymorphicChild
 
   belongs_to :p_parent, polymorphic: true
 end
+
+class HomBus
+  include Mongoid::Document
+
+  has_one :driver, class_name: 'HomBusDriver'
+end
+
+class HomBusDriver
+  include Mongoid::Document
+
+  # No belongs_to :bus
+end

data/spec/mongoid/association/referenced/has_one_spec.rb

@@ -748,7 +748,7 @@ describe Mongoid::Association::Referenced::HasOne do
     end
   end
 
-  describe '##inverse' do
+  describe '#inverse' do
 
     context 'when polymorphic' do
 

data/spec/mongoid/copyable_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-# -*- coding: utf-8 -*-
 require "spec_helper"
 
 require_relative './copyable_spec_models'
@@ -65,30 +64,58 @@ describe Mongoid::Copyable do
 
       context "when a document has fields from a legacy schema" do
 
-        let!(:actor) do
-          Actor.create(name: "test")
-        end
+        shared_examples 'behaves as expected' do
+          let!(:instance) do
+            cls.create(name: "test")
+          end
 
-        before do
-          legacy_fields = { "this_is_not_a_field" => 1, "this_legacy_field_is_nil" => nil }
-          Actor.collection.find(_id: actor.id).update_one("$set" => legacy_fields)
-        end
+          before do
+            legacy_fields = { "this_is_not_a_field" => 1, "this_legacy_field_is_nil" => nil }
+            cls.collection.find(_id: instance.id).update_one("$set" => legacy_fields)
+          end
 
-        let(:cloned) do
-          actor.reload.send(method)
-        end
+          let(:cloned) do
+            instance.reload.send(method)
+          end
+
+          it "sets the legacy attribute" do
+            expect(cloned.attributes['this_is_not_a_field']).to eq(1)
+          end
+
+          it "contains legacy attributes that are nil" do
+            expect(cloned.attributes.key?('this_legacy_field_is_nil')).to eq(true)
+          end
 
-        it "sets the legacy attribute" do
-          expect(cloned.attributes['this_is_not_a_field']).to eq(1)
+          it "copies the known attributes" do
+            expect(cloned.name).to eq('test')
+          end
+
+          it 'calls constructor with explicitly declared attributes only' do
+            expect(cls).to receive(:new).with('name' => 'test').and_call_original
+            cloned
+          end
         end
 
-        it "contains legacy attributes that are nil" do
-          expect(cloned.attributes.key?('this_legacy_field_is_nil')).to eq(true)
+        context 'without Attributes::Dynamic' do
+          let(:cls) { CopyableSpec::Reg }
+
+          before do
+            cls.should_not include(Mongoid::Attributes::Dynamic)
+          end
+
+          include_examples 'behaves as expected'
         end
 
-        it "copies the known attributes" do
-          expect(cloned.name).to eq('test')
+        context 'with Attributes::Dynamic' do
+          let(:cls) { CopyableSpec::Dyn }
+
+          before do
+            cls.should include(Mongoid::Attributes::Dynamic)
+          end
+
+          include_examples 'behaves as expected'
         end
+
       end
 
       context "when using store_as" do

data/spec/mongoid/copyable_spec_models.rb

@@ -31,4 +31,18 @@ module CopyableSpec
   class Blurb
     include Mongoid::Document
   end
+
+  # Do not include Attributes::Dynamic
+  class Reg
+    include Mongoid::Document
+
+    field :name, type: String
+  end
+
+  class Dyn
+    include Mongoid::Document
+    include Mongoid::Attributes::Dynamic
+
+    field :name, type: String
+  end
 end

data/spec/mongoid/equality_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-# -*- coding: utf-8 -*-
 require "spec_helper"
 
 describe Mongoid::Equality do

data/spec/mongoid/extensions/stringified_symbol_spec.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Mongoid::StringifiedSymbol do
+
+  describe ".demongoize" do
+
+    context "when the object is not a symbol" do
+
+      it "returns the symbol" do
+        expect(Mongoid::StringifiedSymbol.demongoize("test")).to eq(:test)
+      end
+    end
+
+    context "when the object is a symbol" do
+
+      it "returns the symbol" do
+        expect(Mongoid::StringifiedSymbol.demongoize(:test)).to eq(:test)
+      end
+    end
+
+    context "when the object is a BSON Symbol" do
+
+      it "returns a symbol" do
+        expect(Mongoid::StringifiedSymbol.demongoize(BSON::Symbol::Raw.new(:test))).to eq(:test)
+      end
+    end
+
+
+    context "when the object is an integer" do
+
+      it "returns a symbol" do
+        expect(Mongoid::StringifiedSymbol.demongoize(14)).to eq(:"14")
+      end
+    end
+
+    context "when the object is nil" do
+
+      it "returns nil" do
+        expect(Mongoid::StringifiedSymbol.demongoize(nil)).to be_nil
+      end
+    end
+  end
+
+  describe ".mongoize" do
+
+    context "when the object is not a symbol" do
+
+      it "returns the object" do
+        expect(Mongoid::StringifiedSymbol.mongoize("test")).to eq("test")
+      end
+
+      it "returns the string" do
+        expect(Mongoid::StringifiedSymbol.mongoize([0,1,2])).to eq("[0, 1, 2]")
+      end
+
+      it "returns the string" do
+        expect(Mongoid::StringifiedSymbol.mongoize(2)).to eq("2")
+      end
+    end
+
+    context "when the object is a symbol" do
+
+      it "returns a string" do
+        expect(Mongoid::StringifiedSymbol.mongoize(:test)).to eq("test")
+      end
+    end
+
+    context "when the object is nil" do
+
+      it "returns nil" do
+        expect(Mongoid::StringifiedSymbol.mongoize(nil)).to be_nil
+      end
+    end
+  end
+
+  describe "#mongoize" do
+
+    it "returns self" do
+      expect(:test.mongoize).to eq(:test)
+    end
+  end
+end