iso8601 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3c7b4ba1e602e306fa8bc033780f6a4f239aa2d592b4721f78e17dfc20bf61bc
-  data.tar.gz: e7eeec472d8ed97d6ca44790b633c5ce881c26ae7363db7d6f786b7c8032b6e1
+SHA1:
+  metadata.gz: 2b989c9cbc0ed939c15af4a776a7bc721069a8c0
+  data.tar.gz: b97d26d50d48493cb55c972acdefa9e7d851a4e4
 SHA512:
-  metadata.gz: 6a2c878595f95c960deb2c70ea2a27adf74930545518147d3d0364ef23874a4efb54c5b6f640ef4df463994eed013afb78b3d7002b7796ef588873f966907cb6
-  data.tar.gz: ea64e2bb8a9bebb77f8ad5d4611db9c72904e815abfd8047843b0dee1c5f4c6b9e95d081c23738f4098c80229774f707c598e61437e698c8f5b93f5d1448c9d1
+  metadata.gz: '08f5b58f3345538a7b8ea1c871ded069fadc994098c0beaaeb43d0980ae3e2d68e0a094ab5d6b61c0b0935ce3ca597e713229622eec0b712bd0d5fdf73c145aa'
+  data.tar.gz: aabdc3c3a408a8f324fb1163b2199b0f7bbe73211b33bbb47a73f494f1bebfd1358067af0661ec555e601377244b47bf63610326ada0c9483caf5b5cb2f70275

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.10.1
+
+* Fix `TimeInterval` size for non UTC timezones. (#41)
+
 ## 0.10.0
 
 * Fix `TimeInterval` with `<duration>/<end>` patterns and leap years.

data/README.md

@@ -1,4 +1,4 @@
-u ISO8601
+# ISO8601
 
 Version 0.9.0 is **not compatible** with previous versions.  Atoms and Durations
 changed their interface when treating base dates so it is only applied when

data/lib/iso8601/months.rb

@@ -60,6 +60,7 @@ module ISO8601
 
     private
 
+    # rubocop:disable Metrics/AbcSize
     def calculation(atom, base)
       initial = base.month + atom
       if initial <= 0

data/lib/iso8601/version.rb

@@ -1,5 +1,5 @@
 module ISO8601
   ##
   # The gem version
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.10.1'.freeze
 end

data/lib/iso8601/years.rb

@@ -51,10 +51,11 @@ module ISO8601
     #   the year length.
     #
     # @return [Numeric]
+    # rubocop:disable Metrics/AbcSize
     def to_seconds(base = nil)
       valid_base?(base)
       return factor(base) * atom if base.nil?
-      target = ::Time.utc(base.year + atom.to_i, base.month, base.day, base.hour, base.minute, base.second)
+      target = ::Time.new(base.year + atom.to_i, base.month, base.day, base.hour, base.minute, base.second, base.zone)
 
       target - base.to_time
     end

data/spec/iso8601/months_spec.rb

@@ -10,7 +10,6 @@ RSpec.describe ISO8601::Months do
   let(:common_december) { ISO8601::DateTime.new('2017-12-01') }
   let(:leap_december) { ISO8601::DateTime.new('2000-12-01') }
 
-
   describe 'Atomic' do
     let(:subject) { ISO8601::Months.new(1) }
 

data/spec/iso8601/time_interval_spec.rb

@@ -128,17 +128,32 @@ RSpec.describe ISO8601::TimeInterval do
   end
 
   describe "#to_f" do
-    it "should calculate the size of time interval" do
+    it "should calculate the size of time interval <start>/<end>" do
       hour = (60 * 60).to_f
-      pattern = 'PT1H/2010-05-09T10:30:00Z'
-      pattern2 = '2010-05-09T11:30:00Z/PT1H'
-      pattern3 = '2010-05-09T11:30:00Z/2010-05-09T12:30:00Z'
+      pattern1 = '2010-05-09T11:30:00Z/2010-05-09T12:30:00Z'
+      pattern2 = '2010-05-09T11:30:00+01:00/2010-05-09T12:30:00+01:00'
+
+      expect(ISO8601::TimeInterval.parse(pattern1).to_f).to eq(hour)
+      expect(ISO8601::TimeInterval.parse(pattern2).to_f).to eq(hour)
+    end
+
+    it "should calculate the size of time interval <start>/<duration>" do
+      hour = (60 * 60).to_f
+      pattern1 = '2010-05-09T11:30:00Z/PT1H'
+      pattern2 = '2010-05-09T11:30:00+01:00/PT1H'
 
-      expect(ISO8601::TimeInterval.parse(pattern).to_f).to eq(hour)
+      expect(ISO8601::TimeInterval.parse(pattern1).to_f).to eq(hour)
       expect(ISO8601::TimeInterval.parse(pattern2).to_f).to eq(hour)
-      expect(ISO8601::TimeInterval.parse(pattern3).to_f).to eq(hour)
     end
 
+    it "should calculate the size of time interval <duration>/<end>" do
+      hour = (60 * 60).to_f
+      pattern1 = 'PT1H/2010-05-09T11:30:00Z'
+      pattern2 = 'PT1H/2010-05-09T11:30:00-09:00'
+
+      expect(ISO8601::TimeInterval.parse(pattern1).to_f).to eq(hour)
+      expect(ISO8601::TimeInterval.parse(pattern2).to_f).to eq(hour)
+    end
     it "should be 0" do
       expect(ISO8601::TimeInterval.parse('2015-01-01/2015-01-01').to_f).to eq(0)
     end
@@ -175,14 +190,14 @@ RSpec.describe ISO8601::TimeInterval do
 
     describe "November" do
       pairs = [
-        {pattern: 'P1Y/2017-11-09T07:00:00Z',
-         start_time: ISO8601::DateTime.new('2016-11-09T07:00:00Z')},
-        {pattern: 'P1M/2017-11-09T07:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-10-09T07:00:00Z')},
-        {pattern: 'P1D/2017-11-09T07:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-11-08T07:00:00Z')},
-        {pattern: 'PT1H/2017-11-09T07:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-11-09T06:00:00Z')},
+        { pattern: 'P1Y/2017-11-09T07:00:00Z',
+          start_time: ISO8601::DateTime.new('2016-11-09T07:00:00Z') },
+        { pattern: 'P1M/2017-11-09T07:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-10-09T07:00:00Z') },
+        { pattern: 'P1D/2017-11-09T07:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-11-08T07:00:00Z') },
+        { pattern: 'PT1H/2017-11-09T07:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-11-09T06:00:00Z') }
       ]
 
       pairs.each do |pair|
@@ -194,16 +209,16 @@ RSpec.describe ISO8601::TimeInterval do
 
     describe "December" do
       pairs = [
-        {pattern: 'P1Y/2017-12-09T07:00:00Z',
-         start_time: ISO8601::DateTime.new('2016-12-09T07:00:00Z')},
-        {pattern: 'P1M/2017-12-09T07:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-11-09T07:00:00Z')},
-        {pattern: 'P3D/2017-12-06T18:30:00Z',
-         start_time: ISO8601::DateTime.new('2017-12-03T18:30:00Z')},
-        {pattern: 'P1D/2017-12-09T07:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-12-08T07:00:00Z')},
-        {pattern: 'PT1H/2017-12-09T07:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-12-09T06:00:00Z')},
+        { pattern: 'P1Y/2017-12-09T07:00:00Z',
+          start_time: ISO8601::DateTime.new('2016-12-09T07:00:00Z') },
+        { pattern: 'P1M/2017-12-09T07:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-11-09T07:00:00Z') },
+        { pattern: 'P3D/2017-12-06T18:30:00Z',
+          start_time: ISO8601::DateTime.new('2017-12-03T18:30:00Z') },
+        { pattern: 'P1D/2017-12-09T07:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-12-08T07:00:00Z') },
+        { pattern: 'PT1H/2017-12-09T07:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-12-09T06:00:00Z') }
       ]
 
       pairs.each do |pair|
@@ -215,14 +230,14 @@ RSpec.describe ISO8601::TimeInterval do
 
     describe "January" do
       pairs = [
-        {pattern: 'P1Y/2017-01-01T00:00:00Z',
-         start_time: ISO8601::DateTime.new('2016-01-01T00:00:00Z')},
-        {pattern: 'P1M/2017-01-01T00:00:00Z',
-         start_time: ISO8601::DateTime.new('2016-12-01T00:00:00Z')},
-        {pattern: 'P1D/2017-01-01T00:00:00Z',
-         start_time: ISO8601::DateTime.new('2016-12-31T00:00:00Z')},
-        {pattern: 'PT1H/2017-01-01T01:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-01-01T00:00:00Z')},
+        { pattern: 'P1Y/2017-01-01T00:00:00Z',
+          start_time: ISO8601::DateTime.new('2016-01-01T00:00:00Z') },
+        { pattern: 'P1M/2017-01-01T00:00:00Z',
+          start_time: ISO8601::DateTime.new('2016-12-01T00:00:00Z') },
+        { pattern: 'P1D/2017-01-01T00:00:00Z',
+          start_time: ISO8601::DateTime.new('2016-12-31T00:00:00Z') },
+        { pattern: 'PT1H/2017-01-01T01:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-01-01T00:00:00Z') }
       ]
 
       pairs.each do |pair|
@@ -234,14 +249,14 @@ RSpec.describe ISO8601::TimeInterval do
 
     describe "February" do
       pairs = [
-        {pattern: 'P1Y/2017-02-01T00:00:00Z',
-         start_time: ISO8601::DateTime.new('2016-02-01T00:00:00Z')},
-        {pattern: 'P1M/2017-02-01T00:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-01-01T00:00:00Z')},
-        {pattern: 'P1D/2017-02-01T00:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-01-31T00:00:00Z')},
-        {pattern: 'PT1H/2017-02-01T01:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-02-01T00:00:00Z')},
+        { pattern: 'P1Y/2017-02-01T00:00:00Z',
+          start_time: ISO8601::DateTime.new('2016-02-01T00:00:00Z') },
+        { pattern: 'P1M/2017-02-01T00:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-01-01T00:00:00Z') },
+        { pattern: 'P1D/2017-02-01T00:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-01-31T00:00:00Z') },
+        { pattern: 'PT1H/2017-02-01T01:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-02-01T00:00:00Z') }
       ]
 
       pairs.each do |pair|
@@ -253,14 +268,14 @@ RSpec.describe ISO8601::TimeInterval do
 
     describe "March" do
       pairs = [
-        {pattern: 'P1Y/2017-03-01T00:00:00Z',
-         start_time: ISO8601::DateTime.new('2016-03-01T00:00:00Z')},
-        {pattern: 'P1M/2017-03-01T00:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-02-01T00:00:00Z')},
-        {pattern: 'P1D/2017-03-01T00:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-02-28T00:00:00Z')},
-        {pattern: 'PT1H/2017-03-01T01:00:00Z',
-         start_time: ISO8601::DateTime.new('2017-03-01T00:00:00Z')},
+        { pattern: 'P1Y/2017-03-01T00:00:00Z',
+          start_time: ISO8601::DateTime.new('2016-03-01T00:00:00Z') },
+        { pattern: 'P1M/2017-03-01T00:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-02-01T00:00:00Z') },
+        { pattern: 'P1D/2017-03-01T00:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-02-28T00:00:00Z') },
+        { pattern: 'PT1H/2017-03-01T01:00:00Z',
+          start_time: ISO8601::DateTime.new('2017-03-01T00:00:00Z') }
       ]
 
       pairs.each do |pair|
@@ -269,10 +284,6 @@ RSpec.describe ISO8601::TimeInterval do
         end
       end
     end
-
-
-
-
   end
 
   describe "#last" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso8601
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Arnau Siches
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-09 00:00:00.000000000 Z
+date: 2017-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: iso8601
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby parser to work with ISO 8601 dateTimes and durations - http://en.wikipedia.org/wiki/ISO_8601