pagy_cursor 0.2.2 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +7 -16
  3. data/Gemfile +2 -2
  4. data/Gemfile.lock +114 -103
  5. data/gemfiles/active_record_61.gemfile +1 -1
  6. data/gemfiles/{active_record_60.gemfile → active_record_70.gemfile} +1 -1
  7. data/lib/pagy_cursor/pagy/cursor.rb +2 -2
  8. data/lib/pagy_cursor/version.rb +1 -1
  9. data/pagy_cursor.gemspec +1 -1
  10. metadata +12 -8
  11. data/gemfiles/active_record_50.gemfile +0 -11
  12. data/gemfiles/active_record_51.gemfile +0 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 44004bd3c0d4a31c61ce024c96e7e69a064c49342aed3e24154a42b61431f0b2
4
- data.tar.gz: 15bee98c168a66fb9fa7db1312e73d4ee5e8123c599d2106b51b3b18a380a367
3
+ metadata.gz: b30060ea35c9a871c94d64e1bca0a9d289e13a9c3751b34aca9b5d358df1e7bf
4
+ data.tar.gz: cc89b1199ee954188859776d4db32b6634ad8efef34f7ffa94a917802a5fd701
5
5
  SHA512:
6
- metadata.gz: 58f4f60789e0558c92a060b13cc118cc5696097a34b9b14613bbd526030de18b2aa6b133967262b96c8b45de1ff9b2db04dae786d35ac934075f9d6b5d233307
7
- data.tar.gz: e41e82f58a98e13e83173788dc402cc51df263b5d0ac9bf53cb1c22eef9f1dca97904afe8bd653502edabc874717c8dc9eade484de4b16936cbd941ecdd05e12
6
+ metadata.gz: 7450e19adcb2c85ff8cff5af659790ee7094a47580edc9e18ea6d5735da3c635357ca041908a2b160a1e19d3e45966c6e7f4757ea5d0881afa6d885d040f1cff
7
+ data.tar.gz: bda797625d3c5579f6ae4f10f0a9a0623b41c11f82536047b3d95beabee13b8f0c16b2dc0fbf1daf390229f50c0e8e547cb2920ca7c47ca98f86e1fe69a776b8
data/.github/workflows/ci.yml CHANGED
@@ -25,21 +25,15 @@ jobs:
25
25
  strategy:
26
26
  matrix:
27
27
  include:
28
- - ruby-version: 2.5
29
- env:
30
- BUNDLE_GEMFILE: gemfiles/active_record_50.gemfile
31
- - ruby-version: 2.6
32
- env:
33
- BUNDLE_GEMFILE: gemfiles/active_record_51.gemfile
34
28
  - ruby-version: 2.7
35
29
  env:
36
30
  BUNDLE_GEMFILE: gemfiles/active_record_52.gemfile
37
31
  - ruby-version: 2.7
38
- env:
39
- BUNDLE_GEMFILE: gemfiles/active_record_60.gemfile
40
- - ruby-version: 3.0
41
32
  env:
42
33
  BUNDLE_GEMFILE: gemfiles/active_record_61.gemfile
34
+ - ruby-version: 3.1
35
+ env:
36
+ BUNDLE_GEMFILE: gemfiles/active_record_70.gemfile
43
37
 
44
38
  fail-fast: false
45
39
  env: ${{ matrix.env }}
@@ -77,18 +71,15 @@ jobs:
77
71
  strategy:
78
72
  matrix:
79
73
  include:
80
- - ruby-version: 2.5
81
- env:
82
- BUNDLE_GEMFILE: gemfiles/active_record_50.gemfile
83
- - ruby-version: 2.6
84
- env:
85
- BUNDLE_GEMFILE: gemfiles/active_record_51.gemfile
86
74
  - ruby-version: 2.7
87
75
  env:
88
76
  BUNDLE_GEMFILE: gemfiles/active_record_52.gemfile
89
77
  - ruby-version: 3.0
90
78
  env:
91
- BUNDLE_GEMFILE: gemfiles/active_record_60.gemfile
79
+ BUNDLE_GEMFILE: gemfiles/active_record_61.gemfile
80
+ - ruby-version: 3.1
81
+ env:
82
+ BUNDLE_GEMFILE: gemfiles/active_record_70.gemfile
92
83
  fail-fast: false
93
84
  env: ${{ matrix.env }}
94
85
  steps:
