xml_mapper 0.5.4 → 0.5.5

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/lib/xml_mapper.rb

@@ -212,12 +212,16 @@ class XmlMapper
   def parse_duration(string)
     return string.to_i if string.match(/^\d+$/)
     string = "00:#{string}" if string.match(/^(\d+):(\d+)$/)
-    string = string.to_s.gsub(/PT(\d+M.*)/,"PT0H\\1") # insert 0H into PT3M12S, for example: PT0H3M12S
-    time = Time.parse(string)
-    return (time.hour.to_i * 1 * 3600 + time.min.to_i * 1 * 60 + time.sec.to_i).to_i
+    string = string.to_s.gsub(/PT(\d+M.*)/,"PT0H\\1")         # insert 0H into PT3M12S, for example: PT0H3M12S
+    if string.match(/^PT(\d+)H(\d+)M(\d+)S$/) || string.match(/^(\d+):(\d+):(\d+)$/)
+      $1.to_i * 3600 + $2.to_i * 60 + $3.to_i
+    else
+      nil
+    end
   end
   
   def parse_date(text)
     text.to_s.strip.length > 0 ? Date.parse(text.to_s.strip) : nil
+  rescue
   end
 end

data/spec/xml_mapper_spec.rb

@@ -16,20 +16,13 @@ describe "XmlMapper" do
   end
   
   describe "#parse_duration" do
-    it "convert human readable strings to lenghs" do
-      XmlMapper.new.parse_duration("00:01").should == 1
-      XmlMapper.new.parse_duration("00:00:01").should == 1
-      XmlMapper.new.parse_duration("00:01:01").should == 61
-      XmlMapper.new.parse_duration("01:01:01").should == 3661
-    end
-
-    it "should convert iso string to lengths" do
-      XmlMapper.new.parse_duration("PT0H5M54S").should == 354
-      XmlMapper.new.parse_duration("PT3M12S").should == 192
-    end
-
-    it "should not convert integer values" do
-      XmlMapper.new.parse_duration("60").should == 60
+    {
+      "60" => 60, "no_duration" => nil, "PT0H5M54S" => 354, "PT3M12S" => 192, "PT64M54S" => 3894,
+      "00:01" => 1, "00:00:01" => 1, "00:01:01" => 61, "01:01:01" => 3661
+    }.each do |duration_string, value|
+      it "converts #{duration_string.inspect} to #{value}" do
+        XmlMapper.new.parse_duration(duration_string).should == value
+      end
     end
   end
   
@@ -45,6 +38,10 @@ describe "XmlMapper" do
     it "parses dates correctly" do
       XmlMapper.new.parse_date("2010-09-01").should == Date.new(2010, 9, 1)
     end
+    
+    it "returns nil when unable to parse date" do
+      XmlMapper.new.parse_date("something_wrong").should be_nil
+    end
   end
   
   describe "#add_mapping" do

data/xml_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xml_mapper}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-04-11}
+  s.date = %q{2011-04-12}
   s.description = %q{Declarative XML to Ruby mapping}
   s.email = %q{tobias.schwab@dynport.de}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xml_mapper
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 +02:00
+date: 2011-04-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency