timezone 1.2.12 → 1.3.0

data/lib/timezone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Timezone
-  VERSION = '1.2.12'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/lib/timezone/zone.rb

@@ -61,7 +61,7 @@ module Timezone
     def utc_to_local(time)
       time = sanitize(time)
 
-      time.utc + utc_offset(time)
+      (time + utc_offset(time)).utc
     end
 
     alias time utc_to_local
@@ -109,7 +109,7 @@ module Timezone
     def local_to_utc(time)
       time = sanitize(time)
 
-      time.utc - rule_for_local(time).rules.first[OFFSET_BIT]
+      (time - rule_for_local(time).rules.first[OFFSET_BIT]).utc
     end
 
     # Converts the given time to the local timezone and includes the UTC
@@ -199,7 +199,6 @@ module Timezone
     private_constant :RuleSet
 
     def rule_for_local(local)
-      local = local.utc if local.respond_to?(:utc)
       local = local.to_i
 
       # For each rule, convert the local time into the UTC equivalent for
@@ -245,7 +244,6 @@ module Timezone
     end
 
     def rule_for_utc(time)
-      time = time.utc if time.respond_to?(:utc)
       time = time.to_i
 
       private_rules[binary_search(time) { |t, r| match?(t, r) }]

data/test/timezone/lookup/test_test.rb

@@ -18,6 +18,18 @@ class TestTest < ::Minitest::Test
     assert_equal 'America/Los_Angeles', mine.lookup(-10, 10)
   end
 
+  def test_simple_unstub
+    mine = lookup
+    mine.stub(-10, 10, nil)
+
+    assert_nil mine.lookup(-10, 10)
+
+    mine.unstub(-10, 10)
+    assert_raises(::Timezone::Error::Test) do
+      mine.lookup(-10, 10)
+    end
+  end
+
   def test_missing_stub
     assert_raises(::Timezone::Error::Test) do
       lookup.lookup(100, 100)

data/test/timezone/test_loader.rb

@@ -9,7 +9,7 @@ module Timezone
 
     def test_load
       assert_equal(
-        [[1_483_228_800, 'GMT', false, 0]],
+        [[0, 'GMT', false, 0]],
         Loader.load('GMT')
       )
 

data/test/timezone/test_zone.rb

@@ -12,11 +12,11 @@ class TestZone < ::Minitest::Test
   end
 
   def utc_offset(name, year, month, day)
-    zone(name).utc_offset(Time.new(year, month, day))
+    zone(name).utc_offset(Time.new(year, month, day).freeze)
   end
 
   def dst?(name, year, month, day)
-    zone(name).dst?(Time.new(year, month, day))
+    zone(name).dst?(Time.new(year, month, day).freeze)
   end
 
   def la
@@ -33,8 +33,8 @@ class TestZone < ::Minitest::Test
   end
 
   def test_abbr
-    assert_equal 'PDT', la.abbr(Time.new(2011, 6, 5))
-    assert_equal 'PST', la.abbr(Time.new(2011, 11, 20))
+    assert_equal 'PDT', la.abbr(Time.new(2011, 6, 5).freeze)
+    assert_equal 'PST', la.abbr(Time.new(2011, 11, 20).freeze)
   end
 
   def test_valid?
@@ -94,7 +94,8 @@ class TestZone < ::Minitest::Test
   end
 
   def test_gmt_timezone
-    assert_equal Time.now.utc.to_i, zone('GMT').utc_to_local(Time.now).to_i
+    t = Time.now.freeze
+    assert_equal t.dup.utc.to_i, zone('GMT').utc_to_local(t).to_i
   end
 
   def test_historical_time
@@ -187,23 +188,23 @@ class TestZone < ::Minitest::Test
     timezone = zone('America/Los_Angeles')
 
     # Time maps to two rules - we pick the first
-    local = Time.utc(2015, 11, 1, 1, 50, 0)
-    utc = Time.utc(2015, 11, 1, 8, 50, 0)
+    local = Time.utc(2015, 11, 1, 1, 50, 0).freeze
+    utc = Time.utc(2015, 11, 1, 8, 50, 0).freeze
     assert_equal(utc.to_s, timezone.local_to_utc(local).to_s)
 
     # Time is above the maximum - we pick the last rule
-    local = Time.utc(3000, 1, 1, 0, 0, 0)
-    utc = Time.utc(3000, 1, 1, 8, 0, 0)
+    local = Time.utc(3000, 1, 1, 0, 0, 0).freeze
+    utc = Time.utc(3000, 1, 1, 8, 0, 0).freeze
     assert_equal(utc.to_s, timezone.local_to_utc(local).to_s)
 
     # Time maps to a single rule - we pick that rule
-    local = Time.utc(2015, 11, 1, 0, 1, 0)
-    utc = Time.utc(2015, 11, 1, 7, 1, 0)
+    local = Time.utc(2015, 11, 1, 0, 1, 0).freeze
+    utc = Time.utc(2015, 11, 1, 7, 1, 0).freeze
     assert_equal(utc.to_s, timezone.local_to_utc(local).to_s)
 
     # Time is missing - we pick the first closest rule
-    local = Time.utc(2015, 3, 8, 2, 50, 0)
-    utc = Time.utc(2015, 3, 8, 9, 50, 0)
+    local = Time.utc(2015, 3, 8, 2, 50, 0).freeze
+    utc = Time.utc(2015, 3, 8, 9, 50, 0).freeze
     assert_equal(utc.to_s, timezone.local_to_utc(local).to_s)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timezone
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.3.0
 platform: ruby
 authors:
 - Pan Thomakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -462,7 +462,6 @@ files:
 - data/CST6CDT
 - data/Canada/Atlantic
 - data/Canada/Central
-- data/Canada/East-Saskatchewan
 - data/Canada/Eastern
 - data/Canada/Mountain
 - data/Canada/Newfoundland
@@ -745,10 +744,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: timezone
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: timezone-1.2.12
+summary: timezone-1.3.0
 test_files:
 - test/data/Helsinki_rules_without_timestamps.json
 - test/data/asia
@@ -777,3 +776,4 @@ test_files:
 - test/timezone/test_mathn_compatibility.rb
 - test/timezone/test_nil_zone.rb
 - test/timezone/test_zone.rb
+has_rdoc: 

data/data/Canada/East-Saskatchewan

@@ -1,54 +0,0 @@
--2030202085:LMT:0:-25116
-398138484:MST:0:-25200
-16930800:MDT:1:-21600
-363481200:MST:0:-25200
-13302000:MDT:1:-21600
-18147600:MST:0:-25200
-13302000:MDT:1:-21600
-18147600:MST:0:-25200
-13302000:MDT:1:-21600
-18752400:MST:0:-25200
-12697200:MDT:1:-21600
-18752400:MST:0:-25200
-13302000:MDT:1:-21600
-79232400:MST:0:-25200
-15721200:MDT:1:-21600
-15728400:MST:0:-25200
-15116400:MDT:1:-21600
-16333200:MST:0:-25200
-15721200:MDT:1:-21600
-16333200:MST:0:-25200
-15721200:MDT:1:-21600
-15728400:MST:0:-25200
-15721200:MDT:1:-21600
-10378800:MST:0:-25200
-110815200:MWT:1:-21600
-4006800:MPT:1:-21600
-16938000:MST:0:-25200
-15721200:MDT:1:-21600
-16938000:MST:0:-25200
-13302000:MDT:1:-21600
-18147600:MST:0:-25200
-13302000:MDT:1:-21600
-18147600:MST:0:-25200
-13302000:MDT:1:-21600
-18752400:MST:0:-25200
-12697200:MDT:1:-21600
-18752400:MST:0:-25200
-13302000:MDT:1:-21600
-18147600:MST:0:-25200
-13302000:MDT:1:-21600
-18147600:MST:0:-25200
-13302000:MDT:1:-21600
-18147600:MST:0:-25200
-13302000:MDT:1:-21600
-18147600:MST:0:-25200
-13302000:MDT:1:-21600
-18752400:MST:0:-25200
-13302000:MDT:1:-21600
-18147600:MST:0:-25200
-13302000:MDT:1:-21600
-49597200:MST:0:-25200
-15721200:MDT:1:-21600
-15728400:MST:0:-25200
-1788966001:CST:0:-21600