plucky 0.1.4 → 0.2

data/lib/plucky.rb

@@ -9,6 +9,11 @@ module Plucky
   autoload :Query,        'plucky/query'
   autoload :Version,      'plucky/version'
 
+  module Pagination
+    autoload :Decorator,  'plucky/pagination/decorator'
+    autoload :Paginator,  'plucky/pagination/paginator'
+  end
+
   def self.to_object_id(value)
     if value.nil? || (value.respond_to?(:empty?) && value.empty?)
       nil

data/lib/plucky/criteria_hash.rb

@@ -12,6 +12,9 @@ module Plucky
       super
       @options = @options.dup
       @source  = @source.dup
+      each do |key, value|
+        self[key] = value.dup if value.is_a?(Array) || value.is_a?(Hash)
+      end
     end
 
     def []=(key, value)
@@ -74,6 +77,12 @@ module Plucky
       self.class.new(target)
     end
 
+    def merge!(other)
+      merge(other).to_hash.each do |key, value|
+        self[key] = value
+      end
+    end
+
     def object_ids
       @options[:object_ids] ||= []
     end

data/lib/plucky/options_hash.rb

@@ -11,6 +11,9 @@ module Plucky
     def initialize_copy(source)
       super
       @source = @source.dup
+      each do |key, value|
+        self[key] = value.dup if value.is_a?(Array) || value.is_a?(Hash)
+      end
     end
 
     def []=(key, value)
@@ -30,6 +33,15 @@ module Plucky
       !self[:fields].nil?
     end
 
+    def merge(other)
+      self.class.new(to_hash.merge(other.to_hash))
+    end
+
+    def merge!(other)
+      other.to_hash.each { |key, value| self[key] = value }
+      self
+    end
+
     private
       def method_missing(method, *args, &block)
         @source.send(method, *args, &block)

data/lib/plucky/pagination/decorator.rb

@@ -0,0 +1,21 @@
+require 'forwardable'
+module Plucky
+  module Pagination
+    module Decorator
+      extend Forwardable
+
+      def_delegators  :@paginator,
+                      :total_entries, :total_pages,
+                      :current_page,  :per_page,
+                      :previous_page, :next_page,
+                      :skip,          :limit, 
+                      :offset,        :out_of_bounds?
+
+      def paginator(p=nil)
+        return @paginator if p.nil?
+        @paginator = p
+        self
+      end
+    end
+  end
+end

data/lib/plucky/pagination/paginator.rb

@@ -0,0 +1,37 @@
+# encoding: UTF-8
+module Plucky
+  module Pagination
+    class Paginator
+      attr_reader :total_entries, :current_page, :per_page
+
+      def initialize(total, page, per_page=nil)
+        @total_entries = total.to_i
+        @current_page  = [page.to_i, 1].max
+        @per_page      = (per_page || 25).to_i
+      end
+
+      def total_pages
+        (total_entries / per_page.to_f).ceil
+      end
+
+      def out_of_bounds?
+        current_page > total_pages
+      end
+
+      def previous_page
+        current_page > 1 ? (current_page - 1) : nil
+      end
+
+      def next_page
+        current_page < total_pages ? (current_page + 1) : nil
+      end
+
+      def skip
+        (current_page - 1) * per_page
+      end
+
+      alias :limit :per_page
+      alias :offset :skip
+    end
+  end
+end

data/lib/plucky/query.rb

@@ -30,32 +30,63 @@ module Plucky
       self
     end
 
-    def find(opts={})
-      update(opts).collection.find(criteria.to_hash, options.to_hash)
+    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.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|
+        docs.extend(Pagination::Decorator)
+        docs.paginator(paginator)
+      end
+    end
+
+    def find_many(opts={})
+      query = clone.update(opts)
+      query.collection.find(query.criteria.to_hash, query.options.to_hash)
     end
 
     def find_one(opts={})
-      update(opts).collection.find_one(criteria.to_hash, options.to_hash)
+      query = clone.update(opts)
+      query.collection.find_one(query.criteria.to_hash, query.options.to_hash)
+    end
+
+    def find(*ids)
+      if ids.size == 1 && !ids[0].is_a?(Array)
+        first(:_id => ids[0])
+      else
+        all(:_id => ids.flatten)
+      end
     end
 
     def all(opts={})
-      update(opts).find(to_hash).to_a
+      find_many(opts).to_a
     end
 
     def first(opts={})
-      update(opts).find_one(to_hash)
+      find_one(opts)
     end
 
     def last(opts={})
-      update(opts).reverse.find_one(to_hash)
+      clone.update(opts).reverse.find_one
     end
 
     def remove(opts={})
-      update(opts).collection.remove(criteria.to_hash)
+      query = clone.update(opts)
+      query.collection.remove(query.criteria.to_hash)
     end
 
     def count(opts={})
-      update(opts).find(to_hash).count
+      find_many(opts).count
     end
 
     def update(opts={})
@@ -64,33 +95,33 @@ module Plucky
     end
 
     def fields(*args)
-      self[:fields] = args
-      self
+      clone.tap { |query| query.options[:fields] = args }
     end
 
     def limit(count=nil)
-      self[:limit] = count
-      self
+      clone.tap { |query| query.options[:limit] = count }
     end
 
     def reverse
-      self[:sort].map! { |s| [s[0], -s[1]] } unless self[:sort].nil?
-      self
+      clone.tap do |query|
+        query[:sort].map! do |s|
+          [s[0], -s[1]]
+        end unless query.options[:sort].nil?
+      end
     end
 
     def skip(count=nil)
-      self[:skip] = count
-      self
+      clone.tap { |query| query.options[:skip] = count }
     end
 
     def sort(*args)
-      self[:sort] = *args
-      self
+      clone.tap { |query| query.options[:sort] = *args }
     end
 
     def where(hash={})
-      criteria.merge(CriteriaHash.new(hash)).to_hash.each { |key, value| self[key] = value }
-      self
+      clone.tap do |query|
+        query.criteria.merge!(CriteriaHash.new(hash))
+      end
     end
 
     def [](key)
@@ -112,8 +143,9 @@ module Plucky
     end
 
     def merge(other)
-      merged = criteria.merge(other.criteria).to_hash.merge(options.to_hash.merge(other.options.to_hash))
-      clone.update(merged)
+      merged_criteria = criteria.merge(other.criteria).to_hash
+      merged_options  = options.merge(other.options).to_hash
+      clone.update(merged_criteria).update(merged_options)
     end
 
     def to_hash

data/lib/plucky/version.rb

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

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 -04:00
+date: 2010-05-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +85,8 @@ files:
 - lib/plucky/criteria_hash.rb
 - lib/plucky/extensions.rb
 - lib/plucky/options_hash.rb
+- lib/plucky/pagination/decorator.rb
+- lib/plucky/pagination/paginator.rb
 - lib/plucky/query.rb
 - lib/plucky/version.rb
 - lib/plucky.rb