data/Gemfile CHANGED
@@ -2,10 +2,10 @@ source "https://rubygems.org"
2
2
 
3
3
  git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
4
4
 
5
- gem "rails", "~> 6.1"
5
+ gem "rails", "~> 7.0.0"
6
6
  gem "pg"
7
7
  gem "sqlite3"
8
- gem "mysql2"
8
+ # gem "mysql2"
9
9
  gem "pry"
10
10
  # Specify your gem's dependencies in pagy_cursor.gemspec
11
11
  gemspec path: "./"
data/Gemfile.lock CHANGED
@@ -1,173 +1,184 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- pagy_cursor (0.2.1)
4
+ pagy_cursor (0.6.0)
5
5
  activerecord (>= 5)
6
- pagy (< 5)
6
+ pagy (>= 6, < 7)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- actioncable (6.1.4.4)
12
- actionpack (= 6.1.4.4)
13
- activesupport (= 6.1.4.4)
11
+ actioncable (7.0.4.3)
12
+ actionpack (= 7.0.4.3)
13
+ activesupport (= 7.0.4.3)
14
14
  nio4r (~> 2.0)
15
15
  websocket-driver (>= 0.6.1)
16
- actionmailbox (6.1.4.4)
17
- actionpack (= 6.1.4.4)
18
- activejob (= 6.1.4.4)
19
- activerecord (= 6.1.4.4)
20
- activestorage (= 6.1.4.4)
21
- activesupport (= 6.1.4.4)
16
+ actionmailbox (7.0.4.3)
17
+ actionpack (= 7.0.4.3)
18
+ activejob (= 7.0.4.3)
19
+ activerecord (= 7.0.4.3)
20
+ activestorage (= 7.0.4.3)
21
+ activesupport (= 7.0.4.3)
22
22
  mail (>= 2.7.1)
23
- actionmailer (6.1.4.4)
24
- actionpack (= 6.1.4.4)
25
- actionview (= 6.1.4.4)
26
- activejob (= 6.1.4.4)
27
- activesupport (= 6.1.4.4)
23
+ net-imap
24
+ net-pop
25
+ net-smtp
26
+ actionmailer (7.0.4.3)
27
+ actionpack (= 7.0.4.3)
28
+ actionview (= 7.0.4.3)
29
+ activejob (= 7.0.4.3)
30
+ activesupport (= 7.0.4.3)
28
31
  mail (~> 2.5, >= 2.5.4)
32
+ net-imap
33
+ net-pop
34
+ net-smtp
29
35
  rails-dom-testing (~> 2.0)
30
- actionpack (6.1.4.4)
31
- actionview (= 6.1.4.4)
32
- activesupport (= 6.1.4.4)
33
- rack (~> 2.0, >= 2.0.9)
36
+ actionpack (7.0.4.3)
37
+ actionview (= 7.0.4.3)
38
+ activesupport (= 7.0.4.3)
39
+ rack (~> 2.0, >= 2.2.0)
34
40
  rack-test (>= 0.6.3)
35
41
  rails-dom-testing (~> 2.0)
36
42
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
37
- actiontext (6.1.4.4)
38
- actionpack (= 6.1.4.4)
39
- activerecord (= 6.1.4.4)
40
- activestorage (= 6.1.4.4)
41
- activesupport (= 6.1.4.4)
43
+ actiontext (7.0.4.3)
44
+ actionpack (= 7.0.4.3)
45
+ activerecord (= 7.0.4.3)
46
+ activestorage (= 7.0.4.3)
47
+ activesupport (= 7.0.4.3)
48
+ globalid (>= 0.6.0)
42
49
  nokogiri (>= 1.8.5)
43
- actionview (6.1.4.4)
44
- activesupport (= 6.1.4.4)
50
+ actionview (7.0.4.3)
51
+ activesupport (= 7.0.4.3)
45
52
  builder (~> 3.1)
46
53
  erubi (~> 1.4)
47
54
  rails-dom-testing (~> 2.0)
48
55
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
49
- activejob (6.1.4.4)
50
- activesupport (= 6.1.4.4)
56
+ activejob (7.0.4.3)
57
+ activesupport (= 7.0.4.3)
51
58
  globalid (>= 0.3.6)
52
- activemodel (6.1.4.4)
53
- activesupport (= 6.1.4.4)
54
- activerecord (6.1.4.4)
55
- activemodel (= 6.1.4.4)
56
- activesupport (= 6.1.4.4)
57
- activestorage (6.1.4.4)
58
- actionpack (= 6.1.4.4)
59
- activejob (= 6.1.4.4)
60
- activerecord (= 6.1.4.4)
61
- activesupport (= 6.1.4.4)
62
- marcel (~> 1.0.0)
59
+ activemodel (7.0.4.3)
60
+ activesupport (= 7.0.4.3)
61
+ activerecord (7.0.4.3)
62
+ activemodel (= 7.0.4.3)
63
+ activesupport (= 7.0.4.3)
64
+ activestorage (7.0.4.3)
65
+ actionpack (= 7.0.4.3)
66
+ activejob (= 7.0.4.3)
67
+ activerecord (= 7.0.4.3)
68
+ activesupport (= 7.0.4.3)
69
+ marcel (~> 1.0)
63
70
  mini_mime (>= 1.1.0)
64
- activesupport (6.1.4.4)
71
+ activesupport (7.0.4.3)
65
72
  concurrent-ruby (~> 1.0, >= 1.0.2)
66
73
  i18n (>= 1.6, < 2)
67
74
  minitest (>= 5.1)
68
75
  tzinfo (~> 2.0)
69
- zeitwerk (~> 2.3)
70
76
  builder (3.2.4)
71
77
  coderay (1.1.3)
72
- concurrent-ruby (1.1.9)
78
+ concurrent-ruby (1.2.2)
73
79
  crass (1.0.6)
80
+ date (3.3.3)
74
81
  diff-lcs (1.5.0)
75
- erubi (1.10.0)
76
- globalid (1.0.0)
82
+ erubi (1.12.0)
83
+ globalid (1.1.0)
77
84
  activesupport (>= 5.0)
78
- i18n (1.9.1)
85
+ i18n (1.12.0)
79
86
  concurrent-ruby (~> 1.0)
80
- loofah (2.13.0)
87
+ loofah (2.20.0)
81
88
  crass (~> 1.0.2)
82
89
  nokogiri (>= 1.5.9)
83
- mail (2.7.1)
90
+ mail (2.8.1)
84
91
  mini_mime (>= 0.1.1)
92
+ net-imap
93
+ net-pop
94
+ net-smtp
85
95
  marcel (1.0.2)
86
96
  method_source (1.0.0)
87
97
  mini_mime (1.1.2)
88
- minitest (5.15.0)
89
- mysql2 (0.5.3)
90
- nio4r (2.5.8)
91
- nokogiri (1.12.5-x86_64-darwin)
98
+ minitest (5.18.0)
99
+ net-imap (0.3.4)
100
+ date
101
+ net-protocol
102
+ net-pop (0.1.2)
103
+ net-protocol
104
+ net-protocol (0.2.1)
105
+ timeout
106
+ net-smtp (0.3.3)
107
+ net-protocol
108
+ nio4r (2.5.9)
109
+ nokogiri (1.14.3-x86_64-darwin)
92
110
  racc (~> 1.4)
93
- pagy (4.11.0)
94
- pg (1.3.1)
95
- pry (0.14.1)
111
+ pagy (6.0.3)
112
+ pg (1.4.6)
113
+ pry (0.14.2)
96
114
  coderay (~> 1.1)
97
115
  method_source (~> 1.0)
98
- racc (1.6.0)
99
- rack (2.2.3)
100
- rack-test (1.1.0)
101
- rack (>= 1.0, < 3)
102
- rails (6.1.4.4)
103
- actioncable (= 6.1.4.4)
104
- actionmailbox (= 6.1.4.4)
105
- actionmailer (= 6.1.4.4)
106
- actionpack (= 6.1.4.4)
107
- actiontext (= 6.1.4.4)
108
- actionview (= 6.1.4.4)
109
- activejob (= 6.1.4.4)
110
- activemodel (= 6.1.4.4)
111
- activerecord (= 6.1.4.4)
112
- activestorage (= 6.1.4.4)
113
- activesupport (= 6.1.4.4)
116
+ racc (1.6.2)
117
+ rack (2.2.6.4)
118
+ rack-test (2.1.0)
119
+ rack (>= 1.3)
120
+ rails (7.0.4.3)
121
+ actioncable (= 7.0.4.3)
122
+ actionmailbox (= 7.0.4.3)
123
+ actionmailer (= 7.0.4.3)
124
+ actionpack (= 7.0.4.3)
125
+ actiontext (= 7.0.4.3)
126
+ actionview (= 7.0.4.3)
127
+ activejob (= 7.0.4.3)
128
+ activemodel (= 7.0.4.3)
129
+ activerecord (= 7.0.4.3)
130
+ activestorage (= 7.0.4.3)
131
+ activesupport (= 7.0.4.3)
114
132
  bundler (>= 1.15.0)
