plucky 0.6.4 → 0.6.5

data/lib/plucky/criteria_hash.rb

@@ -77,58 +77,9 @@ module Plucky
       @source
     end
 
-    # Public and completely disgusting
+    # Public
     def merge(other)
-      target = @source.dup
-      other.source.each_key do |key|
-        value, other_value = target[key], other[key]
-        target[key] =
-          if target.key?(key)
-            value_is_hash = value.is_a?(Hash)
-            other_is_hash = other_value.is_a?(Hash)
-
-            if value_is_hash && other_is_hash
-              value.update(other_value) do |key, old_value, new_value|
-                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
-                  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) }
-                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) }
-                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
-              merge_values_into_array(value, other_value)
-            end
-          else
-            other_value
-          end
-      end
-      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)
+      self.class.new hash_merge(@source, other.source)
     end
 
     # Public
@@ -139,17 +90,6 @@ module Plucky
       self
     end
 
-    # Private
-    def object_ids
-      @options[:object_ids] ||= []
-    end
-
-    # Private
-    def object_ids=(value)
-      raise ArgumentError unless value.is_a?(Array)
-      @options[:object_ids] = value.flatten
-    end
-
     # Public: The definition of simple is querying by only _id or _id and _type.
     # If this is the case, you can use IdentityMap in library to not perform
     # query and instead just return from map.
@@ -165,6 +105,75 @@ module Plucky
       object_ids.include?(key.to_sym)
     end
 
+    # Private
+    def object_ids
+      @options[:object_ids] ||= []
+    end
+
+    # Private
+    def object_ids=(value)
+      raise ArgumentError unless value.is_a?(Array)
+      @options[:object_ids] = value.flatten
+    end
+
+    private
+
+    # Private
+    def hash_merge(oldhash, newhash)
+      merge_compound_or_clauses!(oldhash, newhash)
+      oldhash.merge(newhash) do |key, oldval, newval|
+        old_is_hash = oldval.instance_of? Hash
+        new_is_hash = newval.instance_of? Hash
+
+        if old_is_hash && new_is_hash
+          hash_merge(oldval, newval)
+        elsif old_is_hash
+          modifier_merge(oldval, newval)
+        elsif new_is_hash
+          modifier_merge(newval, oldval)
+        else
+          merge_values_into_array(oldval, newval)
+        end
+      end
+    end
+
+    def merge_compound_or_clauses!(oldhash, newhash)
+      old_or = oldhash[:$or]
+      new_or = newhash[:$or]
+      if old_or && new_or
+        oldhash[:$and] ||= []
+        oldhash[:$and] << {:$or => oldhash.delete(:$or)}
+        oldhash[:$and] << {:$or => newhash.delete(:$or)}
+      elsif new_or && oldhash[:$and]
+        if oldhash[:$and].any? {|v| v.key? :$or }
+          oldhash[:$and] << {:$or => newhash.delete(:$or)}
+        end
+      elsif old_or && newhash[:$and]
+        if newhash[:$and].any? {|v| v.key? :$or }
+          newhash[:$and] << {:$or => oldhash.delete(:$or)}
+        end
+      end
+    end
+
+    # Private
+    def modifier_merge(hash, value)
+      if modifier_key = hash.keys.detect { |k| Plucky.modifier?(k) }
+        hash[modifier_key].concat( array(value) ).uniq
+      end
+    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
+
     # Private
     def normalized_key(key)
       key_normalizer.call(key)

data/lib/plucky/normalizers/hash_key.rb

@@ -0,0 +1,19 @@
+module Plucky
+  module Normalizers
+    class HashKey
+
+      def initialize(keys)
+        @keys = keys
+      end
+
+      # Public: Normalizes an options hash key
+      #
+      # key - The key to normalize
+      #
+      # Returns a Symbol.
+      def call(key)
+        @keys.fetch key.to_sym, key
+      end
+    end
+  end
+end

data/lib/plucky/normalizers/options_hash_value.rb

@@ -5,9 +5,9 @@ require 'plucky/normalizers/sort_value'
 module Plucky
   module Normalizers
     class OptionsHashValue
-
-      # Public: Initialize an OptionsHashValue.
-      #
+
+      # Public: Initialize an OptionsHashValue.
+      #
       # args - The hash of arguments (default: {})
       #        :key_normalizer - The key normalizer to use, must respond to call
       #        :value_normalizers - Hash where key is name of options hash key
@@ -66,9 +66,7 @@ module Plucky
 
       # Private
       def default_sort_value_normalizer
-        Normalizers::SortValue.new({
-          :key_normalizer => @key_normalizer,
-        })
+        Normalizers::SortValue.new(:key_normalizer => Normalizers::HashKey.new({:_id => :id}))
       end
 
       # Private

data/lib/plucky/options_hash.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'plucky/normalizers/options_hash_key'
+require 'plucky/normalizers/hash_key'
 require 'plucky/normalizers/options_hash_value'
 
 module Plucky
@@ -82,7 +82,12 @@ module Plucky
     # Private
     def key_normalizer
       @key_normalizer ||= @options.fetch(:key_normalizer) {
-        Normalizers::OptionsHashKey.new
+        Normalizers::HashKey.new({
+          :order  => :sort,
+          :select => :fields,
+          :offset => :skip,
+          :id     => :_id,
+        })
       }
     end
 

data/lib/plucky/version.rb

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

data/spec/functional/options_hash_spec.rb

@@ -0,0 +1,36 @@
+require 'helper'
+
+describe Plucky::OptionsHash do
+  subject { described_class.new }
+
+  describe "#[]=" do
+    it "changes order to sort" do
+      subject[:order] = "foo asc"
+      subject[:sort].should == [["foo", 1]]
+      subject[:order].should be_nil
+    end
+
+    it "changes select to fields" do
+      subject[:select] = [:foo]
+      subject[:fields].should == [:foo]
+      subject[:select].should be_nil
+    end
+
+    it "changes offset to skip" do
+      subject[:offset] = 10
+      subject[:skip].should == 10
+      subject[:offset].should be_nil
+    end
+
+    it "changes id to _id" do
+      subject[:id] = :foo
+      subject[:_id].should == :foo
+      subject[:id].should be_nil
+    end
+
+    it "does not change the sort field" do
+      subject[:order] = :order.asc
+      subject[:sort].should == [["order", 1]]
+    end
+  end
+end

data/spec/helper.rb

@@ -17,7 +17,7 @@ Log = Logger.new(File.join(log_dir, 'test.log'))
 
 LogBuddy.init :logger => Log
 
-port = ENV.fetch "GH_MONGODB_PORT", 27017
+port = ENV.fetch "BOXEN_MONGODB_PORT", 27017
 connection = Mongo::MongoClient.new('127.0.0.1', port.to_i, :logger => Log)
 DB = connection.db('test')
 

data/spec/plucky/criteria_hash_spec.rb

@@ -147,6 +147,40 @@ describe Plucky::CriteriaHash do
       c1.merge(c2).should_not equal(c1)
       c1[:foo].should == 'bar'
     end
+
+    context "given multiple $or clauses" do
+      before do
+        @c1 = described_class.new(:$or => [{:a => 1}, {:b => 2}])
+        @c2 = described_class.new(:$or => [{:a => 3}, {:b => 4}])
+        @c3 = described_class.new(:$or => [{:a => 4}, {:b => 4}])
+      end
+
+      it "merges two $ors into a compound $and" do
+        merged = @c1.merge(@c2)
+        merged[:$and].should == [
+          {:$or => [{:a => 1}, {:b => 2}]},
+          {:$or => [{:a => 3}, {:b => 4}]}
+        ]
+      end
+
+      it "merges an $and and a $or into a compound $and" do
+        merged = @c1.merge(@c2).merge(@c3)
+        merged[:$and].should == [
+          {:$or => [{:a => 1}, {:b => 2}]},
+          {:$or => [{:a => 3}, {:b => 4}]},
+          {:$or => [{:a => 4}, {:b => 4}]}
+        ]
+      end
+
+      it "merges an $or and an $and into a compound $and" do
+        merged = @c3.merge @c1.merge(@c2)
+        merged[:$and].should == [
+          {:$or => [{:a => 1}, {:b => 2}]},
+          {:$or => [{:a => 3}, {:b => 4}]},
+          {:$or => [{:a => 4}, {:b => 4}]}
+        ]
+      end
+    end
   end
 
   context "#merge!" do

data/spec/plucky/normalizers/hash_key_spec.rb

@@ -0,0 +1,15 @@
+require 'helper'
+
+describe Plucky::Normalizers::HashKey do
+  subject {
+    described_class.new(:bacon => :sizzle)
+  }
+
+  it "changes defined fields" do
+    subject.call(:bacon).should eq(:sizzle)
+  end
+
+  it "does not change undefined fields" do
+    subject.call(:sausage).should eq(:sausage)
+  end
+end

