zizia 2.1.0.alpha.09 → 3.0.0.alpha.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df38310eefb6cf286ea8be271801a25f0220b895f75606152d24da1d229516f7
-  data.tar.gz: 38c2bece99c72f109498e1a2778528a1d4a1d0909745c72eb347c9c60bc40679
+  metadata.gz: 90b6fee12982a33482459065c8d486198ccacc9e98853e6a8654b57eee92334a
+  data.tar.gz: 9dc25fad947cfa77a960831b9e9a3307a6c8bbcc27adaecce762c4255a0da239
 SHA512:
-  metadata.gz: 2ceffb44d966e00d57549a94b2f107e0b33be5fd90dde44988668791951e3711f61fb60802045dbad4c5b415d251be0c2b26908c7b6ed18d19a61890170a5a0b
-  data.tar.gz: a819a0a23c09bf88e9ab15cd99d85c5dba0c52ae5cb962af5c2f163c9b666871dc3dda2fb8f7ebfdf57e28e31a03bed17a33fd049623e7e3b150a6101b87d6af
+  metadata.gz: 25e92885a6e991097b1debec7c9f2c00a01bf0ad4ff58c94e01bdf86518ba62867233d72845959a51eebe2510e0f14f6bbb7e829e685462a23e0e6f4f8f1981b
+  data.tar.gz: 36717ea07f9f8cb2e363d267afd759fcce3d7b50e2629eb6631a0895e2916387d77e174b93a48e46fc8db0641cfb93d98e5559f583a209136c5bb170993f7006

data/.gitignore

@@ -13,3 +13,4 @@ zizia_import.log
 auto-save-list
 tramp
 .\#*
+coverage/

data/.rubocop.yml

@@ -22,6 +22,7 @@ Metrics/AbcSize:
   Exclude:
     - 'spec/support/hyrax/basic_metadata.rb'
     - 'lib/zizia/hyrax_record_importer.rb'
+    - lib/zizia/importer.rb
 
 Metrics/BlockLength:
   Exclude:
@@ -64,6 +65,10 @@ RSpec/ExampleLength:
     - 'spec/zizia/hyrax_basic_metadata_mapper_spec.rb'
     - 'spec/integration/import_hyrax_csv.rb'
 
+RSpec/MessageSpies:
+  Exclude:
+    - spec/integration/import_csv_spec.rb
+
 RSpec/MultipleExpectations:
   Exclude:
     - 'spec/zizia/hyrax_basic_metadata_mapper_spec.rb'

data/app/importers/modular_importer.rb

@@ -24,7 +24,7 @@ class ModularImporter
 
     file = File.open(@csv_file)
 
-    Zizia.config.default_info_stream << "[zizia] event: start_import, batch_id: #{@csv_import.id}, collection_id: #{@collection_id}, user: #{@user_email}"
+    Rails.logger.info "[zizia] event: start_import, batch_id: #{@csv_import.id}, collection_id: #{@collection_id}, user: #{@user_email}"
     Zizia::Importer.new(parser: Zizia::CsvParser.new(file: file), record_importer: Zizia::HyraxRecordImporter.new(attributes: attrs)).import
     file.close
   end

data/app/jobs/zizia/start_csv_import_job.rb

@@ -6,8 +6,7 @@ module Zizia
 
     def perform(csv_import_id)
       csv_import = CsvImport.find csv_import_id
-      log_stream = Zizia.config.default_info_stream
-      log_stream << "Starting import with batch ID: #{csv_import_id}"
+      Rails.logger.info "[zizia] Starting import with batch ID: #{csv_import_id}"
       importer = ModularImporter.new(csv_import)
       importer.import
     end

data/docs/customizing_metadata.md

@@ -36,8 +36,6 @@ It should look like this:
 ```ruby
 Zizia.config do |config|
   config.metadata_mapper_class = CustomMapper
-  config.default_info_stream = Rails.logger
-  config.default_error_stream = Rails.logger
 end
 ```
-This tells zizia what class to use for metadata mappings, and where to log the output.
+This tells zizia what class to use for metadata mappings. Output is logged to `Rails.logger` and all output is prefixed with `[zizia]` for easy log parsing.

data/lib/zizia/hyrax_record_importer.rb

@@ -44,16 +44,13 @@ module Zizia
     #                 batch_id: '789',
     #                 deduplication_field: 'legacy_id'
     #               }
-    def initialize(error_stream: Zizia.config.default_error_stream,
-                   info_stream: Zizia.config.default_info_stream,
-                   attributes: {})
+    def initialize(attributes: {})
       self.collection_id = attributes[:collection_id]
       self.batch_id = attributes[:batch_id]
       self.deduplication_field = attributes[:deduplication_field]
       set_depositor(attributes[:depositor_id])
       @success_count = 0
       @failure_count = 0
-      super(error_stream: error_stream, info_stream: info_stream)
     end
 
     # "depositor" is a required field for Hyrax.  If
@@ -89,9 +86,9 @@ module Zizia
       create_for(record: record) unless existing_record
       update_for(existing_record: existing_record, update_record: record) if existing_record
     rescue Faraday::ConnectionFailed, Ldp::HttpError => e
-      error_stream << e
+      Rails.logger.error "[zizia] #{e}"
     rescue RuntimeError => e
-      error_stream << e
+      Rails.logger.error "[zizia] #{e}"
       raise e
     end
 
@@ -193,7 +190,7 @@ module Zizia
       # We assume the object was created as expected if the actor stack returns true.
       # Note that for now the update stack will only update metadata and update collection membership, it will not re-import files.
       def update_for(existing_record:, update_record:)
-        info_stream << "[zizia] event: record_update_started, batch_id: #{batch_id}, collection_id: #{collection_id}, #{deduplication_field}: #{update_record.respond_to?(deduplication_field) ? update_record.send(deduplication_field) : update_record}"
+        Rails.logger.info "[zizia] event: record_update_started, batch_id: #{batch_id}, collection_id: #{collection_id}, #{deduplication_field}: #{update_record.respond_to?(deduplication_field) ? update_record.send(deduplication_field) : update_record}"
         additional_attrs = {
           depositor: @depositor.user_key
         }
@@ -211,11 +208,11 @@ module Zizia
 
         actor_env = Hyrax::Actors::Environment.new(existing_record, ::Ability.new(@depositor), attrs)
         if metadata_only_middleware.update(actor_env)
-          info_stream << "[zizia] event: record_updated, batch_id: #{batch_id}, record_id: #{existing_record.id}, collection_id: #{collection_id}, #{deduplication_field}: #{existing_record.respond_to?(deduplication_field) ? existing_record.send(deduplication_field) : existing_record}"
+          Rails.logger.info "[zizia] event: record_updated, batch_id: #{batch_id}, record_id: #{existing_record.id}, collection_id: #{collection_id}, #{deduplication_field}: #{existing_record.respond_to?(deduplication_field) ? existing_record.send(deduplication_field) : existing_record}"
           @success_count += 1
         else
           existing_record.errors.each do |attr, msg|
-            error_stream << "[zizia] event: validation_failed, batch_id: #{batch_id}, collection_id: #{collection_id}, attribute: #{attr.capitalize}, message: #{msg}, record_title: record_title: #{attrs[:title] ? attrs[:title] : attrs}"
+            Rails.logger.error "[zizia] event: validation_failed, batch_id: #{batch_id}, collection_id: #{collection_id}, attribute: #{attr.capitalize}, message: #{msg}, record_title: record_title: #{attrs[:title] ? attrs[:title] : attrs}"
           end
           @failure_count += 1
         end
@@ -224,7 +221,7 @@ module Zizia
       # Create an object using the Hyrax actor stack
       # We assume the object was created as expected if the actor stack returns true.
       def create_for(record:)
