zizia 2.1.0.alpha.08 → 2.1.0.alpha.09

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f01e21a72b0a90ff796529c072cf9c5a68d5509d054e125112bb43cd30544699
-  data.tar.gz: f251b98deed66733a0a2b1634fac07b330dac06c7c781a28ee5ce39ad369150a
+  metadata.gz: df38310eefb6cf286ea8be271801a25f0220b895f75606152d24da1d229516f7
+  data.tar.gz: 38c2bece99c72f109498e1a2778528a1d4a1d0909745c72eb347c9c60bc40679
 SHA512:
-  metadata.gz: 300027bae9529295cbedfb3802a07321ce31a56c8af99293d72b009c6f44b04d231c6ae7446d461455d923d606e84ec20b7ae5fa7069ca553941849e9a04d1e7
-  data.tar.gz: 51f2ae499e189a88ab984d59e80f59ff6763680f2c8fbc71c4ba73f358e168aa421b38116218493764beaadfa75d4c3c39bc9c66f4b45ecc34392cc73a005dc7
+  metadata.gz: 2ceffb44d966e00d57549a94b2f107e0b33be5fd90dde44988668791951e3711f61fb60802045dbad4c5b415d251be0c2b26908c7b6ed18d19a61890170a5a0b
+  data.tar.gz: a819a0a23c09bf88e9ab15cd99d85c5dba0c52ae5cb962af5c2f163c9b666871dc3dda2fb8f7ebfdf57e28e31a03bed17a33fd049623e7e3b150a6101b87d6af

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-    samvera: samvera/circleci-orb@dev:fix-bundle-cache
+    samvera: samvera/circleci-orb@0.3.1
 jobs:
     build:
         parameters:

data/README.md

@@ -11,7 +11,7 @@ information. See the <a href="https://curationexperts.github.io/zizia/">Getting
 
 
 [![Gem Version](https://badge.fury.io/rb/zizia.svg)](https://badge.fury.io/rb/zizia)
-[![Build Status](https://travis-ci.org/curationexperts/zizia.svg?branch=master)](https://travis-ci.org/curationexperts/zizia)
+[![CircleCI](https://circleci.com/gh/curationexperts/zizia.svg?style=svg)](https://circleci.com/gh/curationexperts/zizia)
 [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/gems/zizia) [![Coverage Status](https://coveralls.io/repos/github/curationexperts/zizia/badge.svg?branch=coveralls)](https://coveralls.io/github/curationexperts/zizia?branch=coveralls)
 
 </td></tr>

data/app/importers/modular_importer.rb

@@ -24,7 +24,7 @@ class ModularImporter
 
     file = File.open(@csv_file)
 
-    Zizia.config.default_info_stream << "event: start_import, batch_id: #{@csv_import.id}, collection_id: #{@collection_id}, user: #{@user_email}"
+    Zizia.config.default_info_stream << "[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/lib/zizia/hyrax_record_importer.rb

@@ -193,7 +193,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 << "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}"
+        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}"
         additional_attrs = {
           depositor: @depositor.user_key
         }
@@ -211,11 +211,11 @@ module Zizia
 
         actor_env = Hyrax::Actors::Environment.new(existing_record, ::Ability.new(@depositor), attrs)
         if metadata_only_middleware.update(actor_env)
-          info_stream << "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}"
+          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}"
           @success_count += 1
         else
           existing_record.errors.each do |attr, msg|
-            error_stream << "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}"
+            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}"
           end
           @failure_count += 1
         end
@@ -224,7 +224,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 << "event: record_import_started, batch_id: #{batch_id}, collection_id: #{collection_id}, record_title: #{record.respond_to?(:title) ? record.title : 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}"
 
         additional_attrs = {
           uploaded_files: create_upload_files(record),
@@ -248,11 +248,11 @@ module Zizia
                                                    attrs)
 
         if Hyrax::CurationConcern.actor.create(actor_env)
-          info_stream << "event: record_created, batch_id: #{batch_id}, record_id: #{created.id}, collection_id: #{collection_id}, record_title: #{attrs[:title]&.first}"
+          info_stream << "[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 << "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}"
+            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}"
           end
           @failure_count += 1
         end

data/lib/zizia/importer.rb

@@ -40,8 +40,8 @@ module Zizia
 
     # Do not attempt to run an import if there are no records. Instead, just write to the log.
     def no_records_message
-      @info_stream << "event: empty_import, batch_id: #{record_importer.batch_id}"
-      @error_stream << "event: empty_import, batch_id: #{record_importer.batch_id}"
+      @info_stream << "[zizia] event: empty_import, batch_id: #{record_importer.batch_id}"
+      @error_stream << "[zizia] event: empty_import, batch_id: #{record_importer.batch_id}"
     end
 
     ##
@@ -51,11 +51,11 @@ module Zizia
     def import
       no_records_message && return unless records.count.positive?
       start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      @info_stream << "event: start_import, batch_id: #{record_importer.batch_id}, expecting to import #{records.count} records."
+      @info_stream << "[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 << "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}"
+      @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}"
     end
   end
 end

data/lib/zizia/version.rb

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

data/spec/zizia/csv_template_spec.rb

@@ -5,7 +5,11 @@ require 'spec_helper'
 RSpec.describe Zizia::CsvTemplate do
   let(:csv_template) { described_class.new }
 
-  it 'retruns a CSV string based on the headers in the Hyrax mapper' do
+  before do
+    Zizia.config.metadata_mapper_class = Zizia::HyraxBasicMetadataMapper
+  end
+
+  it 'returns a CSV string based on the headers in the Hyrax mapper' do
     expect(csv_template.to_s).to eq(Zizia::HyraxBasicMetadataMapper.new.fields.join(','))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 2.1.0.alpha.08
+  version: 2.1.0.alpha.09
 platform: ruby
 authors:
 - Data Curation Experts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora