om 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1de731732be29cdf0c460beebcb5b603deccb18c
-  data.tar.gz: 6fa913f9d7bcdd57e7d29555a266d265dd426ad0
+  metadata.gz: d22a3f6b7dc5a7d6c75dac4d1bf14c60f5e0fc0c
+  data.tar.gz: 22198afe29d16339742f4ef4a9735121afa31136
 SHA512:
-  metadata.gz: e947f9c90119f8ac601105505d947a2ad78d4307ada79f3f7e609fd64ecb71c0330bbe668438e1d4ee71aac4dbcf112a9f5d2a0fe4a841d9a22125b81cd78e9d
-  data.tar.gz: 4db6a2f387c9630f6e9909966bc81e9939110ac92b6588745fb82766ec23d3249041ddbe70b5ddba6322b094622e51cdd09da26365bec6c6af7fcb12cc2a9f5a
+  metadata.gz: a32c99b5587ae306791119c7e4e0c0b9e6d7ae7f8bb36e9ad4102c6de90c6a892daebc680083ab2609e9bf261f608f0d15d67dd66f30ec5263fc143d376f71b5
+  data.tar.gz: 4a4cb65a378cbef9ce02f38f05309916c6703978962112a01d7a08ff51ccad389f5efd78425b43531fada607b1cb25888f04f652e568f4e020f1e006e4999886

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "3.0.5"
+  VERSION = "3.0.6"
 end

data/lib/om/xml/term.rb

@@ -94,7 +94,12 @@ module OM
       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

data/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 @@ EOF
           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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Matt Zumwalt