kaminari-activerecord 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0e3987b715c154f63032c05ad45a836a4bc139d9
-  data.tar.gz: 43b5b4c0fefd80e2352225db7e554a9bf65714ae
+SHA256:
+  metadata.gz: ea8e3ace660d361f867d8358b4b8da5330fe38cf58e67a5f51ea52ba8c86d103
+  data.tar.gz: bfab69ff0b3736bae5e657ccd3bdeb9188dc689205cb56c7d9eb9ab7c782c499
 SHA512:
-  metadata.gz: 10c492be6d29d0f8382a3d83ce8d12b35873eb451949487295f4997f5f267c806831d678407dc64535bb15b40a4165db7d2d844b955999a3493286e40227319b
-  data.tar.gz: 6eb25dd8a03cb0c4748121f60d9bae7c64f56ad227aa774e62d60818da34a16976b93130fb2898d1747b2a33156e8a8423e5893dc3bfcc65b9b524ef19f26fc0
+  metadata.gz: 7a53c8910b98e6dbe3e62d8e5ca32869c0d591a3b54394422cab727df6bbd7193e836201e6de2dc9a18724f5de7f3c88f7ad314b5a39d94a4a21d154f61fb065
+  data.tar.gz: 81d0a8aff3e2cf06b0014b8460d1070ed30d0b0f7b735827a79a179d07590c94ae24772ee07aa3ace8ae71e9b5808d95b0432b6db92f9109cc3ab8dc53f37b94

data/lib/kaminari/activerecord.rb

@@ -3,6 +3,7 @@ require "kaminari/activerecord/version"
 require 'active_support/lazy_load_hooks'
 
 ActiveSupport.on_load :active_record do
+  require 'kaminari/core'
   require 'kaminari/activerecord/active_record_extension'
   ::ActiveRecord::Base.send :include, Kaminari::ActiveRecordExtension
 end

data/lib/kaminari/activerecord/active_record_relation_methods.rb

@@ -33,8 +33,10 @@ module Kaminari
       c = c.count(column_name)
       @total_count = if c.is_a?(Hash) || c.is_a?(ActiveSupport::OrderedHash)
         c.count
-      else
-        c.respond_to?(:count) ? c.count(column_name) : c
+     elsif c.respond_to? :count
+       c.count(column_name)
+     else
+       c
       end
     end
 

data/lib/kaminari/activerecord/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Kaminari
   module Activerecord
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Kaminari Active Record adapter