origin 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b3dd0d1ffa7364b1d22d3ecab9755acad55db19
-  data.tar.gz: 59d946d465824d927f0e21b234c5bca4ce14b5e5
+  metadata.gz: a84f9c2e99783c93a4a4e74e7eb70341451be50f
+  data.tar.gz: 3c82e871417054d9669033ce53e84faab00dcb9f
 SHA512:
-  metadata.gz: 303578ea5526fef18a4a6bd01012de29816c62c21e55875ddd1766f92d2fc4906641ccf512fcc9aaef168763fbdfd3f1d6a754bfa83670a7464a3a95573455bc
-  data.tar.gz: 55882c68fe07dec11b74d82eb13b48eaf2c2f92857197763365f5a7bd033d6535ef8155dea91a80562aaa9d9190d25622fae0c865c00b2f355fb824cc8b0276b
+  metadata.gz: 7c56c70958271f3557dafb5280b31e1361fec3c57aea397e51d25ea360bd140d0950be487891bb70541b5c81f68e3efe4f9916a186f4dc3399e1c3d15b7d5d30
+  data.tar.gz: dc05d8f492fe32644b76d98524e2769c7588c0a437fa205a3fa08a9425bee4bfea18191e6c77bf63cb2fb046befc70f7e615a86b826de1cf098a9bc486eb3243

data/lib/origin/selector.rb

@@ -19,7 +19,13 @@ module Origin
       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)
@@ -188,5 +194,15 @@ module Origin
     def multi_value?(key)
       key =~ /\$nin|\$in/
     end
+
+    private
+
+    def in?(key)
+      key =~ /\$in/
+    end
+
+    def nin?(key)
+      key =~ /\$nin/
+    end
   end
 end

data/lib/origin/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Origin
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origin
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies: []
 description: Origin is a simple DSL for generating MongoDB selectors and options
 email: