plucky 0.4.4 → 0.5.0

data/.gitignore

@@ -0,0 +1,4 @@
+*.project
+log
+*.gem
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+  - 1.9.3
+notifications:
+  email: false
+bundler_args: --without debug

data/Gemfile

@@ -0,0 +1,17 @@
+source :rubygems
+gemspec
+
+gem 'bson_ext', '~> 1.5'
+gem 'rake'
+
+group(:debug) do
+  platforms(:mri_18) { gem 'ruby-debug' }
+  platforms(:mri_19) { gem 'ruby-debug19' }
+end
+
+group(:test) do
+  gem 'shoulda',            '~> 2.11'
+  gem 'jnunemaker-matchy',  '~> 0.4.0', :require => 'matchy'
+  gem 'mocha',              '~> 0.9.8'
+  gem 'log_buddy'
+end

data/README.md

@@ -0,0 +1,101 @@
+# Plucky
+
+Thin layer over the ruby driver that allows you to quickly grab hold of your data (pluck it!).
+
+## Install
+
+```
+gem install plucky
+```
+
+## Examples
+
+```ruby
+connection = Mongo::Connection.new
+db = connection.db('test')
+collection = db['users']
+collection.remove # clear out the collection
+
+collection.insert({'_id' => 'chris', 'age' => 26, 'name' => 'Chris'})
+collection.insert({'_id' => 'steve', 'age' => 29, 'name' => 'Steve'})
+collection.insert({'_id' => 'john',  'age' => 28, 'name' => 'John'})
+
+# initialize query with collection
+query = Plucky::Query.new(collection)
+
+puts 'Querying'
+pp query.where(:name => 'John').first
+pp query.first(:name => 'John')
+pp query.where(:name => 'John').all
+pp query.all(:name => 'John')
+
+puts 'Find by _id'
+pp query.find('chris')
+pp query.find('chris', 'steve')
+pp query.find(['chris', 'steve'])
+
+puts 'Sort'
+pp query.sort(:age).all
+pp query.sort(:age.asc).all # same as above
+pp query.sort(:age.desc).all
+pp query.sort(:age).last # steve
+
+puts 'Counting'
+pp query.count # 3
+pp query.size # 3
+pp query.count(:name => 'John')       # 1
+pp query.where(:name => 'John').count # 1
+pp query.where(:name => 'John').size  # 1
+
+puts 'Distinct'
+pp query.distinct(:age) # [26, 29, 28]
+
+puts 'Select only certain fields'
+pp query.fields(:age).find('chris')   # {"_id"=>"chris", "age"=>26}
+pp query.only(:age).find('chris')     # {"_id"=>"chris", "age"=>26}
+pp query.ignore(:name).find('chris')  # {"_id"=>"chris", "age"=>26}
+
+puts 'Pagination, yeah we got that'
+pp query.sort(:age).paginate(:per_page => 1, :page => 2)
+pp query.sort(:age).per_page(1).paginate(:page => 2)
+
+pp query.sort(:age).limit(2).to_a           # [chris, john]
+pp query.sort(:age).skip(1).limit(2).to_a   # [john, steve]
+pp query.sort(:age).offset(1).limit(2).to_a # [john, steve]
+
+puts 'Using a cursor'
+cursor = query.find_each(:sort => :age) do |doc|
+  pp doc
+end
+pp cursor
+
+puts 'Symbol Operators'
+pp query.where(:age.gt => 28).count       # 1 (steve)
+pp query.where(:age.lt => 28).count       # 1 (chris)
+pp query.where(:age.in => [26, 28]).to_a  # [chris, john]
+pp query.where(:age.nin => [26, 28]).to_a  # [steve]
+
+puts 'Removing'
+query.remove(:name => 'John')
+pp query.count # 2
+query.where(:name => 'Chris').remove
+pp query.count # 1
+query.remove
+pp query.count # 0
+```
+
+## Help
+
+https://groups.google.com/forum/#!forum/mongomapper
+
+## Contributing
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+## Copyright
+
+Copyright (c) 2010 John Nunemaker. See LICENSE for details.

data/Rakefile

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'rake'
+require 'rake/testtask'
+require File.expand_path('../lib/plucky/version', __FILE__)
+
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+namespace :test do
+  Rake::TestTask.new(:all) do |test|
+    test.libs      << 'lib' << 'test'
+    test.pattern   = 'test/**/test_*.rb'
+    test.verbose   = true
+  end
+end
+
+task :test do
+  Rake::Task['test:all'].invoke
+end
+
+task :default => :test

data/examples/query.rb

@@ -0,0 +1,80 @@
+require 'pp'
+require 'pathname'
+require 'rubygems'
+
+root_path = Pathname(__FILE__).dirname.join('..').expand_path
+lib_path  = root_path.join('lib')
+$:.unshift(lib_path)
+require 'plucky'
+
+connection = Mongo::Connection.new
+db = connection.db('test')
+collection = db['users']
+collection.remove # clear out the collection
+
+collection.insert({'_id' => 'chris', 'age' => 26, 'name' => 'Chris'})
+collection.insert({'_id' => 'steve', 'age' => 29, 'name' => 'Steve'})
+collection.insert({'_id' => 'john',  'age' => 28, 'name' => 'John'})
+
+# initialize query with collection
+query = Plucky::Query.new(collection)
+
+puts 'Querying'
+pp query.where(:name => 'John').first
+pp query.first(:name => 'John')
+pp query.where(:name => 'John').all
+pp query.all(:name => 'John')
+
+puts 'Find by _id'
+pp query.find('chris')
+pp query.find('chris', 'steve')
+pp query.find(['chris', 'steve'])
+
+puts 'Sort'
+pp query.sort(:age).all
+pp query.sort(:age.asc).all # same as above
+pp query.sort(:age.desc).all
+pp query.sort(:age).last # steve
+
+puts 'Counting'
+pp query.count # 3
+pp query.size # 3
+pp query.count(:name => 'John')       # 1
+pp query.where(:name => 'John').count # 1
+pp query.where(:name => 'John').size  # 1
+
+puts 'Distinct'
+pp query.distinct(:age) # [26, 29, 28]
+
+puts 'Select only certain fields'
+pp query.fields(:age).find('chris')   # {"_id"=>"chris", "age"=>26}
+pp query.only(:age).find('chris')     # {"_id"=>"chris", "age"=>26}
+pp query.ignore(:name).find('chris')  # {"_id"=>"chris", "age"=>26}
+
+puts 'Pagination, yeah we got that'
+pp query.sort(:age).paginate(:per_page => 1, :page => 2)
+pp query.sort(:age).per_page(1).paginate(:page => 2)
+
+pp query.sort(:age).limit(2).to_a           # [chris, john]
+pp query.sort(:age).skip(1).limit(2).to_a   # [john, steve]
+pp query.sort(:age).offset(1).limit(2).to_a # [john, steve]
+
+puts 'Using a cursor'
+cursor = query.find_each(:sort => :age) do |doc|
+  pp doc
+end
+pp cursor
+
+puts 'Symbol Operators'
+pp query.where(:age.gt => 28).count       # 1 (steve)
+pp query.where(:age.lt => 28).count       # 1 (chris)
+pp query.where(:age.in => [26, 28]).to_a  # [chris, john]
+pp query.where(:age.nin => [26, 28]).to_a  # [steve]
+
+puts 'Removing'
+query.remove(:name => 'John')
+pp query.count # 2
+query.where(:name => 'Chris').remove
+pp query.count # 1
+query.remove
+pp query.count # 0

data/lib/plucky.rb

@@ -10,16 +10,8 @@ require 'plucky/pagination'
 module Plucky
   autoload :Version, 'plucky/version'
 
-  # Array of methods that actually perform queries
-  Methods = [
-    :where, :filter, :limit, :skip, :offset, :sort, :order,
-    :fields, :ignore, :only,
-    :each, :find_each,
-    :count, :size, :distinct,
-    :last, :first, :all, :paginate,
-    :exists?, :exist?, :empty?,
-    :to_a, :remove,
-  ]
+  # Array of finder DSL methods to delegate
+  Methods = Plucky::Query::DSL.instance_methods.sort.map(&:to_sym)
 
   def self.to_object_id(value)
     return value if value.is_a?(BSON::ObjectId)

data/lib/plucky/criteria_hash.rb

@@ -3,6 +3,8 @@ module Plucky
   class CriteriaHash
     attr_reader :source, :options
 
+    NestingOperators = [:$or, :$and, :$nor]
+
     def initialize(hash={}, options={})
       @source, @options = {}, options
       hash.each { |key, value| self[key] = value }
@@ -119,8 +121,15 @@ module Plucky
       def normalized_value(parent_key, key, value)
         case value
           when Array, Set
-            value.map! { |v| Plucky.to_object_id(v) } if object_id?(parent_key)
-            parent_key == key && ![:$or, :$and].include?(key) ? {'$in' => value.to_a} : value.to_a
+            if object_id?(parent_key)
+              value.map { |v| Plucky.to_object_id(v) }
+            elsif NestingOperators.include?(key)
+              value.map  { |v| CriteriaHash.new(v, options).to_hash }
+            elsif parent_key == key
+              {'$in' => value.to_a}
+            else
+              value.to_a
+            end
           when Time
             value.utc
           when String
@@ -136,4 +145,4 @@ module Plucky
         end
       end
   end
-end
+end

data/lib/plucky/query.rb

@@ -34,138 +34,148 @@ module Plucky
       self
     end
 
-    def per_page(limit=nil)
-      return @per_page || 25 if limit.nil?
-      @per_page = limit
-      self
-    end
+    # finder DSL methods to delegate to your model if you're building an ODM
+    # e.g. MyModel.last needs to be equivalent to MyModel.query.last
+    module DSL
+      def per_page(limit=nil)
+        return @per_page || 25 if limit.nil?
+        @per_page = limit
+        self
+      end
 
-    def paginate(opts={})
-      page      = opts.delete(:page)
-      limit     = opts.delete(:per_page) || per_page
-      query     = clone.amend(opts)
-      paginator = Pagination::Paginator.new(query.count, page, limit)
-      query.amend(:limit => paginator.limit, :skip => paginator.skip).all.tap do |docs|
-        docs.extend(Pagination::Decorator)
-        docs.paginator(paginator)
+      def paginate(opts={})
+        page      = opts.delete(:page)
+        limit     = opts.delete(:per_page) || per_page
+        query     = clone.amend(opts)
+        paginator = Pagination::Paginator.new(query.count, page, limit)
+        query.amend(:limit => paginator.limit, :skip => paginator.skip).all.tap do |docs|
+          docs.extend(Pagination::Decorator)
+          docs.paginator(paginator)
+        end
       end
-    end
 
-    def find_each(opts={})
-      query = clone.amend(opts)
-      query.collection.find(query.criteria.to_hash, query.options.to_hash)
-    end
+      def find_each(opts={}, &block)
+        query = clone.amend(opts)
+        cursor = query.collection.find(query.criteria.to_hash, query.options.to_hash)
+        if block_given?
+          cursor.each { |doc| yield doc }
+          cursor.rewind!
+        end
+        cursor
+      end
 
-    def find_one(opts={})
-      query = clone.amend(opts)
-      query.collection.find_one(query.criteria.to_hash, query.options.to_hash)
-    end
+      def find_one(opts={})
+        query = clone.amend(opts)
+        query.collection.find_one(query.criteria.to_hash, query.options.to_hash)
+      end
 
-    def find(*ids)
-      return nil if ids.empty?
-      if ids.size == 1 && !ids[0].is_a?(Array)
-        first(:_id => ids[0])
-      else
-        all(:_id => ids.flatten)
+      def find(*ids)
+        return nil if ids.empty?
+        if ids.size == 1 && !ids[0].is_a?(Array)
+          first(:_id => ids[0])
+        else
+          all(:_id => ids.flatten)
+        end
       end
-    end
 
-    def all(opts={})
-      find_each(opts).to_a
-    end
+      def all(opts={})
+        find_each(opts).to_a
+      end
 
-    def first(opts={})
-      find_one(opts)
-    end
+      def first(opts={})
+        find_one(opts)
+      end
 
-    def last(opts={})
-      clone.amend(opts).reverse.find_one
-    end
+      def last(opts={})
+        clone.amend(opts).reverse.find_one
+      end
 
-    def each
-      find_each.each { |doc| yield(doc) }
-    end
+      def each(&block)
+        find_each(&block)
+      end
 
-    def remove(opts={}, driver_opts={})
-      query = clone.amend(opts)
-      query.collection.remove(query.criteria.to_hash, driver_opts)
-    end
+      def remove(opts={}, driver_opts={})
+        query = clone.amend(opts)
+        query.collection.remove(query.criteria.to_hash, driver_opts)
+      end
 
-    def update(document, driver_opts={})
-      query = clone
-      query.collection.update(query.criteria.to_hash, document, driver_opts)
-    end
+      def count(opts={})
+        find_each(opts).count
+      end
 
-    def count(opts={})
-      find_each(opts).count
-    end
+      def size
+        count
+      end
 
-    def size
-      count
-    end
+      def distinct(key, opts = {})
+        query = clone.amend(opts)
+        query.collection.distinct(key, query.criteria.to_hash)
+      end
 
-    def distinct(key, opts = {})
-      query = clone.amend(opts)
-      query.collection.distinct(key, query.criteria.to_hash)
-    end
+      def fields(*args)
+        clone.tap { |query| query.options[:fields] = *args }
+      end
 
-    def amend(opts={})
-      opts.each { |key, value| self[key] = value }
-      self
-    end
+      def ignore(*args)
+        set_fields(args, 0)
+      end
 
-    def fields(*args)
-      clone.tap { |query| query.options[:fields] = *args }
-    end
+      def only(*args)
+        set_fields(args, 1)
+      end
 
-    def ignore(*args)
-      set_fields(args, 0)
-    end
+      def limit(count=nil)
+        clone.tap { |query| query.options[:limit] = count }
+      end
 
-    def only(*args)
-      set_fields(args, 1)
-    end
+      def reverse
+        clone.tap do |query|
+          query[:sort] = query[:sort].map do |s|
+            [s[0], -s[1]]
+          end unless query.options[:sort].nil?
+        end
+      end
 
-    def limit(count=nil)
-      clone.tap { |query| query.options[:limit] = count }
-    end
+      def skip(count=nil)
+        clone.tap { |query| query.options[:skip] = count }
+      end
+      alias offset skip
 
-    def reverse
-      clone.tap do |query|
-        query[:sort] = query[:sort].map do |s|
-          [s[0], -s[1]]
-        end unless query.options[:sort].nil?
+      def sort(*args)
+        clone.tap { |query| query.options[:sort] = *args }
       end
-    end
+      alias order sort
 
-    def skip(count=nil)
-      clone.tap { |query| query.options[:skip] = count }
-    end
-    alias offset skip
+      def where(hash={})
+        clone.tap do |query|
+          query.criteria.merge!(CriteriaHash.new(hash))
+        end
+      end
+      alias filter where
 
-    def sort(*args)
-      clone.tap { |query| query.options[:sort] = *args }
-    end
-    alias order sort
+      def empty?
+        count.zero?
+      end
 
-    def where(hash={})
-      clone.tap do |query|
-        query.criteria.merge!(CriteriaHash.new(hash))
+      def exists?(options={})
+        !count(options).zero?
       end
-    end
-    alias filter where
+      alias :exist? :exists?
 
-    def empty?
-      count.zero?
+      def to_a
+        find_each.to_a
+      end
     end
+    include DSL
 
-    def exists?(options={})
-      !count(options).zero?
+    def update(document, driver_opts={})
+      query = clone
+      query.collection.update(query.criteria.to_hash, document, driver_opts)
     end
-    alias :exist? :exists?
 
-    def to_a
-      find_each.to_a
+    def amend(opts={})
+      opts.each { |key, value| self[key] = value }
+      self
     end
 
     def [](key)

data/lib/plucky/version.rb

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

data/plucky.gemspec

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+require File.expand_path('../lib/plucky/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name         = 'plucky'
+  s.homepage     = 'http://github.com/jnunemaker/plucky'
+  s.summary      = 'Thin layer over the ruby driver that allows you to quickly grab hold of your data (pluck it!).'
+  s.require_path = 'lib'
+  s.homepage    = 'http://jnunemaker.github.com/plucky/'
+  s.authors      = ['John Nunemaker']
+  s.email        = ['nunemaker@gmail.com']
+  s.version      = Plucky::Version
+  s.platform     = Gem::Platform::RUBY
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'mongo', '~> 1.5'
+end

data/specs.watchr

@@ -0,0 +1,54 @@
+def growl(title, msg, img)
+  %x{growlnotify -m #{ msg.inspect} -t #{title.inspect} --image ~/.watchr/#{img}.png}
+end
+
+def form_growl_message(str)
+  results = str.split("\n").last
+  if results =~ /[1-9]\s(failure|error)s?/
+    growl "Test Results", "#{results}", "fail"
+  elsif results != ""
+    growl "Test Results", "#{results}", "pass"
+  end
+end
+
+def run(cmd)
+  puts(cmd)
+  output = ""
+  IO.popen(cmd) do |com|
+    com.each_char do |c|
+      print c
+      output << c
+      $stdout.flush
+    end
+  end
+  form_growl_message output
+end
+
+def run_test_file(file)
+  run %Q(ruby -I"lib:test" -rubygems #{file})
+end
+
+def run_all_tests
+  run "rake test"
+end
+
+def related_test_files(path)
+  Dir['test/**/*.rb'].select { |file| file =~ /test_#{File.basename(path)}/ }
+end
+
+# watch('.*\.rb') { system('clear'); run_all_tests }
+watch('test/helper\.rb')  { system('clear'); run_all_tests }
+watch('test/.*test_.*\.rb') { |m| system('clear'); run_test_file(m[0]) }
+watch('lib/.*')             { |m| related_test_files(m[0]).each { |file| run_test_file(file) } }
+
+watch('examples/.*\.rb') { |m| system('clear'); run "bundle exec ruby #{m[0]}" }
+
+# Ctrl-\
+Signal.trap('QUIT') do
+  puts " --- Running all tests ---\n\n"
+  run_all_tests
+end
+
+# Ctrl-C
+Signal.trap('INT') { abort("\n") }
+

data/test/helper.rb

@@ -1,8 +1,7 @@
 require 'rubygems'
-gem 'jnunemaker-matchy', '~> 0.4.0'
-gem 'log_buddy'
-gem 'shoulda',           '~> 2.11'
-gem 'mocha',             '~> 0.9.8'
+require 'bundler'
+
+Bundler.require(:default, :test)
 
 $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'plucky'
@@ -10,11 +9,7 @@ require 'plucky'
 require 'fileutils'
 require 'logger'
 require 'pp'
-
-require 'log_buddy'
-require 'shoulda'
-require 'matchy'
-require 'mocha'
+require 'set'
 
 log_dir = File.expand_path('../../log', __FILE__)
 FileUtils.mkdir_p(log_dir)
@@ -42,4 +37,4 @@ end
 
 operators = %w{gt lt gte lte ne in nin mod all size exists}
 operators.delete('size') if RUBY_VERSION >= '1.9.1'
-SymbolOperators = operators
+SymbolOperators = operators

data/test/plucky/test_criteria_hash.rb

@@ -24,6 +24,52 @@ class CriteriaHashTest < Test::Unit::TestCase
       }
     end
 
+    context "nested clauses" do
+      context "::NestingOperators" do
+        should "return array of operators that take nested queries" do
+          CriteriaHash::NestingOperators.should == [:$or, :$and, :$nor]
+        end
+      end
+
+      CriteriaHash::NestingOperators.each do |operator|
+        context "#{operator}" do
+          should "work with symbol operators" do
+            nested1     = {:age.gt   => 12, :age.lt => 20}
+            translated1 = {:age      => {'$gt'  => 12, '$lt'  => 20 }}
+            nested2     = {:type.nin => ['friend', 'enemy']}
+            translated2 = {:type     => {'$nin' => ['friend', 'enemy']}}
+
+            given       = {operator.to_s => [nested1, nested2]}
+
+            CriteriaHash.new(given)[operator].should == [translated1, translated2]
+          end
+
+          should "honor criteria hash options" do
+            nested     = {:post_id  => '4f5ead6378fca23a13000001'}
+            translated = {:post_id  => BSON::ObjectId.from_string('4f5ead6378fca23a13000001')}
+            given      = {operator.to_s => [nested]}
+
+            CriteriaHash.new(given, :object_ids => [:post_id])[operator].should == [translated]
+          end
+        end
+      end
+
+      context "doubly nested" do
+        should "work with symbol operators" do
+          nested1     = {:age.gt   => 12, :age.lt => 20}
+          translated1 = {:age      => {'$gt' => 12, '$lt' => 20}}
+          nested2     = {:type.nin => ['friend', 'enemy']}
+          translated2 = {:type     => {'$nin' => ['friend', 'enemy']}}
+          nested3     = {'$and'    => [nested2]}
+          translated3 = {:$and     => [translated2]}
+
+          given       = {'$or'     => [nested1, nested3]}
+
+          CriteriaHash.new(given)[:$or].should == [translated1, translated3]
+        end
+      end
+    end
+
     context "#initialize_copy" do
       setup do
         @original = CriteriaHash.new({
@@ -158,6 +204,10 @@ class CriteriaHashTest < Test::Unit::TestCase
       should "not turn value to $in with $and key" do
         CriteriaHash.new(:$and => [{:numbers => 1}, {:numbers => 2}] )[:$and].should == [{:numbers=>1}, {:numbers=>2}]
       end
+
+      should "not turn value to $in with $nor key" do
+        CriteriaHash.new(:$nor => [{:numbers => 1}, {:numbers => 2}] )[:$nor].should == [{:numbers=>1}, {:numbers=>2}]
+      end
     end
 
     context "with set value" do
@@ -210,12 +260,17 @@ class CriteriaHashTest < Test::Unit::TestCase
       setup do
         @id1      = BSON::ObjectId.new
         @id2      = BSON::ObjectId.new
-        @criteria = CriteriaHash.new({:_id => {'$in' => [@id1.to_s, @id2.to_s]}}, :object_ids => [:_id])
+        @ids      = [@id1.to_s, @id2.to_s]
+        @criteria = CriteriaHash.new({:_id => {'$in' => @ids}}, :object_ids => [:_id])
       end
 
       should "convert strings to object ids" do
         @criteria[:_id].should == {'$in' => [@id1, @id2]}
       end
+
+      should "not modify original array of string ids" do
+        @ids.should == [@id1.to_s, @id2.to_s]
+      end
     end
 
     context "#merge" do
@@ -297,4 +352,4 @@ class CriteriaHashTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/plucky/test_options_hash.rb

@@ -7,9 +7,9 @@ class OptionsHashTest < Test::Unit::TestCase
     should "delegate missing methods to the source hash" do
       hash = {:limit => 1, :skip => 1}
       options = OptionsHash.new(hash)
-      options[:skip].should   == 1
-      options[:limit].should  == 1
-      options.keys.should     == [:limit, :skip]
+      options[:skip].should      == 1
+      options[:limit].should     == 1
+      options.keys.to_set.should == [:limit, :skip].to_set
     end
 
     context "#initialize_copy" do

data/test/plucky/test_query.rb

@@ -72,6 +72,18 @@ class QueryTest < Test::Unit::TestCase
         cursor = Query.new(@collection).find_each(:order => :name.asc)
         cursor.to_a.should == [@chris, @john, @steve]
       end
+
+      should "yield elements to a block if given" do
+        yielded_elements = Set.new
+        Query.new(@collection).find_each { |doc| yielded_elements << doc }
+        yielded_elements.should == [@chris, @john, @steve].to_set
+      end
+
+      should "be Ruby-like and return a reset cursor if a block is given" do
+        cursor = Query.new(@collection).find_each {}
+        cursor.should be_instance_of(Mongo::Cursor)
+        cursor.next.should be_instance_of(oh.class)
+      end
     end
 
     context "#find_one" do
@@ -650,6 +662,18 @@ class QueryTest < Test::Unit::TestCase
         end
         docs.should == [@chris, @john, @steve]
       end
+
+      should "return a working enumerator" do
+        query = Query.new(@collection)
+        query.each.methods.map(&:to_sym).include?(:group_by).should be(true)
+        query.each.next.class.should == oh.class
+      end
+
+      should "be fulfilled by #find_each" do
+        query = Query.new(@collection)
+        query.expects(:find_each)
+        query.each
+      end
     end
 
     context "enumerables" do

data/test/test_plucky.rb

@@ -32,14 +32,16 @@ class PluckyTest < Test::Unit::TestCase
     context "::Methods" do
       should "return array of methods" do
         Plucky::Methods.should == [
-          :where, :filter, :limit, :skip, :offset, :sort, :order,
+          :where, :filter,
+          :sort, :order, :reverse,
+          :paginate, :per_page, :limit, :skip, :offset,
           :fields, :ignore, :only,
-          :each, :find_each,
+          :each, :find_each, :find_one, :find,
           :count, :size, :distinct,
-          :last, :first, :all, :paginate,
+          :last, :first, :all, :to_a,
           :exists?, :exist?, :empty?,
-          :to_a, :remove,
-        ]
+          :remove,
+        ].sort_by(&:to_s)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: plucky
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 4
-  version: 0.4.4
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 Z
+date: 2012-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mongo
+  type: :runtime
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,8 +30,8 @@ dependencies:
         - 1
         - 5
         version: "1.5"
-  type: :runtime
   version_requirements: *id001
+  name: mongo
 description: 
 email: 
 - nunemaker@gmail.com
@@ -42,18 +42,28 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- .travis.yml
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- UPGRADES
+- examples/query.rb
+- lib/plucky.rb
 - lib/plucky/criteria_hash.rb
+- lib/plucky/extensions.rb
 - lib/plucky/extensions/duplicable.rb
 - lib/plucky/extensions/symbol.rb
-- lib/plucky/extensions.rb
 - lib/plucky/new_relic.rb
 - lib/plucky/options_hash.rb
+- lib/plucky/pagination.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
+- plucky.gemspec
+- specs.watchr
 - test/helper.rb
 - test/plucky/pagination/test_decorator.rb
 - test/plucky/pagination/test_paginator.rb
@@ -63,10 +73,7 @@ files:
 - test/test_plucky.rb
 - test/test_symbol.rb
 - test/test_symbol_operator.rb
-- LICENSE
-- README.rdoc
-- UPGRADES
-homepage: http://github.com/jnunemaker/plucky
+homepage: http://jnunemaker.github.com/plucky/
 licenses: []
 
 post_install_message: 
@@ -99,5 +106,13 @@ rubygems_version: 1.8.10
 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: []
-
+test_files: 
+- test/helper.rb
+- test/plucky/pagination/test_decorator.rb
+- test/plucky/pagination/test_paginator.rb
+- test/plucky/test_criteria_hash.rb
+- test/plucky/test_options_hash.rb
+- test/plucky/test_query.rb
+- test/test_plucky.rb
+- test/test_symbol.rb
+- test/test_symbol_operator.rb

data/README.rdoc

@@ -1,19 +0,0 @@
-= Plucky
-
-Thin layer over the ruby driver that allows you to quickly grab hold of your data (pluck it!).
-
-== Install
-
-  $ gem install plucky
-
-== Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 John Nunemaker. See LICENSE for details.