origin 1.0.2 → 1.0.3

data/CHANGELOG.md

@@ -6,11 +6,18 @@
 
 ### Resolved Issues
 
+## 1.0.3
+
+### Resolved Issues
+
+* mongoid/mongoid\#2170 Multi selection ($and/$or) now properly concats
+  when merging two criteria.
+
 ## 1.0.2
 
 ### Resolved Issues
 
-* mongoid/mongoid \#2165 Multi selection ($and/$or) now takes into account
+* mongoid/mongoid\#2165 Multi selection ($and/$or) now takes into account
   field aliases.
 
 ## 1.0.1

data/lib/origin/selector.rb

@@ -5,11 +5,24 @@ module Origin
   # coming into it as well as being alias and locale aware for key names.
   class Selector < Smash
 
+    # Merges another selector into this one.
+    #
+    # @example Merge in another selector.
+    #   selector.merge!(name: "test")
+    #
+    # @param [ Hash, Selector ] other The object to merge in.
+    #
+    # @return [ Selector ] The selector.
+    #
+    # @since 1.0.0
     def merge!(other)
       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)
         end
+        if multi_selection?(key)
+          value = (self[key.to_s] || []).concat(value)
+        end
         store(key, value)
       end
     end

data/lib/origin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origin
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3124346352379562039
+      hash: -80852933804557315
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: