zizia 5.5.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94370ebf6412c155e295ce307d1d60f7a650d12e60ad61172c869bf3054a76b3
-  data.tar.gz: 137780153f7ccb0f0dd129ca47cdf1ba82bf867ac3c7942d9af0638320a2a306
+  metadata.gz: 4ea278f920c48f0ca7d4e52cc54a619fdcb1214cf115efaeff63f96ca36590ce
+  data.tar.gz: cf2d2a451e0e6d41d80ccf121793e1672cb2b1ce13a830013bfd031273a69f26
 SHA512:
-  metadata.gz: 95c8b4a8bac7fc41862b6b5291122cafab5a6aae10e7e78231cfafd94e51a4dd07e84010a73fe8796e74a4f3c5e81f99df2e49b4637798242584e898682a3b36
-  data.tar.gz: f0ff9cb82e4dda1a2dbe9f63761ffc0557c20932e2fea5d9e934f280f0094eb218fba7970778cff9437834d8aed3fcf0e014794364f0b49fb5825c95b9ae6a0c
+  metadata.gz: 30c878339f6b6076f203c008fed9b6ae448466947e55fbb8c80a53b56920e014be4e92d58afc322fffde6e04120a8cf8cee9be66ba5b90fda776a92ded3d5606
+  data.tar.gz: dfaf9874758df10a63ce96425105c986708858ed549f02217fac2977bb000e204294cb05dbe6e5b8a3ceb347604418e1a67396ddc2b97d0428389c23d8185e9d

data/.github_changelog_generator

@@ -1,2 +1,2 @@
 unreleased=true
-future-release=5.5.0
+future-release=6.0.0

data/.rubocop.yml

@@ -62,7 +62,6 @@ RSpec/DescribeClass:
 
 RSpec/ExampleLength:
   Exclude:
-    - 'spec/controllers/pre_ingest_works_controller_spec.rb'
     - 'spec/zizia/hyrax/hyrax_basic_metadata_mapper_spec.rb'
     - 'spec/integration/import_hyrax_csv.rb'
     - 'spec/integration/csv_import_detail_spec.rb'

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 # Changelog
 
-## [5.5.0](https://github.com/curationexperts/zizia/tree/5.5.0) (2019-11-21)
+## [6.0.0](https://github.com/curationexperts/zizia/tree/6.0.0) (2019-12-13)
 
-[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.4.0...5.5.0)
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.5.0...6.0.0)
+
+**Merged pull requests:**
+
+- Revert "Basic file status" [\#68](https://github.com/curationexperts/zizia/pull/68) ([little9](https://github.com/little9))
+- More detailed file status [\#66](https://github.com/curationexperts/zizia/pull/66) ([little9](https://github.com/little9))
+
+## [v5.5.0](https://github.com/curationexperts/zizia/tree/v5.5.0) (2019-11-21)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.4.0...v5.5.0)
 
 **Merged pull requests:**
 
@@ -87,6 +96,7 @@
 - Add intro header for metadata field guide [\#36](https://github.com/curationexperts/zizia/pull/36) ([bess](https://github.com/bess))
 - Add field definitions for 'files' and 'visibility' to the field guide [\#35](https://github.com/curationexperts/zizia/pull/35) ([mark-dce](https://github.com/mark-dce))
 - Label and hide system fields [\#34](https://github.com/curationexperts/zizia/pull/34) ([bess](https://github.com/bess))
+- Add files count to import details page [\#32](https://github.com/curationexperts/zizia/pull/32) ([little9](https://github.com/little9))
 
 ## [v4.5.4.alpha.01](https://github.com/curationexperts/zizia/tree/v4.5.4.alpha.01) (2019-10-04)
 
@@ -100,10 +110,6 @@
 
 [Full Changelog](https://github.com/curationexperts/zizia/compare/v4.5.2.alpha.01...v4.5.3.alpha.01)
 
-**Merged pull requests:**
-
-- Add files count to import details page [\#32](https://github.com/curationexperts/zizia/pull/32) ([little9](https://github.com/little9))
-
 ## [v4.5.2.alpha.01](https://github.com/curationexperts/zizia/tree/v4.5.2.alpha.01) (2019-10-03)
 
 [Full Changelog](https://github.com/curationexperts/zizia/compare/v4.5.1.alpha.01...v4.5.2.alpha.01)

data/README.md

@@ -60,7 +60,7 @@ to create a new application with Zizia installed.
 8. Add a deduplication_key to your default work type's medata:
 
 ```
-  property :deduplication_key, predicate: "http://curationexperts.com/vocab/predicates#deduplicationKey", multiple: false do |index|
+  property :deduplication_key, predicate: ::RDF::Vocab::BF2::identifiedBy, multiple: false do |index|
     index.as :stored_searchable
   end
 ```
@@ -104,7 +104,7 @@ environment variables called `IMPORT_PATH`. If `IMPORT_PATH` is not set, `HyraxR
 
 To run Solr and Fedora for testing purposes, open a new terminal session for each and run the following commads:
 
-`solr_wrapper --config spec/dummy/config/solr_wrapper_test.yml`  
+`solr_wrapper --config spec/dummy/config/solr_wrapper_test.yml`
 `fcrepo_wrapper --config spec/dummy/config/fcrepo_wrapper_test.yml`
 
 After this you can run the whole suite, or individual specs. System specs are located

data/app/assets/javascripts/zizia/zizia.js

@@ -1,48 +1,6 @@
 var Zizia = {
-  displayUploadedFile: function () {
+  displayUploadedFile: function() {
     var DisplayUploadedFile = require('zizia/DisplayUploadedFile')
     new DisplayUploadedFile().display()
-  },
-  checkStatuses: function (options) {
-    var results = []
-    // Go through the list of thumbnails for the work based
-    // on the deduplicationKey
-    options.thumbnails.forEach(function (thumbnail) {
-      $.ajax({
-        type: 'HEAD',
-        url: thumbnail,
-        complete: function (xhr) {
-          // Request only the headers from the thumbnail url
-          // push the statuses into an array
-          results.push(xhr.getResponseHeader('status'))
-          // See how many urls are not returning 200
-          var missingThumbnailCount = results.filter(
-            function (status) {
-              if (status !== '200 OK') { return true }
-            }).length
-          // If there are any not returning 200, the work is still being processed
-          if (missingThumbnailCount > 0) {
-
-          } else {
-            Zizia.addSuccessClasses(options)
-          }
-        }
-      })
-    })
-  },
-  displayWorkStatus: function () {
-    $('[id^=work-status]').each(function () {
-	    var deduplicationKey = $(this)[0].id.split('work-status-')[1]
-	    $.get('/pre_ingest_works/thumbnails/' + deduplicationKey, function (data) {
-        data.deduplicationKey = deduplicationKey
-        Zizia.checkStatuses(data)
-      })
-    })
-  },
-  addSuccessClasses: function (options) {
-    $('#work-status-' + options.deduplicationKey + ' > span').removeClass('status-unknown')
-    $('#work-status-' + options.deduplicationKey + ' > span').removeClass('glyphicon-question-sign')
-    $('#work-status-' + options.deduplicationKey + ' > span').addClass('text-success')
-    $('#work-status-' + options.deduplicationKey + ' > span').addClass('glyphicon-ok-sign')
   }
 }

data/app/helpers/zizia/application_helper.rb

@@ -30,5 +30,11 @@ module Zizia
     def collections?
       !ActiveFedora::SolrService.query('has_model_ssim:Collection').empty?
     end
+
+    def status_icon(status)
+      # rubocop:disable Rails/OutputSafety
+      return "<span class='glyphicon glyphicon-ok-sign text-success' aria-label='Status: Complete'></span>".html_safe if status == 'attached'
+      "<span class='glyphicon glyphicon-question-sign' aria-label='Status: Unknown'></span>".html_safe
+    end
   end
 end

data/app/models/zizia/csv_import_detail.rb

@@ -9,6 +9,10 @@ module Zizia
     has_many :pre_ingest_works
     has_many :pre_ingest_files, through: :pre_ingest_works
 
+    def status
+      'undetermined'
+    end
+
     def total_size
       return 0 if pre_ingest_files.empty?
       pre_ingest_files.map(&:size).sum

data/app/models/zizia/pre_ingest_work.rb

@@ -12,20 +12,5 @@ module Zizia
       return solr_title unless solr_title.nil?
       'This work\'s metadata has not been indexed yet.'
     end
-
-    # Returns thumbnail urls based on the work's deduplication_key
-    # @return [Array<String>] the work's thumbnail urls
-    def thumbnails
-      thumbnail_urls = []
-      return thumbnail_urls if deduplication_key.nil?
-      file_sets = ActiveFedora::SolrService.get("deduplication_key_tesim:#{deduplication_key}")
-                                           .dig('response', 'docs', 0, 'file_set_ids_ssim')
-      return thumbnail_urls unless file_sets
-      file_sets.each do |file_set_id|
-        thumbnail_urls.push(ActiveFedora::SolrService.get("id:#{file_set_id}")
-                              .dig('response', 'docs', 0, 'thumbnail_path_ss'))
-      end
-      thumbnail_urls
-    end
   end
 end

data/app/uploaders/zizia/csv_manifest_validator.rb

@@ -63,7 +63,7 @@ module Zizia
          'publisher', 'date created', 'subject',
          'language', 'identifier', 'location',
          'related url', 'bibliographic_citation',
-         'source', 'visibility']
+         'source', 'visibility', 'deduplication_key', 'type']
       end
 
       def parse_csv
@@ -82,7 +82,7 @@ module Zizia
       end
 
       def required_headers
-        ['title', 'creator', 'keyword', 'rights statement', 'visibility', 'files']
+        ['title', 'creator', 'keyword', 'rights statement', 'visibility', 'files', 'deduplication_key']
       end
 
       def duplicate_headers

data/app/views/zizia/csv_import_details/_pre_ingest_files_table.html.erb

@@ -8,6 +8,7 @@
       <th>Size</th>
       <th>Row Number</th>
       <th>Date Created</th>
+      <th>Status</th>
     </tr>
     <% pre_ingest_work.pre_ingest_files.each do |pre_ingest_file| %>
       <tr>
@@ -23,6 +24,9 @@
         <td>
           <%= pre_ingest_file.created_at.strftime("%B %-d, %Y %H:%M") %>
         </td>
+        <td>
+          <%= status_icon(pre_ingest_file.status) %>
+        </td>
       </tr>
     <% end %>
   </table>

data/app/views/zizia/csv_import_details/index.html.erb

@@ -9,6 +9,7 @@
     <th>Number of Works</th>
     <th>Number of Files</th>
     <th>Total Size</th>
+    <th>Status</th>
     <th>Overwrite Behavior Type</th>
   </tr>
   <% @csv_import_details.each do |csv_import_detail| %>
@@ -34,6 +35,9 @@
       <td>
         <%= number_to_human_size(csv_import_detail.total_size) %>
       </td>
+      <td>
+        <%= csv_import_detail.status %>
+      </td>
       <td>
         <%= human_update_actor_stack(csv_import_detail.update_actor_stack) %>
       </td>

data/app/views/zizia/csv_import_details/show.html.erb

@@ -15,7 +15,6 @@
       <th>Title</th>
       <th>Files</th>
       <th>Date</th>
-      <th>Status</th>
     </tr>
   <% @pre_ingest_works.each do |pre_ingest_work| %>
     <tr>
@@ -31,16 +30,11 @@
       <td>
         <%= pre_ingest_work.created_at.strftime("%B %-d, %Y %H:%M") %>
       </td>
-      <td id="<%= "work-status-#{pre_ingest_work.deduplication_key}" %>">
-        <span class="glyphicon glyphicon-question-sign status-unknown"></span>
+      <td>
+        <%= status_icon(pre_ingest_work.status) %>
       </td>
     </tr>
   <% end %>
   </table>
   <%= paginate @pre_ingest_works %>
 </div>
-<script>
- $(document).on('turbolinks:load', function() {
-   Zizia.displayWorkStatus()
- })
-</script>

data/config/initializers/content_deposit_event_job_prepends.rb

@@ -0,0 +1,10 @@
+module ContentDepositEventJobPrepends
+  def action
+    super
+    if repo_object.deduplication_key
+      pre_ingest_work = Zizia::PreIngestWork.find_by(deduplication_key: repo_object.deduplication_key)
+      pre_ingest_work.status = 'attached'
+      pre_ingest_work.save
+    end
+  end
+end

data/config/initializers/file_set_attached_event_job_prepends.rb

@@ -0,0 +1,12 @@
+module FileSetAttachedEventJobPrepends
+  def action
+    if repo_object.kind_of?(FileSet)
+      pre_ingest_work_id = Zizia::PreIngestWork.find_by(deduplication_key: curation_concern.deduplication_key)
+      pre_ingest_file = Zizia::PreIngestFile.find_by(size: repo_object.files.first.size,
+                                                     filename: repo_object.files.first.original_name,
+                                                     pre_ingest_work_id: pre_ingest_work_id)
+      pre_ingest_file.status = 'attached'
+      pre_ingest_file.save
+    end
+  end
+end

data/config/initializers/prepends.rb

@@ -0,0 +1,2 @@
+ContentDepositEventJob.prepend(ContentDepositEventJobPrepends)
+FileSetAttachedEventJob.prepend(FileSetAttachedEventJobPrepends)

data/config/routes.rb

@@ -10,5 +10,4 @@ Zizia::Engine.routes.draw do
 
   get 'csv_import_details/index'
   get 'csv_import_details/show/:id', to: 'csv_import_details#show', as: 'csv_import_detail'
-  get 'pre_ingest_works/thumbnails/:deduplication_key', to: 'pre_ingest_works#thumbnails'
 end

data/db/migrate/20191114021032_add_status_to_pre_ingest_file.rb

@@ -0,0 +1,5 @@
+class AddStatusToPreIngestFile < ActiveRecord::Migration[5.1]
+  def change
+    add_column :zizia_pre_ingest_files, :status, :string, default: 'preingest'
+  end
+end

data/db/migrate/20191210223833_add_status_to_pre_ingest_work.rb

@@ -0,0 +1,5 @@
+class AddStatusToPreIngestWork < ActiveRecord::Migration[5.1]
+  def change
+    add_column :zizia_pre_ingest_works, :status, :string, default: 'preingest'
+  end
+end

data/lib/zizia/hyrax/hyrax_basic_metadata_mapper.rb

@@ -31,7 +31,7 @@ module Zizia
     ##
     # @return [Enumerable<Symbol>] The fields the mapper can process.
     def fields
-      core_fields + basic_fields + [:visibility, :files]
+      core_fields + basic_fields + [:visibility, :files] + zizia_fields
     end
 
     # Properties defined with `multiple: false` in
@@ -57,6 +57,10 @@ module Zizia
       single_value('import_url')
     end
 
+    def deduplication_key
+      single_value('deduplication_key')
+    end
+
     # We should accept visibility values that match the UI and transform them into
     # the controlled vocabulary term expected by Hyrax
     def visibility
@@ -152,5 +156,10 @@ module Zizia
          :based_near, :related_url,
          :bibliographic_citation, :source]
       end
+
+      # Properties requires for zizia
+      def zizia_fields
+        [:deduplication_key]
+      end
   end
 end

data/lib/zizia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zizia
-  VERSION = '5.5.0'
+  VERSION = '6.0.0'
 end

data/spec/dummy/app/models/work.rb

@@ -9,7 +9,7 @@ class Work < ActiveFedora::Base
   validates :title, presence: { message: 'Your work must have a title.' }
 
 
-  property :deduplication_key, predicate: 'http://metadata.example.com/vocab/predicates#deduplicationKey', multiple: false do |index|
+  property :deduplication_key, predicate: ::RDF::Vocab::BF2::identifiedBy, multiple: false do |index|
     index.as :stored_searchable
   end
   # This must be included at the end, because it finalizes the metadata

data/spec/dummy/db/schema.rb

@@ -595,6 +595,8 @@ ActiveRecord::Schema.define(version: 201901241536542) do
     t.integer "pre_ingest_work_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "status", default: "preingest"
+    t.string "access_control_id"
     t.index ["pre_ingest_work_id"], name: "index_zizia_pre_ingest_files_on_pre_ingest_work_id"
   end
 
@@ -604,6 +606,7 @@ ActiveRecord::Schema.define(version: 201901241536542) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "deduplication_key"
+    t.string "status", default: "preingest"
     t.index ["csv_import_detail_id"], name: "index_zizia_pre_ingest_works_on_csv_import_detail_id"
     t.index ["deduplication_key"], name: "index_zizia_pre_ingest_works_on_deduplication_key"
   end

data/spec/dummy/spec/fixtures/csv_import/csv_files_with_problems/extra - headers.csv

@@ -1,4 +1,4 @@
-rights_statement,another_header_2,rights statement,title,files,label,relative_path,import url,resource type,creator,contributor,abstract or summary,keyword,license,publisher,date created,subject,language,identifier,location,related url,bibliographic_citation,source,visibility
-http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 1 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open
-http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 2 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open
-http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 3 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open
+deduplication_key,rights_statement,another_header_2,rights statement,title,files,label,relative_path,import url,resource type,creator,contributor,abstract or summary,keyword,license,publisher,date created,subject,language,identifier,location,related url,bibliographic_citation,source,visibility
+1,http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 1 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open
+2,http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 2 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open
+3,http://rightsstatements.org/vocab/InC/1.0/,,http://rightsstatements.org/vocab/InC/1.0/,Work 3 Title,cat.jpg,,,,,creator,,,cat,,,,,,,,,,,open

data/spec/dummy/spec/fixtures/csv_import/good/all_fields.csv

@@ -1,2 +1,2 @@
-identifier,license,deduplication_key,visibility,location,keyword,rights statement,creator,title,files
-abc/123,https://creativecommons.org/licenses/by/4.0/,abc/123,PUBlic,http://www.geonames.org/5667009/montana.html|~|http://www.geonames.org/6252001/united-states.html,Clothing stores $z California $z Los Angeles|~|Interior design $z California $z Los Angeles,http://rightsstatements.org/vocab/InC/1.0/,"Connell, Will, $d 1898-1961","Interior view of The Bachelors haberdashery designed by Julius Ralph Davidson, Los Angeles, circa 1929",dog.jpg
+identifier,type,license,deduplication_key,visibility,location,keyword,rights statement,creator,title,files
+abc/123,work,https://creativecommons.org/licenses/by/4.0/,abc/123,PUBlic,http://www.geonames.org/5667009/montana.html|~|http://www.geonames.org/6252001/united-states.html,Clothing stores $z California $z Los Angeles|~|Interior design $z California $z Los Angeles,http://rightsstatements.org/vocab/InC/1.0/,"Connell, Will, $d 1898-1961","Interior view of The Bachelors haberdashery designed by Julius Ralph Davidson, Los Angeles, circa 1929",dog.jpg

data/spec/dummy/spec/fixtures/csv_import/good/all_fields_multi.csv

@@ -0,0 +1,2 @@
+identifier,type,license,deduplication_key,visibility,location,keyword,rights statement,creator,title,files
+abc/123,work,https://creativecommons.org/licenses/by/4.0/,abc/123,PUBlic,http://www.geonames.org/5667009/montana.html|~|http://www.geonames.org/6252001/united-states.html,Clothing stores $z California $z Los Angeles|~|Interior design $z California $z Los Angeles,http://rightsstatements.org/vocab/InC/1.0/,"Connell, Will, $d 1898-1961","Interior view of The Bachelors haberdashery designed by Julius Ralph Davidson, Los Angeles, circa 1929",dog.jpg|~|cat.jpg

data/spec/dummy/spec/support/capybara.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+Capybara.default_max_wait_time = 20
 
 # Setup chrome headless driver
 Capybara.server = :puma, { Silent: true }

data/spec/dummy/spec/system/csv_import_details_page_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 include Warden::Test::Helpers
 
-RSpec.describe 'viewing the csv import detail page', :clean, js: true do
+RSpec.describe 'viewing the csv import detail page', js: true do
   let(:user) { FactoryBot.create(:admin, email: 'systems@curationexperts.com')}
   let(:second_user) { FactoryBot.create(:user, email: 'user@curationexperts.com') }
   let(:csv_import) { FactoryBot.create(:csv_import) }
@@ -11,14 +11,6 @@ RSpec.describe 'viewing the csv import detail page', :clean, js: true do
   let(:csv_import_detail_third) { FactoryBot.create(:csv_import_detail, created_at: Time.parse('Wed, 30 Oct 2019 14:20:02 UTC +00:00').utc, depositor_id: second_user.id, csv_import_id: 2) }
   let(:csv_pre_ingest_works) { FactoryBot.create_list(:pre_ingest_work, 12, csv_import_detail_id: 4) }
   let(:csv_pre_ingest_work_second) { FactoryBot.create(:pre_ingest_work, csv_import_detail_id: 5, created_at: Time.parse('Thur, 31 Oct 2019 14:20:02 UTC +00:00').utc) }
-  let(:pre_ingest_file) { FactoryBot.create(:pre_ingest_file, pre_ingest_work_id: csv_pre_ingest_work_second.id) }
-  let(:file_set) do
-    FactoryBot.create(:file_set,
-                      title: ['zizia.png'],
-                      content: File.open([Zizia::Engine.root, '/', 'spec/fixtures/zizia.png'].join))
-  end
-  let(:work) { Work.new(title: ['a title'], deduplication_key: csv_pre_ingest_work_second.deduplication_key) }
-
 
   before do
     user.save
@@ -35,10 +27,6 @@ RSpec.describe 'viewing the csv import detail page', :clean, js: true do
     csv_import_detail_third.save
     csv_pre_ingest_works.each(&:save)
     csv_pre_ingest_work_second.save
-    pre_ingest_file.save
-
-    work.ordered_members << file_set
-    work.save
     login_as user
   end
 
@@ -46,6 +34,7 @@ RSpec.describe 'viewing the csv import detail page', :clean, js: true do
     visit ('/csv_import_details/index')
     expect(page).to have_content('ID')
     click_on '13'
+    expect(page).to have_content('Status')
     expect(page).to have_content('Total Size')
     expect(page).to have_content('Deduplication Key')
   end
@@ -65,6 +54,12 @@ RSpec.describe 'viewing the csv import detail page', :clean, js: true do
     expect(page).to have_link '13'
   end
 
+  it 'has a sortable status' do
+    pending 'status is always undetermined currently'
+    visit('/csv_import_details/index?direction=asc&locale=en&sort=status')
+    expect(page).to have_content 'zippy'
+  end
+
   it 'has a sortable date' do
     visit('/csv_import_details/index?direction=desc&locale=en&sort=created_at')
     expect(page).to have_content 'October 31'
@@ -83,6 +78,12 @@ RSpec.describe 'viewing the csv import detail page', :clean, js: true do
     expect(page).to have_content('October 29, 2019 14:20')
   end
 
+  it 'displays undetermined for the status' do
+    visit ('/csv_import_details/index')
+    expect(page).to have_content('Status')
+    expect(page).to have_content('undetermined')
+  end
+
   it 'displays the overwrite behavior type' do
     visit ('/csv_import_details/index')
     expect(page).to have_content('Overwrite Behavior Type')
@@ -98,6 +99,7 @@ RSpec.describe 'viewing the csv import detail page', :clean, js: true do
 
     visit('/csv_import_details/index')
     expect(page).to have_content('Next')
+
   end
 
   it 'has pagination at 10' do
@@ -132,15 +134,4 @@ RSpec.describe 'viewing the csv import detail page', :clean, js: true do
     click_on 'View Files'
     expect(page).to have_content 'Row Number'
   end
-
-  it 'can show a status for a file' do
-    file_set
-    visit('/csv_import_details/index')
-    click_on '5'
-    expect(page).to have_content 'View Files'
-    expect(page).to have_content 'Status'
-    expect(page.html).to match(/glyphicon-question-sign/)
-    click_on 'View Files'
-    expect(page).to have_content('Filename')
-  end
 end

data/spec/dummy/spec/system/import_file_status_spec.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+require 'rails_helper'
+include Warden::Test::Helpers
+
+RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type: :system, js: true do
+  before do
+    allow(CharacterizeJob).to receive(:perform_later)
+    ENV['IMPORT_PATH'] = File.join(fixture_path, 'images')
+  end
+
+  let(:csv_file) { File.join(fixture_path, 'csv_import', 'good', 'all_fields_multi.csv') }
+
+  context 'logged in as an admin user' do
+    let(:collection) { FactoryBot.build(:collection, title: ['Testing Collection']) }
+    let(:admin_user) { FactoryBot.create(:admin) }
+
+    let(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id) }
+    let(:workflow) { Sipity::Workflow.create!(active: true, name: 'test-workflow', permission_template: permission_template) }
+
+    before do
+      # Create a single action that can be taken
+      Sipity::WorkflowAction.create!(name: 'submit', workflow: workflow)
+
+      # Grant the user access to deposit into the admin set.
+      Hyrax::PermissionTemplateAccess.create!(
+        permission_template_id: permission_template.id,
+        agent_type: 'user',
+        agent_id: admin_user.user_key,
+        access: 'deposit'
+      )
+
+      collection.save!
+      login_as admin_user
+    end
+
+    it 'starts the import' do
+      visit '/csv_imports/new'
+      expect(page).to have_content 'Testing Collection'
+      expect(page).not_to have_content '["Testing Collection"]'
+
+      # Fill in and submit the form
+      select 'Testing Collection', from: "csv_import[fedora_collection_id]"
+      select 'Update Existing Metadata, create new works', from: "csv_import[update_actor_stack]"
+      attach_file('csv_import[manifest]', csv_file, make_visible: true)
+
+      expect(page).to have_content('You sucessfully uploaded this CSV: all_fields_multi.csv')
+
+      click_on 'Preview Import'
+
+      # We expect to see the title of the collection on the page
+      expect(page).to have_content 'Testing Collection'
+
+      expect(page).to have_content 'This import will process 1 row(s).'
+
+      # There is a link so the user can cancel.
+      expect(page).to have_link 'Cancel', href: '/csv_imports/new?locale=en'
+
+      expect(page).not_to have_content 'deduplication_key'
+
+      # After reading the warnings, the user decides
+      # to continue with the import.
+      click_on 'Start Import'
+
+      # The show page for the CsvImport
+      expect(page).to have_content 'all_fields_multi.csv'
+      expect(page).to have_content 'Start time'
+
+      # We expect to see the title of the collection on the page
+      expect(page).to have_content 'Testing Collection'
+      expect(Work.count).to eq 1
+
+      # Ensure that all the fields got assigned as expected
+      work = Work.where(title: "*haberdashery*").first
+      expect(work.title.first).to match(/haberdashery/)
+      expect(Zizia::PreIngestFile.last.status).to eq('attached')
+
+      expect(Zizia::PreIngestWork.find_by(deduplication_key: work.deduplication_key).pre_ingest_files.count).to eq(2)
+
+      # Everything should have the attached status now
+      expect(Zizia::PreIngestWork.find_by(deduplication_key: work.deduplication_key)
+               .pre_ingest_files.first.status).to eq('attached')
+      expect(Zizia::PreIngestWork.find_by(deduplication_key: work.deduplication_key).pre_ingest_files.last.status).to eq('attached')
+      expect(Zizia::PreIngestWork.find_by(deduplication_key: work.deduplication_key).status).to eq('attached')
+      visit('/csv_import_details/index')
+      click_on '1'
+      expect(page).to have_content 'View Files'
+      click_on 'View Files'
+      expect(page.html).not_to match(/glyphicon-question-sign/)
+      expect(page.html).to match(/glyphicon-ok-sign/)
+      expect(page).to have_content('dog.jpg')
+      expect(page).to have_content('cat.jpg')
+    end
+  end
+end

data/spec/dummy/spec/system/import_from_csv_spec.rb

@@ -4,6 +4,7 @@ include Warden::Test::Helpers
 
 RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type: :system, js: true do
   before do
+    allow(CharacterizeJob).to receive(:perform_later)
     ENV['IMPORT_PATH'] = File.join(fixture_path, 'images')
   end
 
@@ -32,7 +33,6 @@ RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type:
         access: 'deposit'
       )
 
-      allow(CharacterizeJob).to receive(:perform_later) # There is no fits installed on travis-ci
       collection.save!
       login_as admin_user
     end
@@ -251,7 +251,7 @@ RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type:
       expect(page).to have_content('cat.jpg')
       expect(page).to have_content('5.74 MB')
       expect(page).to have_content('abc/123')
-      expect(page).to have_content('This work\'s metadata has not been indexed yet.')
+      expect(page).to have_content('haberdashery')
       expect(page).to have_content('Date Created')
     end
   end

data/spec/factories/pre_ingest_file.rb

@@ -7,7 +7,7 @@ FactoryBot.define do
     updated_at { Time.current }
     row_number { 1 }
     row { 'sample,row' }
-    filename { [Zizia::Engine.root, '/', 'spec/fixtures/zizia.png'].join }
+    filename { '/a/path/to/my.csv' }
     size { 100_203_424 }
   end
 end

data/spec/models/zizia/application_job_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+RSpec.describe Zizia::ApplicationJob do
+  let(:application_job) { described_class.new }
+
+  context 'when including Zizia' do
+    it 'has its own ApplicationJob class' do
+      expect(application_job).to be_kind_of(ActiveJob::Base)
+    end
+  end
+end

data/spec/models/zizia/pre_ingest_file_spec.rb

@@ -4,15 +4,9 @@ require 'rails_helper'
 RSpec.describe Zizia::PreIngestFile do
   let(:pre_ingest_work) { FactoryBot.create(:pre_ingest_work) }
   let(:pre_ingest_file) { FactoryBot.create(:pre_ingest_file, pre_ingest_work_id: pre_ingest_work.id) }
-  let(:pre_ingest_file_without_file) { FactoryBot.create(:pre_ingest_file, pre_ingest_work_id: pre_ingest_work.id, filename: File.open([Zizia::Engine.root, '/', 'spec/fixtures/dog.jpg'].join)) }
-  let(:file_set) do
-    FactoryBot.create(:file_set,
-                      title: ['zizia.png'],
-                      content: File.open([Zizia::Engine.root, '/', 'spec/fixtures/zizia.png'].join))
-  end
-  let(:basename) { 'zizia.png' }
+  let(:basename) { 'my.csv' }
 
   it 'can get the basename for the file' do
-    expect(pre_ingest_file.basename).to eq basename
+    expect(pre_ingest_file.basename).to eq(basename)
   end
 end

data/spec/rails_helper.rb

@@ -12,7 +12,6 @@ require 'hydra-role-management'
 require 'byebug'
 require 'rails-controller-testing'
 require 'selenium-webdriver'
-require 'devise'
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
@@ -39,8 +38,6 @@ rescue ActiveRecord::PendingMigrationError => e
   exit 1
 end
 RSpec.configure do |config|
-  config.include Devise::Test::ControllerHelpers, type: :controller
-
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 

data/spec/support/hyrax/basic_metadata.rb

@@ -25,6 +25,9 @@ module Hyrax
       work.property :related_url, predicate: ::RDF::RDFS.seeAlso
       work.property :bibliographic_citation, predicate: ::RDF::Vocab::DC.bibliographicCitation
       work.property :source, predicate: ::RDF::Vocab::DC.source
+
+      # From Zizia
+      work.property :deduplication_key, predicate: ::RDF::Vocab::BF2.identifiedBy
     end
   end
 end

data/spec/zizia/hyrax/hyrax_basic_metadata_mapper_spec.rb

@@ -23,12 +23,16 @@ describe Zizia::HyraxBasicMetadataMapper do
     [:visibility, :files]
   end
 
+  let(:zizia_fields) do
+    [:deduplication_key]
+  end
+
   it_behaves_like 'a Zizia::Mapper' do
     let(:metadata) do
       { title: ['A Title for a Record'],
         my_custom_field: ['This gets ignored'] }
     end
-    let(:expected_fields) { core_fields + basic_fields + tenejo_fields }
+    let(:expected_fields) { core_fields + basic_fields + tenejo_fields + zizia_fields }
   end
 
   context 'with metadata, but some missing fields' do

data/zizia.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'fcrepo_wrapper'
   gem.add_development_dependency 'ffaker'
   gem.add_development_dependency 'font-awesome-rails'
+  gem.add_development_dependency 'github_changelog_generator'
   gem.add_development_dependency 'hydra-role-management'
   gem.add_development_dependency 'hyrax', '~> 2.5.1'
   gem.add_development_dependency 'hyrax-spec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Data Curation Experts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -254,6 +254,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hydra-role-management
   requirement: !ruby/object:Gem::Requirement
@@ -673,7 +687,6 @@ files:
 - app/controllers/zizia/csv_imports_controller.rb
 - app/controllers/zizia/importer_documentation_controller.rb
 - app/controllers/zizia/metadata_details_controller.rb
-- app/controllers/zizia/pre_ingest_works_controller.rb
 - app/helpers/zizia/application_helper.rb
 - app/helpers/zizia/metadata_details_helper.rb
 - app/importers/modular_importer.rb
@@ -682,7 +695,6 @@ files:
 - app/lib/zizia/metadata_details.rb
 - app/lib/zizia/metadata_usage.rb
 - app/lib/zizia/work_attributes.rb
-- app/models/zizia/ability.rb
 - app/models/zizia/csv_import.rb
 - app/models/zizia/csv_import_detail.rb
 - app/models/zizia/pre_ingest_file.rb
@@ -710,6 +722,9 @@ files:
 - app/views/zizia/importer_documentation/guide.html.erb
 - app/views/zizia/metadata_details/show.html.erb
 - bin/rails
+- config/initializers/content_deposit_event_job_prepends.rb
+- config/initializers/file_set_attached_event_job_prepends.rb
+- config/initializers/prepends.rb
 - config/routes.rb
 - db/migrate/201901162141281_create_zizia_csv_imports.rb
 - db/migrate/201901162203121_add_manifest_to_zizia_csv_imports.rb
@@ -731,6 +746,8 @@ files:
 - db/migrate/20191031131041_add_deduplication_key_to_pre_ingest_work.rb
 - db/migrate/20191105165518_add_uniqueness_constraint_to_pre_ingest_work_deduplication_key.rb
 - db/migrate/20191105211127_remove_uniqueness_constraint_to_pre_ingest_work_deduplication_key.rb
+- db/migrate/20191114021032_add_status_to_pre_ingest_file.rb
+- db/migrate/20191210223833_add_status_to_pre_ingest_work.rb
 - docs/_config.yml
 - docs/customizing_metadata.md
 - docs/index.md
@@ -781,7 +798,6 @@ files:
 - solr/config/xslt/luke.xsl
 - spec/controllers/importer_documentation_controller_spec.rb
 - spec/controllers/metadata_details_spec.rb
-- spec/controllers/pre_ingest_works_controller_spec.rb
 - spec/dummy/.fcrepo_wrapper
 - spec/dummy/.gitignore
 - spec/dummy/.rspec
@@ -1474,6 +1490,7 @@ files:
 - spec/dummy/spec/fixtures/csv_import/good/all_fields.csv
 - spec/dummy/spec/fixtures/csv_import/good/all_fields_complete_update.csv
 - spec/dummy/spec/fixtures/csv_import/good/all_fields_metadata_update.csv
+- spec/dummy/spec/fixtures/csv_import/good/all_fields_multi.csv
 - spec/dummy/spec/fixtures/csv_import/good/all_fields_only_new.csv
 - spec/dummy/spec/fixtures/images/animals/cat.png
 - spec/dummy/spec/fixtures/images/birds.jpg
@@ -1490,6 +1507,7 @@ files:
 - spec/dummy/spec/support/capybara.rb
 - spec/dummy/spec/system/csv_import_details_page_spec.rb
 - spec/dummy/spec/system/import_csv_with_warnings_spec.rb
+- spec/dummy/spec/system/import_file_status_spec.rb
 - spec/dummy/spec/system/import_from_csv_spec.rb
 - spec/dummy/spec/system/import_from_csv_with_errors_spec.rb
 - spec/dummy/spec/system/import_with_no_collection_spec.rb
@@ -1512,7 +1530,6 @@ files:
 - spec/factories/collection.rb
 - spec/factories/csv_import.rb
 - spec/factories/csv_import_detail.rb
-- spec/factories/file_sets.rb
 - spec/factories/pre_ingest_file.rb
 - spec/factories/pre_ingest_work.rb
 - spec/factories/user.rb
@@ -1532,6 +1549,7 @@ files:
 - spec/integration/csv_import_detail_spec.rb
 - spec/integration/import_hyrax_csv.rb
 - spec/models/csv_import_spec.rb
+- spec/models/zizia/application_job_spec.rb
 - spec/models/zizia/csv_import_detail_spec.rb
 - spec/models/zizia/pre_ingest_file_spec.rb
 - spec/models/zizia/pre_ingest_work_spec.rb

data/app/controllers/zizia/pre_ingest_works_controller.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Zizia
-  class PreIngestWorksController < ::ApplicationController
-    before_action :merge_abilities
-    load_and_authorize_resource
-
-    def thumbnails
-      pre_ingest_work = Zizia::PreIngestWork.where(deduplication_key: pre_ingest_works_params[:deduplication_key]).first
-
-      @thumbnails = if pre_ingest_work
-                      pre_ingest_work.thumbnails
-                    else
-                      []
-                    end
-
-      respond_to do |format|
-        format.json { render json: { thumbnails: @thumbnails } }
-      end
-    end
-
-    private
-
-      def pre_ingest_works_params
-        params.permit(:deduplication_key, :format)
-      end
-
-      def merge_abilities
-        current_ability.merge(Zizia::Ability.new(current_user))
-      end
-  end
-end

data/app/models/zizia/ability.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-module Zizia
-  class Ability
-    include Hydra::Ability
-    include Hyrax::Ability
-    self.ability_logic += [:everyone_can_create_curation_concerns]
-
-    # Define any customized permissions here.
-    def custom_permissions
-      can :manage, Zizia::CsvImport if current_user.admin?
-      can :manage, Zizia::CsvImportDetail if current_user.admin?
-      can :manage, Zizia::PreIngestWork if current_user.admin?
-    end
-  end
-end

data/spec/controllers/pre_ingest_works_controller_spec.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Zizia::PreIngestWorksController, :clean, type: :controller do
-  routes { Zizia::Engine.routes }
-  let(:admin_user) { FactoryBot.create(:admin) }
-  let(:pre_ingest_work) { FactoryBot.create(:pre_ingest_work) }
-  let(:pre_ingest_file) { FactoryBot.create(:pre_ingest_file, pre_ingest_work_id: pre_ingest_work.id) }
-  let(:pre_ingest_file_without_file) { FactoryBot.create(:pre_ingest_file, pre_ingest_work_id: pre_ingest_work.id, filename: File.open([Zizia::Engine.root, '/', 'spec/fixtures/dog.jpg'].join)) }
-  let(:work) { Work.new(title: ['a title'], deduplication_key: pre_ingest_work.deduplication_key) }
-  let(:file_set) do
-    FactoryBot.create(:file_set,
-                      title: ['zizia.png'],
-                      content: File.open([Zizia::Engine.root, '/', 'spec/fixtures/zizia.png'].join))
-  end
-  let(:basename) { 'zizia.png' }
-  before do
-    work.ordered_members << file_set
-    work.save
-  end
-
-  describe 'GET thumbnails' do
-    context 'as a logged in user' do
-      it 'returns 200' do
-        allow(controller).to receive(:current_user).and_return(admin_user)
-        get :thumbnails, params: { deduplication_key: pre_ingest_work.deduplication_key, format: :json }
-        expect(response.status).to eq(200)
-      end
-
-      it 'returns an array of thumbail paths' do
-        file_set.save
-        allow(controller).to receive(:current_user).and_return(admin_user)
-        get :thumbnails, params: { deduplication_key: pre_ingest_work.deduplication_key, format: :json }
-        parsed_json = JSON.parse(response.body)
-        expect(parsed_json['thumbnails']).to be_an(Array)
-        expect(parsed_json['thumbnails'].empty?).to eq(false)
-      end
-
-      it 'returns an empty array if there aren\'t any thumbnails' do
-        allow(controller).to receive(:current_user).and_return(admin_user)
-        get :thumbnails, params: { deduplication_key: 'abc/1234', format: :json }
-        parsed_json = JSON.parse(response.body)
-        expect(parsed_json['thumbnails']).to be_an(Array)
-        expect(parsed_json['thumbnails'].empty?).to eq(true)
-      end
-    end
-
-    context 'as someone not logged in' do
-      it 'returns 401' do
-        get :thumbnails, params: { deduplication_key: pre_ingest_work.deduplication_key, format: :json }
-        expect(response.status).to eq(401)
-      end
-    end
-  end
-end

data/spec/factories/file_sets.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-FactoryBot.define do
-  factory :file_set do
-    transient do
-      user { build(:user) }
-      title { nil }
-      content { nil }
-    end
-    after(:build) do |fs, evaluator|
-      fs.apply_depositor_metadata evaluator.user.user_key
-      fs.title = evaluator.title
-    end
-
-    after(:create) do |file, evaluator|
-      Hydra::Works::UploadFileToFileSet.call(file, evaluator.content) if evaluator.content
-    end
-
-    trait :public do
-      read_groups { ["public"] }
-    end
-
-    trait :registered do
-      read_groups { ["registered"] }
-    end
-
-    factory :file_with_work do
-      after(:build) do |file, _evaluator|
-        file.title = ['testfile']
-      end
-      after(:create) do |file, evaluator|
-        Hydra::Works::UploadFileToFileSet.call(file, evaluator.content) if evaluator.content
-        create(:work, user: evaluator.user).members << file
-      end
-    end
-  end
-end