will_paginate 3.0.1 → 3.0.2

data/lib/will_paginate/active_record.rb

@@ -73,7 +73,7 @@ module WillPaginate
 
       # workaround for Active Record 3.0
       def size
-        if !loaded? and limit_value
+        if !loaded? and limit_value and group_values.empty?
           [super, limit_value].min
         else
           super
@@ -83,12 +83,9 @@ module WillPaginate
       # overloaded to be pagination-aware
       def empty?
         if !loaded? and offset_value
-          rel_count = count
-          if rel_count.respond_to?(:size) and !rel_count.is_a?(Integer)
-            rel_count.size <= offset_value
-          else
-            rel_count <= offset_value
-          end
+          result = count
+          result = result.size if result.respond_to?(:size) and !result.is_a?(Integer)
+          result <= offset_value
         else
           super
         end
@@ -167,25 +164,34 @@ module WillPaginate
       # application.
       # 
       def paginate_by_sql(sql, options)
-        pagenum  = options.fetch(:page) { raise ArgumentError, ":page parameter required" }
+        pagenum  = options.fetch(:page) { raise ArgumentError, ":page parameter required" } || 1
         per_page = options[:per_page] || self.per_page
         total    = options[:total_entries]
 
         WillPaginate::Collection.create(pagenum, per_page, total) do |pager|
           query = sanitize_sql(sql.dup)
           original_query = query.dup
+          oracle = self.connection.adapter_name =~ /^(oracle|oci$)/i
+
           # add limit, offset
-          query << " LIMIT #{pager.per_page} OFFSET #{pager.offset}"
+          if oracle
+            query = <<-SQL
+              SELECT * FROM (
+                SELECT rownum rnum, a.* FROM (#{query}) a
+                WHERE rownum <= #{pager.offset + pager.per_page}
+              ) WHERE rnum >= #{pager.offset}
+            SQL
+          else
+            query << " LIMIT #{pager.per_page} OFFSET #{pager.offset}"
+          end
+
           # perfom the find
           pager.replace find_by_sql(query)
 
           unless pager.total_entries
-            count_query = original_query.sub /\bORDER\s+BY\s+[\w`,\s]+$/mi, ''
+            count_query = original_query.sub /\bORDER\s+BY\s+[\w`,\s.]+$/mi, ''
             count_query = "SELECT COUNT(*) FROM (#{count_query})"
-
-            unless self.connection.adapter_name =~ /^(oracle|oci$)/i
-              count_query << ' AS count_table'
-            end
+            count_query << ' AS count_table' unless oracle
             # perform the count query
             pager.total_entries = count_by_sql(count_query)
           end

data/lib/will_paginate/version.rb

@@ -2,7 +2,7 @@ module WillPaginate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/finders/active_record_spec.rb

@@ -146,6 +146,13 @@ describe WillPaginate::ActiveRecord do
       }.should run_queries(1)
     end
 
+    it "supports `size` for grouped queries" do
+      topics = Topic.group(:project_id).paginate :page => 1, :per_page => 3
+      lambda {
+        topics.size.should == {nil=>2, 1=>2}
+      }.should run_queries(1)
+    end
+
     it "overrides total_entries count with a fixed value" do
       lambda {
         topics = Topic.paginate :page => 1, :per_page => 3, :total_entries => 999
@@ -212,14 +219,24 @@ describe WillPaginate::ActiveRecord do
       }.should run_queries(1)
     end
 
+    it "defaults to page 1" do
+      sql = "select content from topics"
+      topics = Topic.paginate_by_sql sql, :page => nil, :per_page => 1
+      topics.current_page.should == 1
+      topics.size.should == 1
+    end
+
     it "should strip the order when counting" do
       lambda {
-        sql = "select id, title, content from topics order by title"
+        sql = "select id, title, content from topics order by topics.title"
         topics = Topic.paginate_by_sql sql, :page => 1, :per_page => 2
         topics.first.should == topics(:ar)
       }.should run_queries(2)
+
+      $query_sql.last.should include('COUNT')
+      $query_sql.last.should_not include('order by topics.title')
     end
-    
+
     it "shouldn't change the original query string" do
       query = 'select * from topics where 1 = 2'
       original_query = query.dup

metadata

@@ -2,7 +2,7 @@
 name: will_paginate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-17 00:00:00 Z
+date: 2011-09-27 00:00:00 Z
 dependencies: []
 
 description: will_paginate provides a simple API for performing paginated queries with Active Record, DataMapper and Sequel, and includes helpers for rendering pagination links in Rails, Sinatra and Merb web apps.