mongoid_query_string_interface 0.6.1 → 0.6.2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    mongoid_query_string_interface (0.6.0)
-      mongoid (~> 2.0.2)
+    mongoid_query_string_interface (0.6.2)
+      mongoid (>= 2.0.2)
       query_string_interface (>= 0.1.0)
       will_paginate (~> 3.0.pre2)
 

data/lib/mongoid/paginate.rb

@@ -5,9 +5,15 @@ module Mongoid
       page = (options[:page] || 1).to_i
       offset = (page - 1) * per_page
 
-      WillPaginate::Collection.create(page, per_page, count) do |pager|
-        pager.replace(skip(offset).limit(per_page).to_a)
-      end
+      create_paginatable_collection(skip(offset).limit(per_page).to_a, count, page, per_page)
     end
+
+    protected
+
+      def create_paginatable_collection(collection, total, page, per_page)
+        WillPaginate::Collection.create(page, per_page, total) do |pager|
+          pager.replace(collection)
+        end
+      end
   end
 end

data/lib/mongoid/query_string_interface.rb

@@ -18,14 +18,7 @@ module Mongoid
     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, collection_name_in_pagination_result => result }
+      build_results_with_pager_for(filter_by(params))
     end
 
     def filter_with_optimized_pagination_by(params={})
@@ -50,12 +43,9 @@ module Mongoid
       params = hash_with_indifferent_access(params)
 
       pagination = pagination_options(params)
-      pager = WillPaginate::Collection.new pagination[:page], pagination[:per_page], where(filtering_options(params)).count
+      collection = WillPaginate::Collection.new pagination[:page], pagination[:per_page], where(filtering_options(params)).count
 
-      PAGER_ATTRIBUTES.inject({}) do |result, attr|
-        result[attr] = pager.send(attr)
-        result
-      end
+      build_pager_from(collection)
     end
 
     protected
@@ -66,6 +56,25 @@ module Mongoid
         end
       end
 
+      def results_with_pager(collection, total, params={})
+        params = hash_with_indifferent_access(params)
+        pagination = pagination_options(params)
+
+        result = create_paginatable_collection(collection, total, pagination[:page], pagination[:per_page])
+        build_results_with_pager_for(result)
+      end
+
+      def build_pager_from(collection)
+        PAGER_ATTRIBUTES.inject({}) do |result, attr|
+          result[attr] = collection.send(attr)
+          result
+        end
+      end
+
+      def build_results_with_pager_for(collection)
+        { :pager => build_pager_from(collection), collection_name_in_pagination_result => collection }
+      end
+
       def collection_name_in_pagination_result
         model_name.human.underscore.pluralize.to_sym
       end

data/lib/version.rb

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

metadata

@@ -1,82 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongoid_query_string_interface
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.2
   prerelease: 
-  version: 0.6.1
 platform: ruby
-authors: 
+authors:
 - Vicente Mundim
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-28 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: query_string_interface
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160890640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: will_paginate
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2160890640
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: &2160890160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.pre2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mongoid
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2160890160
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &2160889680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2160889680
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2160889200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2160889200
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: &2160918400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
-  version_requirements: *id005
-description: Gives a method that can parse query string parameters into a set of criterias that Mongoid can use to perform actual queries in MongoDB databases for a given model.
-email: 
+  prerelease: false
+  version_requirements: *2160918400
+description: Gives a method that can parse query string parameters into a set of criterias
+  that Mongoid can use to perform actual queries in MongoDB databases for a given
+  model.
+email:
 - vicente.mundim@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/mongoid/paginate.rb
 - lib/mongoid/query_string_interface.rb
 - lib/mongoid_query_string_interface.rb
@@ -87,30 +85,26 @@ files:
 - Gemfile.lock
 homepage: http://github.com/vicentemundim/mongoid_query_string_interface
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: mongoid_query_string_interface
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: An interface for performing queries in MongoDB using query string parameters.
 test_files: []
-