Merge pull request samvera-deprecated#52 from projecthydra/invalid_ti…

…me_serialization

Handle invalid time for Rails 3 ("just merge it,dude")

lib/om/xml/term.rb

@@ -94,7 +94,12 @@ def serialize (val)
       when :date, :integer
         val.to_s
       when :time
-        time = val.to_time
+        begin
+          time = val.to_time
+        rescue ArgumentError
+          # In Rails 3, an invalid time raises ArgumentError, in Rails 4 it just returns nil
+          raise TypeMismatch, "Can't convert `#{val}` to time"
+        end
         raise TypeMismatch, "Can't convert `#{val}` to time" if time.nil?
         time.utc.iso8601
       when :boolean

spec/integration/serialization_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'active_support/core_ext/string/conversions' # for String#to_time conversion
+require 'active_support/core_ext/date_time/conversions' # for String#to_time conversion (only needed for Rails 3)
 
 describe "element values" do
   before(:all) do
@@ -64,6 +65,9 @@ class ElementValueTerminology
           it "raises a type mismatch error" do
             expect { datastream.my_time = '' }.to raise_error OM::TypeMismatch
           end
+          it "raises a type mismatch error" do
+            expect { datastream.my_time = 'Foo' }.to raise_error OM::TypeMismatch
+          end
         end
       end