mongoid 7.2.1 → 7.3.1

data/spec/mongoid/document_fields_spec.rb

@@ -85,4 +85,30 @@ describe Mongoid::Document do
       end
     end
   end
+
+  context 'Regexp field' do
+    shared_examples "persists strings as regexp" do |type|
+      it 'persists strings as regexp' do
+        mop = Mop.create!(regexp_field: 'foo')
+        expect(mop.regexp_field).to be_a Regexp
+        expect(Mop.find(mop.id).regexp_field).to be_a BSON::Regexp::Raw
+        expect(
+          Mop.collection.find(
+            "_id" => mop.id,
+            "regexp_field" => { "$type" => type }
+          ).count
+        ).to be == 1
+      end
+    end
+
+    context "< 3.2" do
+      max_server_version("3.1")
+      include_examples "persists strings as regexp", 11
+    end
+
+    context ">= 3.2" do
+      min_server_version("3.2")
+      it_behaves_like "persists strings as regexp", "regex"
+    end
+  end
 end

data/spec/mongoid/document_query_spec.rb

@@ -36,4 +36,55 @@ describe Mongoid::Document do
       expect(_person.age).to be 42
     end
   end
+
+  context 'when projecting with #without' do
+    before do
+      duck = Pet.new(name: 'Duck')
+      Person.create!(username: 'Dev', title: 'CEO', pet: duck)
+    end
+
+    let(:person) { Person.where(username: 'Dev').without(:title).first }
+
+      it 'allows access to attribute of embedded document' do
+      expect(person.pet.name).to eq 'Duck'
+    end
+
+    context 'when exclusion starts with association name but is not the association' do
+
+      let(:person) { Person.where(username: 'Dev').without(:pet_).first }
+
+      it 'allows access to attribute of embedded document' do
+        expect(person.pet.name).to eq 'Duck'
+      end
+    end
+
+    context 'when exclusion starts with prefix of association name' do
+
+      let(:person) { Person.where(username: 'Dev').without(:pe).first }
+
+      it 'allows access to attribute of embedded document' do
+        expect(person.pet.name).to eq 'Duck'
+      end
+    end
+
+    context 'when another attribute of the association is excluded' do
+
+      let(:person) { Person.where(username: 'Dev').without('pet.weight').first }
+
+      it 'allows access to non-excluded attribute of embedded document' do
+        expect(person.pet.name).to eq 'Duck'
+      end
+    end
+
+    context 'when the excluded attribute of the association is retrieved' do
+
+      let(:person) { Person.where(username: 'Dev').without('pet.name').first }
+
+      it 'prohibits the retrieval' do
+        lambda do
+          person.pet.name
+        end.should raise_error(ActiveModel::MissingAttributeError)
+      end
+    end
+  end
 end

data/spec/mongoid/document_spec.rb

@@ -124,13 +124,13 @@ describe Mongoid::Document do
   describe "._mongoid_clear_types" do
 
     context "when changing the discriminator_value" do
-      
-      before do 
+
+      before do
         Kangaroo._types
         Kangaroo.discriminator_value = "dvalue"
       end
 
-      after do 
+      after do
         Kangaroo.discriminator_value = nil
       end
 
@@ -140,13 +140,13 @@ describe Mongoid::Document do
     end
 
     context "when changing the discriminator_value in child" do
-      
-      before do 
+
+      before do
         Shape._types
         Circle.discriminator_value = "dvalue"
       end
 
-      after do 
+      after do
         Circle.discriminator_value = nil
       end
 
@@ -924,7 +924,7 @@ describe Mongoid::Document do
       end
 
       context "when no embedded documents are present" do
-        context "when using the default discriminator key" do 
+        context "when using the default discriminator key" do
           let(:person) do
             manager.becomes(Person)
           end
@@ -948,12 +948,12 @@ describe Mongoid::Document do
           end
         end
 
-        context "when using a custom discriminator key" do 
-          before do 
+        context "when using a custom discriminator key" do
+          before do
             Person.discriminator_key = "dkey"
           end
 
-          after do 
+          after do
             Person.discriminator_key = nil
           end
 
@@ -962,13 +962,13 @@ describe Mongoid::Document do
           end
         end
 
-        context "when using a custom discriminator key and discriminator value" do 
-          before do 
+        context "when using a custom discriminator key and discriminator value" do
+          before do
             Person.discriminator_key = "dkey"
             Person.discriminator_value = "dvalue"
           end
 
-          after do 
+          after do
             Person.discriminator_key = nil
             Person.discriminator_value = nil
           end

data/spec/mongoid/errors/delete_restriction_spec.rb

@@ -13,7 +13,7 @@ describe Mongoid::Errors::DeleteRestriction do
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "Cannot delete Person because of dependent 'drugs'."
+        "Cannot destroy Person because of dependent 'drugs'."
       )
     end
 

data/spec/mongoid/errors/mongoid_error_spec.rb

@@ -10,14 +10,26 @@ describe Mongoid::Errors::MongoidError do
   let(:options) { {} }
 
   before do
-    {"message_title" => "message", "summary_title" => "summary", "resolution_title" => "resolution"}.each do |key, name|
-      expect(::I18n).to receive(:translate).with("mongoid.errors.messages.#{key}", {}).and_return(name)
-    end
-
-    ["message", "summary", "resolution"].each do |name|
-      expect(::I18n).to receive(:translate).
-        with("mongoid.errors.messages.#{key}.#{name}", {}).
-      and_return(name)
+    if RUBY_VERSION.start_with?('3.', '2.7')
+      {"message_title" => "message", "summary_title" => "summary", "resolution_title" => "resolution"}.each do |key, name|
+        expect(::I18n).to receive(:translate).with("mongoid.errors.messages.#{key}", **{}).and_return(name)
+      end
+
+      ["message", "summary", "resolution"].each do |name|
+        expect(::I18n).to receive(:translate).
+          with("mongoid.errors.messages.#{key}.#{name}", **{}).
+          and_return(name)
+      end
+    else
+      {"message_title" => "message", "summary_title" => "summary", "resolution_title" => "resolution"}.each do |key, name|
+        expect(::I18n).to receive(:translate).with("mongoid.errors.messages.#{key}", {}).and_return(name)
+      end
+
+      ["message", "summary", "resolution"].each do |name|
+        expect(::I18n).to receive(:translate).
+          with("mongoid.errors.messages.#{key}.#{name}", {}).
+          and_return(name)
+      end
     end
 
     error.compose_message(key, options)

data/spec/mongoid/extensions/false_class_spec.rb

@@ -17,7 +17,7 @@ describe Mongoid::Extensions::FalseClass do
     context "when provided a Boolean" do
 
       it "returns true" do
-        expect(false.is_a?(Boolean)).to be true
+        expect(false.is_a?(Mongoid::Boolean)).to be true
       end
     end
 

data/spec/mongoid/extensions/string_spec.rb

@@ -158,16 +158,16 @@ describe Mongoid::Extensions::String do
           Time.now.utc_offset
         end
 
-        before do
-          expect(utc_offset).not_to eq(Time.zone.now.utc_offset)
-        end
-
-        let(:expected_time) { Time.parse("2010-11-19 00:24:49.123457 +0000").in_time_zone - utc_offset }
+        let(:expected_time) { Time.parse("2010-11-19 00:24:49.123457 +0000") - Time.parse(string).utc_offset }
 
         let(:mongoized) do
           string.__mongoize_time__
         end
 
+        it 'test operates in multiple time zones' do
+          expect(utc_offset).not_to eq(Time.zone.now.utc_offset)
+        end
+
         it_behaves_like 'mongoizes to Time'
         it_behaves_like 'maintains precision when mongoized'
       end

data/spec/mongoid/extensions/true_class_spec.rb

@@ -17,7 +17,7 @@ describe Mongoid::Extensions::TrueClass do
     context "when provided a Boolean" do
 
       it "returns true" do
-        expect(true.is_a?(Boolean)).to be true
+        expect(true.is_a?(Mongoid::Boolean)).to be true
       end
     end
 

data/spec/mongoid/fields/localized_spec.rb

@@ -448,7 +448,7 @@ describe Mongoid::Fields::Localized do
         context "when the value is false" do
 
           let(:field) do
-            described_class.new(:boolean_value, localize: true, type: Boolean)
+            described_class.new(:boolean_value, localize: true, type: Mongoid::Boolean)
           end
 
           let(:value) do
@@ -463,7 +463,7 @@ describe Mongoid::Fields::Localized do
         context "when the value is true" do
 
           let(:field) do
-            described_class.new(:boolean_value, localize: true, type: Boolean)
+            described_class.new(:boolean_value, localize: true, type: Mongoid::Boolean)
           end
 
           let(:value) do
@@ -491,7 +491,7 @@ describe Mongoid::Fields::Localized do
               end
 
               let(:field) do
-                described_class.new(:boolean_value, localize: true, type: Boolean)
+                described_class.new(:boolean_value, localize: true, type: Mongoid::Boolean)
               end
 
               let(:value) do
@@ -510,7 +510,7 @@ describe Mongoid::Fields::Localized do
               end
 
               let(:field) do
-                described_class.new(:boolean_value, localize: true, type: Boolean)
+                described_class.new(:boolean_value, localize: true, type: Mongoid::Boolean)
               end
 
               let(:value) do

data/spec/mongoid/fields_spec.rb

@@ -322,7 +322,7 @@ describe Mongoid::Fields do
       end
 
       it "converts to Mongoid::Boolean" do
-        expect(klass.field(:test, type: Boolean).type).to be(Mongoid::Boolean)
+        expect(klass.field(:test, type: Mongoid::Boolean).type).to be(Mongoid::Boolean)
       end
     end
 
@@ -404,7 +404,7 @@ describe Mongoid::Fields do
       context "when the options are all standard" do
 
         before do
-          Band.field :acceptable, type: Boolean
+          Band.field :acceptable, type: Mongoid::Boolean
         end
 
         after do
@@ -419,7 +419,7 @@ describe Mongoid::Fields do
       context "when a custom option is provided" do
 
         before do
-          Band.field :acceptable, type: Boolean, custom: true
+          Band.field :acceptable, type: Mongoid::Boolean, custom: true
         end
 
         it "adds the field to the model" do
@@ -990,7 +990,7 @@ describe Mongoid::Fields do
       end
 
       before do
-        Person.field :aliased, as: :alias, type: Boolean, overwrite: true
+        Person.field :aliased, as: :alias, type: Mongoid::Boolean, overwrite: true
       end
 
       it "uses the alias to write the attribute" do

data/spec/mongoid/inspectable_spec.rb

@@ -33,18 +33,18 @@ describe Mongoid::Inspectable do
         expect(inspected).to include("t(test):")
       end
 
-      it "displays the default discriminator key" do 
+      it "displays the default discriminator key" do
         expect(inspected).to include(%q,_type: "Person",)
       end
     end
 
     context "when using a custom discriminator key" do
 
-      before do 
+      before do
         Person.discriminator_key = "dkey"
       end
 
-      after do 
+      after do
         Person.discriminator_key = nil
       end
 
@@ -56,7 +56,7 @@ describe Mongoid::Inspectable do
         person.inspect
       end
 
-      it "displays the new discriminator key" do 
+      it "displays the new discriminator key" do
         expect(inspected).to include(%q,dkey: "Person",)
       end
     end
@@ -75,5 +75,13 @@ describe Mongoid::Inspectable do
         expect(inspected).to include(%q,some_attribute: "foo",)
       end
     end
+
+    context 'when id is unaliased' do
+      let(:shirt) { Shirt.new(id: 1, _id: 2) }
+
+      it 'shows the correct _id and id values' do
+        shirt.inspect.should == "#<Shirt _id: 2, color: nil, id: \"1\">"
+      end
+    end
   end
 end

data/spec/mongoid/matcher/extract_attribute_data/numeric_keys.yml

@@ -0,0 +1,104 @@
+- name: string key - matches
+  document:
+    # Document field names in MongoDB are always strings.
+    '42': foo
+  # The paths are also always strings.
+  key: '42'
+  
+  result:
+    - foo
+
+- name: string key - does not match
+  document:
+    # Document field names in MongoDB are always strings.
+    '42': foo
+  # The paths are also always strings.
+  key: '4'
+  
+  result: []
+
+- name: array value - matches
+  document:
+    '42':
+      - foo
+  key: '42'
+  
+  result:
+    - ['foo']
+
+- name: subfield of numeric key - matches
+  document:
+    '42':
+      foo: bar
+  key: 42.foo
+  
+  result: 
+    - bar
+
+- name: numeric key under array
+  document:
+    a:
+      -
+        '42': bar
+
+  key: a.42
+
+  result: 
+    - bar
+
+- name: multiple values under numeric key under array
+  document: &numeric-key-under-array
+    a:
+      -
+        '42': bar
+      -
+        '42': foo
+
+  key: a.42
+
+  result: 
+    - bar
+    - foo
+
+- name: array indexing with values under numeric key under array
+  document: *numeric-key-under-array
+
+  key: a.1
+
+  result: 
+    - 
+      '42': foo
+
+- name: multiple values under array under numeric key
+  document:
+    a:
+      '42':
+        -
+          foo: bar
+        -       
+          foo: baq
+
+  key: a.42.foo
+
+  result: 
+    - bar
+    - baq
+
+- name: path component interpretable as both array index and hash key
+  document: 
+    a:
+      -
+        '1': bar
+      -
+        '1': foo
+
+  key: a.1
+
+  result: 
+    # The order of these results isn't guaranteed:
+    # 1 interpreted as the array index:
+    -
+      '1': foo
+    # 1 interpreted as hash key:
+    - bar
+    - foo