data/spec/plucky/normalizers/sort_value_spec.rb

@@ -3,7 +3,7 @@ require 'plucky/normalizers/sort_value'
 
 describe Plucky::Normalizers::SortValue do
   let(:key_normalizer) {
-    lambda { |key| key == :id ? :_id : key.to_sym }
+    Plucky::Normalizers::HashKey.new({:id => :_id})
   }
 
   subject {
@@ -88,6 +88,10 @@ describe Plucky::Normalizers::SortValue do
     subject.call([:id.asc]).should eq([['_id', 1]])
   end
 
+  it "doesn't convert keys like :sort to :order via key normalizer" do
+    subject.call(:order.asc).should eq([['order', 1]])
+  end
+
   it "converts string with $natural correctly" do
     subject.call('$natural desc').should eq([['$natural', -1]])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plucky
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -52,8 +52,8 @@ files:
 - lib/plucky/normalizers/criteria_hash_key.rb
 - lib/plucky/normalizers/criteria_hash_value.rb
 - lib/plucky/normalizers/fields_value.rb
+- lib/plucky/normalizers/hash_key.rb
 - lib/plucky/normalizers/integer.rb
-- lib/plucky/normalizers/options_hash_key.rb
 - lib/plucky/normalizers/options_hash_value.rb
 - lib/plucky/normalizers/sort_value.rb
 - lib/plucky/options_hash.rb
@@ -67,13 +67,14 @@ files:
 - script/criteria_hash.rb
 - script/release
 - script/test
+- spec/functional/options_hash_spec.rb
 - spec/helper.rb
 - spec/plucky/criteria_hash_spec.rb
 - spec/plucky/normalizers/criteria_hash_key_spec.rb
 - spec/plucky/normalizers/criteria_hash_value_spec.rb
 - spec/plucky/normalizers/fields_value_spec.rb
+- spec/plucky/normalizers/hash_key_spec.rb
 - spec/plucky/normalizers/integer_spec.rb
-- spec/plucky/normalizers/options_hash_key_spec.rb
 - spec/plucky/normalizers/options_hash_value_spec.rb
 - spec/plucky/normalizers/sort_value_spec.rb
 - spec/plucky/options_hash_spec.rb
@@ -110,13 +111,14 @@ specification_version: 3
 summary: Thin layer over the ruby driver that allows you to quickly grab hold of your
   data (pluck it!).
 test_files:
+- spec/functional/options_hash_spec.rb
 - spec/helper.rb
 - spec/plucky/criteria_hash_spec.rb
 - spec/plucky/normalizers/criteria_hash_key_spec.rb
 - spec/plucky/normalizers/criteria_hash_value_spec.rb
 - spec/plucky/normalizers/fields_value_spec.rb
+- spec/plucky/normalizers/hash_key_spec.rb
 - spec/plucky/normalizers/integer_spec.rb
-- spec/plucky/normalizers/options_hash_key_spec.rb
 - spec/plucky/normalizers/options_hash_value_spec.rb
 - spec/plucky/normalizers/sort_value_spec.rb
 - spec/plucky/options_hash_spec.rb

data/lib/plucky/normalizers/options_hash_key.rb

@@ -1,23 +0,0 @@
-module Plucky
-  module Normalizers
-    class OptionsHashKey
-
-      # Internal: Keys with values that they should normalize to
-      NormalizedKeys = {
-        :order  => :sort,
-        :select => :fields,
-        :offset => :skip,
-        :id     => :_id,
-      }
-
-      # Public: Normalizes an options hash key
-      #
-      # key - The key to normalize
-      #
-      # Returns a Symbol.
-      def call(key)
-        NormalizedKeys.fetch key.to_sym, key
-      end
-    end
-  end
-end

data/spec/plucky/normalizers/options_hash_key_spec.rb

@@ -1,23 +0,0 @@
-require 'helper'
-
-describe Plucky::Normalizers::OptionsHashKey do
-  subject {
-    described_class.new
-  }
-
-  it "changes order to sort" do
-    subject.call(:order).should eq(:sort)
-  end
-
-  it "changes select to fields" do
-    subject.call(:select).should eq(:fields)
-  end
-
-  it "changes offset to skip" do
-    subject.call(:offset).should eq(:skip)
-  end
-
-  it "changes id to _id" do
-    subject.call(:id).should eq(:_id)
-  end
-end