time-interval 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c19e6c56117a74623c0b0be054d6b4cd555b090
-  data.tar.gz: 2aa769a3bb0baacbc67e0dd5195e10851d78110b
+  metadata.gz: 1f07fe3b685cf4deb569c85716903b92d1b5011d
+  data.tar.gz: 5057c93856e759678b3e09de12cdc6bf74740206
 SHA512:
-  metadata.gz: f00bda6968150c34b15b8c14574bd2645fc641cd2aba9404b8f34706890cb3f14927912092cac3ecc96295c9d11b37840eb25ea31a58a1e94f060157223e38ea
-  data.tar.gz: 640c3eeff7454ef811de018237aebd233fc503c7b22ca6855a4ce7ab4452608ef7ba18f983cf3b8ed83992c77802ce00960f536bc15507e5b852c79727fd8580
+  metadata.gz: d175b9c1e8a6a150d7d523d9656297fcf8895bbad59e848fce5f18ac4ca6b1ba5684f086ea572298b06fd200614c39c64882ba4ef321cd2427110eb869a9364d
+  data.tar.gz: 8277a184873b26605553041ca0c3a8b2d839f6b44b659bcb23aec0b28135e3c6c7f7791ab59f21324be99655cf69ec8a9646f2f506aeca084aac42033c2676a3

data/lib/time_interval/duration.rb

@@ -1,20 +1,32 @@
 module TimeInterval
   class Duration
     def self.parse(duration_str)
-      y = duration_str['Y'] ? duration_str.match(/(\d+)Y/)[1].to_i : 0
-      m = duration_str['M'] ? duration_str.match(/(\d+)M/)[1].to_i : 0
-      w = duration_str['W'] ? duration_str.match(/(\d+)W/)[1].to_i : 0
-      d = duration_str['D'] ? duration_str.match(/(\d+)D/)[1].to_i : 0
-      if duration_str['T']
-        h = duration_str['H'] ? duration_str.match(/T.*(\d+)H/)[1].to_i : 0
-        mi = duration_str['M'] ? duration_str.match(/T.*(\d+)M/)[1].to_i : 0
-        s = duration_str['S'] ? duration_str.match(/T.*(\d+)S/)[1].to_i : 0
+      if duration_str['PT']
+        date_str = nil
+        time_str = duration_str
+      else
+        date_str, time_str = duration_str.split('T')
+      end
+
+      if date_str
+        y = date_str['Y'] ? date_str.match(/(\d+)Y/)[1].to_i : 0
+        m = date_str['M'] ? date_str.match(/(\d+)M/)[1].to_i : 0
+        w = date_str['W'] ? date_str.match(/(\d+)W/)[1].to_i : 0
+        d = date_str['D'] ? date_str.match(/(\d+)D/)[1].to_i : 0
+      else
+        y = m = w = d = 0
+      end
+
+      if time_str
+        h = time_str['H'] ? time_str.match(/(\d+)H/)[1].to_i : 0
+        mi = time_str['M'] ? time_str.match(/(\d+)M/)[1].to_i : 0
+        s = time_str['S'] ? time_str.match(/(\d+)S/)[1].to_i : 0
       else
         h = mi = s = 0
       end
 
       new(years: y, months: m, weeks: w, days: d, hours: h, minutes: mi,
-      seconds: s)
+          seconds: s)
     end
 
     attr_reader :years, :months, :weeks, :days, :hours, :minutes, :seconds

data/lib/time_interval/version.rb

@@ -1,3 +1,3 @@
 module TimeInterval
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/lib/time_interval/duration_spec.rb

@@ -0,0 +1,28 @@
+RSpec.describe Duration do
+  describe '.parse' do
+    it 'should parse time-only durations correctly' do
+      duration = Duration.parse 'PT2H25M'
+
+      expect(duration.months).to eq 0
+      expect(duration.hours).to eq 2
+      expect(duration.minutes).to eq 25
+    end
+
+    it 'should parse date-only durations correctly' do
+      duration = Duration.parse 'P1Y2M'
+
+      expect(duration.years).to eq 1
+      expect(duration.months).to eq 2
+      expect(duration.minutes).to eq 0
+    end
+
+    it 'should parse mixed durations correctly' do
+      duration = Duration.parse 'P1Y2MT2H25M'
+
+      expect(duration.years).to eq 1
+      expect(duration.months).to eq 2
+      expect(duration.hours).to eq 2
+      expect(duration.minutes).to eq 25
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time-interval
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sebastian Edwards
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - lib/time_interval/time_pair.rb
 - lib/time_interval/time_with_duration.rb
 - lib/time_interval/version.rb
+- spec/lib/time_interval/duration_spec.rb
 - spec/lib/time_interval/repeating_interval_spec.rb
 - spec/lib/time_interval/time_pair_spec.rb
 - spec/lib/time_interval/time_with_duration_spec.rb
@@ -132,6 +133,7 @@ signing_key:
 specification_version: 4
 summary: Simple library to handle ISO8601 time intervals.
 test_files:
+- spec/lib/time_interval/duration_spec.rb
 - spec/lib/time_interval/repeating_interval_spec.rb
 - spec/lib/time_interval/time_pair_spec.rb
 - spec/lib/time_interval/time_with_duration_spec.rb