timezone 0.2.1 → 0.3.0

data/test/timezone/parser/rule/on_rules_test.rb

@@ -0,0 +1,20 @@
+require 'timezone/parser/rule/on_rules'
+require 'minitest/autorun'
+
+describe Timezone::Parser::Rule::On do
+  def parse(*args)
+    Timezone::Parser::Rule::On.parse(*args)
+  end
+
+  it 'parses lastDAY' do
+    assert_equal ['Oct', '29'], parse('lastSun', 'Oct', 1995)
+    assert_equal ['Oct', '27'], parse('lastSun', 'Oct', 1996)
+    assert_equal ['Oct', '26'], parse('lastSun', 'Oct', 1997)
+  end
+
+  it 'parses DAY>=NUM' do
+    assert_equal ['Apr', '01'], parse('Fri>=26', 'Mar', 2005)
+    assert_equal ['Mar', '31'], parse('Fri>=26', 'Mar', 2006)
+    assert_equal ['Mar', '30'], parse('Fri>=26', 'Mar', 2007)
+  end
+end

data/test/timezone/parser/rule_test.rb

@@ -0,0 +1,52 @@
+require 'timezone/parser/rule'
+require 'minitest/autorun'
+
+describe Timezone::Parser::Rule do
+  before do
+    Timezone::Parser.rules.clear
+    Timezone::Parser.rule("Rule	Zion	1940	only	-	Jun	 1	0:00	1:00	D")
+    @rule = Timezone::Parser.rules['Zion'].first
+    Timezone::Parser.rule("Rule	Zion	1948	1950	-	May	23	0:00	2:20	S")
+    @oddity = Timezone::Parser.rules['Zion'].last
+  end
+
+  it 'adds multiple rules with the same name' do
+    assert_equal 4, Timezone::Parser.rules['Zion'].count
+  end
+
+  describe '#offset' do
+    it 'properly calculates hours' do
+      assert_equal 3_600, @rule.offset
+    end
+
+    it 'properly calculates minutes' do
+      assert_equal 8_400, @oddity.offset
+    end
+  end
+
+  it 'selects rules given an end date' do
+    end_date = Time.new(1947, 1, 1).to_i * 1_000
+    assert_equal [@rule], Timezone::Parser.select_rules('Zion', end_date)
+  end
+
+  it 'knows daylight savings time' do
+    assert @rule.dst?
+  end
+
+  it 'properly calculates start_date' do
+    assert_equal Time.utc(1940, 6, 1, 0, 0, 0).to_i*1_000, @rule.start_date
+  end
+
+  it 'understands lastDAY rules' do
+    Timezone::Parser.rule("Rule	EUAsia	1996	max	-	Oct	lastSun	 1:00u	0	-")
+    rule = Timezone::Parser.rules['EUAsia'].first
+
+    assert_equal Time.utc(1996, 10, 27, 1, 0, 0).to_i*1_000, rule.start_date
+  end
+
+  it 'understands DAY>=NUM rules' do
+    Timezone::Parser.rule("Rule	Zion	2005	only	-	Mar	Fri>=26	2:00	1:00	D")
+    rule = Timezone::Parser.rules['Zion'].last
+    assert_equal Time.utc(2005, 4, 1, 2, 0, 0).to_i*1_000, rule.start_date
+  end
+end

data/test/timezone/parser/zone/data_generator_test.rb

@@ -0,0 +1,101 @@
+require 'timezone/parser/zone/data_generator'
+require 'minitest/autorun'
+
+describe Timezone::Parser::Zone::DataGenerator do
+  it 'properly parses Asia/Hebron Zion rules' do
+    Timezone::Parser.zones.clear
+    Timezone::Parser.rules.clear
+
+    Timezone::Parser.rule("Rule	Zion	1940	only	-	Jun	 1	0:00	1:00	D")
+    Timezone::Parser.rule("Rule	Zion	1942	1944	-	Nov	 1	0:00	0	S")
+    Timezone::Parser.rule("Rule	Zion	1943	only	-	Apr	 1	2:00	1:00	D")
+    Timezone::Parser.rule("Rule	Zion	1944	only	-	Apr	 1	0:00	1:00	D")
+    Timezone::Parser.rule("Rule	Zion	1945	only	-	Apr	16	0:00	1:00	D")
+    Timezone::Parser.rule("Rule	Zion	1945	only	-	Nov	 1	2:00	0	S")
+    Timezone::Parser.rule("Rule	Zion	1946	only	-	Apr	16	2:00	1:00	D")
+    Timezone::Parser.rule("Rule	Zion	1946	only	-	Nov	 1	0:00	0	S")
+    Timezone::Parser.rule("Rule	Zion	1948	only	-	May	23	0:00	2:00	DD")
+    Timezone::Parser.rule("Rule	Zion	1948	only	-	Sep	 1	0:00	1:00	D")
+    Timezone::Parser.rule("Rule	Zion	1948	1949	-	Nov	 1	2:00	0	S")
+    Timezone::Parser.rule("Rule	Zion	1949	only	-	May	 1	0:00	1:00	D")
+
+    Timezone::Parser.zone('Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct')
+    Timezone::Parser.zone('2:00	Zion	EET	1948 May 15')
+
+    zones = Timezone::Parser::Zone.generate('Asia/Hebron')
+
+    assert_equal 12, zones.count
+
+    assert_equal -377705116800000, zones[0].start_date
+    assert_equal -2185410023000, zones[0].end_date
+    assert !zones[0].dst
+    assert_equal 8423, zones[0].offset
+    assert_equal 'LMT', zones[0].name
+
+    assert_equal "-9999-01-01T00:00:00Z", JSON.parse(zones[0].to_json)['_from']
+    assert_equal "1900-09-30T21:39:37Z", JSON.parse(zones[0].to_json)['_to']
+
+    assert_equal -2185410023000, zones[1].start_date
+    assert_equal -933645600000, zones[1].end_date
+    assert !zones[1].dst
+    assert_equal 7_200, zones[1].offset
+    assert_equal 'EET', zones[1].name
+
+    assert_equal -933645600000, zones[2].start_date
+    assert_equal -857358000000, zones[2].end_date
+    assert zones[2].dst
+    assert_equal 10_800, zones[2].offset
+    assert_equal 'EET', zones[2].name
+
+    assert_equal -857358000000, zones[3].start_date
+    assert_equal -844300800000, zones[3].end_date
+    assert !zones[3].dst
+    assert_equal 7_200, zones[3].offset
+    assert_equal 'EET', zones[3].name
+
+    assert_equal -844300800000, zones[4].start_date
+    assert_equal -825822000000, zones[4].end_date
+    assert zones[4].dst
+    assert_equal 10_800, zones[4].offset
+    assert_equal 'EET', zones[4].name
+  end
+
+  it 'properly parses Asia/Nicosia' do
+    Timezone::Parser.zones.clear
+    Timezone::Parser.rules.clear
+
+    Timezone::Parser.rule("Rule	Cyprus	1975	only	-	Apr	13	0:00	1:00	S")
+    Timezone::Parser.rule("Rule	Cyprus	1975	only	-	Oct	12	0:00	0	-")
+    Timezone::Parser.rule("Rule	Cyprus	1976	only	-	May	15	0:00	1:00	S")
+    Timezone::Parser.rule("Rule	Cyprus	1976	only	-	Oct	11	0:00	0	-")
+    Timezone::Parser.rule("Rule	Cyprus	1977	1980	-	Apr	Sun>=1	0:00	1:00	S")
+    Timezone::Parser.rule("Rule	Cyprus	1977	only	-	Sep	25	0:00	0	-")
+    Timezone::Parser.rule("Rule	Cyprus	1978	only	-	Oct	2	0:00	0	-")
+    Timezone::Parser.rule("Rule	Cyprus	1979	1997	-	Sep	lastSun	0:00	0	-")
+    Timezone::Parser.rule("Rule	Cyprus	1981	1998	-	Mar	lastSun	0:00	1:00	S")
+    Timezone::Parser.rule("Rule	EUAsia	1981	max	-	Mar	lastSun	 1:00u	1:00	S")
+    Timezone::Parser.rule("Rule	EUAsia	1979	1995	-	Sep	lastSun	 1:00u	0	-")
+    Timezone::Parser.rule("Rule	EUAsia	1996	max	-	Oct	lastSun	 1:00u	0	-")
+
+    Timezone::Parser.zone('Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14')
+    Timezone::Parser.zone('			2:00	Cyprus	EE%sT	1998 Sep')
+    Timezone::Parser.zone('			2:00	EUAsia	EE%sT')
+
+
+    zones = Timezone::Parser::Zone.generate('Asia/Nicosia')
+
+    assert zones[-2].dst
+    assert_equal 10_800, zones[-2].offset
+    assert_equal 2531955600000, zones[-2].start_date
+    assert_equal 2550704400000, zones[-2].end_date
+    assert_equal 'EEST', zones[-2].name
+
+    assert !zones.last.dst
+    assert_equal 7_200, zones.last.offset
+    assert_equal 2550704400000, zones.last.start_date
+    assert_equal 253402300799000, zones.last.end_date
+    assert_equal 'EET', zones.last.name
+
+    assert_equal 154, zones.count
+  end
+end

