iso8601 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9dcdc5cbdd5d7ca45c4cdda75be726ba788883b
-  data.tar.gz: 579e363f9c3969d20987122e9108e07e94acae56
+  metadata.gz: f6495a0f183eb9f89a063e0404b9001fd024b90d
+  data.tar.gz: c9bedd70b4ecc51ad6c1094a4f714b5d2a17fdcc
 SHA512:
-  metadata.gz: c906351a59be4c6173cb08a666396659b2f37b0ba481899bb751434c5ab316f6fcd2d31f9da188c10307d22d85016851038d26351bb6f35d4f97c94aec77da56
-  data.tar.gz: 666289b7461bdd1d29ed51eed7c810fe3a55ec4403df3163cedce303f31f1888877319fce5efc2294122ffb80dd4b5f64a05ffeeb1b9280dc31b384ab868a009
+  metadata.gz: 2dbe7ba46843e37298b2a4766752e74d240546ec6232e9dd1aa0e2449589351d18440ed0bf1b982c39353141d5a91b84b8f031b29697d5f09616bb6eadbfd33d
+  data.tar.gz: ced9dcc8204013b265f69e6c8a2407247386202026c83e19296acd99ec44b06a4811b7785e9becc1cae7a49c8a4005c64c4e4a519f7f06decb8bdfd727991b0f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Changes for 0.7.0
+
+* Add decimal fractions for any component in a duration.
+* Add a catch all `ISO8601::Errors::StandardError`.
+* Add support for comma (`,`) as a separator for duration decimal fractions.
 
 ## Changes for 0.6.0
 

data/lib/iso8601/duration.rb

@@ -18,16 +18,16 @@ module ISO8601
       @duration = /^(\+|-)? # Sign
                    P(
                       (
-                        (\d+Y)? # Years
-                        (\d+M)? # Months
-                        (\d+D)? # Days
+                        (\d+(?:[,.]\d+)?Y)? # Years
+                        (\d+(?:[.,]\d+)?M)? # Months
+                        (\d+(?:[.,]\d+)?D)? # Days
                         (T
-                          (\d+H)? # Hours
-                          (\d+M)? # Minutes
-                          (\d+(?:\.\d+)?S)? # Seconds
+                          (\d+(?:[.,]\d+)?H)? # Hours
+                          (\d+(?:[.,]\d+)?M)? # Minutes
+                          (\d+(?:[.,]\d+)?S)? # Seconds
                         )? # Time
                       )
-                      |(\d+W) # Weeks
+                      |(\d+(?:[.,]\d+)?W) # Weeks
                     ) # Duration
                   $/x.match(pattern) or raise ISO8601::Errors::UnknownPattern.new(pattern)
 
@@ -43,6 +43,7 @@ module ISO8601
         :minutes => @duration[9].nil? ? 0 : @duration[9].chop.to_f * sign,
         :seconds => @duration[10].nil? ? 0 : @duration[10].chop.to_f * sign
       }
+      valid_fractions?
     end
     ##
     # Assigns a new base datetime
@@ -198,5 +199,13 @@ module ISO8601
         raise ISO8601::Errors::UnknownPattern.new(@duration)
       end
     end
+
+    def valid_fractions?
+      values = @atoms.values.reject(&:zero?)
+      fractions = values.select { |a| (a % 1) != 0 }
+      if fractions.size > 1 || (fractions.size == 1 && fractions.last != values.last)
+        raise ISO8601::Errors::InvalidFractions.new(@duration)
+      end
+    end
   end
 end

data/lib/iso8601/errors.rb

@@ -4,23 +4,33 @@ module ISO8601
   ##
   # Contains all ISO8601-specific errors.
   module Errors
+
+    class StandardError < ::StandardError
+    end
     ##
     # Raised when the given pattern doesn't fit as ISO 8601 parser.
-    class UnknownPattern < ::StandardError
+    class UnknownPattern < StandardError
       def initialize(pattern)
         super("The pattern “#{pattern}” is not allowed in this implementation of ISO8601.")
       end
     end
     ##
+    # Raised when the given pattern contains an invalid fraction.
+    class InvalidFractions < StandardError
+      def initialize(pattern)
+        super("Fractions are only allowed in the last component")
+      end
+    end
+    ##
     # Raised when the given date is valid but out of range.
-    class RangeError < ::StandardError
+    class RangeError < StandardError
       def initialize(pattern)
         super("“#{pattern}” is out of range")
       end
     end
     ##
     # Raise when the base is not suitable.
-    class DurationBaseError < ::StandardError
+    class DurationBaseError < StandardError
       def initialize(duration)
         super("Wrong base for #{duration} duration.")
       end

data/lib/iso8601/version.rb

@@ -1,5 +1,5 @@
 module ISO8601
   ##
   # The gem version
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/iso8601/duration_spec.rb

@@ -13,14 +13,30 @@ describe ISO8601::Duration do
     expect { ISO8601::Duration.new('~P1Y') }.to raise_error(ISO8601::Errors::UnknownPattern)
     expect { ISO8601::Duration.new('.P1Y') }.to raise_error(ISO8601::Errors::UnknownPattern)
   end
+  it "should raise a ISO8601::Errors::InvalidFraction for any invalid patterns" do
+    expect { ISO8601::Duration.new('P1.5Y0.5M') }.to raise_error(ISO8601::Errors::InvalidFractions)
+    expect { ISO8601::Duration.new('P1.5Y1M') }.to raise_error(ISO8601::Errors::InvalidFractions)
+    expect { ISO8601::Duration.new('P1.5MT10.5S') }.to raise_error(ISO8601::Errors::InvalidFractions)
+  end
   it "should parse any allowed pattern" do
     expect { ISO8601::Duration.new('P1Y') }.to_not raise_error
+    expect { ISO8601::Duration.new('P0.5Y') }.to_not raise_error
+    expect { ISO8601::Duration.new('P0,5Y') }.to_not raise_error
     expect { ISO8601::Duration.new('P1Y1M') }.to_not raise_error
+    expect { ISO8601::Duration.new('P1Y0.5M') }.to_not raise_error
+    expect { ISO8601::Duration.new('P1Y0,5M') }.to_not raise_error
     expect { ISO8601::Duration.new('P1Y1M1D') }.to_not raise_error
+    expect { ISO8601::Duration.new('P1Y1M0.5D') }.to_not raise_error
+    expect { ISO8601::Duration.new('P1Y1M0,5D') }.to_not raise_error
     expect { ISO8601::Duration.new('P1Y1M1DT1H') }.to_not raise_error
+    expect { ISO8601::Duration.new('P1Y1M1DT0.5H') }.to_not raise_error
+    expect { ISO8601::Duration.new('P1Y1M1DT0,5H') }.to_not raise_error
     expect { ISO8601::Duration.new('P1Y1M1DT1H1M') }.to_not raise_error
+    expect { ISO8601::Duration.new('P1Y1M1DT1H0.5M') }.to_not raise_error
+    expect { ISO8601::Duration.new('P1Y1M1DT1H0,5M') }.to_not raise_error
     expect { ISO8601::Duration.new('P1Y1M1DT1H1M1S') }.to_not raise_error
     expect { ISO8601::Duration.new('P1Y1M1DT1H1M1.0S') }.to_not raise_error
+    expect { ISO8601::Duration.new('P1Y1M1DT1H1M1,0S') }.to_not raise_error
     expect { ISO8601::Duration.new('P1W') }.to_not raise_error
     expect { ISO8601::Duration.new('+P1Y') }.to_not raise_error
     expect { ISO8601::Duration.new('-P1Y') }.to_not raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iso8601
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Arnau Siches