plucky 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 236de7ad53c48e9a9178df951de813f6c1cd39a5
-  data.tar.gz: 6d1dca59a0d373438a27c3d9a19104c08eebacfa
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjkzYmEyZjI0NmViZjk3Nzc0N2JlODc5Y2JiZmZiNzhhOWQ4ZTY1OA==
+  data.tar.gz: !binary |-
+    MmNmOGM2N2RmYmRmYjllN2Q2MjRjZjQyNzAwYzhkMmZjMzZiN2JkYw==
 SHA512:
-  metadata.gz: d61c08e49e1968bc59e020b76980ad66766b826db747020de4ed18a3499866ed9a36816b02bfa16ac34cc947398a07c423f430d1e02ce6031db75d5f38dc6388
-  data.tar.gz: 53c005bd85023ab2df818e3053932bcb05142441c494181b5d9caf549f2301347aa7ee245887349ff8578539a9c8f4b54c4d339cfecb52bdd99f29571b654257
+  metadata.gz: !binary |-
+    MzNiMDVhYTk0MDBmMzI0NmM5ZGNiMzcwZTkwNDEwZGQ3N2E1NTlhMWM3YjMz
+    NmNjNDliOTc0OTUxNzFmNDU5YWE4N2Q0NDc1ODMyMjMxZDljOWJmNWRiN2Mw
+    ZmUwNTQ4NTA5ZGFlYWFmZTA5M2E5ZGFjYTA4ZjRkMDcxZGIxNDk=
+  data.tar.gz: !binary |-
+    NjExZmVhZjMyNDE2MTk2ODY1ZmRhMTdhYzdkNTliNDk1NmNkZTY3M2NkMTIy
+    OTgwNjZiNDE0NDUyYzc3YzdmYWQ1MmE4NWU5MDFiZWJiNzkxYjFjYjAxNjFk
+    YWVlOTA0YjA0NjI1YTkwMTJkNThjZmI1NTQ0MDI1OTYwNGM0OWU=

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.8.7
   - ree
   - 1.9.3
+  - jruby-19mode
 notifications:
   email: false
 bundler_args: --without debug guard performance

data/Gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'bson_ext', '~> 1.5'
+gem 'bson_ext', '~> 1.5', :platform => :mri
 gem 'rake'
 
-group :performance do
-  gem 'perftools.rb', :require => 'perftools'
+group :performance  do
+  gem 'perftools.rb', :require => 'perftools', :platform => :mri
 end
 
 group(:test) do

data/lib/plucky/criteria_hash.rb

@@ -125,7 +125,9 @@ module Plucky
         old_is_hash = oldval.instance_of? Hash
         new_is_hash = newval.instance_of? Hash
 
-        if old_is_hash && new_is_hash
+        if oldval == newval
+          oldval
+        elsif old_is_hash && new_is_hash
           hash_merge(oldval, newval)
         elsif old_is_hash
           modifier_merge(oldval, newval)
@@ -171,7 +173,12 @@ module Plucky
     # 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)
+      case value
+      when nil, BSON::ObjectId
+        [value]
+      else
+        Array(value)
+      end
     end
 
     # Private

data/lib/plucky/normalizers/criteria_hash_value.rb

@@ -1,10 +1,12 @@
+require 'set'
+
 module Plucky
   module Normalizers
     class CriteriaHashValue
 
       # Internal: Used by normalized_value to determine if we need to run the
       # value through another criteria hash to normalize it.
-      NestingOperators = [:$or, :$and, :$nor]
+      NestingOperators = Set[:$or, :$and, :$nor]
 
       def initialize(criteria_hash)
         @criteria_hash = criteria_hash

data/lib/plucky/pagination/collection.rb

@@ -17,7 +17,7 @@ module Plucky
       end
 
       def method_missing(method, *args)
-        @query.send method, *args
+        @paginator.send method, *args
       end
 
       # Public

data/lib/plucky/version.rb

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

data/spec/plucky/criteria_hash_spec.rb

