mongoid 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed08df05221cb2fd51ee6873d0057b4966a5c0b8
-  data.tar.gz: a741c71fcb479876d2ea795cecb20662732a2333
+  metadata.gz: a8b580a727a83dc18982a841d0b52cf35f5d0c0a
+  data.tar.gz: b27b04628096c9a288675eb3f467e06dd8d86d5a
 SHA512:
-  metadata.gz: 0cae8bddd78b2ede9c0a8ace4ce8c468699e2a9f3b4377b3af9dde6948a83d911271e5425944ff12a385a56f4c3316f360a313933db558e801b76cb1b23ecd47
-  data.tar.gz: 4611925c73babd6ec1b7b3297e764f78ecd3b49d8dea449dc43d45385151ca59b69dba0f8b454cd554583c4d5217fd1c24f83d7a16cddfd32e1e82611e7c0a95
+  metadata.gz: ebc9caddd2509267906d0560638c935f78bf2b88424cb0a5b9bd948f32dc072775053a98636979458810c01e9c444abe4e7c6484b48eafbfa982288821302b16
+  data.tar.gz: ff7dd1d52db6ec52a32c372f7d991e7821adaf0fc2404d9cde3b2c397df971b76a6fc273fe46d04f84976c56415886dd177b585b9071afedeac31de4617a02cb

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-Wǻ�fJw���
��� �<L���
��ڐ�5��
>�������1R9$�nPK)�M#����v��GM��q�?��S��j��YJA����{_�������%45f-{Hy�;BO�_M�$,��@S*i�HI}�З�����]���Dd~1���@��;����j}�����la���]~0��ob8-�����t�_h�:��f�jF��J��̀�R���T8)�w
+���ה��\�k�D|u&�ި:ͨ�fIZ���j�۳爑i��#A$U��F��	>w
+Z7�ۻ&aZ9��0bC��,�AfZ��\Z{�e���_H(K~;ٕ���|�;C���Μ�����p��1d�RP!eC��`{>��!��}D��?���/B���w�Ŏ��~��C1楯y��H,��^p�Ņ��?���ޓ
+ju8����3�Y�A�n<�?���Ky�ԟmb"iz5���'�ü�3�77@�$x����

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

@@ -21,7 +21,13 @@ 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|
-                _key == '$in' ? new_val & old_val : old_val | new_val
+                if in?(_key)
+                  new_val & old_val
+                elsif nin?(_key)
+                  (old_val + new_val).uniq
+                else
+                  new_val
+                end
               end
             end
             if multi_selection?(key)
@@ -190,6 +196,16 @@ module Mongoid
         def multi_value?(key)
           key =~ /\$nin|\$in/
         end
+
+        private
+
+        def in?(key)
+          key =~ /\$in/
+        end
+
+        def nin?(key)
+          key =~ /\$nin/
+        end
       end
     end
   end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "6.0.1"
+  VERSION = "6.0.2"
 end

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

@@ -135,6 +135,27 @@ describe Mongoid::Criteria::Queryable::Selector do
       end
     end
 
+    context 'when an object does not support the | operator' do
+
+      before do
+        selector['start'] = selection
+        selector.merge!(other)
+      end
+
+      let(:selection) do
+        { '$lt' => Time.now }
+      end
+
+      let(:other) do
+        { 'start' => selection, 'name' => 'test',  }
+      end
+
+      it "merges" do
+        expect(selector['name']).to eq('test')
+        expect(selector['start']).to eq(selection)
+      end
+    end
+
     context "when the selector contains an $or" do
 
       let(:initial) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   ZIvvwAhgCjVW5QCi2I1noxXLmtZ3XDawWu8kaGtu8giHXcwL3941m8hvFZ/Wr9Yi
   JvcXJt2a4/JvwnIs2hmKuyfhZmB9HEE5wQQaCMnnC14=
   -----END CERTIFICATE-----
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel

metadata.gz.sig

@@ -1,2 +1 @@
-�ϭ���<i�L�˶���`G�|�d�w����l#��w��S���b
���a���!рu����\�SV�M2����Vb�A�$XI�q[n��/h���Ğ\�/:�z6Q35�T���y�Ie����>Lp �����dY� +5��
��Ç��)��xC�ݔFG�-km��MK��v��h�lXO�q@�F�[�$,���������1
�j�
-�J.)g�ג��a��
+��@3�GO�1����{��i{Uǀ��B�}1�m���\4`ż��)�/�$���x܉�+�Hw�#�l������tv��dҒ�ʕ^��=�G���9�q0;Ȍ�N�-1}T��