kaminari 0.10.2 → 0.10.3

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.10.3
+
+* Fixed a bug that total_count() didn't work when chained with group() scope
+#21 [jgeiger]
+
+* Fixed a bug that the paginate helper didn't work properly with an Ajax call
+#23 [hjuskewycz]
+
 == 0.10.2
 
 * Added :param_name option to the pagination helper #10 [ivanvr]

data/Rakefile

@@ -18,7 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/amatsuda/kaminari"
   gem.license = "MIT"
   gem.summary = 'A pagination engine plugin for Rails 3'
-  gem.description = 'Kaminari is a Scope & Engine based clean and powerful and customizable and sophisticated paginator for Rails 3'
+  gem.description = 'Kaminari is a Scope & Engine based, clean, powerful, customizable and sophisticated paginator for Rails 3'
   gem.email = "ronnie@dio.jp"
   gem.authors = ["Akira Matsuda"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,

data/VERSION

@@ -1 +1 @@
-0.10.2
+0.10.3

data/app/views/kaminari/_paginator.html.erb

@@ -7,7 +7,7 @@
     paginator:     the paginator that renders the pagination tags inside
 -%>
 <%= paginator.render do -%>
-  <nav class='pagination'>
+  <nav class="pagination">
     <%= current_page > 1 ? prev_link_tag : prev_span_tag %>
     <% each_page do |page| -%>
       <% if page.current? -%>

data/kaminari.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kaminari}
-  s.version = "0.10.2"
+  s.version = "0.10.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akira Matsuda"]
-  s.date = %q{2011-02-22}
-  s.description = %q{Kaminari is a Scope & Engine based clean and powerful and customizable and sophisticated paginator for Rails 3}
+  s.date = %q{2011-02-23}
+  s.description = %q{Kaminari is a Scope & Engine based, clean, powerful, customizable and sophisticated paginator for Rails 3}
   s.email = %q{ronnie@dio.jp}
   s.extra_rdoc_files = [
     "LICENSE.txt",

data/lib/kaminari/helpers/helpers.rb

@@ -17,10 +17,6 @@ module Kaminari
         resolver.find_all(*args_for_lookup(name)).present?
       end
 
-      def output_buffer #:nodoc:
-        @template.instance_variable_get('@output_buffer')
-      end
-
       private
       def context
         @template.instance_variable_get('@lookup_context')

data/lib/kaminari/helpers/tags.rb

@@ -74,17 +74,13 @@ module Kaminari
       def initialize(template, window_options) #:nodoc:
         @template, @options = template, window_options.reverse_merge(template.options)
         # so that this instance can actually "render". Black magic?
-        @output_buffer = @template.output_buffer
-        if @output_buffer.nil?
-          @output_buffer, @return_buffer = ActionView::OutputBuffer.new, true
-        end
+        @output_buffer = ActionView::OutputBuffer.new
       end
 
       # render given block as a view template
       def render(&block)
         instance_eval &block if @options[:num_pages] > 1
-        # return the output text only if the output_buffer was created inside this instance
-        @return_buffer ? @output_buffer : nil
+        @output_buffer
       end
 
       # enumerate each page providing PageProxy object as the block parameter

data/lib/kaminari/models/active_record_relation_methods.rb

@@ -3,7 +3,9 @@ module Kaminari
     extend ActiveSupport::Concern
     module InstanceMethods
       def total_count #:nodoc:
-        except(:offset, :limit).count
+        c = except(:offset, :limit).count
+        # .group returns an OrderdHash that responds to #count
+        c.respond_to?(:count) ? c.count : c
       end
     end
   end

data/spec/fake_app.rb

@@ -42,7 +42,7 @@ Object.const_set(:ApplicationHelper, Module.new)
 #migrations
 class CreateAllTables < ActiveRecord::Migration
   def self.up
-    create_table(:users) {|t| t.string :name }
-    create_table(:books) {|t| t.string :title }
+    create_table(:users) {|t| t.string :name; t.integer :age}
+    create_table(:books) {|t| t.string :title}
   end
 end

data/spec/models/scopes_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path('../spec_helper', File.dirname(__FILE__))
 describe Kaminari::ActiveRecordExtension do
   before :all do
     User.delete_all
-    1.upto(100) {|i| User.create! :name => "user#{'%03d' % i}" }
+    1.upto(100) {|i| User.create! :name => "user#{'%03d' % i}", :age => (i / 10)}
   end
 
   describe '#page' do
@@ -94,4 +94,11 @@ describe Kaminari::ActiveRecordExtension do
       its(:current_page) { should == 2 }
     end
   end
+
+  context 'chained with .group' do
+    subject { User.group('age').page(2).per 5 }
+    # 0..10
+    its(:total_count) { should == 11 }
+    its(:num_pages) { should == 3 }
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 3
+  version: 0.10.3
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +09:00
+date: 2011-02-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -252,7 +252,7 @@ dependencies:
   prerelease: false
   type: :runtime
   requirement: *id015
-description: Kaminari is a Scope & Engine based clean and powerful and customizable and sophisticated paginator for Rails 3
+description: Kaminari is a Scope & Engine based, clean, powerful, customizable and sophisticated paginator for Rails 3
 email: ronnie@dio.jp
 executables: []