active_resource_pagination 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/active_resource_pagination.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_resource_pagination}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   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

@@ -11,15 +11,13 @@ module ActiveResource
   #                    :params => {:year => 2010, :page => 1, :per_page => 20})
   #
   #  To set default per_page value for all resources. you can do
-  #    ActiveResource.per_page = 20    # do this in config/environment or initializers
+  #    ActiveResource::Base.per_page = 20    # do this in config/environment or initializers
   # 
   # or to implement per_page() in your resource class.
   module Pagination
     def self.included(base)
       base.class_eval do
-        class << self
-          attr_accessor :per_page
-        end
+        cattr_accessor :per_page
       end
       base.extend ClassMethods
     end
@@ -36,11 +34,12 @@ module ActiveResource
       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]
         
-        arr = find(*args)
+        arr = find(*args) || []
         total_entries = options[:total_entries] || arr.size 
         WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
           if arr.size > per_page

data/spec/active_resource_pagination_spec.rb

@@ -1,6 +1,34 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe ActiveResource::Pagination do
+  describe "##per_page" do
+    it "should config per_page" do
+      ActiveResource::Base.per_page.should be_nil
+      ActiveResource::Base.per_page = 3
+      ActiveResource::Base.per_page.should == 3
+      
+      class MySrc < ActiveResource::Base; end
+      MySrc.per_page.should == 3
+    end
+  
+    it "should override per_page in method" do
+      class Something < ActiveResource::Base
+        def self.per_page
+          2
+        end
+      end
+    
+      Something.per_page.should == 2
+    end
+
+    it "should override per_page ad hoc" do
+      class Comment < ActiveResource::Base
+      end
+      Comment.per_page = 5
+      Comment.per_page.should == 5
+    end
+  end
+  
   describe "##paginate" do
     before(:all) do
       class Article < ActiveResource::Base
@@ -24,17 +52,6 @@ describe ActiveResource::Pagination do
       ActiveResource::Base.should respond_to(:paginate)
     end
     
-    it "should override per_page in method" do
-      Article.per_page.should == 2
-    end
-
-    it "should override per_page ad hoc" do
-      class Comment < ActiveResource::Base
-      end
-      Comment.per_page = 5
-      Comment.per_page.should == 5
-    end
-    
     describe "when backend does not paginate" do  
       before(:each) do
         Article.should_receive(:find).and_return(@articles)      

metadata

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