traject 3.8.1 → 3.8.3

data/test/command_line_test.rb

@@ -24,21 +24,20 @@ describe "Shell out to command line" do
     out, err, result = execute_with_args("-v")
 
     assert result.success?, "Expected subprocess exit code to be success.\nSTDERR:\n#{err}\n\nSTDOUT:\n#{out}"
-    assert_equal err, "traject version #{Traject::VERSION}\n"
+    assert err.end_with?("traject version #{Traject::VERSION}\n")
   end
 
   it "can display help text" do
     out, err, result = execute_with_args("-h")
 
     assert result.success?, "Expected subprocess exit code to be success.\nSTDERR:\n#{err}\n\nSTDOUT:\n#{out}"
-    assert err.start_with?("traject [options] -c configuration.rb [-c config2.rb] file.mrc")
+    assert_includes err, "traject [options] -c configuration.rb [-c config2.rb] file.mrc"
   end
 
   it "handles bad argument" do
     out, err, result = execute_with_args("--no-such-arg")
     refute result.success?
-
-    assert err.start_with?("Error: unknown option `--no-such-arg'\nExiting...\n")
+    assert_includes err, "Error: unknown option `--no-such-arg'\nExiting...\n"
   end
 
   it "does basic dry run" do
@@ -49,4 +48,3 @@ describe "Shell out to command line" do
     assert_match /bib_1000165 +author_sort +Collection la/, out
   end
 end
-

data/test/indexer/error_handler_test.rb

@@ -21,7 +21,7 @@ describe 'Custom mapping error handler' do
     end
 
     assert_equal "I just like raising errors", e.message
-    assert output.string =~ /while executing \(to_field \"id\" at .*error_handler_test.rb:\d+\)/
+    assert output.string =~ /while executing \(to_field \"id\" at .*error_handler_test.rb:\d+.*\)/
     assert output.string =~ /CustomFakeException: I just like raising errors/
   end
 
@@ -38,7 +38,7 @@ describe 'Custom mapping error handler' do
       end
     end
     e = assert_raises(CustomFakeException) { indexer.map_record({}) }
-    assert e.message =~ /\(to_field \"id\" at .*error_handler_test.rb:\d+\)/
+    assert e.message =~ /\(to_field \"id\" at .*error_handler_test.rb:\d+.*\)/
   end
 
   it "custom handler can skip and continue" do

data/test/indexer/macros/macros_marc21_semantics_test.rb

@@ -87,8 +87,9 @@ describe "Traject::Macros::Marc21Semantics" do
 
       assert_equal ["Business renaissance quarterly [electronic resource]."], output["author_sort"]
       assert_equal [""], @indexer.map_record(empty_record)['author_sort']
-
     end
+
+
   end
 
   describe "marc_sortable_title" do
@@ -107,6 +108,16 @@ describe "Traject::Macros::Marc21Semantics" do
 
       assert_equal ["Business renaissance quarterly"], output["title_sort"]
     end
+
+    it "respects non-filing when the first subfield isn't alphabetic" do
+      @record = MARC::Reader.new(support_file_path  "the_business_ren.marc").first
+      @record.fields("245").first.subfields.unshift MARC::Subfield.new("6", "245-03")
+      output = @indexer.map_record(@record)
+      assert_equal ["Business renaissance quarterly"], output["title_sort"]
+
+
+    end
+
     it "works with a record with no 245$ab" do
       @record = MARC::Reader.new(support_file_path  "245_no_ab.marc").to_a.first
       output = @indexer.map_record(@record)
@@ -127,6 +138,14 @@ describe "Traject::Macros::Marc21Semantics" do
       assert_equal({}, @indexer.map_record(empty_record))
 
     end
+    it "can handle ISO 639-3 language codes" do
+      @record = MARC::Reader.new(support_file_path  "iso639-3_lang.marc").to_a.first
+      output = @indexer.map_record(@record)
+
+      assert_equal ["Norwegian", "English", "Norwegian (Bokmål)"], output["languages"]
+      assert_equal({}, @indexer.map_record(empty_record))
+
+    end
   end
 
   describe "marc_instrumentation_humanized" do

data/test/test_support/iso639-3_lang.marc

@@ -0,0 +1 @@
+01498cam a2200385 i 45000010009000000050017000090080041000269060045000679250042001129550090001540100017002440200029002610350024002900400023003140410013003370410023003500420008003730430012003810500023003932450107004162640044005233000046005673360026006133370028006393380027006675040041006945460045007355850101007806500045008816500044009267000032009707100065010029230029010679850016010962206778720211129111712.0210529s2020    no a     b    000 0 nor    a7bcbccorigresd3encipf20gy-gencatlg0 aacquireb1 shelf copyxpolicy default  ave21 2021-06-04bff16 2021-09-23aff00 2021-09-23 to GS/SBCGiff07 2021-11-29 to BCCD  a  2021378586  a9788293654162qpaperback  a(GyWOH)har205007114  aDLCbengcDLCerda1 anoraeng17anobaeng2iso639-3  apcc  af------00aN7380.5b.A47 202000aAlpha Crucis :bcontemporary African art /credaktør: Gunnar B. Kvaran ; oversettelse: Halvor Haugen. 1aOslo :bAstrup Fearnley Museet,c[2020]  a272 pages :bcolor illustrations ;c26 cm  atextbtxt2rdacontent  aunmediatedbn2rdamedia  avolumebnc2rdacarrier  aIncludes bibliographical references.  aParallel texts in English and Norwegian.  aIn conjunction with an exhibition held at Astrup Fearnley Museum, Oslo, January 31-May 17, 2020. 0aArt, Africany21st centuryvExhibitions. 0aArt, Moderny21st centuryvExhibitions.1 aKvaran, Gunnar B.,eeditor.2 aAstrup Fearnley museet for moderne kunst,ehost institution.  d20210531n0255802sGyWOH  eVENDOR LOAD

data/traject.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
 
 
   spec.add_dependency "concurrent-ruby", ">= 0.8.0"
+  spec.add_dependency "csv"
   spec.add_dependency "marc", "~> 1.0"
 
   spec.add_dependency "hashie", ">= 3.1", "< 6" # used for Indexer#settings
@@ -29,6 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "yell" # logging
   spec.add_dependency "dot-properties", ">= 0.1.1" # reading java style .properties
   spec.add_dependency "httpclient", "~> 2.5"
+  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
+
   spec.add_dependency "http", ">= 3.0", "< 6" # used in oai_pmh_reader, may use more extensively in future instead of httpclient
   spec.add_dependency 'marc-fastxmlwriter', '~>1.0' # fast marc->xml
   spec.add_dependency "nokogiri", "~> 1.9" # NokogiriIndexer

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traject
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.8.3
 platform: ruby
 authors:
 - Jonathan Rochkind
 - Bill Dueber
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-09 00:00:00.000000000 Z
+date: 2025-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -25,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: marc
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -225,7 +252,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description:
 email:
 - none@nowhere.org
 executables:
@@ -346,6 +372,7 @@ files:
 - test/test_support/escaped_character_reference.marc8.marc
 - test/test_support/george_eliot.marc
 - test/test_support/hebrew880s.marc
+- test/test_support/iso639-3_lang.marc
 - test/test_support/louis_armstrong.marc
 - test/test_support/manufacturing_consent.marc
 - test/test_support/manuscript_online_thesis.marc
@@ -387,7 +414,6 @@ homepage: http://github.com/traject/traject
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -402,8 +428,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: An easy to use, high-performance, flexible and extensible metadata transformation
   system, focused on library-archives-museums input, and indexing to Solr as output.
@@ -452,6 +477,7 @@ test_files:
 - test/test_support/escaped_character_reference.marc8.marc
 - test/test_support/george_eliot.marc
 - test/test_support/hebrew880s.marc
+- test/test_support/iso639-3_lang.marc
 - test/test_support/louis_armstrong.marc
 - test/test_support/manufacturing_consent.marc
 - test/test_support/manuscript_online_thesis.marc