active_resource_pagination 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/active_resource_pagination.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_resource_pagination}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dorren Chen"]

data/lib/active_resource_pagination.rb

@@ -5,9 +5,9 @@ module ActiveResource
   # This adds pagination support to Active Resource. For example
   #
   #   Article.paginate
-  #   Article.paginate(:all, :page => 2, :per_page => 20)
-  #   Article.paginate(:all, :page => 2, :per_page => 20, :total_entries => 123)
-  #   Article.paginate(:all, :from => :most_popular,
+  #   Article.paginate(:page => 2, :per_page => 20)
+  #   Article.paginate(:page => 2, :per_page => 20, :total_entries => 123)
+  #   Article.paginate(:from => :most_popular,
   #                    :params => {:year => 2010, :page => 1, :per_page => 20})
   #
   #  To set default per_page value for all resources. you can do
@@ -31,15 +31,17 @@ module ActiveResource
       # if resource backend doesn't paginate and retursn all result, then this method automatically
       # sets the total_entry count from the result. Otherwise, you have to pass in the 
       # :total_entries count value manually.
-      def paginate(*args)
-        options = args.last || {}
-        options = options[:params] || options
-        options = options.reject{|k, v| v.blank?}
-        options = {:page => 1, :per_page => per_page}.merge(options)
-        page = options[:page]
-        per_page = options[:per_page]
+      def paginate(options={})
+        if options[:params] 
+          pg_params = options[:params] = with_default_params(options[:params])
+        else
+          pg_params = options = with_default_params(options)
+        end
+
+        page = pg_params[:page]
+        per_page = pg_params[:per_page]
         
-        arr = find(*args) || []
+        arr = find(:all, options) || []
         total_entries = options[:total_entries] || arr.size 
         WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
           if arr.size > per_page
@@ -49,6 +51,11 @@ module ActiveResource
           end
         end
       end
+      
+      protected
+      def with_default_params(options)
+        {:page => 1, :per_page => per_page}.merge(options.reject{|k, v| v.blank?})
+      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Dorren Chen