ddr-batch 2.0.0.beta.2 → 2.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61fc23605e8881dfc9f97e122bd65400afb190d2
-  data.tar.gz: e604d8522d0263d9b794ecb278688f48fb4e4a13
+  metadata.gz: edade02b9a093a2f96346cdd4c1be1a96dc72aca
+  data.tar.gz: 1cf48aa8494ccec2da2da86c76392c1b85269aa4
 SHA512:
-  metadata.gz: dabddac82026a2a86c24962db9581a20307809c21f872193efb2f6489295f30a9f5bb8fa8f1273e7f4019fe39b11709a73bb7130ca822b4a5f0452a11be3a953
-  data.tar.gz: aa86ea167a533f8203d639e7e537a1018f02537603581b81e9e75c14ba8b4196f43a1b531fdd4213236f6e1492f02dd867455d7c098452f48b7b7488f12afb59
+  metadata.gz: 87c19f8e727145795d87fb8e97a738049976da148b0030bf17efba95174b577c5a33224581577196a20ace8525edd8604d4b560bafe7de147f4d45545ee03136
+  data.tar.gz: 828a723bedeb17d3906f7ada5ea4a1b9485ecd125b60b67ef44f4e4fa20213506e576cd92bfc392254572aad55206ae28e71123320b7d2ba96f10d481762aa31

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

@@ -1,19 +1,25 @@
 module Ddr::Batch
-
   class BatchProcessorRunMailer < ActionMailer::Base
 
-    default :from => "noreply@duke.edu"
-
     def send_notification(batch)
       @batch = batch
       @title = "Batch Processor Run #{@batch.status}"
       @host = `uname -n`.strip
       @subject = "[#{@host}] #{@title}"
-      from = "#{`echo $USER`.strip}@#{@host}"
       attachments["details.txt"] = File.read(@batch.logfile.path)
-      mail(from: from, to: @batch.user.email, subject: @subject)
+      mail(from: from_address, to: @batch.user.email, subject: @subject)
     end
 
-  end
+    private
 
-end
+    def from_address
+      if Rails.application.config.action_mailer.default_options &&
+              addr = Rails.application.config.action_mailer.default_options[:from]
+        addr
+      else
+        raise Ddr::Batch::Error, 'Application config.action_mailer.default_options[:from] must be set'
+      end
+    end
+
+  end
+end

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

@@ -120,7 +120,6 @@ module Ddr::Batch
         else
           verifications["Object exists in repository"] = VERIFICATION_PASS
           verifications["Object is correct model"] = verify_model(repo_object) if model
-          # verifications["Object has correct label"] = verify_label(repo_object) if label
           unless batch_object_attributes.empty?
             batch_object_attributes.each do |a|
               if a.operation == BatchObjectAttribute::OPERATION_ADD
@@ -157,10 +156,6 @@ module Ddr::Batch
         end
       end
 
-      # def verify_label(repo_object)
-      #   repo_object.label.eql?(label) ? VERIFICATION_PASS : VERIFICATION_FAIL
-      # end
-      #
       def verify_attribute(repo_object, attribute)
         verified = case attribute.datastream
           when 'descMetadata'

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

@@ -4,9 +4,9 @@ module Ddr::Batch
 
     belongs_to :batch_object, :inverse_of => :batch_object_datastreams
 
-    DATASTREAMS = [ Ddr::Datastreams::CONTENT,
-                    Ddr::Datastreams::DESC_METADATA,
-                    Ddr::Datastreams::STRUCT_METADATA ]
+    DATASTREAMS = [ Ddr::Models::File::CONTENT,
+                    Ddr::Models::File::DESC_METADATA,
+                    Ddr::Models::File::STRUCT_METADATA ]
 
     OPERATION_ADD = "ADD" # add this datastream to the object -- considered an error if datastream already exists
     OPERATION_ADDUPDATE = "ADDUPDATE" # add this datastream to or update this datastream in the object

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

@@ -44,7 +44,6 @@ module Ddr::Batch
           event.detail = ingest_outcome_detail.join("\n")
           event.save!
         end
-        update_attributes(:pid => repo_object.pid)
         verifications = verify_repository_object
         verification_outcome_detail = []
         verified = true
@@ -76,8 +75,8 @@ module Ddr::Batch
       repo_object = nil
       begin
         repo_object = model.constantize.new(:id => repo_pid)
-        # repo_object.label = label if label
         repo_object.save(validate: false)
+        update_attributes(:pid => repo_object.pid)
         batch_object_attributes.each { |a| repo_object = add_attribute(repo_object, a) }
         batch_object_datastreams.each { |d| repo_object = populate_datastream(repo_object, d) }
         batch_object_relationships.each { |r| repo_object = add_relationship(repo_object, r) }
@@ -94,6 +93,7 @@ module Ddr::Batch
           else
             repo_clean = true
           end
+          update_attributes(pid: nil)
         else
           repo_clean = true
         end

data/lib/ddr/batch/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Batch
-    VERSION = "2.0.0.beta.2"
+    VERSION = "2.0.0.beta.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-batch
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.2
+  version: 2.0.0.beta.3
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails