traject 3.3.0 → 3.7.0

data/test/solr_json_writer_test.rb

@@ -178,17 +178,52 @@ describe "Traject::SolrJsonWriter" do
     assert(auth.empty?)
   end
 
-  it "allows basic authentication setup" do
-    settings = {
-      "solr.url" => "http://example.com/solr/foo",
-      "solr_writer.basic_auth_user" => "foo",
-      "solr_writer.basic_auth_password" => "bar",
-    }
+  describe "HTTP basic auth" do
 
-    writer = Traject::SolrJsonWriter.new(settings)
-    auth = writer.instance_variable_get("@http_client")
-      .www_auth.basic_auth.instance_variable_get("@auth")
-    assert(!auth.empty?)
+    it "supports basic authentication settings" do
+      settings = {
+        "solr.url" => "http://example.com/solr/foo",
+        "solr_writer.basic_auth_user" => "foo",
+        "solr_writer.basic_auth_password" => "bar",
+      }
+
+      # testing with some internal implementation of HTTPClient sorry
+
+      writer = Traject::SolrJsonWriter.new(settings)
+
+      auth = writer.instance_variable_get("@http_client")
+        .www_auth.basic_auth.instance_variable_get("@auth")
+      assert(!auth.empty?)
+      assert_equal(auth.values.first, Base64.encode64("foo:bar").chomp)
+    end
+
+    it "supports basic auth from solr.url" do
+      settings = {
+        "solr.url" => "http://foo:bar@example.com/solr/foo",
+      }
+
+      # testing with some internal implementation of HTTPClient sorry
+
+      writer = Traject::SolrJsonWriter.new(settings)
+      auth = writer.instance_variable_get("@http_client")
+        .www_auth.basic_auth.instance_variable_get("@auth")
+      assert(!auth.empty?)
+      assert_equal(auth.values.first, Base64.encode64("foo:bar").chomp)
+    end
+
+    it "does not log basic auth from solr.url" do
+      string_io = StringIO.new
+      settings = {
+        "solr.url" => "http://secret_username:secret_password@example.com/solr/foo",
+        "logger"   => Logger.new(string_io)
+      }
+
+
+      writer = Traject::SolrJsonWriter.new(settings)
+
+      refute_includes string_io.string, "secret_username:secret_password"
+      assert_includes string_io.string, "(with HTTP basic auth)"
+    end
   end
 
   describe "commit" do

data/test/test_support/missing-second-date.marc

@@ -0,0 +1 @@
+01351nem a2200313 a 4500001001100000001001100011008004100022034001300063035002200076043003000098080001200128100006100140245011600201255002900317260005900346300003500405500004500440500013600485500003800621500005000659530004400709651006000753700003800813710010200851730000900953856005300962907001401015940000801029.b20028118.b6928510x170714q1678    fr ||||   |  |||| ||fre|c1 aab10000  a(OCoLC)1120596466  ae-sp---be-spcce2catmarc  a(084.3)1 aBeaulieu, Sébastien de Pontault,csieur de,d1613-1674.10aPlan de la ville de Puiçerdah[Document cartogràfic] :bpris en 1678 /c[Beaulieu] ; DR f. [Des Roches fecit]  aEscala [1:10 000 aprox.]  a[A Paris :bpar le Chevalier de Beaulieu,cpost. 1678]  a1 mapa :bgravat;c28 x 32 cm.  aEscala gràfica: Eschelle de 150 toises.  aPertany a l'obra "Les plans et profils des principales villes et lieux considerables de la Principauté de Catalogne", de Beaulieu.  aPeu d'impremta de l'obra general.  aMapa emmarcat en una orla amb motius florals.  aTambé disponible la versió en línia. 4aPuigcerdà (Catalunya)xMapesxObres anteriors al 1800.1 aDes Roches, Jean Baptiste Hamont.2 aCol·lecció de mapes antics de Martí Gelabertó (Universitat Autònoma de Barcelona)5ES-BaUAB.0 aDDD.41zAccés lliureuhttps://ddd.uab.cat/record/180313  ab20028118  aUAB

data/traject.gemspec

@@ -24,12 +24,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "concurrent-ruby", ">= 0.8.0"
   spec.add_dependency "marc", "~> 1.0"
 
-  spec.add_dependency "hashie", ">= 3.1", "< 5" # used for Indexer#settings
-  spec.add_dependency "slop", ">= 3.4.5", "< 4.0" # command line parsing
+  spec.add_dependency "hashie", ">= 3.1", "< 6" # used for Indexer#settings
+  spec.add_dependency "slop", "~> 4.0" # command line parsing
   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 "http", ">= 3.0", "< 5" # used in oai_pmh_reader, may use more extensively in future instead of httpclient
+  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,15 @@
 --- !ruby/object:Gem::Specification
 name: traject
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 - Bill Dueber
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -48,7 +48,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,25 +58,19 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -130,7 +124,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -140,7 +134,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: marc-fastxmlwriter
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +225,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: 
+description:
 email:
 - none@nowhere.org
 executables:
@@ -246,8 +240,8 @@ extra_rdoc_files:
 - doc/settings.md
 - doc/xml.md
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - ".yardopts"
 - CHANGES.md
 - Gemfile
@@ -263,6 +257,7 @@ files:
 - doc/programmatic_use.md
 - doc/settings.md
 - doc/xml.md
+- examples/marc/tiny.xml
 - lib/tasks/load_maps.rake
 - lib/traject.rb
 - lib/traject/array_writer.rb
@@ -307,6 +302,7 @@ files:
 - lib/translation_maps/marc_geographic.yaml
 - lib/translation_maps/marc_instruments.yaml
 - lib/translation_maps/marc_languages.yaml
+- test/command_line_test.rb
 - test/debug_writer_test.rb
 - test/delimited_writer_test.rb
 - test/experimental_nokogiri_streaming_reader_test.rb
@@ -354,6 +350,7 @@ files:
 - test/test_support/manufacturing_consent.marc
 - test/test_support/manuscript_online_thesis.marc
 - test/test_support/microform_online_conference.marc
+- test/test_support/missing-second-date.marc
 - test/test_support/multi_era.marc
 - test/test_support/multi_geo.marc
 - test/test_support/musical_cage.marc
@@ -390,7 +387,7 @@ homepage: http://github.com/traject/traject
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -405,13 +402,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 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.
 test_files:
+- test/command_line_test.rb
 - test/debug_writer_test.rb
 - test/delimited_writer_test.rb
 - test/experimental_nokogiri_streaming_reader_test.rb
@@ -459,6 +456,7 @@ test_files:
 - test/test_support/manufacturing_consent.marc
 - test/test_support/manuscript_online_thesis.marc
 - test/test_support/microform_online_conference.marc
+- test/test_support/missing-second-date.marc
 - test/test_support/multi_era.marc
 - test/test_support/multi_geo.marc
 - test/test_support/musical_cage.marc

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-cache: bundler
-# we don't really need `sudo: true`, but for some reason travis docker-based systems are unreliable
-# at downloading jruby, and
-sudo: true
-rvm:
-  - 2.4.4
-  - 2.5.1
-  - 2.6.1
-# avoid having travis install jdk on MRI builds where we don't need it.
-matrix:
-  include:
-    - jdk: openjdk8
-      rvm: jruby-9.1.17.0
-    - jdk: openjdk8
-      rvm: jruby-9.2.6.0