warclight 0.8.0 → 0.9.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/warclight-build.yml +32 -0
  3. data/.gitignore +1 -0
  4. data/.rubocop.yml +36 -14
  5. data/CHANGELOG.md +37 -0
  6. data/Gemfile +2 -2
  7. data/README.md +9 -5
  8. data/app/helpers/warclight_helper.rb +6 -8
  9. data/lib/warclight/version.rb +1 -1
  10. data/package-lock.json +2102 -0
  11. data/package.json +3 -3
  12. data/tasks/warclight.rake +2 -2
  13. data/template.rb +2 -2
  14. data/warclight.gemspec +20 -16
  15. metadata +74 -26
  16. data/.travis.yml +0 -40
data/package.json CHANGED
@@ -4,9 +4,9 @@
4
4
  "main": "index.js",
5
5
  "dependencies": {},
6
6
  "devDependencies": {
7
- "eslint": "^5.10.0",
8
- "eslint-config-airbnb-base": "^13.1.0",
9
- "eslint-plugin-import": "^2.2.0"
7
+ "eslint": "^7.30.0",
8
+ "eslint-config-airbnb-base": "^14.0.0",
9
+ "eslint-plugin-import": "^2.23.4"
10
10
  },
11
11
  "scripts": {
12
12
  "test": "echo \"Error: no test specified\" && exit 1"
data/tasks/warclight.rake CHANGED
@@ -52,10 +52,10 @@ namespace :warclight do
52
52
  desc 'Seed fixture data to Solr'
53
53
  task :seed do
54
54
  puts 'Seeding index with data from spec/fixtures/warcs/...'
55
- # rubocop:disable Metrics/LineLength
55
+ # rubocop:disable Layout/LineLength
56
56
  system('curl -o ".internal_test_app/tmp/warc-indexer.jar" "http://alpha.library.yorku.ca/warc-indexer.jar"')
57
57
  system('java -Djava.io.tmpdir=.internal_test_app/tmp -jar .internal_test_app/tmp/warc-indexer.jar -c .internal_test_app/solr/warclight_warc-indexer.conf -i "York University Libraries" -n "Test Collection" -u "12345" -s http://localhost:8983/solr/blacklight-core spec/fixtures/warcs/*.gz')
58
58
  system('curl "http://localhost:8983/solr/blacklight-core/update?commit=true&openSearcher=true"')
59
- # rubocop:enable Metrics/LineLength
59
+ # rubocop:enable Layout/LineLength
60
60
  end
61
61
  end
data/template.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- gem 'warclight', github: 'archivesunleashed/warclight'
4
- gem 'blacklight_range_limit', '7.0.0.rc2'
3
+ gem 'warclight', github: 'archivesunleashed/warclight', branch: 'main'
4
+ gem 'blacklight_range_limit', '8.0.0'
5
5
 
6
6
  run 'bundle install'
7
7
 
data/warclight.gemspec CHANGED
@@ -6,34 +6,38 @@ require 'warclight/version'
6
6
 
7
7
  # Describe your gem and declare its dependencies:
8
8
  Gem::Specification.new do |s|
9
- s.name = 'warclight'
10
- s.version = Warclight::VERSION
11
- s.authors = ['Nick Ruest']
12
- s.email = ['ruestn@yorku.ca']
13
- s.homepage = 'https://github.com/archivesunleashed/warclight'
14
- s.summary = 'A Rails engine supporting discovery of web archives.'
15
- s.license = 'Apache-2.0'
9
+ s.name = 'warclight'
10
+ s.version = Warclight::VERSION
11
+ s.authors = ['Nick Ruest']
12
+ s.email = ['ruestn@yorku.ca']
13
+ s.homepage = 'https://github.com/archivesunleashed/warclight'
14
+ s.summary = 'A Rails engine supporting discovery of web archives.'
15
+ s.license = 'Apache-2.0'
16
+ s.required_ruby_version = '>= 2.6'
16
17
 
17
- s.files = `git ls-files -z`.split("\x0").reject do |f|
18
+ s.files = `git ls-files -z`.split("\x0").reject do |f|
18
19
  f.match(%r{^(test|spec|features)/})
19
20
  end
20
21
  s.bindir = 'exe'
21
22
  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
22
23
  s.require_paths = ['lib']
23
24
 
24
- s.add_dependency 'blacklight', '7.0.1'
25
- s.add_dependency 'blacklight_range_limit', '7.0.0'
26
- s.add_dependency 'rails', '~> 5.0'
25
+ s.add_dependency 'blacklight', '~> 7.2'
26
+ s.add_dependency 'blacklight_range_limit', '8.0.0'
27
+ s.add_dependency 'rails', '>= 5.1', '< 6.2'
28
+ s.add_dependency 'sprockets', '< 4.0'
27
29
 
28
- s.add_development_dependency 'bundler', '~> 1.14'
30
+ s.add_development_dependency 'bundler', '> 1.14'
29
31
  s.add_development_dependency 'capybara'
30
32
  s.add_development_dependency 'engine_cart'
31
33
  s.add_development_dependency 'mocha'
32
34
  s.add_development_dependency 'poltergeist'
33
- s.add_development_dependency 'rake', '~> 12.0'
34
- s.add_development_dependency 'rspec-rails', '~> 3.0'
35
- s.add_development_dependency 'rubocop', '~> 0.65.0'
36
- s.add_development_dependency 'rubocop-rspec', '~> 1.32.0'
35
+ s.add_development_dependency 'rake', '~> 13.0'
36
+ s.add_development_dependency 'rspec-rails', '~> 5.0'
37
+ s.add_development_dependency 'rubocop', '~> 1.18.3'
38
+ s.add_development_dependency 'rubocop-performance'
39
+ s.add_development_dependency 'rubocop-rails'
40
+ s.add_development_dependency 'rubocop-rspec', '~> 2.4.0'
37
41
  s.add_development_dependency 'simplecov'
38
42
  s.add_development_dependency 'solr_wrapper'
39
43
  end
metadata CHANGED
@@ -1,69 +1,89 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: warclight
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.0
4
+ version: 0.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nick Ruest
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-03-24 00:00:00.000000000 Z
11
+ date: 2021-07-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: blacklight
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '='
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 7.0.1
19
+ version: '7.2'
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: 7.0.1
26
+ version: '7.2'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: blacklight_range_limit
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 7.0.0
33
+ version: 8.0.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 7.0.0
40
+ version: 8.0.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rails
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '5.0'
47
+ version: '5.1'
48
+ - - "<"
49
+ - !ruby/object:Gem::Version
50
+ version: '6.2'
48
51
  type: :runtime
49
52
  prerelease: false
50
53
  version_requirements: !ruby/object:Gem::Requirement
51
54
  requirements:
52
- - - "~>"
55
+ - - ">="
53
56
  - !ruby/object:Gem::Version
54
- version: '5.0'
57
+ version: '5.1'
58
+ - - "<"
59
+ - !ruby/object:Gem::Version
60
+ version: '6.2'
61
+ - !ruby/object:Gem::Dependency
62
+ name: sprockets
63
+ requirement: !ruby/object:Gem::Requirement
64
+ requirements:
65
+ - - "<"
66
+ - !ruby/object:Gem::Version
67
+ version: '4.0'
68
+ type: :runtime
69
+ prerelease: false
70
+ version_requirements: !ruby/object:Gem::Requirement
71
+ requirements:
72
+ - - "<"
73
+ - !ruby/object:Gem::Version
74
+ version: '4.0'
55
75
  - !ruby/object:Gem::Dependency
56
76
  name: bundler
57
77
  requirement: !ruby/object:Gem::Requirement
58
78
  requirements:
59
- - - "~>"
79
+ - - ">"
60
80
  - !ruby/object:Gem::Version
61
81
  version: '1.14'
62
82
  type: :development
63
83
  prerelease: false
64
84
  version_requirements: !ruby/object:Gem::Requirement
65
85
  requirements:
66
- - - "~>"
86
+ - - ">"
67
87
  - !ruby/object:Gem::Version
68
88
  version: '1.14'
69
89
  - !ruby/object:Gem::Dependency
@@ -128,56 +148,84 @@ dependencies:
128
148
  requirements:
129
149
  - - "~>"
130
150
  - !ruby/object:Gem::Version
131
- version: '12.0'
151
+ version: '13.0'
132
152
  type: :development
133
153
  prerelease: false
134
154
  version_requirements: !ruby/object:Gem::Requirement
135
155
  requirements:
136
156
  - - "~>"
137
157
  - !ruby/object:Gem::Version
138
- version: '12.0'
158
+ version: '13.0'
139
159
  - !ruby/object:Gem::Dependency
140
160
  name: rspec-rails
141
161
  requirement: !ruby/object:Gem::Requirement
142
162
  requirements:
143
163
  - - "~>"
144
164
  - !ruby/object:Gem::Version
145
- version: '3.0'
165
+ version: '5.0'
146
166
  type: :development
147
167
  prerelease: false
148
168
  version_requirements: !ruby/object:Gem::Requirement
149
169
  requirements:
150
170
  - - "~>"
151
171
  - !ruby/object:Gem::Version
152
- version: '3.0'
172
+ version: '5.0'
153
173
  - !ruby/object:Gem::Dependency
154
174
  name: rubocop
155
175
  requirement: !ruby/object:Gem::Requirement
156
176
  requirements:
157
177
  - - "~>"
158
178
  - !ruby/object:Gem::Version
159
- version: 0.65.0
179
+ version: 1.18.3
160
180
  type: :development
161
181
  prerelease: false
162
182
  version_requirements: !ruby/object:Gem::Requirement
163
183
  requirements:
164
184
  - - "~>"
165
185
  - !ruby/object:Gem::Version
166
- version: 0.65.0
186
+ version: 1.18.3
187
+ - !ruby/object:Gem::Dependency
188
+ name: rubocop-performance
189
+ requirement: !ruby/object:Gem::Requirement
190
+ requirements:
191
+ - - ">="
192
+ - !ruby/object:Gem::Version
193
+ version: '0'
194
+ type: :development
195
+ prerelease: false
196
+ version_requirements: !ruby/object:Gem::Requirement
197
+ requirements:
198
+ - - ">="
199
+ - !ruby/object:Gem::Version
200
+ version: '0'
201
+ - !ruby/object:Gem::Dependency
202
+ name: rubocop-rails
203
+ requirement: !ruby/object:Gem::Requirement
204
+ requirements:
205
+ - - ">="
206
+ - !ruby/object:Gem::Version
207
+ version: '0'
208
+ type: :development
209
+ prerelease: false
210
+ version_requirements: !ruby/object:Gem::Requirement
211
+ requirements:
212
+ - - ">="
213
+ - !ruby/object:Gem::Version
214
+ version: '0'
167
215
  - !ruby/object:Gem::Dependency
168
216
  name: rubocop-rspec
169
217
  requirement: !ruby/object:Gem::Requirement
170
218
  requirements:
171
219
  - - "~>"
172
220
  - !ruby/object:Gem::Version
173
- version: 1.32.0
221
+ version: 2.4.0
174
222
  type: :development
175
223
  prerelease: false
176
224
  version_requirements: !ruby/object:Gem::Requirement
177
225
  requirements:
178
226
  - - "~>"
179
227
  - !ruby/object:Gem::Version
180
- version: 1.32.0
228
+ version: 2.4.0
181
229
  - !ruby/object:Gem::Dependency
182
230
  name: simplecov
183
231
  requirement: !ruby/object:Gem::Requirement
@@ -216,11 +264,11 @@ files:
216
264
  - ".eslintrc"
217
265
  - ".github/ISSUE_TEMPLATE/Bug_report.md"
218
266
  - ".github/ISSUE_TEMPLATE/Feature_request.md"
267
+ - ".github/workflows/warclight-build.yml"
219
268
  - ".gitignore"
220
269
  - ".rspec"
221
270
  - ".rubocop.yml"
222
271
  - ".solr_wrapper"
223
- - ".travis.yml"
224
272
  - CHANGELOG.md
225
273
  - CODE_OF_CONDUCT.md
226
274
  - CONTRIBUTING.md
@@ -248,6 +296,7 @@ files:
248
296
  - lib/warclight.rb
249
297
  - lib/warclight/engine.rb
250
298
  - lib/warclight/version.rb
299
+ - package-lock.json
251
300
  - package.json
252
301
  - solr/conf/elevate.xml
253
302
  - solr/conf/lang/contractions_ca.txt
@@ -314,15 +363,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
314
363
  requirements:
315
364
  - - ">="
316
365
  - !ruby/object:Gem::Version
317
- version: '0'
366
+ version: '2.6'
318
367
  required_rubygems_version: !ruby/object:Gem::Requirement
319
368
  requirements:
320
369
  - - ">="
321
370
  - !ruby/object:Gem::Version
322
371
  version: '0'
323
372
  requirements: []
324
- rubyforge_project:
325
- rubygems_version: 2.7.6
373
+ rubygems_version: 3.2.22
326
374
  signing_key:
327
375
  specification_version: 4
328
376
  summary: A Rails engine supporting discovery of web archives.
data/.travis.yml DELETED
@@ -1,40 +0,0 @@
1
- sudo: false
2
- language: ruby
3
- notifications:
4
- email: false
5
- branches:
6
- only:
7
- - master
8
- rvm:
9
- - 2.6.0
10
- - 2.5.3
11
- - 2.4.5
12
- - 2.3.8
13
- - 2.2.10
14
- jdk:
15
- - oraclejdk8
16
- - openjdk8
17
-
18
- # Update to phantomjs 2.1.1 to fix issues with < 2
19
- # See https://github.com/travis-ci/travis-ci/issues/3225#issuecomment-177592725
20
- # and https://github.com/travis-ci/travis-ci/issues/3225#issuecomment-200965782
21
- cache:
22
- bundler: true
23
- directories:
24
- - "travis_phantomjs"
25
-
26
- before_install:
27
- - "gem install bundler -v '< 2'"
28
- - "phantomjs --version"
29
- - "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"
30
- - "phantomjs --version"
31
- - "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
32
- - "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
33
- - "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
34
- - "hash -r"
35
- - "phantomjs --version"
36
-
37
- notifications:
38
- email: false
39
- slack:
40
- secure: 1iYPmf/YSm31fZTPiM4OxG/Ii9H8J1eE/jNN0eCnA4wYPGh3SaoeCw9GpsnGWZ4wSuXUdRmGn5s5BFfTCp1RVcjJSo2TZnhhdIAavWlhmgnrdInQdXfZNfTKE7xCCAW+rW4pjrZZorEAGTYPNXV39AyNDMUsGF0sAnjM56ODXa93Xy+1+enIP95Pprxnqk2usxOlsLoQkVthMTFGgche5W1yEqY/rZxyIl3Q0YacVZpEzmPwsFG/Vgq7Vl8iLNcDzngNYeGmmomlR9WOw/DyHSag6FDb2AE1crXlx7yrBsbSo0sFKmDaJvjJrIDY2wkq/M75vMPwiOjzXVcXE1Tj1+LzJ1fbjEaEIoXwLGXtnSUC2u96je0iJSeudTLc2J7ah6vdec4H/tUPjXv9QLbKrP5xQlFItaks4J8DHVNUe22vVyFg6VVs5ZBkOqzwLH0Bj12vRKlW+P7xDF0mKYZRqigLeTqWJEpMRozlBycUXpdCxL2JVbzDd6q57mq67YPhVo5HNIlBfPt8nYlfx1gXJeyMj/cBu3sQSXsKXff6h+wjLUFsSO1il95BulrpRFO8THGOIJHsJlwgE11c+/3DZCU/lHYMY+XfS6qhoDWgKqhDl/8wie/THtaWX+VOEDxRdCES1GTn2x+R/jN6wp02zBPGsTASDCY0UXwQXv3ENB4=