iso8601 0.8.7 → 0.9.0

data/lib/iso8601/version.rb

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

data/lib/iso8601/weeks.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+module ISO8601
+  ##
+  # A Weeks atom in a {ISO8601::Duration}
+  class Weeks
+    include Atomic
+
+    AVERAGE_FACTOR = 604800
+
+    ##
+    # @param [Numeric] atom The atom value
+    def initialize(atom)
+      valid_atom?(atom)
+
+      @atom = atom
+    end
+
+    ##
+    # The Week factor
+    #
+    # @return [Numeric]
+    def factor
+      AVERAGE_FACTOR
+    end
+
+    ##
+    # The amount of seconds
+    #
+    # @return [Numeric]
+    def to_seconds
+      AVERAGE_FACTOR * atom
+    end
+
+    ##
+    # The atom symbol.
+    #
+    # @return [Symbol]
+    def symbol
+      :W
+    end
+  end
+end

data/lib/iso8601/years.rb

@@ -0,0 +1,80 @@
+# encoding: utf-8
+
+module ISO8601
+  ##
+  # A Years atom in a {ISO8601::Duration}
+  #
+  # A "calendar year" is the cyclic time interval in a calendar which is
+  # required for one revolution of the Earth around the Sun and approximated to
+  # an integral number of "calendar days".
+  #
+  # A "duration year" is the duration of 365 or 366 "calendar days" depending
+  # on the start and/or the end of the corresponding time interval within the
+  # specific "calendar year".
+  class Years
+    include Atomic
+
+    ##
+    # The "duration year" average is calculated through time intervals of 400
+    # "duration years". Each cycle of 400 "duration years" has 303 "common
+    # years" of 365 "calendar days" and 97 "leap years" of 366 "calendar days".
+    AVERAGE_FACTOR = ((365 * 303 + 366 * 97) / 400) * 86400
+
+    ##
+    # @param [Numeric] atom The atom value
+    def initialize(atom)
+      valid_atom?(atom)
+
+      @atom = atom
+    end
+
+    ##
+    # The Year factor
+    #
+    # @param [ISO8601::DateTime, nil] base (nil) The base datetime to compute
+    #   the year length.
+    #
+    # @return [Integer]
+    def factor(base = nil)
+      valid_base?(base)
+
+      return AVERAGE_FACTOR if base.nil?
+      return adjusted_factor(1, base) if atom.zero?
+
+      adjusted_factor(atom, base)
+    end
+
+    ##
+    # The amount of seconds
+    #
+    # @param [ISO8601::DateTime, nil] base (nil) The base datetime to compute
+    #   the year length.
+    #
+    # @return [Numeric]
+    def to_seconds(base = nil)
+      valid_base?(base)
+
+      return (AVERAGE_FACTOR * atom) if base.nil?
+
+      ::Time.utc(year(atom, base)) - ::Time.utc(base.year)
+    end
+
+    ##
+    # The atom symbol.
+    #
+    # @return [Symbol]
+    def symbol
+      :Y
+    end
+
+    private
+
+    def adjusted_factor(atom, base)
+      (::Time.utc((base.year + atom).to_i) - ::Time.utc(base.year)) / atom
+    end
+
+    def year(atom, base)
+      (base.year + atom).to_i
+    end
+  end
+end

data/spec/iso8601/date_spec.rb

@@ -57,18 +57,12 @@ describe ISO8601::Date do
     it "should return the result of the addition of a number" do
       expect((ISO8601::Date.new('2012-07-07') + 7).to_s).to eq('2012-07-14')
     end
-    it "should return the result of the addition of a Duration" do
-      expect((ISO8601::Date.new('2012-07-07') + ISO8601::Duration.new('P7D')).to_s).to eq('2012-07-14')
-    end
   end
 
   describe '#-' do
     it "should return the result of the subtraction" do
       expect((ISO8601::Date.new('2012-07-07') - 7).to_s).to eq('2012-06-30')
     end
-    it "should return the result of the subtraction" do
-      expect((ISO8601::Date.new('2012-07-07') - ISO8601::Duration.new('P7D')).to_s).to eq('2012-06-30')
-    end
   end
 
   describe '#to_a' do

data/spec/iso8601/date_time_spec.rb

@@ -111,19 +111,12 @@ describe ISO8601::DateTime do
       expect((ISO8601::DateTime.new('2012-07-07T20:20:20.5Z') + 10).second).to eq(30.5)
       expect((ISO8601::DateTime.new('2012-07-07T20:20:20+02:00') + 10.09).second).to eq(30.1)
     end
-    it "should return the result of the addition of a Duration" do
-      expect((ISO8601::DateTime.new('2012-07-07T20:20:20Z') + ISO8601::Duration.new("PT10S")).to_s).to eq('2012-07-07T20:20:30+00:00')
-      expect((ISO8601::DateTime.new('2015-07-07T20:20:20Z') + ISO8601::Duration.new("P10D")).to_s).to eq('2015-07-17T20:20:20+00:00')
-    end
   end
 
   describe '#-' do
     it "should return the result of the subtraction of a number" do
       expect((ISO8601::DateTime.new('2012-07-07T20:20:20Z') - 10).to_s).to eq('2012-07-07T20:20:10+00:00')
     end
-    it "should return the result of the subtraction of a Duration" do
-      expect((ISO8601::DateTime.new('2012-07-07T20:20:20Z') - ISO8601::Duration.new(10)).to_s).to eq('2012-07-07T20:20:10+00:00')
-    end
   end
 
   describe '#to_a' do
@@ -158,7 +151,6 @@ describe ISO8601::DateTime do
 
     it "should identify as the same when two dates with different timezones are the same timestamp" do
       expect(ISO8601::DateTime.new('2014-10-11T12:13:14Z') == ISO8601::DateTime.new('2014-10-11T13:13:14+01:00')).to be_truthy
-
     end
   end
 end

data/spec/iso8601/days_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+RSpec.describe ISO8601::Days do
+  describe 'Atomic' do
+    let(:subject) { ISO8601::Days.new(1) }
+
+    it "should respond to the Atomic interface" do
+      expect(subject).to respond_to(:factor)
+      expect(subject).to respond_to(:to_seconds)
+      expect(subject).to respond_to(:symbol)
+      expect(subject).to respond_to(:to_i)
+      expect(subject).to respond_to(:to_f)
+      expect(subject).to respond_to(:to_s)
+      expect(subject).to respond_to(:value)
+      expect(subject).to respond_to(:<=>)
+      expect(subject).to respond_to(:eql?)
+      expect(subject).to respond_to(:hash)
+      expect(subject).to respond_to(:valid_atom?)
+    end
+  end
+
+  describe '#factor' do
+    it "should return the Day factor" do
+      expect(ISO8601::Days.new(2).factor).to eq(86400)
+    end
+
+    it "should return the amount of seconds" do
+      expect(ISO8601::Days.new(2).to_seconds).to eq(172800)
+      expect(ISO8601::Days.new(-2).to_seconds).to eq(-172800)
+    end
+  end
+
+  describe '#symbol' do
+    it "should return the ISO symbol" do
+      expect(ISO8601::Days.new(1).symbol).to eq(:D)
+    end
+  end
+
+  describe '#hash' do
+    it "should build hash identity by value" do
+      expect(ISO8601::Days.new(3).hash).to eq(ISO8601::Days.new(3).hash)
+    end
+  end
+end

data/spec/iso8601/duration_spec.rb

@@ -3,6 +3,12 @@
 require 'spec_helper'
 
 RSpec.describe ISO8601::Duration do
+  let(:common_year) { ISO8601::DateTime.new('2010-01-01') }
+  let(:leap_year) { ISO8601::DateTime.new('2000-01-01') }
+
+  let(:common_february) { ISO8601::DateTime.new('2010-02-01') }
+  let(:leap_february) { ISO8601::DateTime.new('2000-02-01') }
+
   it "should raise a ISO8601::Errors::UnknownPattern for any unknown pattern" do
     expect { ISO8601::Duration.new('') }.to raise_error(ISO8601::Errors::UnknownPattern)
     expect { ISO8601::Duration.new('P') }.to raise_error(ISO8601::Errors::UnknownPattern)
@@ -14,11 +20,13 @@ RSpec.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
@@ -42,32 +50,11 @@ RSpec.describe ISO8601::Duration do
     expect { ISO8601::Duration.new('+P1Y') }.to_not raise_error
     expect { ISO8601::Duration.new('-P1Y') }.to_not raise_error
   end
-  it "should raise a TypeError when the base is not a ISO8601::DateTime" do
-    expect { ISO8601::Duration.new('P1Y1M1DT1H1M1S', ISO8601::DateTime.new('2010-01-01')) }.to_not raise_error
-    expect { ISO8601::Duration.new('P1Y1M1DT1H1M1S', '2010-01-01') }.to raise_error(ISO8601::Errors::TypeError)
-    expect { ISO8601::Duration.new('P1Y1M1DT1H1M1S', 2010) }.to raise_error(ISO8601::Errors::TypeError)
-    expect {
-      d = ISO8601::Duration.new('P1Y1M1DT1H1M1S', ISO8601::DateTime.new('2010-01-01'))
-      d.base = 2012
-    }.to raise_error(ISO8601::Errors::TypeError)
-  end
 
-  it "should return a Duration instance from a Numeric input" do
-    subject = ISO8601::Duration.new(36993906, ISO8601::DateTime.new('2012-01-01'))
-    contrast = ISO8601::Duration.new('P1Y2M3DT4H5M6S', ISO8601::DateTime.new('2012-01-01'))
-    expect(subject.to_seconds).to eq(contrast.to_seconds)
-  end
-
-  describe '#base' do
-    it "should return the base datetime" do
-      dt = ISO8601::DateTime.new('2010-01-01')
-      dt2 = ISO8601::DateTime.new('2012-01-01')
-      expect(ISO8601::Duration.new('P1Y1M1DT1H1M1S').base).to be_an_instance_of(NilClass)
-      expect(ISO8601::Duration.new('P1Y1M1DT1H1M1S', dt).base).to be_an_instance_of(ISO8601::DateTime)
-      expect(ISO8601::Duration.new('P1Y1M1DT1H1M1S', dt).base).to eq(dt)
-      d = ISO8601::Duration.new('P1Y1M1DT1H1M1S', dt).base = dt2
-      expect(d).to eq(dt2)
-    end
+  it "should raise a TypeError when the base is not a ISO8601::DateTime" do
+    expect { ISO8601::Duration.new('P1Y1M1DT1H1M1S').to_seconds(common_year) }.to_not raise_error
+    expect { ISO8601::Duration.new('P1Y1M1DT1H1M1S').to_seconds('2010-01-01') }.to raise_error(ISO8601::Errors::TypeError)
+    expect { ISO8601::Duration.new('P1Y1M1DT1H1M1S').to_seconds(2010) }.to raise_error(ISO8601::Errors::TypeError)
   end
 
   describe '#pattern' do
@@ -84,22 +71,24 @@ RSpec.describe ISO8601::Duration do
   end
 
   describe '#+' do
-    it "should raise an ISO8601::Errors::DurationBaseError" do
-      expect { ISO8601::Duration.new('PT1H', ISO8601::DateTime.new('2000-01-01')) + ISO8601::Duration.new('PT1H') }.to raise_error(ISO8601::Errors::DurationBaseError)
-    end
-
     it "should return the result of the addition" do
       expect((ISO8601::Duration.new('P11Y1M1DT1H1M1S') + ISO8601::Duration.new('P1Y1M1DT1H1M1S')).to_s).to eq('P12Y2M2DT2H2M2S')
       expect((ISO8601::Duration.new('P1Y1M1DT1H1M1S') + ISO8601::Duration.new('PT10S')).to_s).to eq('P1Y1M1DT1H1M11S')
       expect(ISO8601::Duration.new('P1Y1M1DT1H1M1S') + ISO8601::Duration.new('PT10S')).to be_an_instance_of(ISO8601::Duration)
     end
-  end
 
-  describe '#-' do
-    it "should raise an ISO8601::Errors::DurationBaseError when bases mismatch" do
-      expect { ISO8601::Duration.new('PT1H', ISO8601::DateTime.new('2000-01-01')) - ISO8601::Duration.new('PT1H') }.to raise_error(ISO8601::Errors::DurationBaseError)
+    it "should perform addition operation with Numeric class" do
+      day = 60 * 60 * 24
+      expect((ISO8601::Duration.new('P11Y1M1DT1H1M1S') + day).to_s).to eq('P11Y1M2DT1H1M1S')
+      expect((ISO8601::Duration.new('P11Y1M1DT1H1M1S') + (2 * day).to_f).to_s).to eq('P11Y1M3DT1H1M1S')
+    end
+
+    it "should raise ISO8601::Errors::TypeError when other object is not Numeric or ISO8601::Duration" do
+      expect { ISO8601::Duration.new('PT1H') + 'wololo' }.to raise_error(ISO8601::Errors::TypeError)
     end
+  end
 
+  describe '#-' do
     it "should return the result of the subtraction" do
       expect(ISO8601::Duration.new('P1Y1M1DT1H1M1S') - ISO8601::Duration.new('PT10S')).to be_an_instance_of(ISO8601::Duration)
       expect((ISO8601::Duration.new('P1Y1M1DT1H1M11S') - ISO8601::Duration.new('PT10S')).to_s).to eq('P1Y1M1DT1H1M1S')
@@ -109,126 +98,138 @@ RSpec.describe ISO8601::Duration do
       expect((ISO8601::Duration.new('PT1S') - ISO8601::Duration.new('PT12S')).to_s).to eq('-PT11S')
       expect((ISO8601::Duration.new('PT1S') - ISO8601::Duration.new('-PT12S')).to_s).to eq('PT13S')
     end
-  end
 
-  describe "#to_days" do
-    it "should return the days of a duration" do
-      expect(ISO8601::Duration.new('P1Y', ISO8601::DateTime.new('2010-01-01')).to_days).to eq(365)
-      expect(ISO8601::Duration.new('P1D').to_days).to eq(1)
+    it "should perform subtract operation with Numeric class" do
+      day = 60 * 60 * 24
+      minute = 60
+      expect((ISO8601::Duration.new('P11Y1M1DT1H1M1S') - day).to_s).to eq('P11Y1MT1H1M1S')
+      expect((ISO8601::Duration.new('P11Y1M1DT1H1M1S') - (2 * minute).to_f).to_s).to eq('P11Y1M1DT59M1S')
     end
   end
 
   describe '#to_seconds' do
     context 'positive durations' do
       it "should return the seconds of a P[n]Y duration in a common year" do
-        expect(ISO8601::Duration.new('P2Y', ISO8601::DateTime.new('2010-01-01')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2010, 1))
+        expect(ISO8601::Duration.new('P2Y').to_seconds(common_year)).to eq(Time.utc(2012, 1) - Time.utc(2010, 1))
       end
+
       it "should return the seconds of a P[n]Y duration in a leap year" do
-        expect(ISO8601::Duration.new('P2Y', ISO8601::DateTime.new('2000-01-01')).to_seconds).to eq(Time.utc(2002, 1) - Time.utc(2000, 1))
+        expect(ISO8601::Duration.new('P2Y').to_seconds(leap_year)).to eq(Time.utc(2002, 1) - Time.utc(2000, 1))
       end
+
       it "should return the seconds of a P[n]Y[n]M duration in a common year" do
-        expect(ISO8601::Duration.new('P2Y3M', ISO8601::DateTime.new('2010-01-01')).to_seconds).to eq(Time.utc(2012, 4) - Time.utc(2010, 1))
+        expect(ISO8601::Duration.new('P2Y3M').to_seconds(common_year)).to eq(Time.utc(2012, 4) - Time.utc(2010, 1))
       end
+
       it "should return the seconds of a P[n]Y[n]M duration in a leap year" do
-        expect(ISO8601::Duration.new('P2Y3M', ISO8601::DateTime.new('2000-01-01')).to_seconds).to eq(Time.utc(2002, 4) - Time.utc(2000, 1))
+        expect(ISO8601::Duration.new('P2Y3M').to_seconds(leap_year)).to eq(Time.utc(2002, 4) - Time.utc(2000, 1))
       end
+
       it "should return the seconds of a P[n]M duration in a common year" do
-        expect(ISO8601::Duration.new('P1M', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2012, 2) - Time.utc(2012, 1))
-        expect(ISO8601::Duration.new('P2M', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2012, 3) - Time.utc(2012, 1))
-        expect(ISO8601::Duration.new('P19M', ISO8601::DateTime.new('2012-05-01')).to_seconds).to eq(Time.utc(2014, 12) - Time.utc(2012, 5))
-        expect(ISO8601::Duration.new('P14M', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2013, 3) - Time.utc(2012, 1))
+        expect(ISO8601::Duration.new('P1M').to_seconds(common_year)).to eq(2678400)
+        expect(ISO8601::Duration.new('P19M').to_seconds(ISO8601::DateTime.new('2012-05-01'))).to eq(Time.utc(2014, 12) - Time.utc(2012, 5))
+        expect(ISO8601::Duration.new('P14M').to_seconds(common_year)).to eq(Time.utc(2011, 3) - Time.utc(2010, 1))
       end
+
       it "should return the seconds of a P[n]M duration in a leap year" do
-        expect(ISO8601::Duration.new('P1M', ISO8601::DateTime.new('2000-01-01')).to_seconds).to eq(Time.utc(2000, 2) - Time.utc(2000, 1))
-        expect(ISO8601::Duration.new('P2M', ISO8601::DateTime.new('2000-01-01')).to_seconds).to eq(Time.utc(2000, 3) - Time.utc(2000, 1))
-        expect(ISO8601::Duration.new('P14M', ISO8601::DateTime.new('2000-01-01')).to_seconds).to eq(Time.utc(2001, 3) - Time.utc(2000, 1))
+        expect(ISO8601::Duration.new('P1M').to_seconds(leap_year)).to eq(Time.utc(2000, 2) - Time.utc(2000, 1))
+        expect(ISO8601::Duration.new('P2M').to_seconds(leap_year)).to eq(Time.utc(2000, 3) - Time.utc(2000, 1))
+        expect(ISO8601::Duration.new('P14M').to_seconds(leap_year)).to eq(Time.utc(2001, 3) - Time.utc(2000, 1))
       end
+
       it "should return the seconds of a P[n]Y[n]M[n]D duration" do
-        expect(ISO8601::Duration.new('P2Y11D', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2014, 1, 12) - Time.utc(2012, 1))
-        expect(ISO8601::Duration.new('P1Y1M1D', ISO8601::DateTime.new('2010-05-01')).to_seconds).to eq(Time.utc(2011, 6, 2) - Time.utc(2010, 5))
+        expect(ISO8601::Duration.new('P2Y11D').to_seconds(common_year)).to eq(Time.utc(2012, 1, 12) - Time.utc(2010, 1))
+        expect(ISO8601::Duration.new('P1Y1M1D').to_seconds(ISO8601::DateTime.new('2010-05-01'))).to eq(Time.utc(2011, 6, 2) - Time.utc(2010, 5))
       end
+
       it "should return the seconds of a P[n]D duration" do
-        expect(ISO8601::Duration.new('P1D', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2012, 1, 2) - Time.utc(2012, 1, 1))
-        expect(ISO8601::Duration.new('P11D', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2012, 1, 12) - Time.utc(2012, 1, 1))
-        expect(ISO8601::Duration.new('P3M11D', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2012, 4, 12) - Time.utc(2012, 1))
+        expect(ISO8601::Duration.new('P1D').to_seconds(common_year)).to eq(Time.utc(2010, 1, 2) - Time.utc(2010, 1, 1))
+        expect(ISO8601::Duration.new('P11D').to_seconds(common_year)).to eq(Time.utc(2010, 1, 12) - Time.utc(2010, 1, 1))
+        expect(ISO8601::Duration.new('P3M11D').to_seconds(common_year)).to eq(Time.utc(2010, 4, 12) - Time.utc(2010, 1))
       end
+
       it "should return the seconds of a P[n]W duration" do
-        expect(ISO8601::Duration.new('P2W', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2012, 1, 15) - Time.utc(2012, 1))
-        expect(ISO8601::Duration.new('P2W', ISO8601::DateTime.new('2012-02-01')).to_seconds).to eq(Time.utc(2012, 2, 15) - Time.utc(2012, 2))
+        expect(ISO8601::Duration.new('P2W').to_seconds).to eq(1209600)
       end
 
       it "should return the seconds of a PT[n]H duration" do
-        expect(ISO8601::Duration.new('PT5H', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2012, 1, 1, 5) - Time.utc(2012, 1))
-        expect(ISO8601::Duration.new('P1YT5H', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2013, 1, 1, 5) - Time.utc(2012, 1))
+        expect(ISO8601::Duration.new('PT5H').to_seconds).to eq(18000)
+        expect(ISO8601::Duration.new('P1YT5H').to_seconds(common_year)).to eq(Time.utc(2011, 1, 1, 5) - Time.utc(2010, 1))
       end
 
       it "should return the seconds of a PT[n]H[n]M duration" do
-        expect(ISO8601::Duration.new('PT5M', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2012, 1, 1, 0, 5) - Time.utc(2012, 1))
-        expect(ISO8601::Duration.new('PT1H5M', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2012, 1, 1, 1, 5) - Time.utc(2012, 1))
-        expect(ISO8601::Duration.new('PT1H5M', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(ISO8601::Duration.new('PT65M', ISO8601::DateTime.new('2012-01-01')).to_seconds)
+        expect(ISO8601::Duration.new('PT5M').to_seconds).to eq(60 * 5)
+        expect(ISO8601::Duration.new('PT1H5M').to_seconds).to eq(3900)
       end
 
       it "should return the seconds of a PT[n]H[n]M duration" do
-        expect(ISO8601::Duration.new('PT10S', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2012, 1, 1, 0, 0, 10) - Time.utc(2012, 1))
-        expect(ISO8601::Duration.new('PT10.4S', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(10.4)
+        expect(ISO8601::Duration.new('PT10S').to_seconds).to eq(10)
+        expect(ISO8601::Duration.new('PT10.4S').to_seconds).to eq(10.4)
       end
     end
 
     context 'negative durations' do
       it "should return the seconds of a -P[n]Y duration" do
-        expect(ISO8601::Duration.new('-P2Y', ISO8601::DateTime.new('2010-01-01')).to_seconds).to eq(Time.utc(2008, 1) - Time.utc(2010, 1))
+        expect(ISO8601::Duration.new('-P2Y').to_seconds(common_year)).to eq(Time.utc(2008, 1) - Time.utc(2010, 1))
       end
+
       it "should return the seconds of a -P[n]Y duration in a leap year" do
-        expect(ISO8601::Duration.new('-P2Y', ISO8601::DateTime.new('2001-01-01')).to_seconds).to eq(Time.utc(1999, 1) - Time.utc(2001, 1))
+        expect(ISO8601::Duration.new('-P2Y').to_seconds(ISO8601::DateTime.new('2001-01-01'))).to eq(Time.utc(1999, 1) - Time.utc(2001, 1))
       end
+
       it "should return the seconds of a -P[n]Y[n]M duration in a common year" do
-        expect(ISO8601::Duration.new('-P2Y3M', ISO8601::DateTime.new('2010-01-01')).to_seconds).to eq(Time.utc(2007, 10) - Time.utc(2010, 1))
+        expect(ISO8601::Duration.new('-P2Y3M').to_seconds(ISO8601::DateTime.new('2010-01-01'))).to eq(Time.utc(2007, 10) - Time.utc(2010, 1))
       end
+
       it "should return the seconds of a -P[n]Y[n]M duration in a leap year" do
-        expect(ISO8601::Duration.new('-P2Y3M', ISO8601::DateTime.new('2001-01-01')).to_seconds).to eq(Time.utc(1998, 10) - Time.utc(2001, 1))
+        expect(ISO8601::Duration.new('-P2Y3M').to_seconds(ISO8601::DateTime.new('2001-01-01'))).to eq(Time.utc(1998, 10) - Time.utc(2001, 1))
       end
+
       it "should return the seconds of a -P[n]M duration in a common year" do
-        expect(ISO8601::Duration.new('-P1M', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(Time.utc(2011, 12) - Time.utc(2012, 1))
-        expect(ISO8601::Duration.new('-P1M', ISO8601::DateTime.new('2012-02-01')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2012, 2))
-        expect(ISO8601::Duration.new('-P2M', ISO8601::DateTime.new('2012-03-01')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2012, 3))
-        expect(ISO8601::Duration.new('-P36M', ISO8601::DateTime.new('2013-03-01')).to_seconds).to eq(Time.utc(2010, 3) - Time.utc(2013, 3))
-        expect(ISO8601::Duration.new('-P39M', ISO8601::DateTime.new('2013-03-01')).to_seconds).to eq(Time.utc(2009, 12) - Time.utc(2013, 3))
-        expect(ISO8601::Duration.new('-P156M', ISO8601::DateTime.new('2013-03-01')).to_seconds).to eq(Time.utc(2000, 3) - Time.utc(2013, 3))
+        expect(ISO8601::Duration.new('-P1M').to_seconds(ISO8601::DateTime.new('2012-01-01'))).to eq(Time.utc(2011, 12) - Time.utc(2012, 1))
+        expect(ISO8601::Duration.new('-P1M').to_seconds(ISO8601::DateTime.new('2012-02-01'))).to eq(Time.utc(2012, 1) - Time.utc(2012, 2))
+        expect(ISO8601::Duration.new('-P2M').to_seconds(ISO8601::DateTime.new('2012-03-01'))).to eq(Time.utc(2012, 1) - Time.utc(2012, 3))
+        expect(ISO8601::Duration.new('-P36M').to_seconds(ISO8601::DateTime.new('2013-03-01'))).to eq(Time.utc(2010, 3) - Time.utc(2013, 3))
+        expect(ISO8601::Duration.new('-P39M').to_seconds(ISO8601::DateTime.new('2013-03-01'))).to eq(Time.utc(2009, 12) - Time.utc(2013, 3))
+        expect(ISO8601::Duration.new('-P156M').to_seconds(ISO8601::DateTime.new('2013-03-01'))).to eq(Time.utc(2000, 3) - Time.utc(2013, 3))
       end
+
       it "should return the seconds of a -P[n]M duration in a leap year" do
-        expect(ISO8601::Duration.new('-P1M', ISO8601::DateTime.new('2000-02-01')).to_seconds).to eq(Time.utc(2000, 1) - Time.utc(2000, 2))
-        expect(ISO8601::Duration.new('-P2M', ISO8601::DateTime.new('2000-03-01')).to_seconds).to eq(Time.utc(2000, 1) - Time.utc(2000, 3))
-        expect(ISO8601::Duration.new('-P14M', ISO8601::DateTime.new('2001-03-01')).to_seconds).to eq(Time.utc(2000, 1) - Time.utc(2001, 3))
+        expect(ISO8601::Duration.new('-P1M').to_seconds(ISO8601::DateTime.new('2000-02-01'))).to eq(Time.utc(2000, 1) - Time.utc(2000, 2))
+        expect(ISO8601::Duration.new('-P2M').to_seconds(ISO8601::DateTime.new('2000-03-01'))).to eq(Time.utc(2000, 1) - Time.utc(2000, 3))
+        expect(ISO8601::Duration.new('-P14M').to_seconds(ISO8601::DateTime.new('2001-03-01'))).to eq(Time.utc(2000, 1) - Time.utc(2001, 3))
       end
+
       it "should return the seconds of a -P[n]Y[n]M[n]D duration" do
-        expect(ISO8601::Duration.new('-P2Y11D', ISO8601::DateTime.new('2014-01-12')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2014, 1, 12))
-        expect(ISO8601::Duration.new('-P1Y1M1D', ISO8601::DateTime.new('2010-05-01')).to_seconds).to eq(Time.utc(2009, 3, 31) - Time.utc(2010, 5))
+        expect(ISO8601::Duration.new('-P2Y11D').to_seconds(ISO8601::DateTime.new('2014-01-12'))).to eq(Time.utc(2012, 1) - Time.utc(2014, 1, 12))
+        expect(ISO8601::Duration.new('-P1Y1M1D').to_seconds(ISO8601::DateTime.new('2010-05-01'))).to eq(Time.utc(2009, 3, 31) - Time.utc(2010, 5))
       end
+
       it "should return the seconds of a -P[n]D duration" do
-        expect(ISO8601::Duration.new('-P1D', ISO8601::DateTime.new('2012-01-02')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2012, 1, 2))
-        expect(ISO8601::Duration.new('-P11D', ISO8601::DateTime.new('2012-01-12')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2012, 1, 12))
-        expect(ISO8601::Duration.new('-P3M11D', ISO8601::DateTime.new('2012-04-12')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2012, 4, 12))
+        expect(ISO8601::Duration.new('-P1D').to_seconds(ISO8601::DateTime.new('2012-01-02'))).to eq(Time.utc(2012, 1) - Time.utc(2012, 1, 2))
+        expect(ISO8601::Duration.new('-P11D').to_seconds(ISO8601::DateTime.new('2012-01-12'))).to eq(Time.utc(2012, 1) - Time.utc(2012, 1, 12))
+        expect(ISO8601::Duration.new('-P3M11D').to_seconds(ISO8601::DateTime.new('2012-04-12'))).to eq(Time.utc(2012, 1) - Time.utc(2012, 4, 12))
       end
+
       it "should return the seconds of a -P[n]W duration" do
-        expect(ISO8601::Duration.new('-P2W', ISO8601::DateTime.new('2012-01-15')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2012, 1, 15))
-        expect(ISO8601::Duration.new('-P2W', ISO8601::DateTime.new('2012-02-01')).to_seconds).to eq(Time.utc(2012, 2) - Time.utc(2012, 2, 15))
+        expect(ISO8601::Duration.new('-P2W').to_seconds).to eq(-1209600)
       end
 
       it "should return the seconds of a -PT[n]H duration" do
-        expect(ISO8601::Duration.new('-PT5H', ISO8601::DateTime.new('2012-01-01T05')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2012, 1, 1, 5))
-        expect(ISO8601::Duration.new('-P1YT5H', ISO8601::DateTime.new('2013-01-01T05')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2013, 1, 1, 5))
+        expect(ISO8601::Duration.new('-PT5H').to_seconds(ISO8601::DateTime.new('2012-01-01T05'))).to eq(Time.utc(2012, 1) - Time.utc(2012, 1, 1, 5))
+        expect(ISO8601::Duration.new('-P1YT5H').to_seconds(ISO8601::DateTime.new('2013-01-01T05'))).to eq(Time.utc(2012, 1) - Time.utc(2013, 1, 1, 5))
       end
 
       it "should return the seconds of a -PT[n]H[n]M duration" do
-        expect(ISO8601::Duration.new('-PT5M', ISO8601::DateTime.new('2012-01-01T00:05')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2012, 1, 1, 0, 5))
-        expect(ISO8601::Duration.new('-PT1H5M', ISO8601::DateTime.new('2012-01-01T01:05')).to_seconds).to eq(Time.utc(2012, 1) - Time.utc(2012, 1, 1, 1, 5))
-        expect(ISO8601::Duration.new('-PT1H5M', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(ISO8601::Duration.new('-PT65M', ISO8601::DateTime.new('2012-01-01')).to_seconds)
+        expect(ISO8601::Duration.new('-PT5M').to_seconds(ISO8601::DateTime.new('2012-01-01T00:05'))).to eq(Time.utc(2012, 1) - Time.utc(2012, 1, 1, 0, 5))
+        expect(ISO8601::Duration.new('-PT1H5M').to_seconds(ISO8601::DateTime.new('2012-01-01T01:05'))).to eq(Time.utc(2012, 1) - Time.utc(2012, 1, 1, 1, 5))
+        expect(ISO8601::Duration.new('-PT1H5M').to_seconds(common_year)).to eq(ISO8601::Duration.new('-PT65M').to_seconds(common_year))
       end
 
       it "should return the seconds of a -PT[n]H[n]M duration" do
-        expect(ISO8601::Duration.new('-PT10S', ISO8601::DateTime.new('2012-01-01T00:00:00')).to_seconds).to eq(Time.utc(2011, 12, 31, 23, 59, 50) - Time.utc(2012, 1))
-        expect(ISO8601::Duration.new('-PT10.4S', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(-10.4)
-        expect(ISO8601::Duration.new('-PT10,4S', ISO8601::DateTime.new('2012-01-01')).to_seconds).to eq(-10.4)
+        expect(ISO8601::Duration.new('-PT10S').to_seconds(ISO8601::DateTime.new('2012-01-01T00:00:00'))).to eq(Time.utc(2011, 12, 31, 23, 59, 50) - Time.utc(2012, 1))
+        expect(ISO8601::Duration.new('-PT10.4S').to_seconds).to eq(-10.4)
+        expect(ISO8601::Duration.new('-PT10,4S').to_seconds).to eq(-10.4)
       end
     end
   end
@@ -240,6 +241,7 @@ RSpec.describe ISO8601::Duration do
     it "should return a kind of duration" do
       expect(negative.abs).to be_instance_of(ISO8601::Duration)
     end
+
     it "should return the absolute value of the duration" do
       expect(negative.abs).to eq(positive)
     end
@@ -250,6 +252,12 @@ RSpec.describe ISO8601::Duration do
       expect(ISO8601::Duration.new('PT1H') == ISO8601::Duration.new('PT1H')).to be_truthy
       expect(ISO8601::Duration.new('PT1H') == ISO8601::Duration.new('PT60M')).to be_truthy
     end
+
+    it "should equal by a Numeric value" do
+      hour = 60 * 60
+      expect(ISO8601::Duration.new('PT1H') == hour).to be_truthy
+      expect(ISO8601::Duration.new('PT2H') == hour).to be_falsy
+    end
   end
 
   describe '#eql?' do
@@ -257,24 +265,20 @@ RSpec.describe ISO8601::Duration do
       subject = ISO8601::Duration.new('PT1H')
       expect(subject).to respond_to(:eql?)
     end
+
     it "should equal by hash identity" do
       expect(ISO8601::Duration.new('PT1H').eql? ISO8601::Duration.new('PT1H')).to be_truthy
       expect(ISO8601::Duration.new('PT1H').eql? ISO8601::Duration.new('PT60M')).to be_falsy
     end
-
   end
 
   describe '#hash' do
     it "should respond to #hash" do
-      subject = ISO8601::Duration.new('PT1H')
-
-      expect(subject).to respond_to(:hash)
+      expect(ISO8601::Duration.new('PT1H')).to respond_to(:hash)
     end
-    it "should build hash identity by value" do
-      subject = ISO8601::Duration.new('PT1H')
-      contrast = ISO8601::Duration.new('PT1H')
 
-      expect(subject.hash == contrast.hash).to be_truthy
+    it "should build hash identity by value" do
+      expect(ISO8601::Duration.new('PT1H').hash).to eq(ISO8601::Duration.new('PT1H').hash)
     end
   end
 end