smart_paginate 0.2.1 → 0.2.2

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 (15) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +19 -10
  3. data/Gemfile +1 -1
  4. data/gemfiles/Gemfile.active_record-4.0 +1 -1
  5. data/gemfiles/Gemfile.active_record-4.1 +1 -1
  6. data/gemfiles/Gemfile.active_record-4.2 +1 -1
  7. data/gemfiles/Gemfile.active_record-5.0 +1 -1
  8. data/gemfiles/Gemfile.active_record-5.1 +1 -1
  9. data/gemfiles/Gemfile.active_record-5.2 +1 -1
  10. data/gemfiles/Gemfile.active_record-edge +8 -0
  11. data/lib/smart_paginate/active_record_extension.rb +2 -2
  12. data/lib/smart_paginate/paginating_array.rb +1 -1
  13. data/lib/smart_paginate/version.rb +1 -1
  14. data/smart_paginate.gemspec +3 -5
  15. metadata +7 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5e65dc23b77fc71a3a3eaab093e9533f3c39ae45174bc7fd099eef8db645bef0
4
- data.tar.gz: f88a34b1dc91d397c2303ca154f0a77b3381162c15ac06974d8292b36509f325
3
+ metadata.gz: c1d0bf198bdca8ee540dfa129c6c54020251852535dca192e576e0c4511eb4c4
4
+ data.tar.gz: e4b43b7675ea1ec0a7c0f1dd191c943c4931008e7eff442a6716592d56b12dd6
5
5
  SHA512:
6
- metadata.gz: 636a32462cc0b756557bbf3d7709160e94dadad7091f416aa85834dd16f285a7c1babae1a10af52a3740146d702cdd261d4da69c8667aa5d7e94cee4b15bd958
7
- data.tar.gz: cf05e7d4ca9d4a4adbaea0d59fd9e41c83f1a4d154b12d3f09353fd72de56478f8d00e8a1425e014beb8e928643758ff17249bb61b002e7dec3e090bdf86f0b9
6
+ metadata.gz: 9cdbed5624c8cba17ee254e058926b0cafbe72fce5168f8ddfe13d007df4eb94a9add25dc557329061c9fd03d94c7244281d2eb1798de3d619174cb09774a3f8
7
+ data.tar.gz: a5da9303fa0190d2c427ecf2608b6093b2cde4d0e29bb91f4de3e50b7b9e3cfb37c50ea1e7f86730dac741f94551db7b183517943e3ed47ee188ca64904dfa0f
data/.travis.yml CHANGED
@@ -3,12 +3,12 @@ sudo: false
3
3
  cache: bundler
4
4
  before_install:
5
5
  - gem update --system
6
- - gem install bundler
6
+ - gem install bundler -v '< 2'
7
7
  rvm:
8
- - 2.2.10
9
- - 2.3.7
10
- - 2.4.4
11
- - 2.5.1
8
+ - 2.3.8
9
+ - 2.4.5
10
+ - 2.5.3
11
+ - 2.6.1
12
12
  gemfile:
13
13
  - gemfiles/Gemfile.active_record-4.0
14
14
  - gemfiles/Gemfile.active_record-4.1
@@ -16,13 +16,22 @@ gemfile:
16
16
  - gemfiles/Gemfile.active_record-5.0
17
17
  - gemfiles/Gemfile.active_record-5.1
18
18
  - gemfiles/Gemfile.active_record-5.2
19
+ - gemfiles/Gemfile.active_record-edge
19
20
  matrix:
20
21
  exclude:
21
- - rvm: 2.4.4
22
+ - rvm: 2.4.5
22
23
  gemfile: gemfiles/Gemfile.active_record-4.0
23
- - rvm: 2.4.4
24
- gemfile: gemfiles/Gemfile.active_record-4.1
25
- - rvm: 2.5.1
24
+ - rvm: 2.5.3
25
+ gemfile: gemfiles/Gemfile.active_record-4.0
26
+ - rvm: 2.6.1
26
27
  gemfile: gemfiles/Gemfile.active_record-4.0
27
- - rvm: 2.5.1
28
+ - rvm: 2.4.5
29
+ gemfile: gemfiles/Gemfile.active_record-4.1
30
+ - rvm: 2.5.3
31
+ gemfile: gemfiles/Gemfile.active_record-4.1
32
+ - rvm: 2.6.1
28
33
  gemfile: gemfiles/Gemfile.active_record-4.1
34
+ - rvm: 2.3.8
35
+ gemfile: gemfiles/Gemfile.active_record-edge
36
+ - rvm: 2.4.5
37
+ gemfile: gemfiles/Gemfile.active_record-edge
data/Gemfile CHANGED
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
3
3
  # Specify your gem's dependencies in smart_paginate.gemspec
4
4
  gemspec
5
5
 
6
- gem 'rubocop', '~> 0.48.1', group: :test
6
+ gem 'rubocop', '~> 0.62.0', group: :test
data/gemfiles/Gemfile.active_record-4.0 CHANGED
@@ -5,4 +5,4 @@ gemspec path: '..'
5
5
 
6
6
  gem 'activerecord', '~> 4.0.0'
7
7
 
8
- gem 'rubocop', '~> 0.48.1', group: :test
8
+ gem 'rubocop', '~> 0.62.0', group: :test
data/gemfiles/Gemfile.active_record-4.1 CHANGED
@@ -5,4 +5,4 @@ gemspec path: '..'
5
5
 
6
6
  gem 'activerecord', '~> 4.1.0'
7
7
 
8
- gem 'rubocop', '~> 0.48.1', group: :test
8
+ gem 'rubocop', '~> 0.62.0', group: :test
data/gemfiles/Gemfile.active_record-4.2 CHANGED
@@ -5,4 +5,4 @@ gemspec path: '..'
5
5
 
6
6
  gem 'activerecord', '~> 4.2.0'
7
7
 
8
- gem 'rubocop', '~> 0.48.1', group: :test
8
+ gem 'rubocop', '~> 0.62.0', group: :test
data/gemfiles/Gemfile.active_record-5.0 CHANGED
@@ -5,4 +5,4 @@ gemspec path: '..'
5
5
 
6
6
  gem 'activerecord', '~> 5.0.0'
7
7
 
8
- gem 'rubocop', '~> 0.48.1', group: :test
8
+ gem 'rubocop', '~> 0.62.0', group: :test
data/gemfiles/Gemfile.active_record-5.1 CHANGED
@@ -5,4 +5,4 @@ gemspec path: '..'
5
5
 
6
6
  gem 'activerecord', '~> 5.1.0'
7
7
 
8
- gem 'rubocop', '~> 0.48.1', group: :test
8
+ gem 'rubocop', '~> 0.62.0', group: :test
data/gemfiles/Gemfile.active_record-5.2 CHANGED
@@ -5,4 +5,4 @@ gemspec path: '..'
5
5
 
6
6
  gem 'activerecord', '~> 5.2.0'
7
7
 
8
- gem 'rubocop', '~> 0.48.1', group: :test
8
+ gem 'rubocop', '~> 0.62.0', group: :test
data/gemfiles/Gemfile.active_record-edge ADDED
@@ -0,0 +1,8 @@
1
+ source 'https://rubygems.org'
2
+
3
+ # Specify your gem's dependencies in smart_paginate.gemspec
4
+ gemspec path: '..'
5
+
6
+ gem 'activerecord', git: 'https://github.com/rails/rails.git'
7
+
8
+ gem 'rubocop', '~> 0.62.0', group: :test
data/lib/smart_paginate/active_record_extension.rb CHANGED
@@ -66,7 +66,7 @@ module SmartPaginate
66
66
  end
67
67
 
68
68
  def total_pages
69
- (total_entries / per_page.to_f).ceil
69
+ total_entries > 0 ? (total_entries / per_page.to_f).ceil : 1
70
70
  end
71
71
 
72
72
  def total_entries
@@ -74,7 +74,7 @@ module SmartPaginate
74
74
  load # make sure we have determined the number of fetched records
75
75
 
76
76
  # if we know that there are no more records, then we can calculate total_entries
77
- if @number_of_records <= per_page
77
+ if (current_page == 1 || @number_of_records > 0) && @number_of_records <= per_page
78
78
  offset_value + @number_of_records
79
79
  else
80
80
  rel = except(:limit, :offset)
data/lib/smart_paginate/paginating_array.rb CHANGED
@@ -37,7 +37,7 @@ module SmartPaginate
37
37
  end
38
38
 
39
39
  def total_pages
40
- (total_entries / per_page.to_f).ceil
40
+ total_entries > 0 ? (total_entries / per_page.to_f).ceil : 1
41
41
  end
42
42
  end
43
43
  end
data/lib/smart_paginate/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SmartPaginate
2
- VERSION = "0.2.1".freeze
2
+ VERSION = "0.2.2".freeze
3
3
  end
data/smart_paginate.gemspec CHANGED
@@ -1,6 +1,4 @@
1
- # coding: utf-8
2
-
3
- lib = File.expand_path('../lib', __FILE__)
1
+ lib = File.expand_path('lib', __dir__)
4
2
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
5
3
  require 'smart_paginate/version'
6
4
 
@@ -23,7 +21,7 @@ Gem::Specification.new do |spec|
23
21
  spec.add_development_dependency "bundler", "~> 1.12"
24
22
  spec.add_development_dependency "rake", "~> 10.0"
25
23
  spec.add_development_dependency "rspec", "~> 3.4.0", ">= 3.4.0"
26
- spec.add_development_dependency "sqlite3", "~> 1.3", ">= 1.3.11"
24
+ spec.add_development_dependency "sqlite3", "~> 1.3", "< 1.4"
27
25
 
28
- spec.add_dependency "activerecord", ">= 4.0.0", "< 5.3"
26
+ spec.add_dependency "activerecord", ">= 4.0.0"
29
27
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smart_paginate
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter Postma
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-04-15 00:00:00.000000000 Z
11
+ date: 2019-02-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -65,9 +65,9 @@ dependencies:
65
65
  - - "~>"
66
66
  - !ruby/object:Gem::Version
67
67
  version: '1.3'
68
- - - ">="
68
+ - - "<"
69
69
  - !ruby/object:Gem::Version
70
- version: 1.3.11
70
+ version: '1.4'
71
71
  type: :development
72
72
  prerelease: false
73
73
  version_requirements: !ruby/object:Gem::Requirement
@@ -75,9 +75,9 @@ dependencies:
75
75
  - - "~>"
76
76
  - !ruby/object:Gem::Version
77
77
  version: '1.3'
78
- - - ">="
78
+ - - "<"
79
79
  - !ruby/object:Gem::Version
80
- version: 1.3.11
80
+ version: '1.4'
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: activerecord
83
83
  requirement: !ruby/object:Gem::Requirement
@@ -85,9 +85,6 @@ dependencies:
85
85
  - - ">="
86
86
  - !ruby/object:Gem::Version
87
87
  version: 4.0.0
88
- - - "<"
89
- - !ruby/object:Gem::Version
90
- version: '5.3'
91
88
  type: :runtime
92
89
  prerelease: false
93
90
  version_requirements: !ruby/object:Gem::Requirement
@@ -95,9 +92,6 @@ dependencies:
95
92
  - - ">="
96
93
  - !ruby/object:Gem::Version
97
94
  version: 4.0.0
98
- - - "<"
99
- - !ruby/object:Gem::Version
100
- version: '5.3'
101
95
  description: Simple, smart and clean pagination extension for Active Record and plain
102
96
  Ruby Arrays.
103
97
  email:
@@ -120,6 +114,7 @@ files:
120
114
  - gemfiles/Gemfile.active_record-5.0
121
115
  - gemfiles/Gemfile.active_record-5.1
122
116
  - gemfiles/Gemfile.active_record-5.2
117
+ - gemfiles/Gemfile.active_record-edge
123
118
  - lib/smart_paginate.rb
124
119
  - lib/smart_paginate/active_record_extension.rb
125
120
  - lib/smart_paginate/paginate.rb