@@ -90,7 +90,7 @@ describe Plucky::CriteriaHash do
     it "uniques matching key values" do
       c1 = described_class.new(:foo => 'bar')
       c2 = described_class.new(:foo => 'bar')
-      c1.merge(c2).source.should eq(:foo => {:$in => %w[bar]})
+      c1.merge(c2).source.should eq(:foo => 'bar')
     end
 
     it "correctly merges arrays and non-arrays" do
@@ -148,6 +148,36 @@ describe Plucky::CriteriaHash do
       c1[:foo].should == 'bar'
     end
 
+    it "merges two hashes with the same key, but nil values as nil" do
+      c1 = described_class.new(:foo => nil)
+      c2 = described_class.new(:foo => nil)
+      c1.merge(c2).source.should == { :foo => nil }
+    end
+
+    it "merges two hashes with the same key, but false values as false" do
+      c1 = described_class.new(:foo => false)
+      c2 = described_class.new(:foo => false)
+      c1.merge(c2).source.should == { :foo => false }
+    end
+
+    it "merges two hashes with the same key, but different values with $in" do
+      c1 = described_class.new(:foo => false)
+      c2 = described_class.new(:foo => true)
+      c1.merge(c2).source.should == { :foo => { :'$in' => [false, true] } }
+    end
+
+    it "merges two hashes with different keys and different values properly" do
+      c1 = described_class.new(:foo => 1)
+      c2 = described_class.new(:bar => 2)
+      c1.merge(c2).source.should == { :foo => 1, :bar => 2 }
+    end
+
+    it "merges two sets" do
+      c1 = described_class.new(:foo => Set.new([1, 2]))
+      c2 = described_class.new(:foo => Set.new([2, 3]))
+      c1.merge(c2).source.should == { :foo => { :'$in' => [1,2,3] } }
+    end
+
     context "given multiple $or clauses" do
       before do
         @c1 = described_class.new(:$or => [{:a => 1}, {:b => 2}])

data/spec/plucky/normalizers/criteria_hash_value_spec.rb

@@ -155,7 +155,7 @@ describe Plucky::Normalizers::CriteriaHashValue do
 
   context "nested clauses" do
     it "knows constant array of operators that take nested queries" do
-      described_class::NestingOperators.should == [:$or, :$and, :$nor]
+      described_class::NestingOperators.should == Set[:$or, :$and, :$nor]
     end
 
     described_class::NestingOperators.each do |operator|

data/spec/plucky/pagination/collection_spec.rb

@@ -26,5 +26,10 @@ describe Plucky::Pagination::Collection do
       @object.size.should       == 4
       @object.select { |o| o > 2 }.should == [3, 4]
     end
+
+    it "delegates missing methods to the paginator" do
+      @paginator.should_receive(:blather_matter).with('hello', :xyz, 4)
+      subject.blather_matter('hello', :xyz, 4)
+    end
   end
 end

data/spec/plucky_spec.rb

@@ -31,21 +31,21 @@ describe Plucky do
   describe ".modifier?" do
     context "with a string" do
       it "returns true if modifier" do
-        Plucky.modifier?('$in').should be_true
+        Plucky.modifier?('$in').should == true
       end
 
       it "returns false if not modifier" do
-        Plucky.modifier?('nope').should be_false
+        Plucky.modifier?('nope').should == false
       end
     end
 
     context "with a symbol" do
       it "returns true if modifier" do
-        Plucky.modifier?(:$in).should be_true
+        Plucky.modifier?(:$in).should == true
       end
 
       it "returns false if not modifier" do
-        Plucky.modifier?(:nope).should be_false
+        Plucky.modifier?(:nope).should == false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plucky
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - Guardfile
@@ -91,17 +92,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Thin layer over the ruby driver that allows you to quickly grab hold of your
@@ -124,4 +125,3 @@ test_files:
 - spec/plucky_spec.rb
 - spec/symbol_operator_spec.rb
 - spec/symbol_spec.rb
-has_rdoc: