timezone 0.99.2 → 1.0.0

data/test/timezone/lookup/test_geonames.rb

@@ -35,13 +35,42 @@ class TestGeonames < ::Minitest::Test
     assert_equal 'Australia/Adelaide', mine.lookup(*coordinates)
   end
 
+  def assert_exception(lookup, message)
+    exception = false
+
+    begin
+      lookup.lookup(*coordinates)
+    rescue Timezone::Error::GeoNames => e
+      exception = true
+      assert_equal message, e.message
+    end
+
+    assert(exception)
+  end
+
   def test_api_limit
     mine = lookup
-    mine.client.body = File.open(mock_path + '/api_limit_reached.txt').read
+    mine.client.body = File.open(mock_path + '/api_limit_reached.json').read
 
-    assert_raises Timezone::Error::GeoNames, 'api limit reached' do
-      mine.lookup(*coordinates)
-    end
+    assert_exception(
+      mine,
+      'the daily limit of 30000 credits for XXXXX has been exceeded. ' \
+        'Please throttle your requests or use the commercial service.'
+    )
+  end
+
+  def test_invalid_latlong
+    mine = lookup
+    mine.client.body = File.open(mock_path + '/invalid_latlong.json').read
+
+    assert_exception(mine, 'invalid lat/lng')
+  end
+
+  def test_invalid_parameter
+    mine = lookup
+    mine.client.body = File.open(mock_path + '/invalid_parameter.json').read
+
+    assert_exception(mine, 'error parsing parameter')
   end
 
   private

data/test/timezone/test_zone.rb

@@ -1,15 +1,28 @@
+require 'timecop'
 require 'timezone/zone'
 require 'minitest/autorun'
 
 class TestZone < ::Minitest::Test
   parallelize_me!
 
+  def zone(name)
+    Timezone::Zone.new(name)
+  end
+
+  def utc_offset(name, year, month, day)
+    zone(name).utc_offset(Time.new(year, month, day))
+  end
+
+  def dst?(name, year, month, day)
+    zone(name).dst?(Time.new(year, month, day))
+  end
+
   def la
-    @la ||= Timezone::Zone.new('America/Los_Angeles')
+    @la ||= zone('America/Los_Angeles')
   end
 
   def paris
-    @paris ||= Timezone::Zone.new('Europe/Paris')
+    @paris ||= zone('Europe/Paris')
   end
 
   def test_name
@@ -42,8 +55,203 @@ class TestZone < ::Minitest::Test
   def test_comparable
     assert paris > la
     assert la < paris
-    assert la == Timezone::Zone.new('America/Los_Angeles')
+    assert la == zone('America/Los_Angeles')
 
     assert_equal nil, paris <=> 8
   end
+
+  def test_est5edt_dst_now
+    Timecop.freeze(Time.new(2012, 2, 2, 0, 0, 0)) do
+      refute zone('EST5EDT').dst?(Time.now)
+    end
+    Timecop.freeze(Time.new(2013, 6, 6, 0, 0, 0)) do
+      assert zone('EST5EDT').dst?(Time.now)
+    end
+  end
+
+  def test_utc_offsets
+    assert_equal(36_000, utc_offset('Australia/Sydney', 2011, 06, 05))
+    assert_equal(-25_200, utc_offset('America/Los_Angeles', 2011, 06, 05))
+    assert_equal(20_700, utc_offset('Asia/Kathmandu', 2011, 06, 05))
+    assert_equal(-18_000, utc_offset('America/New_York', 2011, 01, 11))
+    assert_equal(-14_400, utc_offset('America/New_York', 2011, 06, 11))
+  end
+
+  def test_dst
+    refute dst?('Australia/Sydney', 2011, 06, 05)
+    assert dst?('America/Los_Angeles', 2011, 06, 05)
+    refute dst?('Asia/Kathmandu', 2011, 06, 05)
+
+    refute dst?('America/New_York', 2011, 01, 11)
+    assert dst?('America/New_York', 2011, 06, 11)
+  end
+
+  def test_gmt_timezone
+    assert_equal Time.now.utc.to_i, zone('GMT').utc_to_local(Time.now).to_i
+  end
+
+  def test_historical_time
+    timezone = zone('America/Los_Angeles')
+    local = Time.strptime('2011-02-11T13:20:00Z', '%Y-%m-%dT%H:%M:%SZ')
+    utc = Time.strptime('2011-02-11T21:20:00Z', '%Y-%m-%dT%H:%M:%SZ')
+
+    assert_equal local.to_i, timezone.utc_to_local(utc).to_i
+  end
+
+  # http://www.timeanddate.com/worldclock/clockchange.html?n=137&year=2011
+  def test_historical_time_change_in_la_forward
+    local = Time.strptime('2011-03-13T01:59:59 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    utc = Time.strptime('2011-03-13T09:59:59 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    assert_equal local.to_i, zone('America/Los_Angeles').utc_to_local(utc).to_i
+
+    local = Time.strptime('2011-03-13T03:00:00 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    utc = Time.strptime('2011-03-13T10:00:00 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    assert_equal local.to_i, zone('America/Los_Angeles').time(utc).to_i
+  end
+
+  # http://www.timeanddate.com/worldclock/clockchange.html?n=137&year=2011
+  def test_historical_time_change_in_la_backward
+    local = Time.strptime('2011-11-06T01:59:59 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    utc = Time.strptime('2011-11-06T08:59:59 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    assert_equal local.to_i, zone('America/Los_Angeles').time(utc).to_i
+
+    local = Time.strptime('2011-11-06T01:00:00 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    utc = Time.strptime('2011-11-06T09:00:00 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    assert_equal local.to_i, zone('America/Los_Angeles').time(utc).to_i
+  end
+
+  # http://www.timeanddate.com/worldclock/clockchange.html?n=2364&year=1940
+  def test_historical_time_change_in_hebron
+    local = Time.strptime('1940-05-31T23:59:59 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    utc = Time.strptime('1940-05-31T21:59:59 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    assert_equal local.to_i, zone('Asia/Hebron').time(utc).to_i
+
+    local = Time.strptime('1940-06-01T01:00:00 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    utc = Time.strptime('1940-05-31T22:00:00 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    assert_equal local.to_i, zone('Asia/Hebron').time(utc).to_i
+  end
+
+  def test_half_hour_timezone
+    utc = Time.utc(2011, 1, 4, 3, 51, 29)
+    local = Time.utc(2011, 1, 4, 9, 36, 29)
+    assert_equal local.to_i, zone('Asia/Kathmandu').time(utc).to_i
+  end
+
+  # Testing is done with strings since two times can be equivalent even if
+  # their offsets do not match, and we want to test that the time and offsets
+  # are equivalent.
+  def test_time_with_offset
+    utc = Time.utc(2011, 1, 4, 3, 51, 29)
+    local = Time.new(2011, 1, 4, 9, 36, 29, 20_700)
+    assert_equal local.to_s, zone('Asia/Kathmandu').time_with_offset(utc).to_s
+
+    utc = Time.utc(2014, 12, 15, 22, 00, 00)
+    local = Time.new(2014, 12, 15, 14, 00, 00, '-08:00')
+    assert_equal(
+      local.to_s,
+      zone('America/Los_Angeles').time_with_offset(utc).to_s
+    )
+
+    utc = Time.utc(2014, 4, 5, 22, 00, 00)
+    local = Time.new(2014, 4, 5, 15, 00, 00, '-07:00')
+    assert_equal(
+      local.to_s,
+      zone('America/Los_Angeles').time_with_offset(utc).to_s
+    )
+  end
+
+  def test_australian_timezone_with_dst
+    utc = Time.utc(2010, 12, 23, 19, 37, 15)
+    local = Time.utc(2010, 12, 24, 6, 7, 15)
+    assert_equal local.to_i, zone('Australia/Adelaide').time(utc).to_i
+  end
+
+  def test_local_to_utc
+    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)
+    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)
+    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)
+    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)
+    assert_equal(utc.to_s, timezone.local_to_utc(local).to_s)
+  end
+
+  def test_utc_offset_without_dst
+    timezone = zone('Europe/Helsinki')
+
+    # just before DST starts
+    utc = Time.utc(2012, 3, 25, 0, 59, 59)
+    assert_equal 7200, timezone.utc_offset(utc)
+
+    # on the second DST ends
+    utc = Time.utc(2012, 10, 28, 1, 0, 0)
+    assert_equal 7200, timezone.utc_offset(utc)
+  end
+
+  def test_utc_offset_with_dst
+    timezone = zone('Europe/Helsinki')
+    # on the second DST starts
+    utc = Time.utc(2012, 3, 25, 1, 0, 0)
+    assert_equal timezone.utc_offset(utc), 10_800
+
+    # right before DST end
+    utc = Time.utc(2012, 10, 28, 0, 59, 59)
+    assert_equal timezone.utc_offset(utc), 10_800
+  end
+
+  EQUIVALENCE_METHODS = [
+    :time,
+    :local_to_utc,
+    :time_with_offset,
+    :dst?,
+    :utc_offset
+  ].freeze
+
+  def check_equivalence(name, time, other)
+    tz = zone(name)
+
+    EQUIVALENCE_METHODS.each do |m|
+      assert_equal(tz.public_send(m, time), tz.public_send(m, other))
+    end
+  end
+
+  def test_date_equivalence
+    time = Time.new(2011, 2, 3, 0, 0, 0)
+    date = Date.new(2011, 2, 3)
+
+    check_equivalence('America/Los_Angeles', time, date)
+
+    time = Time.new(2011, 6, 3, 0, 0, 0)
+    date = Date.new(2011, 6, 3)
+
+    check_equivalence('America/Los_Angeles', time, date)
+  end
+
+  def test_datetime_equivalence
+    assert_equal 'UTC', Time.now.zone, 'This test must be run in UTC'
+
+    time = Time.new(2011, 2, 3, 13, 5, 0)
+    datetime = DateTime.new(2011, 2, 3, 13, 5, 0, 0)
+
+    check_equivalence('America/Los_Angeles', time, datetime)
+
+    time = Time.new(2011, 6, 3, 13, 5, 0)
+    datetime = DateTime.new(2011, 6, 3, 13, 5, 0, 0)
+
+    check_equivalence('America/Los_Angeles', time, datetime)
+  end
 end

data/timezone.gemspec

@@ -3,29 +3,30 @@ $:.push File.expand_path('../lib', __FILE__)
 require 'timezone/version'
 
 Gem::Specification.new do |s|
-  s.name        = 'timezone'
-  s.version     = Timezone::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Pan Thomakos']
-  s.email       = ['pan.thomakos@gmail.com']
-  s.homepage    = 'http://github.com/panthomakos/timezone'
-  s.summary     = "timezone-#{Timezone::VERSION}"
-  s.license     = 'MIT'
+  s.name = 'timezone'
+  s.version = Timezone::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.authors = ['Pan Thomakos']
+  s.email = ['pan.thomakos@gmail.com']
+  s.homepage =
+    "http://github.com/panthomakos/timezone/tree/#{Timezone::VERSION}"
+  s.summary = "timezone-#{Timezone::VERSION}"
+  s.license = 'MIT'
   s.description = 'Accurate current and historical timezones for Ruby with ' \
     'support for Geonames and Google latitude - longitude lookups.'
 
   s.rubyforge_project = 'timezone'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`
     .split("\n").map { |f| File.basename(f) }
   s.extra_rdoc_files = ['README.markdown', 'License.txt']
   s.rdoc_options = ['--charset=UTF-8']
   s.require_paths = ['lib']
 
-  s.add_development_dependency('rake', '~> 10.5')
+  s.add_development_dependency('rake')
   s.add_development_dependency('minitest', '~> 5.8')
-  s.add_development_dependency('rubocop', '~> 0.37')
+  s.add_development_dependency('rubocop', '= 0.40')
   s.add_development_dependency('timecop', '~> 0.8')
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: timezone
 version: !ruby/object:Gem::Version
-  version: 0.99.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Pan Thomakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0.40'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +402,7 @@ files:
 - data/Asia/Thimbu
 - data/Asia/Thimphu
 - data/Asia/Tokyo
+- data/Asia/Tomsk
 - data/Asia/Ujung_Pandang
 - data/Asia/Ulaanbaatar
 - data/Asia/Ulan_Bator
@@ -528,6 +529,7 @@ files:
 - data/Europe/Jersey
 - data/Europe/Kaliningrad
 - data/Europe/Kiev
+- data/Europe/Kirov
 - data/Europe/Lisbon
 - data/Europe/Ljubljana
 - data/Europe/London
@@ -674,8 +676,6 @@ files:
 - data/WET
 - data/Zulu
 - lib/timezone.rb
-- lib/timezone/active_support.rb
-- lib/timezone/configure.rb
 - lib/timezone/deprecate.rb
 - lib/timezone/error.rb
 - lib/timezone/loader.rb
@@ -689,18 +689,17 @@ files:
 - lib/timezone/parser.rb
 - lib/timezone/version.rb
 - lib/timezone/zone.rb
-- test/basic_lookup_test.rb
 - test/data/Helsinki_rules_without_timestamps.json
 - test/data/asia
-- test/geonames_lookup_test.rb
-- test/google_lookup_test.rb
 - test/http_test_client.rb
-- test/mocks/api_limit_reached.txt
+- test/mocks/api_limit_reached.json
 - test/mocks/google_lat_lon_coords.txt
 - test/mocks/google_request_denied.txt
+- test/mocks/invalid_latlong.json
+- test/mocks/invalid_parameter.json
 - test/mocks/lat_lon_coords.txt
-- test/test_lookup_test.rb
 - test/test_timezone.rb
+- test/timezone/lookup/test_basic.rb
 - test/timezone/lookup/test_geonames.rb
 - test/timezone/lookup/test_google.rb
 - test/timezone/lookup/test_test.rb
@@ -709,9 +708,8 @@ files:
 - test/timezone/test_lookup.rb
 - test/timezone/test_nil_zone.rb
 - test/timezone/test_zone.rb
-- test/timezone_test.rb
 - timezone.gemspec
-homepage: http://github.com/panthomakos/timezone
+homepage: http://github.com/panthomakos/timezone/tree/1.0.0
 licenses:
 - MIT
 metadata: {}
@@ -735,20 +733,19 @@ rubyforge_project: timezone
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: timezone-0.99.2
+summary: timezone-1.0.0
 test_files:
-- test/basic_lookup_test.rb
 - test/data/Helsinki_rules_without_timestamps.json
 - test/data/asia
-- test/geonames_lookup_test.rb
-- test/google_lookup_test.rb
 - test/http_test_client.rb
-- test/mocks/api_limit_reached.txt
+- test/mocks/api_limit_reached.json
 - test/mocks/google_lat_lon_coords.txt
 - test/mocks/google_request_denied.txt
+- test/mocks/invalid_latlong.json
+- test/mocks/invalid_parameter.json
 - test/mocks/lat_lon_coords.txt
-- test/test_lookup_test.rb
 - test/test_timezone.rb
+- test/timezone/lookup/test_basic.rb
 - test/timezone/lookup/test_geonames.rb
 - test/timezone/lookup/test_google.rb
 - test/timezone/lookup/test_test.rb
@@ -757,5 +754,4 @@ test_files:
 - test/timezone/test_lookup.rb
 - test/timezone/test_nil_zone.rb
 - test/timezone/test_zone.rb
-- test/timezone_test.rb
 has_rdoc: