bulkrax 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e97637c391f4f4a5d9c13d04b76315da5931ecf0ae418a50eeae7a872b9d525
-  data.tar.gz: dbba6215c04c4f65d40dbd37bf7e962aa2e9f42fd677be260a12f0f02d4c7ce5
+  metadata.gz: 2cad330885f5f4d2dce25c989ebc7552b49b2212b68434d5def942fff61ad23a
+  data.tar.gz: 2b1e71044b26ff6ab9b25822ee969a7e886e095bbd2147b9b240406634e8f832
 SHA512:
-  metadata.gz: e385b03e162c0765134354d44575662260ce33cd007adeeabc6d920db749c3b43e3741d99779b2ba5b9d5a126610a205f9c5d33d6f8761f356e8d34de1eac196
-  data.tar.gz: ae3edaa107bb8a5df268e19909850b34b171a024aba07e1b24d6cbd6407546e7184cb4e925964b8e21842eb842f38b2078f9419a862660787c1a80406173615e
+  metadata.gz: 18e70353c64be13d686ff1da35d01c932422da49f9fd0ebf08470fdc0edc9333a9b51633b158cfaedf020ae5e3830574eb192a69ba498dff81e92847de4235f7
+  data.tar.gz: 6502ec16bc63aefed3c678ec062d3bc923c159260ac39278e692f4628bfe05acd675d49193b92c9e42f2ab50976d48c3d608d77f8db1d45774a664fd74b09bce

data/app/controllers/bulkrax/importers_controller.rb

@@ -118,12 +118,12 @@ module Bulkrax
         # OAI-only - selective re-harvest
         elsif params[:commit] == 'Update and Harvest Updated Items'
           Bulkrax::ImporterJob.perform_later(@importer.id, true)
-        elsif params[:commit] == 'Update All (update metadata and update files)'
+        elsif params[:commit] == 'Update Metadata and Files'
           @importer.parser_fields['update_files'] = true
           @importer.save
           Bulkrax::ImporterJob.perform_later(@importer.id)
           # Perform a full metadata and files re-import; do the same for an OAI re-harvest of all items
-        elsif params[:commit] == ('Update and Replace (update metadata and replace files)' || 'Update and Re-Harvest All Items')
+        elsif params[:commit] == ('Update and Replace Files' || 'Update and Re-Harvest All Items')
           @importer.parser_fields['replace_files'] = true
           @importer.save
           Bulkrax::ImporterJob.perform_later(@importer.id)

data/app/factories/bulkrax/object_factory.rb

@@ -19,6 +19,11 @@ module Bulkrax
     end
     # rubocop:enable Metrics/ParameterLists
 
+    # update files is set, replace files is set or this is a create
+    def with_files
+      update_files || replace_files || !object
+    end
+
     def run
       arg_hash = { id: attributes[:id], name: 'UPDATE', klass: klass }
       @object = find
@@ -204,10 +209,10 @@ module Bulkrax
     def attribute_update
       return transform_attributes.except(:id) if klass == Collection
       if attributes[:collection].present?
-        transform_attributes.except(:id).except(:collection).merge(member_of_collections_attributes: { 0 => { id: collection.id } })
+        transform_attributes.except(:id).except(:collection).merge(member_of_collections_attributes: { "0" => { id: collection.id } })
       elsif attributes[:collections].present?
         collection_ids = attributes[:collections].each.with_index.each_with_object({}) do |(element, index), ids|
-          ids[index] = element
+          ids[index.to_s] = element
         end
         transform_attributes.except(:id).except(:collections).merge(member_of_collections_attributes: collection_ids)
       else
@@ -218,8 +223,9 @@ module Bulkrax
     # Override if we need to map the attributes from the parser in
     # a way that is compatible with how the factory needs them.
     def transform_attributes
-      attributes.slice(*permitted_attributes)
-                .merge(file_attributes(update_files))
+      @transform_attributes = attributes.slice(*permitted_attributes)
+      @transform_attributes.merge!(file_attributes(update_files)) if with_files
+      @transform_attributes
     end
 
     # Regardless of what the Parser gives us, these are the properties we are prepared to accept.

data/app/matchers/bulkrax/application_matcher.rb

@@ -54,7 +54,10 @@ module Bulkrax
     end
 
     def parse_remote_files(src)
-      { url: src.strip } if src.present?
+      return if src.blank?
+      src.strip!
+      name = Bulkrax::Importer.safe_uri_filename(src)
+      { url: src, file_name: name }
     end
 
     def parse_language(src)

data/app/models/bulkrax/csv_entry.rb

@@ -97,9 +97,17 @@ module Bulkrax
       mapping.each do |key, value|
         next if Bulkrax.reserved_properties.include?(key) && !field_supported?(key)
         next if key == "model"
-        next unless hyrax_record.respond_to?(key.to_s)
-        data = hyrax_record.send(key.to_s)
-        if data.is_a?(ActiveTriples::Relation)
+
+        object_key = key if value.key?('object')
+        next unless hyrax_record.respond_to?(key.to_s) || object_key.present?
+
+        data = object_key.present? ? hyrax_record.send(value['object']) : hyrax_record.send(key.to_s)
+        if object_key.present?
+          next self.parsed_metadata[key] = '' if data.empty?
+          data = data.first if data.is_a?(ActiveTriples::Relation)
+
+          object_metadata(data, object_key)
+        elsif data.is_a?(ActiveTriples::Relation)
           self.parsed_metadata[key] = data.map { |d| prepare_export_data(d) }.join('; ').to_s unless value[:excluded]
         else
           self.parsed_metadata[key] = prepare_export_data(data)
@@ -115,6 +123,32 @@ module Bulkrax
       end
     end
 
+    def object_metadata(data, object_key)
+      data = convert_to_hash(data)
+
+      data.each_with_index do |obj, index|
+        next unless obj[object_key]
+
+        next self.parsed_metadata["#{object_key}_#{index + 1}"] = prepare_export_data(obj[object_key]) unless obj[object_key].is_a?(Array)
+
+        obj[object_key].each_with_index do |_nested_item, nested_index|
+          self.parsed_metadata["#{object_key}_#{index + 1}_#{nested_index + 1}"] = prepare_export_data(obj[object_key][nested_index])
+        end
+      end
+    end
+
+    def convert_to_hash(data)
+      # converts data from `'[{}]'` to `[{}]`
+      gsub_data = data.gsub(/\[{/, '{')
+                      .gsub(/}\]/, '}')
+                      .gsub('=>', ':')
+                      .gsub(/},\s?{/, "}},{{")
+                      .split("},{")
+      gsub_data = [gsub_data] if gsub_data.is_a?(String)
+
+      return gsub_data.map { |d| JSON.parse(d) }
+    end
+
     # In order for the existing exported hyrax_record, to be updated by a re-import
     # we need a unique value in system_identifier
     # add the existing hyrax_record id to system_identifier

data/app/models/bulkrax/importer.rb

@@ -24,6 +24,16 @@ module Bulkrax
     attr_accessor :only_updates, :file_style, :file
     attr_writer :current_run
 
+    def self.safe_uri_filename(uri)
+      uri = URI.parse(uri) unless uri.is_a?(URI)
+      r = Faraday.head(uri.to_s)
+      return CGI.parse(r.headers['content-disposition'])["filename"][0].delete("\"")
+    rescue
+      filename = File.basename(uri.path)
+      filename.delete!('/')
+      filename.presence || file_set.id
+    end
+
     def status
       if self.validate_only
         'Validated'

data/app/models/concerns/bulkrax/file_factory.rb

@@ -33,7 +33,8 @@ module Bulkrax
         if file_value.is_a?(Hash)
           file_value
         elsif file_value.is_a?(String)
-          { url: file_value }
+          name = Bulkrax::Importer.safe_uri_filename(file_value)
+          { url: file_value, file_name: name }
         else
           Rails.logger.error("skipped remote file #{file_value} because we do not recognize the type")
           nil

data/app/models/concerns/bulkrax/has_matchers.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-
+# rubocop:disable Metrics/ModuleLength
 module Bulkrax
   module HasMatchers
     extend ActiveSupport::Concern
@@ -90,9 +90,20 @@ module Bulkrax
     end
 
     def multiple_metadata(content)
-      content = content.content if content.is_a?(Nokogiri::XML::NodeSet)
       return unless content
-      content.is_a?(Array) ? content : Array.wrap(content.strip)
+
+      case content
+      when Nokogiri::XML::NodeSet
+        content&.content
+      when Array
+        content
+      when Hash
+        Array.wrap(content)
+      when String
+        Array.wrap(content.strip)
+      else
+        Array.wrap(content)
+      end
     end
 
     def matched_metadata(multiple, name, result, object_multiple)
@@ -153,3 +164,4 @@ module Bulkrax
     end
   end
 end
+# rubocop:enable Metrics/ModuleLength

data/app/views/bulkrax/exporters/show.html.erb

@@ -7,6 +7,13 @@
 <div class='panel panel-default'>
   <div class='panel-body'>
 
+    <% if File.exist?(@exporter.exporter_export_zip_path) %>
+      <p class='bulkrax-p-align'>
+        <strong>Download:</strong>
+        <%= link_to raw('<span class="glyphicon glyphicon-download"></span>'), exporter_download_path(@exporter) %>
+      </p>
+    <% end %>
+
     <p class='bulkrax-p-align'>
       <strong><%= t('bulkrax.exporter.labels.name') %>:</strong>
       <%= @exporter.name %>
@@ -116,6 +123,10 @@
       <%= page_entries_info(@work_entries) %><br>
       <%= paginate(@work_entries, param_name: :work_entries_page) %>
       <br>
+      <% if File.exist?(@exporter.exporter_export_zip_path) %>
+        <%= link_to 'Download', exporter_download_path(@exporter) %>
+        |
+      <% end %>
       <%= link_to 'Edit', edit_exporter_path(@exporter) %>
       |
       <%= link_to 'Back', exporters_path %>

data/app/views/bulkrax/importers/_edit_form_buttons.html.erb

@@ -1,16 +1,47 @@
+<div class="modal fade" id="bulkraxModal" tabindex="-1" role="dialog" aria-labelledby="bulkraxModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-body">
+        <h5>Options for Updating the Importer</h5>
+        <hr />
 
-<%# If we can know the parser, we can vary the buttons here %>
+        <% if @importer.importer_runs.blank? %>
+          <p>Only update the values in the importer form. Do not import metadata or files for any works or collections.</p>
+          <%= form.button :submit, value: 'Update Importer', class: 'btn btn-primary' %>
+          <hr />
+          <p>Update the values in the importer form and run the importer for the first time.</p>
+          <%= form.button :submit, value: 'Update and Import', class: 'btn btn-primary' %>
+        <% elsif @importer.parser_klass.include?('Oai') %>
+          <p>Only update the values in the importer form. Do not update metadata or files for any works or collections.</p>
+            <%= form.button :submit, value: 'Update Importer', class: 'btn btn-primary' %>
+          <hr />
+          <p>Update the values in the importer form and update items that have changed at the source.</p>
+            <%= form.button :submit, value: 'Update and Harvest Updated Items', class: 'btn btn-primary' %>
+          <hr />
+          <p>Update the values in the importer form and recreate all items from the source.</p>
+            <%= form.button :submit, value: 'Update and Re-Harvest All Items', class: 'btn btn-primary' %>
+        <% else %>
+          <p>Only update the values in the importer form. Do not update metadata or files for any works or collections.</p>
+            <%= form.button :submit, value: 'Update Importer', class: 'btn btn-primary' %>
+          <hr />
+          <p>Update the values in the importer form and update the metadata for all works. Do not update any files.</p>
+            <%= form.button :submit, value: 'Update Metadata', class: 'btn btn-primary' %>
+          <hr />
+          <p>Update the values in the importer form and update the metadata and files for all works. Creates new versions of the files and retains the old versions.</p>
+            <%= form.button :submit, value: 'Update Metadata and Files', class: 'btn btn-primary' %>
+          <hr />
+          <p>Update the values in the importer form and update the metadata. Completely removes all files attached to works for this importer and recreates the files from scratch.</p>
+          <%= form.button :submit,
+                          value: 'Update and Replace Files',
+                          class: 'btn btn-primary',
+                          data: {confirm: "Are you sure? This will remove all files before adding them from the import."} %>
+        <% end %>
+        <hr />
 
-<% if @importer.importer_runs.blank? %>
-	<%= form.button :submit, value: 'Update Importer', class: 'btn btn-primary' %>
-	| <%= form.button :submit, value: 'Update and Import (importer has not yet been run)', class: 'btn btn-primary' %>
-<% elsif @importer.parser_klass.include?('Oai') %> 
-	<%= form.button :submit, value: 'Update Importer', class: 'btn btn-primary' %>
-	| <%= form.button :submit, value: 'Update and Harvest Updated Items', class: 'btn btn-primary' %>
-	| <%= form.button :submit, value: 'Update and Re-Harvest All Items', class: 'btn btn-primary' %>
-<% else %>
-	<%= form.button :submit, value: 'Update Importer', class: 'btn btn-primary' %>
-	| <%= form.button :submit, value: 'Update and Re-Import (update metadata only)', class: 'btn btn-primary' %>
-  | <%= form.button :submit, value: 'Update All (update metadata and update files)', class: 'btn btn-primary' %>
-	| <%= form.button :submit, value: 'Update and Re-Import (update metadata and replace files)', class: 'btn btn-primary', data: {confirm: "Are you sure? This will remove all files before adding them from the import."} %>
-<% end %>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/bulkrax/importers/edit.html.erb

@@ -5,10 +5,12 @@
 <div class="row">
   <div class="col-md-12">
     <div class="panel panel-default tabs">
+
       <%= simple_form_for @importer, html: { multipart: true } do |form| %>
         <%= render 'form', importer: @importer, form: form %>
         <div class="panel-footer">
           <div class='pull-right'>
+            <%= link_to 'Update Importer', '#bulkraxModal', class: "btn btn-primary", data: { toggle: 'modal' } %>
             <%= render 'edit_form_buttons', form: form %>
            <% cancel_path = form.object.persisted? ? importer_path(form.object) : importers_path %>
             | <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default ' %>

data/lib/bulkrax/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bulkrax
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails