mongoid 7.5.4 → 8.0.1

data/spec/integration/dots_and_dollars_spec.rb

@@ -0,0 +1,277 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Dots and Dollars" do
+  min_server_version '5.0'
+
+  before(:all) do
+    class DADMUser
+      include Mongoid::Document
+      field :"first.last", type: String, default: "Neil.Shweky"
+      field :"$_amount", type: Integer, default: 0
+      field :"$a.b", type: Boolean, default: true
+    end
+  end
+
+  let!(:user) { DADMUser.create! }
+
+  describe "accessing the fields" do
+
+    context "when using the field getters" do
+
+      context "on dotted fields" do
+        it "gets the right value" do
+          expect(user.send(:"first.last")).to eq("Neil.Shweky")
+        end
+      end
+
+      context "on dollared fields" do
+        it "gets the right value" do
+          expect(user.send(:"$_amount")).to eq(0)
+        end
+      end
+
+      context "on dotted and dollared fields" do
+        it "gets the right value" do
+          expect(user.send(:"$a.b")).to be true
+        end
+      end
+    end
+
+    context "when using the read_attribute" do
+
+      context "on dotted fields" do
+        it "gets the right value" do
+          expect(user.read_attribute("first.last")).to eq("Neil.Shweky")
+        end
+      end
+
+      context "on dollared fields" do
+        it "gets the right value" do
+          expect(user.read_attribute("$_amount")).to eq(0)
+        end
+      end
+
+      context "on dotted and dollared fields" do
+        it "gets the right value" do
+          expect(user.read_attribute("$a.b")).to be true
+        end
+      end
+    end
+
+    context "when using the field setters" do
+
+      context "on dotted fields" do
+        it "raises an error" do
+          expect do
+            user.send(:"first.last=", "Nissim.Shweky")
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dollared fields" do
+        it "raises an error" do
+          expect do
+            user.send(:"$_amount=", 1)
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dotted and dollared fields" do
+        it "raises an error" do
+          expect do
+            user.send(:"$a.b=", false)
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+    end
+
+    context "when updating via write_attribute" do
+
+      context "on dotted fields" do
+        it "raises an error" do
+          expect do
+            user.write_attribute("first.last", "Nissim.Shweky")
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dollared fields" do
+        it "raises an error" do
+          expect do
+            user.write_attribute("$_amount", 1)
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dotted and dollared fields" do
+        it "raises an error" do
+          expect do
+            user.write_attribute("$a.b", false)
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+    end
+
+    context "when updating via update_attribute" do
+
+      context "on dotted fields" do
+        it "raises an error" do
+          expect do
+            user.update_attribute("first.last", "Nissim.Shweky")
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dollared fields" do
+        it "raises an error" do
+          expect do
+            user.update_attribute("$_amount", 1)
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dotted and dollared fields" do
+        it "raises an error" do
+          expect do
+            user.update_attribute("$a.b", false)
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+    end
+
+    context "when updating via update_attributes!" do
+
+      context "on dotted fields" do
+        it "raises an error" do
+          expect do
+            user.update_attributes!("first.last": "Nissim.Shweky")
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dollared fields" do
+        it "raises an error" do
+          expect do
+            user.update_attributes!("$_amount": 1)
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dotted and dollared fields" do
+        it "raises an error" do
+          expect do
+            user.update_attributes!("$a.b": false)
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+    end
+
+    context "when updating via []=" do
+
+      context "on dotted fields" do
+        it "raises an error" do
+          expect do
+            user[:"first.last"] = "Nissim.Shweky"
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dollared fields" do
+        it "raises an error" do
+          expect do
+            user[:"$_amount"] = 1
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dotted and dollared fields" do
+        it "raises an error" do
+          expect do
+            user[:"$a.b"] = false
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+    end
+
+    context "when updating via remove_attribute" do
+
+      context "on dotted fields" do
+        it "raises an error" do
+          expect do
+            user.remove_attribute("first.last")
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dollared fields" do
+        it "raises an error" do
+          expect do
+            user.remove_attribute("$_amount")
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+
+      context "on dotted and dollared fields" do
+        it "raises an error" do
+          expect do
+            user.remove_attribute("$a.b")
+          end.to raise_error(Mongoid::Errors::InvalidDotDollarAssignment)
+        end
+      end
+    end
+  end
+
+  describe "persisting to the db" do
+
+    context "when saving to the db" do
+
+      let(:user) { DADMUser.new }
+
+      it "the save succeeds" do
+        expect do
+          user.save!
+        end.to_not raise_error
+      end
+    end
+
+    context "when retrieving it from the db" do
+
+      let(:from_db) { DADMUser.first }
+
+      it "has the fields populated correctly" do
+        expect(from_db.attributes["first.last"]).to eq("Neil.Shweky")
+        expect(from_db.attributes["$_amount"]).to eq(0)
+        expect(from_db.attributes["$a.b"]).to eq(true)
+      end
+    end
+  end
+
+  describe "querying that field" do
+
+    context "when attempting to query a dotted field" do
+
+      let(:queried) do
+        DADMUser.where("first.last": "Neil.Shweky").first
+      end
+
+      it "does not work" do
+        expect(queried).to be nil
+      end
+    end
+
+    context "when attempting to query a dollared field" do
+
+      let(:queried) do
+        DADMUser.where("$_amount": 0).first
+      end
+
+      it "raise an error" do
+        expect do
+          queried
+        end.to raise_error(Mongo::Error::OperationFailure)
+      end
+    end
+  end
+end

data/spec/integration/i18n_fallbacks_spec.rb

@@ -23,10 +23,6 @@ describe 'i18n fallbacks' do
       I18n.fallbacks[:de] = [ :en ]
     end
 
-    after do
-      I18n.locale = :en
-    end
-
     context 'when translation is present in active locale' do
       it 'uses active locale' do
         product = Product.new
@@ -40,9 +36,6 @@ describe 'i18n fallbacks' do
     end
 
     context 'when translation is missing in active locale and present in fallback locale' do
-      after do
-        I18n.locale = :en
-      end
 
       it 'falls back on default locale' do
         product = Product.new
@@ -64,10 +57,6 @@ describe 'i18n fallbacks' do
           end
         end
 
-        after do
-          I18n.locale = :en
-        end
-
         it 'returns nil' do
           product = Product.new
           I18n.locale = :en
@@ -86,10 +75,6 @@ describe 'i18n fallbacks' do
           end
         end
 
-        after do
-          I18n.locale = :en
-        end
-
         it 'falls back on default locale' do
           product = Product.new
           I18n.locale = :en
@@ -97,6 +82,7 @@ describe 'i18n fallbacks' do
           I18n.locale = :ru
           product.description.should == 'Marvelous!'
         end
+
       end
     end
   end

data/spec/integration/matcher_examples_spec.rb

@@ -652,10 +652,12 @@ describe 'Matcher' do
 
     describe 'range match on array element' do
 
+      let(:record) do
+        Record.new(producers: [123, 456])
+      end
+
       let!(:band) do
-        Band.create!(records: [
-          Record.new(producers: [123, 456]),
-        ])
+        Band.create!(records: [ record ])
       end
 
       describe 'MongoDB query' do
@@ -667,14 +669,13 @@ describe 'Matcher' do
           expect(found_band).to eq(band)
         end
 
-        # https://jira.mongodb.org/browse/MONGOID-4911
         context 'no match' do
 
-        let!(:band) do
-          Band.create!(records: [
-            Record.new(producers: [50]),
-          ])
-        end
+          let!(:band) do
+            Band.create!(records: [
+              Record.new(producers: [50, 250]),
+            ])
+          end
 
           it 'does not find' do
             expect(found_band).to be nil
@@ -687,10 +688,16 @@ describe 'Matcher' do
           band.records.where(producers: 100..200).first
         end
 
-        it 'raises InvalidQuery' do
-          lambda do
-            found_record
-          end.should raise_error(Mongoid::Errors::InvalidQuery)
+        let(:no_record) do
+          band.records.where(producers: 199..200).first
+        end
+
+        it 'finds correctly' do
+          expect(found_record).to eq(record)
+        end
+
+        it "correctly does not find" do
+          expect(no_record).to eq(nil)
         end
       end
     end

data/spec/integration/matcher_operator_data/type_decimal.yml

@@ -29,12 +29,13 @@
   matches: false
   min_server_version: 3.4
 
-- name: BigDecimal field - does not match
+# Requires :map_big_decimal_to_decimal128 option to be true.
+- name: BigDecimal field - matches
   document:
     big_decimal_field: !ruby/object:BigDecimal
       18:0.42e2
   query:
     big_decimal_field:
       $type: 19
-  matches: false
+  matches: true
   min_server_version: 3.4

data/spec/integration/matcher_operator_spec.rb

@@ -12,6 +12,8 @@ def mop_error?(spec, kind)
 end
 
 describe 'Matcher operators' do
+  config_override :map_big_decimal_to_decimal128, true
+
   Dir[File.join(File.dirname(__FILE__), 'matcher_operator_data', '*.yml')].sort.each do |path|
     context File.basename(path) do
       permitted_classes = [ BigDecimal,
@@ -35,11 +37,7 @@ describe 'Matcher operators' do
                             BSON::Timestamp,
                             BSON::Undefined ]
 
-      specs = if RUBY_VERSION.start_with?("2.5")
-                YAML.safe_load(File.read(path), permitted_classes, [], true)
-              else
-                YAML.safe_load(File.read(path), permitted_classes: permitted_classes, aliases: true)
-              end
+      specs = YAML.safe_load(File.read(path), permitted_classes: permitted_classes, aliases: true)
 
       specs.each do |spec|
         context spec['name'] do