kaminari-activerecord 1.0.1 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +5 -5
  2. data/lib/kaminari/activerecord.rb +1 -0
  3. data/lib/kaminari/activerecord/active_record_relation_methods.rb +4 -2
  4. data/lib/kaminari/activerecord/version.rb +1 -1
  5. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 0e3987b715c154f63032c05ad45a836a4bc139d9
4
- data.tar.gz: 43b5b4c0fefd80e2352225db7e554a9bf65714ae
2
+ SHA256:
3
+ metadata.gz: ea8e3ace660d361f867d8358b4b8da5330fe38cf58e67a5f51ea52ba8c86d103
4
+ data.tar.gz: bfab69ff0b3736bae5e657ccd3bdeb9188dc689205cb56c7d9eb9ab7c782c499
5
5
  SHA512:
6
- metadata.gz: 10c492be6d29d0f8382a3d83ce8d12b35873eb451949487295f4997f5f267c806831d678407dc64535bb15b40a4165db7d2d844b955999a3493286e40227319b
7
- data.tar.gz: 6eb25dd8a03cb0c4748121f60d9bae7c64f56ad227aa774e62d60818da34a16976b93130fb2898d1747b2a33156e8a8423e5893dc3bfcc65b9b524ef19f26fc0
6
+ metadata.gz: 7a53c8910b98e6dbe3e62d8e5ca32869c0d591a3b54394422cab727df6bbd7193e836201e6de2dc9a18724f5de7f3c88f7ad314b5a39d94a4a21d154f61fb065
7
+ data.tar.gz: 81d0a8aff3e2cf06b0014b8460d1070ed30d0b0f7b735827a79a179d07590c94ae24772ee07aa3ace8ae71e9b5808d95b0432b6db92f9109cc3ab8dc53f37b94
data/lib/kaminari/activerecord.rb CHANGED
@@ -3,6 +3,7 @@ require "kaminari/activerecord/version"
3
3
  require 'active_support/lazy_load_hooks'
4
4
 
5
5
  ActiveSupport.on_load :active_record do
6
+ require 'kaminari/core'
6
7
  require 'kaminari/activerecord/active_record_extension'
7
8
  ::ActiveRecord::Base.send :include, Kaminari::ActiveRecordExtension
8
9
  end
data/lib/kaminari/activerecord/active_record_relation_methods.rb CHANGED
@@ -33,8 +33,10 @@ module Kaminari
33
33
  c = c.count(column_name)
34
34
  @total_count = if c.is_a?(Hash) || c.is_a?(ActiveSupport::OrderedHash)
35
35
  c.count
36
- else
37
- c.respond_to?(:count) ? c.count(column_name) : c
36
+ elsif c.respond_to? :count
37
+ c.count(column_name)
38
+ else
39
+ c
38
40
  end
39
41
  end
40
42
 
data/lib/kaminari/activerecord/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
  module Kaminari
3
3
  module Activerecord
4
- VERSION = '1.0.1'
4
+ VERSION = '1.1.0'
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kaminari-activerecord
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Akira Matsuda
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-01-19 00:00:00.000000000 Z
11
+ date: 2017-10-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: kaminari-core
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 1.0.1
19
+ version: 1.1.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 1.0.1
26
+ version: 1.1.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activerecord
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
102
102
  version: '0'
103
103
  requirements: []
104
104
  rubyforge_project:
105
- rubygems_version: 2.6.8
105
+ rubygems_version: 2.6.14
106
106
  signing_key:
107
107
  specification_version: 4
108
108
  summary: Kaminari Active Record adapter