dimkiriyenko-kaminari 0.12.4 → 0.12.5

data/README.rdoc

@@ -62,10 +62,11 @@ Then bundle:
   Note that the +per+ scope is not directly defined on the models but is just a method defined on the page scope. This is absolutely reasonable because you will never actually use +per_page+ without specifying the +page+ number.
 
 * the +smart_count+ method
+
   +ActiveRecord#count+ method may fail or give wrong results on complex queries. Say, for example, you use +having+ constraint, based on +select+ generated columns. As long as generated columns are thrown away, +having+ constraint will fail and you will get invalid query. If this is your case, you should define a +smart_count+ method on your model or scope. A possible implementation may be (works with any complex query):
 
   def smart_count
-    count_by_sql("SELECT COUNT(*) FROM (#{to_sql}) AS count_table")
+    count_by_sql("SELECT COUNT(*) FROM (#{scoped.to_sql}) AS count_table")
   end
 
   Kaminari will call this method instead of +count+ if it is defined.

data/lib/kaminari/version.rb

@@ -1,3 +1,3 @@
 module Kaminari
-  VERSION = '0.12.4'
+  VERSION = '0.12.5'
 end

data/spec/fake_app.rb

@@ -29,15 +29,22 @@ class User < ActiveRecord::Base
     User.joins(:books_read => :authors).where(:authors_books => {:id => self})
   end
 
-  scope :by_name, order(:name)
-  scope :by_read_count, lambda {
-    cols = if connection.adapter_name == "PostgreSQL"
+  def self.cols
+    if connection.adapter_name == "PostgreSQL"
       column_names.map { |column| %{"users"."#{column}"} }.join(", ")
     else
       '"users"."id"'
     end
+  end
+
+  scope :by_name, order(:name)
+  scope :by_read_count, lambda {
     group(cols).select("count(readerships.id) AS read_count, #{cols}").order('read_count DESC')
   }
+
+  scope :read_count_at_least, lambda { |cnt|
+    group(cols).select("count(readerships.id) AS read_count, #{cols}").having("read_count >= #{cnt}")
+  }
 end
 class Authorship < ActiveRecord::Base
   belongs_to :user

data/spec/models/active_record_relation_methods_spec.rb

@@ -10,7 +10,8 @@ describe Kaminari::ActiveRecordRelationMethods do
       @books2 = 3.times.map {|i| @author2.books_authored.create!(:title => "title%03d" % i) }
       @books3 = 4.times.map {|i| @author3.books_authored.create!(:title => "subject%03d" % i) }
       @readers = 4.times.map { User.create! :name => 'reader' }
-      @books.each {|book| book.readers << @readers }
+      @books.each { |book| book.readers << @readers }
+      @books2.each { |book| book.readers << @readers.take(2) }
     end
 
     context "when the scope includes an order which references a generated column" do
@@ -28,12 +29,13 @@ describe Kaminari::ActiveRecordRelationMethods do
     context "when the scope responds to smart_count" do
       module SmartCount
         def smart_count
-          123
+          count_by_sql("SELECT COUNT(*) FROM (#{scoped.to_sql}) AS count_table")
         end
       end
 
       it "should call smart_count on scope and return the given value" do
-        @author.readers.by_read_count.page(1).extending(SmartCount).total_count.should == 123
+        # only 2 users have read more than two books
+        User.joins(:readerships).read_count_at_least(3).extending(SmartCount).page(1).total_count.should == 2
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dimkiriyenko-kaminari
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 0
   - 12
-  - 4
-  version: 0.12.4
+  - 5
+  version: 0.12.5
 platform: ruby
 authors: 
 - Akira Matsuda