plucky 0.3.8 → 0.4.0

data/lib/plucky/query.rb

@@ -14,7 +14,7 @@ module Plucky
     attr_reader    :criteria, :options, :collection
     def_delegator  :criteria, :simple?
     def_delegator  :options,  :fields?
-    def_delegators :to_a, :each, :include?
+    def_delegators :to_a, :include?
 
     def initialize(collection, opts={})
       @collection, @options, @criteria = collection, OptionsHash.new, CriteriaHash.new
@@ -40,26 +40,23 @@ module Plucky
     end
 
     def paginate(opts={})
-      page          = opts.delete(:page)
-      limit         = opts.delete(:per_page) || per_page
-      query         = clone.update(opts)
-      total         = query.count
-      paginator     = Pagination::Paginator.new(total, page, limit)
-      query[:limit] = paginator.limit
-      query[:skip]  = paginator.skip
-      query.all.tap do |docs|
+      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
 
     def find_each(opts={})
-      query = clone.update(opts)
+      query = clone.amend(opts)
       query.collection.find(query.criteria.to_hash, query.options.to_hash)
     end
 
     def find_one(opts={})
-      query = clone.update(opts)
+      query = clone.amend(opts)
       query.collection.find_one(query.criteria.to_hash, query.options.to_hash)
     end
 
@@ -81,11 +78,15 @@ module Plucky
     end
 
     def last(opts={})
-      clone.update(opts).reverse.find_one
+      clone.amend(opts).reverse.find_one
+    end
+
+    def each
+      find_each.each { |doc| yield(doc) }
     end
 
     def remove(opts={})
-      query = clone.update(opts)
+      query = clone.amend(opts)
       query.collection.remove(query.criteria.to_hash)
     end
 
@@ -98,11 +99,11 @@ module Plucky
     end
 
     def distinct(key, opts = {})
-      query = clone.update(opts)
+      query = clone.amend(opts)
       query.collection.distinct(key, query.criteria.to_hash)
     end
 
-    def update(opts={})
+    def amend(opts={})
       opts.each { |key, value| self[key] = value }
       self
     end
@@ -146,6 +147,7 @@ module Plucky
         query.criteria.merge!(CriteriaHash.new(hash))
       end
     end
+    alias filter where
 
     def empty?
       count.zero?
@@ -157,7 +159,7 @@ module Plucky
     alias :exist? :exists?
 
     def to_a
-      all
+      find_each.to_a
     end
 
     def [](key)
@@ -181,7 +183,7 @@ module Plucky
     def merge(other)
       merged_criteria = criteria.merge(other.criteria).to_hash
       merged_options  = options.merge(other.options).to_hash
-      clone.update(merged_criteria).update(merged_options)
+      clone.amend(merged_criteria).amend(merged_options)
     end
 
     def to_hash

data/lib/plucky/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 module Plucky
-  Version = '0.3.8'
+  Version = '0.4.0'
   MongoVersion = '~> 1.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: plucky
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 8
-  version: 0.3.8
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 -04:00
-default_executable: 
+date: 2011-04-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo
@@ -55,7 +54,6 @@ files:
 - lib/plucky.rb
 - LICENSE
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/jnunemaker/plucky
 licenses: []
 
@@ -85,9 +83,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 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: