Stripping options for ActiveSupport::OrderedHash

lib/kaminari/models/active_record_relation_methods.rb

@@ -18,8 +18,12 @@ module Kaminari
 
         # .group returns an OrderdHash that responds to #count
         c = c.count(column_name, options)
+        if c.is_a?(ActiveSupport::OrderedHash)
+          c.count
+        else
           c.respond_to?(:count) ? c.count(column_name, options) : c
         end
       end
     end
   end
+end

spec/models/active_record/active_record_relation_methods_spec.rb

@@ -35,6 +35,13 @@ if defined? ActiveRecord
           User.page(1).count(:name, distinct: true).should == 4
         end
       end
+      context "when the scope returns an ActiveSupport::OrderedHash" do
+        it "should not throw exception by passing options to count" do
+          -> {
+            @author.readers.by_read_count.page(1).total_count(:name, distinct: true)
+          }.should_not raise_exception
+        end
+      end
     end
   end
 end