data/test/timezone/parser/zone/until_test.rb

@@ -0,0 +1,13 @@
+require 'timezone/parser/zone/until'
+require 'minitest/autorun'
+
+describe Timezone::Parser::Zone::Until do
+  def parse(*args)
+    Timezone::Parser::Zone::Until.parse(*args)
+  end
+
+  it 'parses dates' do
+    assert_equal -2185401600000, parse('1900 Oct')
+    assert_equal -682646400000, parse('1948 May 15')
+  end
+end

data/test/timezone/parser/zone_test.rb

@@ -0,0 +1,42 @@
+require 'timezone/parser/zone'
+require 'minitest/autorun'
+
+describe Timezone::Parser::Zone do
+  def setup
+    Timezone::Parser.rules.clear
+    Timezone::Parser.zones.clear
+    # This first rule is before the end date.
+    Timezone::Parser.rule("Rule	Zion	1948	only	-	Jan	13	0:00	0:00	D")
+    # This second rule is after the end date.
+    Timezone::Parser.rule("Rule	Zion	1949	only	-	Oct	12	0:00	0:00	D")
+
+    Timezone::Parser.zone('Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct')
+    Timezone::Parser.zone('2:00	Zion	EET	1948 May 15')
+    Timezone::Parser.zone('2:00 EgyptAsia	EE%sT	1967 Jun  5')
+
+    @zones = Timezone::Parser.zones['Asia/Hebron']
+  end
+
+  it 'properly parses all zone names' do
+    assert_equal 3, Timezone::Parser.zones['Asia/Hebron'].count
+    assert Timezone::Parser.zones['Asia/Hebron'].all?{ |z| z.name == 'Asia/Hebron' }
+  end
+
+  it 'parses offset' do
+    assert_equal [8423, 7_200, 7_200], @zones.map(&:offset)
+  end
+
+  it 'only selects rules within the entry timeline' do
+    assert_equal 1, @zones[1].rules.count
+  end
+
+  it 'parses format' do
+    assert_equal ['LMT', 'EET', 'EE%sT'], @zones.map(&:format)
+  end
+
+  it 'parses end_date' do
+    assert_equal Time.utc(1900, 10,  1).to_i * 1_000, @zones[0].end_date
+    assert_equal Time.utc(1948,  5, 15).to_i * 1_000, @zones[1].end_date
+    assert_equal Time.utc(1967,  6,  5).to_i * 1_000, @zones[2].end_date
+  end
+end

data/test/timezone/parser_test.rb

@@ -0,0 +1,12 @@
+require 'timezone/parser'
+require 'minitest/autorun'
+
+describe Timezone::Parser do
+  it 'parses files with no errors' do
+    Timezone::Parser.parse('test/data/asia')
+    # File.open('data/Asia/Hebron.json', 'w') do |f|
+    #   hash = { '_zone' => 'Asia/Hebron', 'zone' => Timezone::Parser::Zone.data['Asia/Hebron'].map(&:to_hash) }
+    #   f.puts(JSON.pretty_generate(hash))
+    # end
+  end
+end

data/test/timezone_test.rb

@@ -81,6 +81,45 @@ class TimezoneTest < Test::Unit::TestCase
     assert_equal local.to_i, timezone.time(utc).to_i
   end
 
+  # http://www.timeanddate.com/worldclock/clockchange.html?n=137&year=2011
+  def test_historical_time_change_in_la_forward
+    timezone = Timezone::Zone.new :zone => 'America/Los_Angeles'
+    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, timezone.time(utc).to_i
+
+    timezone = Timezone::Zone.new :zone => 'America/Los_Angeles'
+    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, timezone.time(utc).to_i
+  end
+
+  # http://www.timeanddate.com/worldclock/clockchange.html?n=137&year=2011
+  def test_historical_time_change_in_la_backward
+    timezone = Timezone::Zone.new :zone => 'America/Los_Angeles'
+    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, timezone.time(utc).to_i
+
+    timezone = Timezone::Zone.new :zone => 'America/Los_Angeles'
+    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, timezone.time(utc).to_i
+  end
+
+  # http://www.timeanddate.com/worldclock/clockchange.html?n=2364&year=1940
+  def test_historical_time_change_in_hebron
+    timezone = Timezone::Zone.new :zone => 'Asia/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, timezone.time(utc).to_i
+
+    timezone = Timezone::Zone.new :zone => 'Asia/Hebron'
+    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, timezone.time(utc).to_i
+  end
+
   def test_loading_half_hour_timezone
     timezone = Timezone::Zone.new :zone => 'Asia/Kathmandu'
     utc = Time.utc(2011, 1, 4, 3, 51, 29)
@@ -136,11 +175,18 @@ class TimezoneTest < Test::Unit::TestCase
     File.open(File.join(File.dirname(__FILE__),"data/Helsinki_rules_without_timestamps.json")) do |f|
       rules = JSON.parse(f.read)
       timezone = Timezone::Zone.new :zone => 'Europe/Helsinki'
-      timezone.rules = rules
+      # TODO [panthomakos] Resolve this using a stub.
+      timezone.instance_variable_set(:@rules, rules)
       utc = Time.utc(2012, 3, 25, 0, 59, 59)
       assert_equal timezone.utc_offset(utc), 7200
       utc = Time.utc(2012, 3, 25, 1, 0, 0)
       assert_equal timezone.utc_offset(utc), 10800
     end
   end
+
+  def test_active_support_timezone
+    timezone = Timezone::Zone.new(:zone => 'Australia/Adelaide')
+    assert_equal 'Australia/Adelaide', timezone.zone
+    assert_equal 'Adelaide', timezone.active_support_time_zone
+  end
 end

data/timezone.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('minitest')
+  s.add_development_dependency('minitest', '~> 4.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timezone
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 description: A simple way to get accurate current and historical timezone information
   based on zone or latitude and longitude coordinates. This gem uses the tz database
   (http://www.twinsun.com/tz/tz-link.htm) for historical timezone information. It
@@ -531,13 +531,30 @@ files:
 - data/Pacific/Wallis.json
 - data/WET.json
 - lib/timezone.rb
+- lib/timezone/active_support.rb
 - lib/timezone/configure.rb
 - lib/timezone/error.rb
-- lib/timezone/rule.rb
+- lib/timezone/parser.rb
+- lib/timezone/parser/data.rb
+- lib/timezone/parser/link.rb
+- lib/timezone/parser/rule.rb
+- lib/timezone/parser/rule/entry.rb
+- lib/timezone/parser/rule/on.rb
+- lib/timezone/parser/rule/on_rules.rb
+- lib/timezone/parser/zone.rb
+- lib/timezone/parser/zone/data_generator.rb
+- lib/timezone/parser/zone/entry.rb
+- lib/timezone/parser/zone/until.rb
 - lib/timezone/version.rb
 - lib/timezone/zone.rb
 - test/data/Helsinki_rules_without_timestamps.json
-- test/rule_test.rb
+- test/data/asia
+- test/timezone/parser/rule/on_rules_test.rb
+- test/timezone/parser/rule_test.rb
+- test/timezone/parser/zone/data_generator_test.rb
+- test/timezone/parser/zone/until_test.rb
+- test/timezone/parser/zone_test.rb
+- test/timezone/parser_test.rb
 - test/timezone_test.rb
 - timezone.gemspec
 homepage: http://github.com/panthomakos/timezone
@@ -564,9 +581,15 @@ rubyforge_project: timezone
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: timezone-0.2.1
+summary: timezone-0.3.0
 test_files:
 - test/data/Helsinki_rules_without_timestamps.json
-- test/rule_test.rb
+- test/data/asia
+- test/timezone/parser/rule/on_rules_test.rb
+- test/timezone/parser/rule_test.rb
+- test/timezone/parser/zone/data_generator_test.rb
+- test/timezone/parser/zone/until_test.rb
+- test/timezone/parser/zone_test.rb
+- test/timezone/parser_test.rb
 - test/timezone_test.rb
 has_rdoc: 

data/lib/timezone/rule.rb

@@ -1,30 +0,0 @@
-module Timezone
-  @@rules = {}
-  def self.rules ; @@rules ; end
-
-  Rule = Struct.new(:name, :from, :to, :type, :month, :day, :time, :save, :letter) do
-    def initialize(name, *args)
-      super.tap do |rule|
-        Timezone.rules[name] ||= []
-        Timezone.rules[name] << self
-      end
-    end
-
-    # Converts hours and minutes to seconds.
-    #
-    # Example: 1:00 # => 3600
-    def offset
-      @offset ||= save
-        .split(':')
-        .reverse
-        .each_with_index
-        .map{ |number,index| number.to_i*(60**(index+1)) }
-        .reduce(&:+)
-    end
-
-    # Does this rule have daylight savings time?
-    def dst?
-      letter == 'D'
-    end
-  end
-end

data/test/rule_test.rb

@@ -1,42 +0,0 @@
-require 'timezone/rule'
-require 'minitest/autorun'
-
-describe Timezone::Rule do
-  before do
-    Timezone.rules.clear
-    @rule = Timezone::Rule.new('Zion')
-  end
-
-  it 'adds itself to the rules' do
-    assert_equal ['Zion'], Timezone.rules.keys
-  end
-
-  it 'adds multiple rules with the same name' do
-    Timezone::Rule.new('Zion')
-    assert_equal 2, Timezone.rules['Zion'].count
-  end
-
-  describe '#offset' do
-    it 'properly calculates hours' do
-      @rule.save = '1:00'
-      assert_equal 3_600, @rule.offset
-    end
-
-    it 'properly calculates minutes' do
-      @rule.save = '2:20'
-      assert_equal 8_400, @rule.offset
-    end
-  end
-
-  describe '#dst?' do
-    it 'knows standard time' do
-      @rule.letter = 'S'
-      assert !@rule.dst?
-    end
-
-    it 'knows daylight savings time' do
-      @rule.letter = 'D'
-      assert @rule.dst?
-    end
-  end
-end