traject 3.8.2 → 3.8.3
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.
- checksums.yaml +4 -4
- data/.github/workflows/ruby.yml +10 -2
- data/CHANGES.md +10 -5
- data/lib/traject/version.rb +1 -1
- data/test/command_line_test.rb +3 -5
- data/test/indexer/error_handler_test.rb +2 -2
- data/traject.gemspec +3 -0
- metadata +31 -7
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c4434e6a85dc5176d84dfb2c6e42c0882937cdffa37c24e5f5f06844ad0e542d
|
|
4
|
+
data.tar.gz: fd2da1d197ace61ab86e2308298e77ed64866ef0f1ffc49b88b344578900f76e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3aad25487edbb9489a30f6d8a9c6c2fdb467683c6cd6a96199d7de10538f861fd92c2f25ec8213b5a753ef85bc7440c1d27ee48d65fc05d2f36e735a15a7b6a6
|
|
7
|
+
data.tar.gz: 7641b36d876e01d3b8188add71a4121a768116a8bd2462c1fcfb0e2652af7ddebfc9a17d03dd24c68fa56b8810e2b7cd865eea53ff905a53fb5f7675c5dc99e4
|
data/.github/workflows/ruby.yml
CHANGED
|
@@ -2,7 +2,7 @@ name: CI
|
|
|
2
2
|
|
|
3
3
|
on:
|
|
4
4
|
push:
|
|
5
|
-
branches: [
|
|
5
|
+
branches: [ main ]
|
|
6
6
|
pull_request:
|
|
7
7
|
branches: ['**']
|
|
8
8
|
|
|
@@ -12,7 +12,15 @@ jobs:
|
|
|
12
12
|
strategy:
|
|
13
13
|
fail-fast: false
|
|
14
14
|
matrix:
|
|
15
|
-
ruby:
|
|
15
|
+
ruby:
|
|
16
|
+
- '2.7'
|
|
17
|
+
- '3.0'
|
|
18
|
+
- '3.1'
|
|
19
|
+
- '3.2'
|
|
20
|
+
- '3.3'
|
|
21
|
+
- '3.4'
|
|
22
|
+
- 'jruby-9.3'
|
|
23
|
+
- 'jruby-9.4'
|
|
16
24
|
name: Ruby ${{ matrix.ruby }}
|
|
17
25
|
steps:
|
|
18
26
|
- uses: actions/checkout@v2
|
data/CHANGES.md
CHANGED
|
@@ -1,8 +1,16 @@
|
|
|
1
1
|
# Changes
|
|
2
2
|
|
|
3
|
-
##
|
|
3
|
+
## 3.8.3 Compatibility release for ruby 3.4
|
|
4
|
+
|
|
5
|
+
Note that some gems, `ruby-marc` in particular, will throw zillions of
|
|
6
|
+
warnings about literal strings being frozen in future versions of ruby.
|
|
7
|
+
|
|
8
|
+
- Update CI testing matrix
|
|
9
|
+
- removed MRI ruby 2.4, 2.5, 2.6, and jruby-9.2
|
|
10
|
+
- added MRI ruby 3.4
|
|
11
|
+
- Add gem dependencies for `csv` and `mutex_m`, both of which were
|
|
12
|
+
part of the standard library prior to ruby 3.4
|
|
4
13
|
|
|
5
|
-
*
|
|
6
14
|
|
|
7
15
|
## 3.8.2
|
|
8
16
|
|
|
@@ -10,9 +18,6 @@ Bug fix for the `#filing_version` logic, which was incorrectly assuming the
|
|
|
10
18
|
first subfield in a field would hold content (e.g., `$a`) and thus failed
|
|
11
19
|
when it held a pointer to a linking field (e.g., `$6 245-01`)
|
|
12
20
|
|
|
13
|
-
```
|
|
14
|
-
|
|
15
|
-
|
|
16
21
|
## 3.8.1
|
|
17
22
|
|
|
18
23
|
Ugh. Forgot about Jruby 9.1 problem with bundler 2. Changing the requirement back.
|
data/lib/traject/version.rb
CHANGED
data/test/command_line_test.rb
CHANGED
|
@@ -24,21 +24,20 @@ describe "Shell out to command line" do
|
|
|
24
24
|
out, err, result = execute_with_args("-v")
|
|
25
25
|
|
|
26
26
|
assert result.success?, "Expected subprocess exit code to be success.\nSTDERR:\n#{err}\n\nSTDOUT:\n#{out}"
|
|
27
|
-
|
|
27
|
+
assert err.end_with?("traject version #{Traject::VERSION}\n")
|
|
28
28
|
end
|
|
29
29
|
|
|
30
30
|
it "can display help text" do
|
|
31
31
|
out, err, result = execute_with_args("-h")
|
|
32
32
|
|
|
33
33
|
assert result.success?, "Expected subprocess exit code to be success.\nSTDERR:\n#{err}\n\nSTDOUT:\n#{out}"
|
|
34
|
-
|
|
34
|
+
assert_includes err, "traject [options] -c configuration.rb [-c config2.rb] file.mrc"
|
|
35
35
|
end
|
|
36
36
|
|
|
37
37
|
it "handles bad argument" do
|
|
38
38
|
out, err, result = execute_with_args("--no-such-arg")
|
|
39
39
|
refute result.success?
|
|
40
|
-
|
|
41
|
-
assert err.start_with?("Error: unknown option `--no-such-arg'\nExiting...\n")
|
|
40
|
+
assert_includes err, "Error: unknown option `--no-such-arg'\nExiting...\n"
|
|
42
41
|
end
|
|
43
42
|
|
|
44
43
|
it "does basic dry run" do
|
|
@@ -49,4 +48,3 @@ describe "Shell out to command line" do
|
|
|
49
48
|
assert_match /bib_1000165 +author_sort +Collection la/, out
|
|
50
49
|
end
|
|
51
50
|
end
|
|
52
|
-
|
|
@@ -21,7 +21,7 @@ describe 'Custom mapping error handler' do
|
|
|
21
21
|
end
|
|
22
22
|
|
|
23
23
|
assert_equal "I just like raising errors", e.message
|
|
24
|
-
assert output.string =~ /while executing \(to_field \"id\" at .*error_handler_test.rb:\d
|
|
24
|
+
assert output.string =~ /while executing \(to_field \"id\" at .*error_handler_test.rb:\d+.*\)/
|
|
25
25
|
assert output.string =~ /CustomFakeException: I just like raising errors/
|
|
26
26
|
end
|
|
27
27
|
|
|
@@ -38,7 +38,7 @@ describe 'Custom mapping error handler' do
|
|
|
38
38
|
end
|
|
39
39
|
end
|
|
40
40
|
e = assert_raises(CustomFakeException) { indexer.map_record({}) }
|
|
41
|
-
assert e.message =~ /\(to_field \"id\" at .*error_handler_test.rb:\d
|
|
41
|
+
assert e.message =~ /\(to_field \"id\" at .*error_handler_test.rb:\d+.*\)/
|
|
42
42
|
end
|
|
43
43
|
|
|
44
44
|
it "custom handler can skip and continue" do
|
data/traject.gemspec
CHANGED
|
@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
|
|
|
22
22
|
|
|
23
23
|
|
|
24
24
|
spec.add_dependency "concurrent-ruby", ">= 0.8.0"
|
|
25
|
+
spec.add_dependency "csv"
|
|
25
26
|
spec.add_dependency "marc", "~> 1.0"
|
|
26
27
|
|
|
27
28
|
spec.add_dependency "hashie", ">= 3.1", "< 6" # used for Indexer#settings
|
|
@@ -29,6 +30,8 @@ Gem::Specification.new do |spec|
|
|
|
29
30
|
spec.add_dependency "yell" # logging
|
|
30
31
|
spec.add_dependency "dot-properties", ">= 0.1.1" # reading java style .properties
|
|
31
32
|
spec.add_dependency "httpclient", "~> 2.5"
|
|
33
|
+
spec.add_dependency "mutex_m" # httpclient has an undelcared dep needed in ruby 3.4+, not yet released. https://github.com/nahi/httpclient/pull/455
|
|
34
|
+
|
|
32
35
|
spec.add_dependency "http", ">= 3.0", "< 6" # used in oai_pmh_reader, may use more extensively in future instead of httpclient
|
|
33
36
|
spec.add_dependency 'marc-fastxmlwriter', '~>1.0' # fast marc->xml
|
|
34
37
|
spec.add_dependency "nokogiri", "~> 1.9" # NokogiriIndexer
|
metadata
CHANGED
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: traject
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.8.
|
|
4
|
+
version: 3.8.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Jonathan Rochkind
|
|
8
8
|
- Bill Dueber
|
|
9
|
-
autorequire:
|
|
10
9
|
bindir: bin
|
|
11
10
|
cert_chain: []
|
|
12
|
-
date:
|
|
11
|
+
date: 2025-01-28 00:00:00.000000000 Z
|
|
13
12
|
dependencies:
|
|
14
13
|
- !ruby/object:Gem::Dependency
|
|
15
14
|
name: concurrent-ruby
|
|
@@ -25,6 +24,20 @@ dependencies:
|
|
|
25
24
|
- - ">="
|
|
26
25
|
- !ruby/object:Gem::Version
|
|
27
26
|
version: 0.8.0
|
|
27
|
+
- !ruby/object:Gem::Dependency
|
|
28
|
+
name: csv
|
|
29
|
+
requirement: !ruby/object:Gem::Requirement
|
|
30
|
+
requirements:
|
|
31
|
+
- - ">="
|
|
32
|
+
- !ruby/object:Gem::Version
|
|
33
|
+
version: '0'
|
|
34
|
+
type: :runtime
|
|
35
|
+
prerelease: false
|
|
36
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
37
|
+
requirements:
|
|
38
|
+
- - ">="
|
|
39
|
+
- !ruby/object:Gem::Version
|
|
40
|
+
version: '0'
|
|
28
41
|
- !ruby/object:Gem::Dependency
|
|
29
42
|
name: marc
|
|
30
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -115,6 +128,20 @@ dependencies:
|
|
|
115
128
|
- - "~>"
|
|
116
129
|
- !ruby/object:Gem::Version
|
|
117
130
|
version: '2.5'
|
|
131
|
+
- !ruby/object:Gem::Dependency
|
|
132
|
+
name: mutex_m
|
|
133
|
+
requirement: !ruby/object:Gem::Requirement
|
|
134
|
+
requirements:
|
|
135
|
+
- - ">="
|
|
136
|
+
- !ruby/object:Gem::Version
|
|
137
|
+
version: '0'
|
|
138
|
+
type: :runtime
|
|
139
|
+
prerelease: false
|
|
140
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
141
|
+
requirements:
|
|
142
|
+
- - ">="
|
|
143
|
+
- !ruby/object:Gem::Version
|
|
144
|
+
version: '0'
|
|
118
145
|
- !ruby/object:Gem::Dependency
|
|
119
146
|
name: http
|
|
120
147
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -225,7 +252,6 @@ dependencies:
|
|
|
225
252
|
- - "~>"
|
|
226
253
|
- !ruby/object:Gem::Version
|
|
227
254
|
version: '3.4'
|
|
228
|
-
description:
|
|
229
255
|
email:
|
|
230
256
|
- none@nowhere.org
|
|
231
257
|
executables:
|
|
@@ -388,7 +414,6 @@ homepage: http://github.com/traject/traject
|
|
|
388
414
|
licenses:
|
|
389
415
|
- MIT
|
|
390
416
|
metadata: {}
|
|
391
|
-
post_install_message:
|
|
392
417
|
rdoc_options: []
|
|
393
418
|
require_paths:
|
|
394
419
|
- lib
|
|
@@ -403,8 +428,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
403
428
|
- !ruby/object:Gem::Version
|
|
404
429
|
version: '0'
|
|
405
430
|
requirements: []
|
|
406
|
-
rubygems_version: 3.
|
|
407
|
-
signing_key:
|
|
431
|
+
rubygems_version: 3.6.2
|
|
408
432
|
specification_version: 4
|
|
409
433
|
summary: An easy to use, high-performance, flexible and extensible metadata transformation
|
|
410
434
|
system, focused on library-archives-museums input, and indexing to Solr as output.
|