iso8601 0.1.1 → 0.2

data/README.md

@@ -14,7 +14,7 @@ Because Durations and DateTime has substract method, Durations has sign to repre
 
 ## TODO
 
-* Decimal fraction in dateTime and duration patterns
+* Decimal fraction in dateTime patterns
 * Recurring time intervals
 * Ordinal date pattern (YYYY-DDD)
 * Week date pattern (YYYY-Www-D)
@@ -23,6 +23,7 @@ Because Durations and DateTime has substract method, Durations has sign to repre
 
 * [Nick Lynch](https://github.com/njlynch)
 * [Pelle Braendgaard](https://github.com/pelle)
+* [Takahiro Noda](https://github.com/tnoda)
 
 ## Credits
 Arnau Siches under [LGPL](http://www.gnu.org/licenses/lgpl.html) license. LICENSE file for details.

data/lib/iso8601.rb

@@ -1,5 +1,5 @@
 module ISO8601
-  VERSION = "0.1.1"
+  VERSION = "0.2"
 end
 
 require "time"

data/lib/iso8601/duration.rb

@@ -4,7 +4,7 @@ module ISO8601
   class Duration
     attr_reader :base, :atoms
     def initialize(duration, base = nil)
-      @duration = /^(\+|-)?P(((\d+Y)?(\d+M)?(\d+D)?(T(\d+H)?(\d+M)?(\d+S)?)?)|(\d+W))$/.match(duration)
+      @duration = /^(\+|-)?P(((\d+Y)?(\d+M)?(\d+D)?(T(\d+H)?(\d+M)?(\d+(?:\.\d+)?S)?)?)|(\d+W))$/.match(duration)
       @base = base #date base for duration calculations
       valid_pattern?
       valid_base?
@@ -104,7 +104,7 @@ module ISO8601
       days, d_mod = (m_mod / self.days.factor).to_i, (m_mod % self.days.factor)
       hours, h_mod = (d_mod / self.hours.factor).to_i, (d_mod % self.hours.factor)
       minutes, mi_mod = (h_mod / self.minutes.factor).to_i, (h_mod % self.minutes.factor)
-      seconds = mi_mod.to_i
+      seconds = mi_mod.div(1) == mi_mod ? mi_mod.to_i : mi_mod.to_f # Coerce to Integer when needed (`PT1S` instead of `PT1.0S`)
 
       seconds = (seconds != 0 or (years == 0 and months == 0 and days == 0 and hours == 0 and minutes == 0)) ? "#{seconds}S" : ""
       minutes = (minutes != 0) ? "#{minutes}M" : ""

data/test/iso8601/test_duration.rb

@@ -18,6 +18,7 @@ class TestDuration < Test::Unit::TestCase
     assert_nothing_raised() { ISO8601::Duration.new("PT1H1M") }
     assert_nothing_raised() { ISO8601::Duration.new("PT1H1S") }
     assert_nothing_raised() { ISO8601::Duration.new("PT1H1M1S") }
+    assert_nothing_raised() { ISO8601::Duration.new("P1Y2M3DT5H20M30.123S")}
     assert_nothing_raised() { ISO8601::Duration.new("+PT1H1M1S") }
     assert_nothing_raised() { ISO8601::Duration.new("-PT1H1M1S") }
     assert_raise(ISO8601::Errors::UnknownPattern) { ISO8601::Duration.new("~PT1H1M1S") }
@@ -70,7 +71,9 @@ class TestDuration < Test::Unit::TestCase
     assert_equal(27003, ISO8601::Duration.new("PT7H30M3S").to_seconds, "PT[n]H[n]M[n]S form")
     assert_equal(2040, ISO8601::Duration.new("PT34M").to_seconds, "PT[n]M form")
     assert_equal(2050, ISO8601::Duration.new("PT34M10S").to_seconds, "PT[n]M[n]S form")
+    assert_equal(2050.4, ISO8601::Duration.new("PT34M10.4S").to_seconds, "PT[n]M[n.m]S form")
     assert_equal(10, ISO8601::Duration.new("PT10S").to_seconds, "PT[n]S form")
+    assert_equal(10.5, ISO8601::Duration.new("PT10.5S").to_seconds, "PT[n.m]S form")
     assert_equal(ISO8601::Duration.new("PT1H15M").to_seconds, ISO8601::Duration.new("PT75M").to_seconds, "PT[n]H[n]M equivalent to PT[n]M")
   end
 
@@ -87,5 +90,6 @@ class TestDuration < Test::Unit::TestCase
 
   def test_seconds_to_iso
     assert_equal(ISO8601::Duration.new("P1Y2M3DT4H5M6S").to_seconds, ISO8601::Duration.seconds_to_iso(37065906).to_seconds)
+    assert_equal(ISO8601::Duration.new("P1Y2M3DT4H5M6.9S").to_seconds, ISO8601::Duration.seconds_to_iso(37065906.9).to_seconds)
   end
 end

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Arnau Siches
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-30 00:00:00 +01:00
+date: 2012-03-05 00:00:00 +01:00
 default_executable: 
 dependencies: []