-        info_stream << "[zizia] event: record_import_started, batch_id: #{batch_id}, collection_id: #{collection_id}, record_title: #{record.respond_to?(:title) ? record.title : record}"
+        Rails.logger.info "[zizia] event: record_import_started, batch_id: #{batch_id}, collection_id: #{collection_id}, record_title: #{record.respond_to?(:title) ? record.title : record}"
 
         additional_attrs = {
           uploaded_files: create_upload_files(record),
@@ -248,11 +245,11 @@ module Zizia
                                                    attrs)
 
         if Hyrax::CurationConcern.actor.create(actor_env)
-          info_stream << "[zizia] event: record_created, batch_id: #{batch_id}, record_id: #{created.id}, collection_id: #{collection_id}, record_title: #{attrs[:title]&.first}"
+          Rails.logger.info "[zizia] event: record_created, batch_id: #{batch_id}, record_id: #{created.id}, collection_id: #{collection_id}, record_title: #{attrs[:title]&.first}"
           @success_count += 1
         else
           created.errors.each do |attr, msg|
-            error_stream << "[zizia] event: validation_failed, batch_id: #{batch_id}, collection_id: #{collection_id}, attribute: #{attr.capitalize}, message: #{msg}, record_title: record_title: #{attrs[:title] ? attrs[:title] : attrs}"
+            Rails.logger.error "[zizia] event: validation_failed, batch_id: #{batch_id}, collection_id: #{collection_id}, attribute: #{attr.capitalize}, message: #{msg}, record_title: record_title: #{attrs[:title] ? attrs[:title] : attrs}"
           end
           @failure_count += 1
         end

data/lib/zizia/importer.rb

@@ -31,17 +31,14 @@ module Zizia
     #   records.
     # @param record_importer [RecordImporter] An object to handle import of
     #   each record
-    def initialize(parser:, record_importer: RecordImporter.new, info_stream: Zizia.config.default_info_stream, error_stream: Zizia.config.default_error_stream)
+    def initialize(parser:, record_importer: RecordImporter.new)
       self.parser          = parser
       self.record_importer = record_importer
-      @info_stream = info_stream
-      @error_stream = error_stream
     end
 
     # Do not attempt to run an import if there are no records. Instead, just write to the log.
     def no_records_message
-      @info_stream << "[zizia] event: empty_import, batch_id: #{record_importer.batch_id}"
-      @error_stream << "[zizia] event: empty_import, batch_id: #{record_importer.batch_id}"
+      Rails.logger.error "[zizia] event: empty_import, batch_id: #{record_importer.batch_id}"
     end
 
     ##
@@ -51,11 +48,11 @@ module Zizia
     def import
       no_records_message && return unless records.count.positive?
       start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      @info_stream << "[zizia] event: start_import, batch_id: #{record_importer.batch_id}, expecting to import #{records.count} records."
+      Rails.logger.info "[zizia] event: start_import, batch_id: #{record_importer.batch_id}, expecting to import #{records.count} records."
       records.each { |record| record_importer.import(record: record) }
       end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       elapsed_time = end_time - start_time
-      @info_stream << "[zizia] event: finish_import, batch_id: #{record_importer.batch_id}, successful_record_count: #{record_importer.success_count}, failed_record_count: #{record_importer.failure_count}, elapsed_time: #{elapsed_time}, elapsed_time_per_record: #{elapsed_time / records.count}"
+      Rails.logger.info "[zizia] event: finish_import, batch_id: #{record_importer.batch_id}, successful_record_count: #{record_importer.success_count}, failed_record_count: #{record_importer.failure_count}, elapsed_time: #{elapsed_time}, elapsed_time_per_record: #{elapsed_time / records.count}"
     end
   end
 end

data/lib/zizia/parsers/csv_parser.rb

@@ -38,8 +38,8 @@ module Zizia
       CSV.parse(file.read, headers: true).each do |row|
         yield InputRecord.from(metadata: row)
       end
-    rescue CSV::MalformedCSVError
-      []
+    rescue CSV::MalformedCSVError => e
+      Rails.logger.error "[zizia] The file #{file} could not be parsed as CSV: #{e}"
     end
   end
 end

data/lib/zizia/record_importer.rb

@@ -3,25 +3,13 @@
 module Zizia
   class RecordImporter
     ##
-    # @!attribute [rw] error_stream
-    #   @return [#<<]
-    # @!attribute [rw] info_stream
-    #   @return [#<<]
     # @!attribute [rw] batch_id
     #   @return [String] an optional batch id for this import run
     # @!attribute [rw] success_count
     #   @return [Integer] a count of the records that were successfully created
     # @!attribute [rw] failure_count
     #   @return [Integer] a count of the records that failed import
-    attr_accessor :error_stream, :info_stream, :batch_id, :success_count, :failure_count
-
-    ##
-    # @param error_stream [#<<]
-    def initialize(error_stream: Zizia.config.default_error_stream,
-                   info_stream: Zizia.config.default_info_stream)
-      self.error_stream = error_stream
-      self.info_stream  = info_stream
-    end
+    attr_accessor :batch_id, :success_count, :failure_count
 
     ##
     # @param record [ImportRecord]
@@ -30,9 +18,9 @@ module Zizia
     def import(record:)
       create_for(record: record)
     rescue Faraday::ConnectionFailed, Ldp::HttpError => e
-      error_stream << e
+      Rails.logger.error "[zizia] #{e}"
     rescue RuntimeError => e
-      error_stream << e
+      Rails.logger.error "[zizia] #{e}"
       raise e
     end
 
@@ -46,12 +34,11 @@ module Zizia
     private
 
       def create_for(record:)
-        info_stream << 'Creating record: ' \
-                       "#{record.respond_to?(:title) ? record.title : record}."
+        Rails.logger.info "[zizia] Creating record: #{record.respond_to?(:title) ? record.title : record}."
 
         created = import_type.create(record.attributes)
 
-        info_stream << "Record created at: #{created.id}"
+        Rails.logger.info "[zizia] Record created at: #{created.id}"
       end
   end
 end

data/lib/zizia/spec/shared_examples/a_validator.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples 'a Zizia::Validator' do
-  subject(:validator) { described_class.new(error_stream: error_stream) }
-  let(:error_stream)  { [] }
+  subject(:validator) { described_class.new }
 
   define :be_a_validator_error do # |expected|
     match { false } # { |actual| some_condition }
@@ -25,22 +24,6 @@ shared_examples 'a Zizia::Validator' do
         expect(validator.validate(parser: invalid_parser)).to be_any if
           defined?(invalid_parser)
       end
-
-      it 'gives usable errors' do
-        pending 'we need to clarify the error type and usage'
-
-        validator.validate(parser: invalid_parser).each do |error|
-          expect(error).to be_a_validator_error
-        end
-      end
-
-      it 'writes errors to the error stream' do
-        if defined?(invalid_parser)
-          expect { validator.validate(parser: invalid_parser) }
-            .to change { error_stream }
-            .to include(an_instance_of(Zizia::Validator::Error))
-        end
-      end
     end
   end
 end

data/lib/zizia/spec.rb

@@ -7,7 +7,6 @@ module Zizia
   # @see https://relishapp.com/rspec/rspec-core/docs/
   module Spec
     require 'zizia/spec/shared_examples/a_mapper'
-    require 'zizia/spec/shared_examples/a_message_stream'
     require 'zizia/spec/shared_examples/a_parser'
     require 'zizia/spec/shared_examples/a_validator'
     require 'zizia/spec/fakes/fake_parser'

data/lib/zizia/validator.rb

@@ -8,7 +8,7 @@ module Zizia
   # validator must respond to `#validate` and return a collection of errors
   # found during validation. If the input is valid, this collection must be
   # empty. Otherwise, it contains any number of `Validator::Error` structs
-  # which should be sent to the `#error_stream` by the validator.
+  # which should be logged to Rails.logger by the validator.
   #
   # The validation process accepts an entire `Parser` and is free to inspect
   # the input `#file` content, or view its individual `#records`.
@@ -80,24 +80,13 @@ module Zizia
       end
     end
 
-    ##
-    # @!attribute [rw] error_stream
-    #   @return [#<<]
-    attr_accessor :error_stream
-
-    ##
-    # @param error_stream [#<<]
-    def initialize(error_stream: Zizia.config.default_error_stream)
-      self.error_stream = error_stream
-    end
-
     ##
     # @param parser [Parser]
     #
     # @return [Enumerator<Error>] a collection of errors found in validation
     def validate(parser:)
       run_validation(parser: parser).tap do |errors|
-        errors.map { |error| error_stream << error }
+        errors.map { |error| Rails.logger.error "[zizia] #{error}" }
       end
     end
 

data/lib/zizia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zizia
-  VERSION = '2.1.0.alpha.09'
+  VERSION = '3.0.0.alpha.01'
 end

data/lib/zizia.rb

@@ -18,9 +18,6 @@ require "zizia/engine"
 #
 # @example A basic configuration
 #   Zizia.config do |config|
-#     # error/info streams must respond to `#<<`
-#     config.default_error_stream = MyErrorStream.new
-#     config.default_info_stream  = STDOUT
 #   end
 #
 module Zizia
@@ -35,7 +32,6 @@ module Zizia
   end
   module_function :config
 
-  require 'zizia/log_stream'
   require 'zizia/version'
   require 'zizia/metadata_mapper'
   require 'zizia/hash_mapper'
@@ -53,18 +49,9 @@ module Zizia
   ##
   # Module-wide options for `Zizia`.
   class Configuration
-    ##
-    # @!attribute [rw] default_error_stream
-    #   @return [#<<]
-    # @!attribute [rw] default_info_stream
-    #   @return [#<<]
-    attr_accessor :default_error_stream
-    attr_accessor :default_info_stream
     attr_accessor :metadata_mapper_class
 
     def initialize
-      self.default_error_stream = Zizia::LogStream.new
-      self.default_info_stream  = Zizia::LogStream.new
       self.metadata_mapper_class = Zizia::HyraxBasicMetadataMapper
     end
   end

data/spec/integration/import_csv_spec.rb

@@ -18,10 +18,9 @@ describe 'importing a csv batch', :clean do
     context 'with invalid CSV' do
       let(:file) { File.open('spec/fixtures/bad_example.csv') }
 
-      it 'outputs invalid file notice to error stream' do
-        expect { parser.validate }
-          .to output(/^CSV::MalformedCSVError.*line 2/)
-          .to_stdout_from_any_process
+      it 'outputs invalid file notice to Rails.logger' do
+        expect(Rails.logger).to receive(:error).with("[zizia] CSV::MalformedCSVError: Illegal quoting in line 2. (Zizia::CsvFormatValidator)")
+        parser.validate
       end
     end
   end

data/spec/zizia/csv_format_validator_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Zizia::CsvFormatValidator do
-  subject(:validator)  { described_class.new(error_stream: []) }
+  subject(:validator)  { described_class.new }
   let(:invalid_parser) { Zizia::CsvParser.new(file: invalid_file) }
   let(:invalid_file)   { File.open('spec/fixtures/bad_example.csv') }
 

data/spec/zizia/hyrax_record_importer_spec.rb

@@ -3,15 +3,13 @@ require 'spec_helper'
 
 describe Zizia::HyraxRecordImporter, :clean do
   subject(:importer) do
-    described_class.new(error_stream: error_stream, info_stream: info_stream)
+    described_class.new
   end
 
   load File.expand_path("../../support/shared_contexts/with_work_type.rb", __FILE__)
   include_context 'with a work type'
 
-  let(:error_stream) { [] }
-  let(:info_stream)  { [] }
-  let(:record)       { Zizia::InputRecord.from(metadata: metadata) }
+  let(:record) { Zizia::InputRecord.from(metadata: metadata) }
 
   context 'collection id' do
     subject(:importer) do
@@ -128,7 +126,7 @@ describe Zizia::HyraxRecordImporter, :clean do
     end
 
     context 'when depositor is passed to initializer' do
-      subject(:importer) { described_class.new(error_stream: error_stream, info_stream: info_stream, attributes: { depositor_id: user.user_key }) }
+      subject(:importer) { described_class.new(attributes: { depositor_id: user.user_key }) }
 
       let(:user) { ::User.new(id: '123', user_key: 'special_user@example.com') }
       before { allow(::User).to receive(:find).and_return(user) }

data/spec/zizia/record_importer_spec.rb

@@ -4,12 +4,10 @@ require 'spec_helper'
 
 describe Zizia::RecordImporter, :clean do
   subject(:importer) do
-    described_class.new(error_stream: error_stream, info_stream: info_stream)
+    described_class.new
   end
 
-  let(:error_stream) { [] }
-  let(:info_stream)  { [] }
-  let(:record)       { Zizia::InputRecord.from(metadata: metadata) }
+  let(:record) { Zizia::InputRecord.from(metadata: metadata) }
   let(:metadata) do
     {
       'title' => 'A Title',
@@ -33,21 +31,12 @@ describe Zizia::RecordImporter, :clean do
         .by 1
     end
 
-    it 'writes to the info stream before and after create' do
-      expect { importer.import(record: record) }
-        .to change { info_stream }
-        .to contain_exactly(/^Creating record/, /^Record created/)
-    end
-
     context 'when input record errors with LDP errors' do
       let(:ldp_error) { Ldp::PreconditionFailed }
 
       before { allow(record).to receive(:attributes).and_raise(ldp_error) }
-
-      it 'writes errors to the error stream (no reraise!)' do
-        expect { importer.import(record: record) }
-          .to change { error_stream }
-          .to contain_exactly(an_instance_of(ldp_error))
+      it 'catches the error' do
+        expect { importer.import(record: record) }.not_to raise_error(ldp_error)
       end
     end
 
@@ -56,12 +45,6 @@ describe Zizia::RecordImporter, :clean do
 
       before { allow(record).to receive(:attributes).and_raise(custom_error) }
 
-      it 'writes errors to the error stream' do
-        expect { begin; importer.import(record: record); rescue; end }
-          .to change { error_stream }
-          .to contain_exactly(an_instance_of(custom_error))
-      end
-
       it 'reraises error' do
         expect { importer.import(record: record) }.to raise_error(custom_error)
       end

data/spec/zizia/title_validator_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Zizia::TitleValidator do
-  subject(:validator) { described_class.new(error_stream: []) }
+  subject(:validator) { described_class.new }
 
   let(:invalid_parser) do
     FakeParser.new(file: [{ 'title' => 'moomin' }, {}, {}])

data/spec/zizia_spec.rb

@@ -7,18 +7,6 @@ end
 
 describe Zizia do
   describe '#config' do
-    it 'can set a default error stream' do
-      expect { described_class.config { |c| c.default_error_stream = STDOUT } }
-        .to change { described_class.config.default_error_stream }
-        .to(STDOUT)
-    end
-
-    it 'can set a default info stream' do
-      expect { described_class.config { |c| c.default_info_stream = STDOUT } }
-        .to change { described_class.config.default_info_stream }
-        .to(STDOUT)
-    end
-
     it 'has a default metadata mapper' do
       expect(described_class.config.metadata_mapper_class).to eq Zizia::HyraxBasicMetadataMapper
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 2.1.0.alpha.09
+  version: 3.0.0.alpha.01
 platform: ruby
 authors:
 - Data Curation Experts
@@ -329,7 +329,6 @@ files:
 - lib/zizia/hyrax_record_importer.rb
 - lib/zizia/importer.rb
 - lib/zizia/input_record.rb
-- lib/zizia/log_stream.rb
 - lib/zizia/metadata_mapper.rb
 - lib/zizia/metadata_only_stack.rb
 - lib/zizia/parser.rb
@@ -338,10 +337,8 @@ files:
 - lib/zizia/spec.rb
 - lib/zizia/spec/fakes/fake_parser.rb
 - lib/zizia/spec/shared_examples/a_mapper.rb
-- lib/zizia/spec/shared_examples/a_message_stream.rb
 - lib/zizia/spec/shared_examples/a_parser.rb
 - lib/zizia/spec/shared_examples/a_validator.rb
-- lib/zizia/streams/formatted_message_stream.rb
 - lib/zizia/validator.rb
 - lib/zizia/validators/csv_format_validator.rb
 - lib/zizia/validators/title_validator.rb
@@ -453,7 +450,6 @@ files:
 - spec/integration/import_hyrax_csv.rb
 - spec/models/csv_import_spec.rb
 - spec/spec_helper.rb
-- spec/stdout_stream_spec.rb
 - spec/support/hyrax/basic_metadata.rb
 - spec/support/hyrax/core_metadata.rb
 - spec/support/shared_contexts/with_work_type.rb
@@ -462,13 +458,11 @@ files:
 - spec/zizia/csv_format_validator_spec.rb
 - spec/zizia/csv_parser_spec.rb
 - spec/zizia/csv_template_spec.rb
-- spec/zizia/formatted_message_stream_spec.rb
 - spec/zizia/hash_mapper_spec.rb
 - spec/zizia/hyrax_basic_metadata_mapper_spec.rb
 - spec/zizia/hyrax_record_importer_spec.rb
 - spec/zizia/importer_spec.rb
 - spec/zizia/input_record_spec.rb
-- spec/zizia/parser_spec.rb
 - spec/zizia/record_importer_spec.rb
 - spec/zizia/title_validator_spec.rb
 - spec/zizia/validator_spec.rb

data/lib/zizia/log_stream.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Zizia
-  class LogStream
-    ##
-    # @!attribute [rw] logger
-    #   @return [Logger]
-    # @!attribute [rw] severity
-    #   @return [Logger::Serverity]
-    attr_accessor :logger, :severity
-
-    def initialize(logger: nil, severity: nil)
-      self.logger   = logger   || Logger.new(build_filename)
-      self.severity = severity || Logger::INFO
-    end
-
-    def <<(msg)
-      logger.add(severity, msg)
-      STDOUT << msg
-    end
-
-    private
-
-      def build_filename
-        return ENV['IMPORT_LOG'] if ENV['IMPORT_LOG']
-        return rails_log_name if rails_log_name
-        './log/zizia_import.log'
-      end
-
-      def rails_log_name
-        case Rails.env
-        when 'production'
-          Rails.root.join('log', "csv_import.log").to_s
-        when 'development'
-          Rails.root.join('log', "dev_csv_import.log").to_s
-        when 'test'
-          Rails.root.join('log', "test_csv_import.log").to_s
-        end
-      rescue ::NameError
-        false
-      end
-  end
-end

data/lib/zizia/spec/shared_examples/a_message_stream.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-shared_examples 'a Zizia::MessageStream' do
-  describe '#<<' do
-    it { is_expected.to respond_to(:<<) }
-
-    it 'accepts a string argument' do
-      expect { stream << 'some string' }.not_to raise_error
-    end
-  end
-end

data/lib/zizia/streams/formatted_message_stream.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-module Zizia
-  ##
-  # A message stream that formats a message before forwarding it to an
-  # underlying {#stream} (STDOUT by default). Messages are formatted using
-  # the `#%` method; the formatter can be a string format specification like
-  # "Message received: %s".
-  #
-  # @example Using a simple formatter
-  #   formatter = "Message received: %s\n"
-  #   stream    = Zizia::FormattedMessageStream.new(formatter: formatter)
-  #
-  #   stream << "a message"
-  #   # Message received: a message
-  #   # => #<IO:<STDOUT>>
-  #
-  # @example A more complex formatter use case
-  #   class MyFormatter
-  #     def %(arg)
-  #       "#{Time.now}: %s\n" % arg
-  #     end
-  #   end
-  #
-  #   formatter = MyFormatter.new
-  #   stream    = Zizia::FormattedMessageStream.new(formatter: formatter)
-  #
-  #   stream << 'a message'
-  #   # 2018-02-02 16:10:52 -0800: a message
-  #   # => #<IO:<STDOUT>>
-  #
-  #   stream << 'another message'
-  #   # 2018-02-02 16:10:55 -0800: another message
-  #   # => #<IO:<STDOUT>>
-  #
-  class FormattedMessageStream
-    ##
-    # @!attribute [rw] formatter
-    #   @return [#%] A format specification
-    #   @see https://ruby-doc.org/core-2.4.0/String.html#method-i-25
-    # @!attribute [rw] stream
-    #   @return [#<<] an underlying stream to forward messages to after
-    #     formatting
-    attr_accessor :formatter, :stream
-
-    ##
-    # @param formatter [#%] A format specification
-    # @param stream    [#<<] an underlying stream to forward messages to after
-    #   formatting
-    #
-    # @see https://ruby-doc.org/core-2.4.0/String.html#method-i-25
-    def initialize(stream: STDOUT, formatter: "%s\n")
-      self.formatter = formatter
-      self.stream    = stream
-    end
-
-    ##
-    def <<(msg)
-      stream << format_message(msg)
-    end
-
-    ##
-    # @param msg [#to_s]
-    #
-    # @return [String] the input, cast to a string and formatted using
-    def format_message(msg)
-      formatter % msg
-    end
-  end
-end

data/spec/stdout_stream_spec.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'STDOUT as a MessageStream' do
-  subject(:stream) { STDOUT }
-
-  it_behaves_like 'a Zizia::MessageStream'
-end

data/spec/zizia/formatted_message_stream_spec.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'zizia/streams/formatted_message_stream'
-
-describe Zizia::FormattedMessageStream do
-  subject(:stream)     { described_class.new(stream: fake_stream) }
-  let(:fake_stream)    { [] }
-
-  it_behaves_like 'a Zizia::MessageStream'
-
-  describe '#stream' do
-    subject(:stream) { described_class.new }
-
-    it 'is STDOUT by default' do
-      expect(stream.stream).to eq STDOUT
-    end
-  end
-
-  describe '#<<' do
-    it 'appends newlines by default' do
-      expect { stream << 'moomin' }
-        .to change { fake_stream }
-        .to contain_exactly("moomin\n")
-    end
-
-    it 'uses other % formatters' do
-      stream.formatter = "!!!%s!!!"
-
-      expect { stream << 'moomin' }
-        .to change { fake_stream }
-        .to contain_exactly('!!!moomin!!!')
-    end
-  end
-end

data/spec/zizia/parser_spec.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Zizia::Parser do
-  subject(:parser) { described_class.new(file: file) }
-  let(:file)       { :fake_file }
-
-  it_behaves_like 'a Zizia::Parser'
-
-  describe '.for' do
-    it 'raises an error' do
-      expect { described_class.for(file: file) }.to raise_error TypeError
-    end
-
-    context 'with a matching parser subclass' do
-      before(:context) do
-        ##
-        # An importer that matches all types
-        class MyFakeParser < described_class
-          class << self
-            def match?(**_opts)
-              true
-            end
-          end
-        end
-
-        class NestedParser < MyFakeParser; end
-      end
-
-      after(:context) do
-        Object.send(:remove_const, :MyFakeParser)
-        Object.send(:remove_const, :NestedParser)
-      end
-
-      it 'returns an importer instance' do
-        expect(described_class.for(file: file)).to be_a NestedParser
-      end
-    end
-  end
-
-  describe '#records' do
-    it 'raises NotImplementedError' do
-      expect { parser.records }.to raise_error NotImplementedError
-    end
-  end
-end