mongoid 7.2.0 → 7.2.4

data/spec/mongoid/criteria/queryable/selectable_logical_spec.rb

@@ -1447,6 +1447,42 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
       end
     end
+
+    context 'when using multiple criteria and symbol operators' do
+      context 'when using fields that meaningfully evolve values' do
+
+        let(:query) do
+          Dictionary.any_of({a: 1}, :published.gt => Date.new(2020, 2, 3))
+        end
+
+        it 'generates the expected query' do
+          query.selector.should == {'$or' => [
+            {'a' => 1},
+            # Date instance is converted to a Time instance in local time,
+            # because we are querying on a Time field and dates are interpreted
+            # in local time when assigning to Time fields
+            {'published' => {'$gt' => Time.local(2020, 2, 3)}},
+          ]}
+        end
+      end
+
+      context 'when using fields that do not meaningfully evolve values' do
+
+        let(:query) do
+          Dictionary.any_of({a: 1}, :submitted_on.gt => Date.new(2020, 2, 3))
+        end
+
+        it 'generates the expected query' do
+          query.selector.should == {'$or' => [
+            {'a' => 1},
+            # Date instance is converted to a Time instance in UTC,
+            # because we are querying on a Date field and dates are interpreted
+            # in UTC when persisted as dates by Mongoid
+            {'submitted_on' => {'$gt' => Time.utc(2020, 2, 3)}},
+          ]}
+        end
+      end
+    end
   end
 
   describe "#not" do

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/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/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

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

@@ -3,9 +3,8 @@
     name: foo
   key: name
   
-  exists: true
-  value: foo
-  expanded: false
+  result: 
+    - foo
 
 - name: scalar leaf
   document: &foo-bar-foo-bar-2
@@ -16,20 +15,26 @@
             2
   key: foo.bar.foo.bar
   
-  exists: true
-  value: 2
-  expanded: false
+  result:
+    - 2
 
 - name: scalar non-leaf
   document: *foo-bar-foo-bar-2
   key: foo.bar
   
-  exists: true
-  value:
-    foo:
-      bar:
-        2
-  expanded: false
+  result:
+    -
+      foo:
+        bar:
+          2
+
+- name: null leaf
+  document:
+    name:
+  key: name
+  
+  result: 
+    - ~
 
 - name: array leaf
   document: &foo-bar-foo-bar-array-2
@@ -40,21 +45,18 @@
             - 2
   key: foo.bar.foo.bar
   
-  exists: true
-  value:
-    - 2
-  expanded: false
+  result:
+    - [2]
 
 - name: scalar non-leaf
   document: *foo-bar-foo-bar-array-2
   key: foo.bar
   
-  exists: true
-  value:
-    foo:
-      bar:
-        - 2
-  expanded: false
+  result:
+    -
+      foo:
+        bar:
+          - 2
 
 - name: array non-leaf
   document: &foo-bar-array-foo-bar-2
@@ -66,30 +68,24 @@
               2
   key: foo.bar.foo.bar
   
-  exists: true
-  value:
+  result:
     - 2
-  expanded: true
 
 - name: array non-leaf with non-leaf query
   document: *foo-bar-array-foo-bar-2
   key: foo.bar
   
-  exists: true
-  value:
+  result:
     -
       foo:
         bar:
           2
-  expanded: true
 
 - name: array non-leaf with query for missing non-leaf key
   document: *foo-bar-array-foo-bar-2
   key: foo.missing
   
-  exists: false
-  value: []
-  expanded: true
+  result: []
 
 - name: path past end of document
   document: &foo-hello-world
@@ -97,17 +93,23 @@
       hello: world
   key: foo.bar.foo.bar
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
 
 - name: query for missing leaf key
   document: *foo-hello-world
   key: foo.bar
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
+
+- name: numeric path component when traversing hash
+  document:
+    foo:
+      "10":
+        42
+  key: "foo.10"
+
+  result: 
+    - 42
 
 - name: array index - hash leaf
   document: &foo-one-two
@@ -117,42 +119,35 @@
     bar: [3, 4]
   key: foo.1.two
   
-  exists: true
-  value: 2
-  expanded: false
+  result: 
+    - 2
 
 - name: array index - hash non-leaf
   document: *foo-one-two
   key: foo.1
   
-  exists: true
-  value:
-    two: 2
-  expanded: false
+  result:
+    -
+      two: 2
 
 - name: array index - scalar leaf
   document: *foo-one-two
   key: bar.1
   
-  exists: true
-  value: 4
-  expanded: false
+  result: 
+    - 4
 
 - name: array index - scalar leaf - missing
   document: *foo-one-two
   key: bar.2
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
 
 - name: array index - scalar leaf - missing with further hash subscription
   document: *foo-one-two
   key: bar.2.any
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
 
 - name: non-sequential nested arrays - hash leaf - one value
   document: &books-authors
@@ -166,30 +161,27 @@
           - name: Pasha
   key: books.0.authors.name
   
-  exists: true
-  value: [Steve]
-  expanded: true
+  result:
+    - Steve
 
 - name: non-sequential nested arrays - hash non-leaf - one value
   document: *books-authors
   key: books.0
   
-  exists: true
-  value:
-    authors:
-      - name: Steve
-  expanded: false
+  result:
+    -
+      authors:
+        - name: Steve
 
 - name: non-sequential nested arrays - hash non-leaf - multiple values
   document: *books-authors
   key: books.1
   
-  exists: true
-  value:
-    authors:
-      - name: Boris
-      - name: Pasha
-  expanded: false
+  result:
+    -
+      authors:
+        - name: Boris
+        - name: Pasha
 
 - name: sequential nested arrays - numerically indexed leaf
   document: &groups
@@ -197,41 +189,32 @@
       - [1]
   key: groups.0.0
   
-  exists: true
-  value: 1
-  expanded: false
+  result: 
+    - 1
 
 - name: sequential nested arrays - numerically indexed leaf - missing
   document: *groups
   key: groups.0.1
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
 
 - name: sequential nested arrays - missing hash path through non-leaf
   document: *groups
   key: groups.missing
   
-  exists: false
-  value: []
-  expanded: true
+  result: []
 
 - name: sequential nested arrays - missing hash path through leaf
   document: *groups
   key: groups.0.missing
   
-  exists: false
-  value: []
-  expanded: true
+  result: []
 
 - name: sequential nested arrays - missing hash path past leaf
   document: *groups
   key: groups.0.0.missing
   
-  exists: false
-  value: ~
-  expanded: false
+  result: []
 
 - name: mix of arrays and hashes in an array
   document:
@@ -242,9 +225,8 @@
       - bar: 2
   key: foo.bar
   
-  exists: true
-  value: [2]
-  expanded: true
+  result: 
+    - 2
 
 - name: numeric index through a primitive value not supporting subscription operator
   document:
@@ -254,6 +236,4 @@
   key:
     occupants.0.age.0
     
-  exists: false
-  value: ~
-  expanded: false
+  result: []