115
- railties (= 6.1.4.4)
116
- sprockets-rails (>= 2.0.0)
133
+ railties (= 7.0.4.3)
117
134
  rails-dom-testing (2.0.3)
118
135
  activesupport (>= 4.2.0)
119
136
  nokogiri (>= 1.6)
120
- rails-html-sanitizer (1.4.2)
121
- loofah (~> 2.3)
122
- railties (6.1.4.4)
123
- actionpack (= 6.1.4.4)
124
- activesupport (= 6.1.4.4)
137
+ rails-html-sanitizer (1.5.0)
138
+ loofah (~> 2.19, >= 2.19.1)
139
+ railties (7.0.4.3)
140
+ actionpack (= 7.0.4.3)
141
+ activesupport (= 7.0.4.3)
125
142
  method_source
126
- rake (>= 0.13)
143
+ rake (>= 12.2)
127
144
  thor (~> 1.0)
145
+ zeitwerk (~> 2.5)
128
146
  rake (13.0.6)
129
- rspec (3.10.0)
130
- rspec-core (~> 3.10.0)
131
- rspec-expectations (~> 3.10.0)
132
- rspec-mocks (~> 3.10.0)
133
- rspec-core (3.10.2)
134
- rspec-support (~> 3.10.0)
135
- rspec-expectations (3.10.2)
147
+ rspec (3.12.0)
148
+ rspec-core (~> 3.12.0)
149
+ rspec-expectations (~> 3.12.0)
150
+ rspec-mocks (~> 3.12.0)
151
+ rspec-core (3.12.2)
152
+ rspec-support (~> 3.12.0)
153
+ rspec-expectations (3.12.3)
136
154
  diff-lcs (>= 1.2.0, < 2.0)
137
- rspec-support (~> 3.10.0)
138
- rspec-mocks (3.10.3)
155
+ rspec-support (~> 3.12.0)
156
+ rspec-mocks (3.12.5)
139
157
  diff-lcs (>= 1.2.0, < 2.0)
140
- rspec-support (~> 3.10.0)
141
- rspec-support (3.10.3)
142
- sprockets (4.0.2)
143
- concurrent-ruby (~> 1.0)
144
- rack (> 1, < 3)
145
- sprockets-rails (3.4.2)
146
- actionpack (>= 5.2)
147
- activesupport (>= 5.2)
148
- sprockets (>= 3.0.0)
149
- sqlite3 (1.4.2)
158
+ rspec-support (~> 3.12.0)
159
+ rspec-support (3.12.0)
160
+ sqlite3 (1.6.2-x86_64-darwin)
150
161
  thor (1.2.1)
151
- tzinfo (2.0.4)
162
+ timeout (0.3.2)
163
+ tzinfo (2.0.6)
152
164
  concurrent-ruby (~> 1.0)
153
165
  websocket-driver (0.7.5)
154
166
  websocket-extensions (>= 0.1.0)
155
167
  websocket-extensions (0.1.5)
156
- zeitwerk (2.5.4)
168
+ zeitwerk (2.6.7)
157
169
 
158
170
  PLATFORMS
159
171
  x86_64-darwin-19
160
172
 
161
173
  DEPENDENCIES
162
174
  bundler (~> 2.0)
163
- mysql2
164
175
  pagy_cursor!
165
176
  pg
166
177
  pry
167
- rails (~> 6.1)
178
+ rails (~> 7.0.0)
168
179
  rake (~> 13.0)
169
180
  rspec (~> 3.0)
170
181
  sqlite3
171
182
 
172
183
  BUNDLED WITH
173
- 2.2.30
184
+ 2.2.22
data/gemfiles/active_record_61.gemfile CHANGED
@@ -2,7 +2,7 @@ source "https://rubygems.org"
2
2
 
3
3
  git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
4
4
 
5
- gem "rails", "~> 6.1"
5
+ gem "rails", "~> 6.1.0"
6
6
  gem "pg"
7
7
  gem "sqlite3"
8
8
  gem "mysql2"
data/gemfiles/{active_record_60.gemfile → active_record_70.gemfile} RENAMED
@@ -2,7 +2,7 @@ source "https://rubygems.org"
2
2
 
3
3
  git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
4
4
 
5
- gem "rails", "~> 6.0"
5
+ gem "rails", "~> 7.0.0"
6
6
  gem "pg"
7
7
  gem "sqlite3"
8
8
  gem "mysql2"
data/lib/pagy_cursor/pagy/cursor.rb CHANGED
@@ -6,8 +6,8 @@ class Pagy
6
6
  alias_method :has_more?, :has_more
7
7
 
8
8
  def initialize(vars)
9
- @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' })
10
- @items = vars[:items] || VARS[:items]
9
+ @vars = DEFAULT.merge(vars.delete_if{|_,v| v.nil? || v == '' })
10
+ @items = vars[:items] || DEFAULT[:items]
11
11
  @before = vars[:before]
12
12
  @after = vars[:after]
13
13
  @arel_table = vars[:arel_table]
data/lib/pagy_cursor/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module PagyCursor
2
- VERSION = "0.2.2"
2
+ VERSION = "0.6.0"
3
3
  end
data/pagy_cursor.gemspec CHANGED
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
22
22
  spec.bindir = "exe"
23
23
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
24
24
  spec.require_paths = ["lib"]
25
- spec.add_dependency "pagy", "< 5"
25
+ spec.add_dependency "pagy", ">= 6", "< 7"
26
26
  spec.add_dependency "activerecord", ">= 5"
27
27
 
28
28
  spec.add_development_dependency "bundler", "~> 2.0"
metadata CHANGED
@@ -1,29 +1,35 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pagy_cursor
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.2
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Uysim
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-02-05 00:00:00.000000000 Z
11
+ date: 2023-04-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pagy
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
+ - - ">="
18
+ - !ruby/object:Gem::Version
19
+ version: '6'
17
20
  - - "<"
18
21
  - !ruby/object:Gem::Version
19
- version: '5'
22
+ version: '7'
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
27
+ - - ">="
28
+ - !ruby/object:Gem::Version
29
+ version: '6'
24
30
  - - "<"
25
31
  - !ruby/object:Gem::Version
26
- version: '5'
32
+ version: '7'
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: activerecord
29
35
  requirement: !ruby/object:Gem::Requirement
@@ -99,11 +105,9 @@ files:
99
105
  - Rakefile
100
106
  - bin/console
101
107
  - bin/setup
102
- - gemfiles/active_record_50.gemfile
103
- - gemfiles/active_record_51.gemfile
104
108
  - gemfiles/active_record_52.gemfile
105
- - gemfiles/active_record_60.gemfile
106
109
  - gemfiles/active_record_61.gemfile
110
+ - gemfiles/active_record_70.gemfile
107
111
  - lib/pagy_cursor.rb
108
112
  - lib/pagy_cursor/pagy/cursor.rb
109
113
  - lib/pagy_cursor/pagy/extras/cursor.rb
@@ -129,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
129
133
  - !ruby/object:Gem::Version
130
134
  version: '0'
131
135
  requirements: []
132
- rubygems_version: 3.2.32
136
+ rubygems_version: 3.3.26
133
137
  signing_key:
134
138
  specification_version: 4
135
139
  summary: cursor paginations for pagy
data/gemfiles/active_record_50.gemfile DELETED
@@ -1,11 +0,0 @@
1
- source "https://rubygems.org"
2
-
3
- git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
4
-
5
- gem "rails", "~> 5.0.0"
6
- gem "pg"
7
- gem "sqlite3", '~> 1.3.6'
8
- gem "mysql2"
9
- gem "pry"
10
- # Specify your gem's dependencies in pagy_cursor.gemspec
11
- gemspec path: "../"
data/gemfiles/active_record_51.gemfile DELETED
@@ -1,11 +0,0 @@
1
- source "https://rubygems.org"
2
-
3
- git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
4
-
5
- gem "rails", "~> 5.1.0"
6
- gem "pg"
7
- gem "sqlite3", '~> 1.3.6'
8
- gem "mysql2"
9
- gem "pry"
10
- # Specify your gem's dependencies in pagy_cursor.gemspec
11
- gemspec path: "../"