Merge ce5761c into 7e54107

lib/pre_assembly/bundle.rb

@@ -149,7 +149,7 @@ def allowed_values
       {
         :project_style=>{
           :content_structure=>[:simple_image,:simple_book,:book_as_image,:book_with_pdf,:file,:smpl,:'3d'],
-          :get_druid_from=>[:suri,:container,:manifest,:druid_minter],
+          :get_druid_from=>[:container,:manifest,:druid_minter],
         },
         :content_md_creation=>{
           :style=>[:default,:filename,:dpg,:smpl,:salt,:none],
@@ -232,8 +232,7 @@ def validate_usage
         validation_errors << "If should_register=true, it does not make sense to have project_style:content_tag_override=true since objects are not registered yet." if @project_style[:content_tag_override]
       else  # if should_register=false, check some stuff
         validation_errors << "The APO and SET DRUIDs should not be set if should_register = false." if (@apo_druid_id || @set_druid_id)  # APO and SET should not be set
-        validation_errors << "get_druid_from: 'suri' is only valid if should_register = true." if @project_style[:get_druid_from]==:suri # can't use SURI to get druid
-        validation_errors << "get_druid_from: 'manifest' is only valid if use_manifest = true." if @project_style[:get_druid_from]==:manifest && @object_discovery[:use_manifest] == false # can't use SURI to get druid
+        validation_errors << "get_druid_from: 'manifest' is only valid if use_manifest = true." if @project_style[:get_druid_from]==:manifest && @object_discovery[:use_manifest] == false
       end