plucky 0.4.1 → 0.4.2

data/lib/plucky.rb

@@ -2,17 +2,13 @@
 require 'set'
 require 'mongo'
 require 'plucky/extensions'
+require 'plucky/criteria_hash'
+require 'plucky/options_hash'
+require 'plucky/query'
+require 'plucky/pagination'
 
 module Plucky
-  autoload :CriteriaHash, 'plucky/criteria_hash'
-  autoload :OptionsHash,  'plucky/options_hash'
-  autoload :Query,        'plucky/query'
-  autoload :Version,      'plucky/version'
-
-  module Pagination
-    autoload :Decorator,  'plucky/pagination/decorator'
-    autoload :Paginator,  'plucky/pagination/paginator'
-  end
+  autoload :Version, 'plucky/version'
 
   # Array of methods that actually perform queries
   Methods = [

data/lib/plucky/criteria_hash.rb

@@ -120,7 +120,7 @@ module Plucky
         case value
           when Array, Set
             value.map! { |v| Plucky.to_object_id(v) } if object_id?(parent_key)
-            parent_key == key && key != :$or ? {'$in' => value.to_a} : value.to_a
+            parent_key == key && ![:$or, :$and].include?(key) ? {'$in' => value.to_a} : value.to_a
           when Time
             value.utc
           when String

data/lib/plucky/extensions/symbol.rb

@@ -75,7 +75,7 @@ class SymbolOperator
   end
 
   def ==(other)
-    field == other.field && operator == other.operator
+    other.class == self.class && field == other.field && operator == other.operator
   end
 end
 

data/lib/plucky/pagination.rb

@@ -0,0 +1,6 @@
+require 'plucky/pagination/decorator'
+require 'plucky/pagination/paginator'
+
+module Plucky
+  module Pagination; end
+end

data/lib/plucky/version.rb

@@ -1,5 +1,4 @@
 # encoding: UTF-8
 module Plucky
-  Version = '0.4.1'
-  MongoVersion = '~> 1.3.1'
+  Version = '0.4.2'
 end

data/test/plucky/test_criteria_hash.rb

@@ -150,10 +150,14 @@ class CriteriaHashTest < Test::Unit::TestCase
         CriteriaHash.new(:numbers => {'$all' => [1,2,3]})[:numbers].should == {'$all' => [1,2,3]}
         CriteriaHash.new(:numbers => {'$any' => [1,2,3]})[:numbers].should == {'$any' => [1,2,3]}
       end
-      
+
       should "not turn value to $in with $or key" do
         CriteriaHash.new(:$or => [{:numbers => 1}, {:numbers => 2}] )[:$or].should == [{:numbers=>1}, {:numbers=>2}]
       end
+
+      should "not turn value to $in with $and key" do
+        CriteriaHash.new(:$and => [{:numbers => 1}, {:numbers => 2}] )[:$and].should == [{:numbers=>1}, {:numbers=>2}]
+      end
     end
 
     context "with set value" do
@@ -257,7 +261,7 @@ class CriteriaHashTest < Test::Unit::TestCase
         c2 = CriteriaHash.new(:foo => {'$all' => [1, 4, 5]})
         c1.merge(c2).should == CriteriaHash.new(:foo => {'$in' => [1, 2, 3], '$all' => [1, 4, 5]})
       end
-      
+
       should "not update mergee" do
         c1 = CriteriaHash.new(:foo => 'bar')
         c2 = CriteriaHash.new(:foo => 'baz')

data/test/test_symbol_operator.rb

@@ -17,18 +17,24 @@ class SymbolOperatorTest < Test::Unit::TestCase
       should "be true if field and operator are equal" do
         SymbolOperator.new(:foo, 'in').should == SymbolOperator.new(:foo, 'in')
       end
-      
+
       should "be false if fields are equal but operators are not" do
         SymbolOperator.new(:foo, 'in').should_not == SymbolOperator.new(:foo, 'all')
       end
-      
+
       should "be false if operators are equal but fields are not" do
         SymbolOperator.new(:foo, 'in').should_not == SymbolOperator.new(:bar, 'in')
       end
-      
+
       should "be false if neither are equal" do
         SymbolOperator.new(:foo, 'in').should_not == SymbolOperator.new(:bar, 'all')
       end
+
+      should "be false if other isn't an symbol operator" do
+        assert_nothing_raised do
+          SymbolOperator.new(:foo, 'in').should_not == 'foo.in'
+        end
+      end
     end
 
     context "<=>" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: plucky
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 Z
+date: 2011-10-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo
@@ -25,12 +25,20 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 27
         segments: 
         - 1
         - 3
+        - 0
+        version: 1.3.0
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
         - 1
-        version: 1.3.1
+        - 5
+        - 0
+        version: 1.5.0
   type: :runtime
   version_requirements: *id001
 description: 
@@ -51,6 +59,7 @@ files:
 - lib/plucky/options_hash.rb
 - lib/plucky/pagination/decorator.rb
 - lib/plucky/pagination/paginator.rb
+- lib/plucky/pagination.rb
 - lib/plucky/query.rb
 - lib/plucky/version.rb
 - lib/plucky.rb
@@ -95,10 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Thin layer over the ruby driver that allows you to quickly grab hold of your data (pluck it!).
 test_files: []
 
-has_rdoc: