ddr-batch 1.5.1 → 1.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97d177d4e80a1a9e289950be656083ef6cd911fb
-  data.tar.gz: 6de543210db6c67cf114bd10e6834145f92fc65f
+  metadata.gz: b669a1b89bbb629092cf71f8f4618d0a17dae0e0
+  data.tar.gz: 46f1292e988fb407dd28ead7a3ab52fa8772ddf3
 SHA512:
-  metadata.gz: abc0fcf24f05cf8722124ca3a76e017b34450986b30c7381f2f724379d4f3bc29325357343b7849bd235e101abb768a019803989ad150ee2ed12a1b490fc3452
-  data.tar.gz: 2c5ab1d54c81d3aff6427107da4a4fa55fcc96fc534701beb3c48ec3a004b2b6caca3b24d356439787f2b611ca52a7a52825b6c330533bfc46d5d95cd71e18d0
+  metadata.gz: d68302d269a1a68c359be955cc28654af8d975b0c2562b5d6a3c6dd21da119307ef8666e8137e8db400fb1015a6f6fa8dd9cceffeba6d7f6fd202f474bab8833
+  data.tar.gz: bddd38e9a212a44110ebad531b01dec844b7a0d322fccadd02915c1b6f43cb92c64bef47892610776ca404cf9cf67ac99aab74e8c78c3e965ea7820709f6be0f

data/app/mailers/ddr/batch/batch_processor_run_mailer.rb

@@ -5,15 +5,32 @@ module Ddr::Batch
     def send_notification(batch)
       @batch = batch
       @title = "Batch Processor Run #{@batch.status} #{@batch.outcome}"
+      @title << " - #{@batch.collection_title}" if @batch.collection_title.present?
       @host = `uname -n`.strip
       @subject = "[#{@host}] #{@title}"
       @size = @batch.batch_objects.size
       @handled = @batch.handled_count
       @success = @batch.success_count
-      attachments["details.txt"] = File.read(@batch.logfile.path)
+      attachments[attachment_file_name(@batch)] = File.read(@batch.logfile.path)
       mail(to: @batch.user.email, subject: @subject)
     end
 
+    private
+
+    def attachment_file_name(batch)
+      if batch.collection_title.present?
+        sanitized_title = sanitize_title_for_filename(batch.collection_title)
+        "details_#{sanitized_title}.txt"
+      else
+        "details.txt"
+      end
+    end
+
+    def sanitize_title_for_filename(title)
+      title
+          .gsub(/[^\w\s_-]+/, '')
+          .gsub(/\s+/, '_')
+    end
   end
 
 end

data/app/models/ddr/batch/batch.rb

@@ -63,6 +63,12 @@ module Ddr::Batch
       status == STATUS_FINISHED
     end
 
+    def deletable?
+      [ nil,
+        Ddr::Batch::Batch::STATUS_READY,
+        Ddr::Batch::Batch::STATUS_VALIDATED,
+        Ddr::Batch::Batch::STATUS_INVALID ].include?(status)
+    end
   end
 
 end

data/app/models/ddr/batch/ingest_batch_object.rb

@@ -47,7 +47,7 @@ module Ddr::Batch
     end
 
     def ingest(user, opts = {})
-      repo_object = create_repository_object
+      repo_object = create_repository_object(user)
       if !repo_object.nil? && !repo_object.new_record?
         ingest_outcome_detail = []
         ingest_outcome_detail << "Ingested #{model} #{identifier} into #{repo_object.pid}"
@@ -90,14 +90,14 @@ module Ddr::Batch
       repo_object
     end
 
-    def create_repository_object
+    def create_repository_object(user)
       repo_pid = pid if pid.present?
       repo_object = nil
       begin
         repo_object = model.constantize.new(:pid => repo_pid)
         repo_object.label = label if label
         batch_object_attributes.each { |a| repo_object = add_attribute(repo_object, a) }
-        repo_object.save(validate: false, skip_structure_updates: true)
+        repo_object.save(validate: false, skip_structure_updates: true, user: user)
         batch_object_datastreams.each { |d| repo_object = populate_datastream(repo_object, d) }
         batch_object_relationships.each { |r| repo_object = add_relationship(repo_object, r) }
         batch_object_roles.each { |r| repo_object = add_role(repo_object, r) }

data/app/services/ddr/batch/monitor_batch_finished.rb

@@ -40,7 +40,8 @@ module Ddr::Batch
       end
 
       def track_result(results_tracker, batch_object)
-        type, model = [ batch_object.type, batch_object.model ]
+        type = batch_object.type
+        model = batch_object.model || "Missing Model"
         results_tracker[type] = Hash.new unless results_tracker.has_key?(type)
         results_tracker[type][model] = Hash.new unless results_tracker[type].has_key?(model)
         results_tracker[type][model][:successes] = 0 unless results_tracker[type][model].has_key?(:successes)
@@ -84,6 +85,3 @@ module Ddr::Batch
 
   end
 end
-
-
-

data/app/services/ddr/batch/monitor_batch_started.rb

@@ -25,6 +25,7 @@ module Ddr::Batch
 
       def log_batch_start(batch)
         logger = Ddr::Batch::Log.logger(batch.id)
+        logger.info "Collection: #{batch.collection_title}" if batch.collection_title.present?
         logger.info "Batch id: #{batch.id}"
         logger.info "Batch name: #{batch.name}" if name
         logger.info "Batch size: #{batch.batch_objects.size}"

data/db/migrate/20171116183514_add_collection_columns_to_batch.rb

@@ -0,0 +1,8 @@
+class AddCollectionColumnsToBatch < ActiveRecord::Migration
+  def change
+    change_table :batches do |t|
+      t.string "collection_id", null: true
+      t.string "collection_title", null: true
+    end
+  end
+end

data/lib/ddr/batch/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Batch
-    VERSION = "1.5.1"
+    VERSION = "1.6.0.rc1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-batch
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0.rc1
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -230,6 +230,7 @@ files:
 - db/migrate/20161115191636_add_columns_to_batch_object.rb
 - db/migrate/20161116142512_create_batch_object_messages.rb
 - db/migrate/20161222192611_remove_columns_from_batch.rb
+- db/migrate/20171116183514_add_collection_columns_to_batch.rb
 - lib/ddr-batch.rb
 - lib/ddr/batch.rb
 - lib/ddr/batch/batch_user.rb
@@ -251,9 +252,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11