Merge pull request #486 from sul-dlss/t485-split_nil

Handle nil embargo_terms.

app/models/hydrus/item.rb

@@ -524,7 +524,7 @@ def embargo_date_is_well_formed
   # past embargo date, because the nightly job that removes embargoMetadata
   # once the date has passed might not have run yet.
   def embargo_date_in_range
-    return unless is_embargoed
+    return unless is_embargoed && collection.embargo_terms
     b  = beginning_of_embargo_range.to_datetime
     e  = end_of_embargo_range.to_datetime
     dt = embargo_date.to_datetime

spec/models/hydrus/item_spec.rb

@@ -648,12 +648,23 @@
     end
 
     describe 'embargo_date_in_range()' do
-      it 'should not perform validation unless preconditions are met' do
+      it 'should not perform validation unless is_embargoed preconditions are met' do
         expect(item).not_to receive(:beginning_of_embargo_range)
+        collection = instance_double(Hydrus::Collection, embargo_terms: '2 years')
+        allow(item).to receive(:collection).and_return(collection)
         allow(item).to receive(:is_embargoed).and_return(false)
         item.embargo_date_in_range
       end
 
+      it 'should not perform validation unless collection.embargo_terms preconditions are met' do
+        expect(item).not_to receive(:beginning_of_embargo_range)
+
+        collection = instance_double(Hydrus::Collection, embargo_terms: nil)
+        allow(item).to receive(:collection).and_return(collection)
+        allow(item).to receive(:is_embargoed).and_return(true)
+        item.embargo_date_in_range
+      end
+
       it 'should add a validation error when embargo_date falls outside the embargo range' do
         # Set up beginning/end of embargo range.
         b   = '2012-02-01T08:00:00Z'
@@ -673,6 +684,8 @@
         }
         # Validate those dates.
         allow(item).to receive(:is_embargoed).and_return(true)
+        collection = instance_double(Hydrus::Collection, embargo_terms: '2 years')
+        allow(item).to receive(:collection).and_return(collection)
         k = :embargo_date
         dts.each do |dt, is_ok|
           expect(item.errors).not_to have_key(k)