plucky 0.6.1 → 0.6.2

data/lib/plucky/criteria_hash.rb

@@ -92,23 +92,25 @@ module Plucky
                 if old_value.is_a?(Hash) && new_value.is_a?(Hash)
                   self.class.new(old_value).merge(self.class.new(new_value)).to_hash
                 else
-                  Array(old_value).concat(Array(new_value)).uniq
+                  merge_values_into_array(old_value, new_value)
                 end
               end
             elsif value_is_hash && !other_is_hash
               if modifier_key = value.keys.detect { |k| Plucky.modifier?(k) }
-                value[modifier_key].concat(Array(other_value)).uniq!
+                current_value = value[modifier_key]
+                value[modifier_key] = current_value.concat(array(other_value)).uniq
               else
                 # kaboom! Array(value).concat(Array(other_value)).uniq
               end
             elsif other_is_hash && !value_is_hash
               if modifier_key = other_value.keys.detect { |k| Plucky.modifier?(k) }
-                other_value[modifier_key].concat(Array(value)).uniq!
+                current_value = other_value[modifier_key]
+                other_value[modifier_key] = current_value.concat(array(value)).uniq
               else
                 # kaboom! Array(value).concat(Array(other_value)).uniq
               end
             else
-              Array(value).concat(Array(other_value)).uniq
+              merge_values_into_array(value, other_value)
             end
           else
             other_value
@@ -117,6 +119,18 @@ module Plucky
       self.class.new(target)
     end
 
+    # Private
+    def merge_values_into_array(value, other_value)
+      array(value).concat(array(other_value)).uniq
+    end
+
+    # Private: Array(BSON::ObjectId) returns the byte array or what not instead
+    # of the object id. This makes sure it is an array of object ids, not the
+    # guts of the object id.
+    def array(value)
+      value.is_a?(BSON::ObjectId) ? [value] : Array(value)
+    end
+
     # Public
     def merge!(other)
       merge(other).to_hash.each do |key, value|

data/lib/plucky/normalizers/criteria_hash_value.rb

@@ -26,7 +26,7 @@ module Plucky
 
             if nesting_operator?(key)
               value.map  { |v| criteria_hash_class.new(v, options).to_hash }
-            elsif parent_key == key && !modifier?(key)
+            elsif parent_key == key && !modifier?(key) && !value.empty?
               # we're not nested and not the value for a symbol operator
               {:$in => value.to_a}
             else

data/lib/plucky/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Plucky
-  Version = '0.6.1'
+  Version = '0.6.2'
 end

data/spec/plucky/criteria_hash_spec.rb

@@ -100,6 +100,23 @@ describe Plucky::CriteriaHash do
       c2.merge(c1).source.should eq(:foo => {:$in => %w[bar baz]})
     end
 
+    it "correctly merges two bson object ids" do
+      id1 = BSON::ObjectId.new
+      id2 = BSON::ObjectId.new
+      c1 = described_class.new(:foo => id1)
+      c2 = described_class.new(:foo => id2)
+      c1.merge(c2).source.should eq(:foo => {:$in => [id1, id2]})
+    end
+
+    it "correctly merges array and an object id" do
+      id1 = BSON::ObjectId.new
+      id2 = BSON::ObjectId.new
+      c1 = described_class.new(:foo => [id1])
+      c2 = described_class.new(:foo => id2)
+      c1.merge(c2).source.should eq(:foo => {:$in => [id1, id2]})
+      c2.merge(c1).source.should eq(:foo => {:$in => [id1, id2]})
+    end
+
     it "is able to merge two modifier hashes" do
       c1 = described_class.new(:$in => [1, 2])
       c2 = described_class.new(:$in => [2, 3])

data/spec/plucky/normalizers/criteria_hash_value_spec.rb

@@ -64,6 +64,12 @@ describe Plucky::Normalizers::CriteriaHashValue do
       subject.call(:foo, :foo, actual).should eq(expected)
     end
 
+    it "does not turn value to $in with an empty array value" do
+      actual = []
+      expected = []
+      subject.call(:foo, :foo, actual).should eq(expected)
+    end
+
     it "does not turn value to $in with $or key" do
       actual = [{:numbers => 1}, {:numbers => 2}]
       expected = [{:numbers => 1}, {:numbers => 2}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plucky
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70345461736220 !ruby/object:Gem::Requirement
+  requirement: &70139265557120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70345461736220
+  version_requirements: *70139265557120
 description: 
 email:
 - nunemaker@gmail.com
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3792223314074496611
+      hash: -4423147418805869857
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3792223314074496611
+      hash: -4423147418805869857
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10