mongoid 7.5.3 → 7.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27b0f244fe4642a684c267744270dd8e72b2b3ae1074b3621c24b31e979299b6
-  data.tar.gz: a79526be9f430f3777a35b2c27271175eca415c57ab2ae0346e3050b52f9311f
+  metadata.gz: ce7f228fdc033dc1142f46f4771395d36acafc97e0c144599cd063af537c7ae3
+  data.tar.gz: 15f8f0efbb076eb03f25f23898cbe27d044e7441e4a7ae4bc8d22f036838bb98
 SHA512:
-  metadata.gz: 88c97668e4474dc109a910b2faa28f08b4c105b02e0f43611df3f2122e1232d9c3b2bfaedaf8aebebccf4358c40bc65c6bd04cfdc252c8ceca286aecf5b2d77e
-  data.tar.gz: ec9a56811c18fcf4cdeb238a7aa85eb350bc86513d9a883cd8f603122189af3da71bd0eea3a830ac06a26af30424648af935bf633f56ec740d045e94209b24fe
+  metadata.gz: 91f40b7136ae729e6831c5033c60c0a1e2207cd98d80bf5caaef50844230d6830efe555748571d9bdef62a101f75ffd21d2a7942278f84b68e2a51fc6a8f20df
+  data.tar.gz: 3555b90da32865e1faadb9efccc6db0262adea620b4dd473d5dc1ee533b00451039dfaacd982ef5c8f6be4009ccff589119b2f512971a1b5ac509bb7ae4aa96e

data/Rakefile

@@ -11,6 +11,15 @@ $: << File.join(ROOT, 'spec/shared/lib')
 require "rake"
 require "rspec/core/rake_task"
 require 'mrss/spec_organizer'
+require 'rubygems/package'
+require 'rubygems/security/policies'
+
+def signed_gem?(path_to_gem)
+  Gem::Package.new(path_to_gem, Gem::Security::HighSecurity).verify
+  true
+rescue Gem::Security::Exception => e
+  false
+end
 
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "mongoid/version"
@@ -103,3 +112,19 @@ namespace :release do
     end
   end
 end
+
+desc 'Verifies that all built gems in pkg/ are valid'
+task :verify do
+  gems = Dir['pkg/*.gem']
+  if gems.empty?
+    puts 'There are no gems in pkg/ to verify'
+  else
+    gems.each do |gem|
+      if signed_gem?(gem)
+        puts "#{gem} is signed"
+      else
+        abort "#{gem} is not signed"
+      end
+    end
+  end
+end

data/lib/mongoid/criteria/queryable/selector.rb

@@ -20,7 +20,7 @@ module Mongoid
           other.each_pair do |key, value|
             if value.is_a?(Hash) && self[key.to_s].is_a?(Hash)
               value = self[key.to_s].merge(value) do |_key, old_val, new_val|
-                case _key
+                case _key.to_s
                 when '$in'
                   new_val & old_val
                 when '$nin'

data/lib/mongoid/criteria/queryable/storable.rb

@@ -47,7 +47,7 @@ module Mongoid
             if value.is_a?(Hash) && selector[field].is_a?(Hash) &&
               value.keys.all? { |key|
                 key_s = key.to_s
-                key_s.start_with?('$') && !selector[field].key?(key_s)
+                key_s.start_with?('$') && !selector[field].keys.map(&:to_s).include?(key_s)
               }
             then
               # Multiple operators can be combined on the same field by

data/lib/mongoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mongoid
-  VERSION = "7.5.3"
+  VERSION = "7.5.4"
 end

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

@@ -44,7 +44,7 @@ describe Mongoid::Criteria::Queryable::Selector do
       end
     end
 
-    context "when selector contains a $nin" do
+    context "when selector contains a $nin string" do
 
       let(:initial) do
         { "$nin" => ["foo"] }
@@ -72,7 +72,35 @@ describe Mongoid::Criteria::Queryable::Selector do
       end
     end
 
-    context "when selector contains a $in" do
+    context "when selector contains a $nin symbol" do
+
+      let(:initial) do
+        { :$nin => ["foo"] }
+      end
+
+      before do
+        selector["field"] = initial
+      end
+
+      context "when merging in a new $nin" do
+
+        let(:other) do
+          { "field" => { :$nin => ["bar"] } }
+        end
+
+        before do
+          selector.merge!(other)
+        end
+
+        it "combines the two $nin queries into one" do
+          expect(selector).to eq({
+            "field" => { :$nin => ["foo", "bar"] }
+          })
+        end
+      end
+    end
+
+    context "when selector contains a $in string" do
 
       let(:initial) do
         { "$in" => [1, 2] }
@@ -117,6 +145,51 @@ describe Mongoid::Criteria::Queryable::Selector do
       end
     end
 
+    context "when selector contains a $in symbol" do
+
+      let(:initial) do
+        { :$in => [1, 2] }
+      end
+
+      before do
+        selector["field"] = initial
+      end
+
+      context "when merging in a new $in with an intersecting value" do
+
+        let(:other) do
+          { "field" => { :$in => [1] } }
+        end
+
+        before do
+          selector.merge!(other)
+        end
+
+        it "intersects the $in values" do
+          expect(selector).to eq({
+                                     "field" => { :$in => [1] }
+                                 })
+        end
+      end
+
+      context "when merging in a new $in with no intersecting values" do
+
+        let(:other) do
+          { "field" => { :$in => [3] } }
+        end
+
+        before do
+          selector.merge!(other)
+        end
+
+        it "intersects the $in values" do
+          expect(selector).to eq({
+                                     "field" => { :$in => [] }
+                                 })
+        end
+      end
+    end
+
     context "when selector is not nested" do
 
       before do

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

@@ -210,7 +210,79 @@ describe Mongoid::Criteria::Queryable::Storable do
         }
       end
     end
+
+    context 'when value is a hash combine values with different operator keys' do
+      let(:base) do
+        query.add_field_expression('foo', {'$in' => ['bar']})
+      end
+
+      let(:modified) do
+        base.add_field_expression('foo', {'$nin' => ['zoom']})
+      end
+
+      it 'combines the conditions using $and' do
+        modified.selector.should == {
+          'foo' => {
+            '$in' => ['bar'],
+            '$nin' => ['zoom']
+          }
+        }
+      end
+    end
+
+    context 'when value is a hash with symbol operator key combine values with different operator keys' do
+      let(:base) do
+        query.add_field_expression('foo', {:$in => ['bar']})
+      end
+
+      let(:modified) do
+        base.add_field_expression('foo', {:$nin => ['zoom']})
+      end
+
+      it 'combines the conditions using $and' do
+        modified.selector.should == {
+          'foo' => {
+            :$in => ['bar'],
+            :$nin => ['zoom']
+          }
+        }
+      end
+    end
+
+    context 'when value is a hash add values with same operator keys using $and' do
+      let(:base) do
+        query.add_field_expression('foo', {'$in' => ['bar']})
+      end
+
+      let(:modified) do
+        base.add_field_expression('foo', {'$in' => ['zoom']})
+      end
+
+      it 'adds the new condition using $and' do
+        modified.selector.should == {
+          'foo' => {'$in' => ['bar']},
+          '$and' => ['foo' => {'$in' => ['zoom']}]
+        }
+      end
+    end
+
+  context 'when value is a hash with symbol operator key add values with same operator keys using $and' do
+    let(:base) do
+      query.add_field_expression('foo', {:$in => ['bar']})
+    end
+
+    let(:modified) do
+      base.add_field_expression('foo', {:$in => ['zoom']})
+    end
+
+    it 'adds the new condition using $and' do
+      modified.selector.should == {
+        'foo' => {:$in => ['bar']},
+        '$and' => ['foo' => {:$in => ['zoom']}]
+      }
+    end
   end
+end
 
   describe '#add_operator_expression' do
     let(:query_method) { :add_operator_expression }