mongoid_query_string_interface 0.2.0 → 0.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid_query_string_interface (0.2.0)
+    mongoid_query_string_interface (0.2.4)
       json (>= 1.4.6)
       mongoid (~> 2.0.0.rc)
 

data/lib/mongoid/query_string_interface.rb

@@ -11,7 +11,8 @@ module Mongoid
     OR_OPERATOR = :or
     
     ATTRIBUTE_REGEX = /(.*)\.(#{(CONDITIONAL_OPERATORS + SORTING_OPERATORS + [OR_OPERATOR]).join('|')})/
-    
+    PAGER_ATTRIBUTES = [:total_entries, :total_pages, :per_page, :offset, :previous_page, :current_page, :next_page]
+
     PARSERS = [
       Mongoid::QueryStringInterface::Parsers::DateTimeParser.new,
       Mongoid::QueryStringInterface::Parsers::NumberParser.new,
@@ -22,9 +23,34 @@ module Mongoid
     
     def filter_by(params={})
       params = hash_with_indifferent_access(params)
-      filter_only_by(params).order_by(*sorting_options(params)).paginate(pagination_options(params))
+      filter_only_and_order_by(params).paginate(pagination_options(params))
     end
-    
+
+    def filter_with_pagination_by(params)
+      result = filter_by(params)
+
+      pager = PAGER_ATTRIBUTES.inject({}) do |pager, attr|
+        pager[attr] = result.send(attr)
+        pager
+      end
+
+      return { :pager => pager, model_name.human.underscore.pluralize.to_sym => result }
+    end
+
+    def filter_with_optimized_pagination_by(params={})
+      params = hash_with_indifferent_access(params)
+      per_page = (params[:per_page] || default_pagination_options[:per_page]).to_i
+      page = (params[:page] || default_pagination_options[:page]).to_i
+      skip = per_page * (page - 1)
+
+      filter_only_and_order_by(params).skip(skip).limit(per_page)
+    end
+
+    def filter_only_and_order_by(params={})
+      params = hash_with_indifferent_access(params)
+      filter_only_by(params).order_by(*sorting_options(params))
+    end
+
     def filter_only_by(params={})
       where(filtering_options(hash_with_indifferent_access(params)))
     end
@@ -35,7 +61,7 @@ module Mongoid
       pagination = pagination_options(params)
       pager = WillPaginate::Collection.new pagination[:page], pagination[:per_page], where(filtering_options(params)).count
   
-      [:total_entries, :total_pages, :per_page, :offset, :previous_page, :current_page, :next_page].inject({}) do |result, attr|
+      PAGER_ATTRIBUTES.inject({}) do |result, attr|
         result[attr] = pager.send(attr)
         result
       end
@@ -49,9 +75,13 @@ module Mongoid
       []
     end
 
-    private
+    def default_pagination_options
+      { :per_page => 12, :page => 1 }
+    end
+
+    protected
       def pagination_options(options)
-        options.reverse_merge :per_page => 12, :page => 1
+        options.reverse_merge default_pagination_options
       end
   
       def filtering_options(options)

data/lib/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid #:nodoc
   module QueryStringInterface #:nodoc
-    VERSION = "0.2.0"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid_query_string_interface
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Vicente Mundim
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -02:00
+date: 2011-03-21 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency