ddr-batch 1.1.0.rc1 → 1.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c090fcbdee8f9e2e6861a5b5a79cb0766ae420c
-  data.tar.gz: f441540385d72a68ca2ab832f519481c3a77a58b
+  metadata.gz: d88167f89fd5ed29f280a330a1f6fc77498b5ae8
+  data.tar.gz: bae0c5b380c5dfc45df4191ecfdb19b3424345f7
 SHA512:
-  metadata.gz: 4b4a3c317a19cd1a03fa30c679c0a847c9c6f918e55a52248ac5eb31f9f3320e7e6b9b055cebc0ac82e28b6cc48eec66a7d031a35eb6bc7dd14e772374ed0c48
-  data.tar.gz: 5956b006e1ac730ebbbb1d8a3d9904d6fe6a9d46ea5994e279f5aa7e3f552d90e0a2fd5d79e35972b8b5ea43f084df0a4ee82b4e446c91e7e016bc273bc937fe
+  metadata.gz: e26f9322c8e8d6218460d8080b85e2fddc98480beb8bde9fe5a9fd2209f8d13b7c40603fe48984ba70f1e27d9e67409a726b5831303c7c265b09aa46ecb0de50
+  data.tar.gz: dfd738114a802dff9b42f09a0ea3b4b1cb009036ce678dd330436cb6412dd5475e97bb578d981523a94e1d38d144e29c0bc82982c1cc2bca4d4ee5c075dfe28a

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

@@ -6,6 +6,7 @@ module Ddr::Batch
       errors = []
       errors << "#{@error_prefix} Model required for INGEST operation" unless model
       errors += validate_pre_assigned_pid if pid
+      errors += validate_collection if model == 'Collection'
       errors
     end
 
@@ -34,6 +35,16 @@ module Ddr::Batch
       return errs
     end
 
+    def validate_collection
+      errs = []
+      coll = Collection.new
+      batch_object_attributes.each { |attr| coll = add_attribute(coll, attr) }
+      unless coll.valid?
+        coll.errors.messages.each { |k, v| errs << "#{@error_prefix} Collection #{k} #{v.join(';')}" }
+      end
+      errs
+    end
+
     def ingest(user, opts = {})
       repo_object = create_repository_object
       if !repo_object.nil? && !repo_object.new_record?
@@ -89,7 +100,7 @@ module Ddr::Batch
         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) }
-        repo_object.save
+        repo_object.save! # Do not allow batch ingest to successfully create an invalid object
       rescue Exception => e1
         logger.fatal("Error in creating repository object #{repo_object.pid} for #{identifier} : #{e1}")
         repo_clean = false

data/lib/ddr/batch/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Batch
-    VERSION = "1.1.0.rc1"
+    VERSION = "1.1.0.rc2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-batch
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc1
+  version: 1.1.0.rc2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails