tzinfo 0.2.2 → 0.3.0

data/test/tc_country.rb

@@ -9,8 +9,6 @@ class TCCountry < Test::Unit::TestCase
     c = Country.get('GB')
     
     assert_not_nil(c)
-    require 'tzinfo/countries/GB'
-    assert_same(Countries::GB.instance, c)
     assert_equal('GB', c.code)
   end
     
@@ -37,17 +35,11 @@ class TCCountry < Test::Unit::TestCase
       Country.get('gb')
     }
   end
-  
-  def test_new_no_args
-    c = Country.new
     
-    assert_equal('Unknown', c.code)    
-  end
-  
   def test_new_nil
-    c = Country.new(nil)
-    
-    assert_equal('Unknown', c.code)    
+    assert_raise(InvalidCountryCode) {
+      c = Country.new(nil)
+    }        
   end
   
   def test_new_arg
@@ -71,8 +63,7 @@ class TCCountry < Test::Unit::TestCase
     assert_equal(Country.all_codes, all.collect {|c| c.code})
   end
   
-  def test_code
-    assert_equal('Unknown', Country.new.code)
+  def test_code    
     assert_equal('US', Country.get('US').code)
   end
   
@@ -85,43 +76,77 @@ class TCCountry < Test::Unit::TestCase
     assert_equal(Country.get('GB').name, Country.get('GB').to_s)
   end
   
-  def test_zone_names
+  def test_zone_identifiers
     zone_names = Country.get('US').zone_names
     assert_kind_of(Array, zone_names)
-    assert(zone_names.frozen?)
+    assert_equal(true, zone_names.frozen?)    
   end
   
-  def test_zone_identifiers
-    assert_equal(Country.get('US').zone_names, Country.get('US').zone_identifiers)
+  def test_zone_names
+    assert_equal(Country.get('US').zone_identifiers, Country.get('US').zone_names)
   end
   
   def test_zones
     zones = Country.get('US').zones
-    assert_equal(Country.get('US').zone_names, zones.collect {|z| z.identifier})
+    assert_kind_of(Array, zones)    
+    assert_equal(Country.get('US').zone_identifiers, zones.collect {|z| z.identifier})
     
-    zones.each {|z|
-      assert_kind_of(TimezoneProxy, z)
-    }
-  end
-  
-  def test_equals
-    require 'tzinfo/countries/GB'
-    assert(Countries::GB.new == Countries::GB.new)
-    assert(Countries::GB.new == Country.get('GB'))
-    assert(Country.get('GB') == Countries::GB.new)    
+    zones.each {|z| assert_kind_of(TimezoneProxy, z)}
   end
   
+  def test_zone_info
+    zones = Country.get('US').zone_info
+    assert_kind_of(Array, zones)
+    assert_equal(true, zones.frozen?)
+    
+    assert_equal(Country.get('US').zone_identifiers, zones.collect {|z| z.identifier})
+    assert_equal(Country.get('US').zone_identifiers, zones.collect {|z| z.timezone.identifier})
+    
+    zones.each {|z| assert_kind_of(CountryTimezone, z)}
+  end  
+      
   def test_compare
-    require 'tzinfo/countries/GB'
-    require 'tzinfo/countries/FR'
-    require 'tzinfo/countries/US'    
-    assert_equal(0, Countries::GB.new <=> Countries::GB.new)
-    assert_equal(0, Country.get('GB') <=> Countries::GB.new)
-    assert_equal(0, Countries::GB.new <=> Country.get('GB'))
     assert_equal(0, Country.get('GB') <=> Country.get('GB'))
-    assert((Country.get('GB') <=> Country.get('US')) < 0)
-    assert((Country.get('US') <=> Country.get('GB')) > 0)
-    assert((Country.get('FR') <=> Country.get('US')) < 0)
-    assert((Country.get('US') <=> Country.get('FR')) > 0)
+    assert_equal(-1, Country.get('GB') <=> Country.get('US'))
+    assert_equal(1, Country.get('US') <=> Country.get('GB'))
+    assert_equal(-1, Country.get('FR') <=> Country.get('US'))
+    assert_equal(1, Country.get('US') <=> Country.get('FR'))
+  end
+  
+  def test_equality
+    assert_equal(true, Country.get('GB') == Country.get('GB'))
+    assert_equal(false, Country.get('GB') == Country.get('US'))
+    assert_nil(Country.get('GB') == Object.new)
+  end
+  
+  def test_eql
+    assert_equal(true, Country.get('GB').eql?(Country.get('GB')))
+    assert_equal(false, Country.get('GB').eql?(Country.get('US')))
+    assert_nil(Country.get('GB').eql?(Object.new))
+  end
+  
+  def test_hash
+    assert_equal('GB'.hash, Country.get('GB').hash)
+    assert_equal('US'.hash, Country.get('US').hash)
+  end
+  
+  def test_marshal
+    c = Country.get('US')
+    
+    # Should get back the same instance because load calls Country.get.
+    assert_same(c, Marshal.load(Marshal.dump(c)))
+  end
+  
+  def test_reload
+    # If country gets reloaded for some reason, it needs to force a reload of
+    # the country index.
+    
+    c = Country.get('US')
+    assert_equal('US', Country.get('US').code)
+    
+    load 'tzinfo/country.rb'
+    
+    c = Country.get('US')
+    assert_equal('US', Country.get('US').code)
   end
 end

data/test/tc_country_index_definition.rb

@@ -0,0 +1,71 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'test/unit'
+require 'tzinfo/country_index_definition'
+require 'tzinfo/country_info'
+
+include TZInfo
+
+class TCCountryIndexDefinition < Test::Unit::TestCase
+
+  module CountriesTest1     
+    include CountryIndexDefinition
+    
+    country 'ZZ', 'Country One' do |c|
+      raise 'Not a CountryInfo' unless c.kind_of?(CountryInfo)
+      c.timezone 'Test/Zone/1', 3, 2, 41,20
+    end
+    
+    country 'AA', 'Aland' do |c|
+      raise 'Not a CountryInfo' unless c.kind_of?(CountryInfo)
+      c.timezone 'Test/Zone/3', 71,30, 358, 15
+      c.timezone 'Test/Zone/2', 41, 20, 211, 30
+    end
+    
+    country 'TE', 'Three'    
+  end
+  
+  module CountriesTest2
+    include CountryIndexDefinition
+    
+    country 'CO', 'First Country' do |c|
+      raise 'Not a CountryInfo' unless c.kind_of?(CountryInfo)
+    end
+  end
+  
+  def test_module_1
+    hash = CountriesTest1.countries
+    assert_equal(3, hash.length)
+    assert_equal(true, hash.frozen?)
+    
+    zz = hash['ZZ']
+    aa = hash['AA']
+    te = hash['TE']
+    
+    assert_equal('ZZ', zz.code)
+    assert_equal('Country One', zz.name)
+    assert_equal(1, zz.zones.length)
+    assert_equal('Test/Zone/1', zz.zones[0].identifier)
+    
+    assert_equal('AA', aa.code)
+    assert_equal('Aland', aa.name)
+    assert_equal(2, aa.zones.length)
+    assert_equal('Test/Zone/3', aa.zones[0].identifier)
+    assert_equal('Test/Zone/2', aa.zones[1].identifier)
+    
+    assert_equal('TE', te.code)
+    assert_equal('Three', te.name)
+    assert_equal(0, te.zones.length)    
+  end
+  
+  def test_module_2
+    hash = CountriesTest2.countries
+    assert_equal(1, hash.length)
+    assert_equal(true, hash.frozen?)
+    
+    co = hash['CO']
+    
+    assert_equal('CO', co.code)
+    assert_equal('First Country', co.name)
+    assert_equal(0, co.zones.length)
+  end  
+end

data/test/tc_country_info.rb

@@ -0,0 +1,72 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'test/unit'
+require 'tzinfo/country_timezone'
+
+include TZInfo
+
+class TCCountryInfo < Test::Unit::TestCase
+  
+  def test_code
+    ci = CountryInfo.new('ZZ', 'Zzz') {|c| }
+    assert_equal('ZZ', ci.code)
+  end
+  
+  def test_name
+    ci = CountryInfo.new('ZZ', 'Zzz') {|c| }
+    assert_equal('Zzz', ci.name)
+  end
+  
+  def test_zone_identifiers_empty
+    ci = CountryInfo.new('ZZ', 'Zzz') {|c| }
+    assert(ci.zone_identifiers.empty?)
+    assert(ci.zone_identifiers.frozen?)
+  end
+  
+  def test_zone_identifiers_no_block
+    ci = CountryInfo.new('ZZ', 'Zzz')
+    assert(ci.zone_identifiers.empty?)
+    assert(ci.zone_identifiers.frozen?)
+  end
+  
+  def test_zone_identifiers
+    ci = CountryInfo.new('ZZ', 'Zzz') do |c|
+      assert_same(ci, c)
+      c.timezone('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B')
+      c.timezone('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A')
+      c.timezone('ZZ/TimezoneC', -10, 3, -20, 7, 'C')
+      c.timezone('ZZ/TimezoneD', -10, 3, -20, 7)
+    end
+    
+    assert_equal(['ZZ/TimezoneB', 'ZZ/TimezoneA', 'ZZ/TimezoneC', 'ZZ/TimezoneD'], ci.zone_identifiers)
+    assert(ci.zone_identifiers.frozen?)
+  end
+  
+  def test_zones_empty
+    ci = CountryInfo.new('ZZ', 'Zzz') {|c| }
+    assert(ci.zones.empty?)
+    assert(ci.zones.frozen?)
+  end
+  
+  def test_zones_no_block
+    ci = CountryInfo.new('ZZ', 'Zzz')
+    assert(ci.zones.empty?)
+    assert(ci.zones.frozen?)
+  end
+  
+  def test_zones
+    ci = CountryInfo.new('ZZ', 'Zzz') do |c|
+      assert_same(ci, c)
+      c.timezone('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B')
+      c.timezone('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A')
+      c.timezone('ZZ/TimezoneC', -10, 3, -20, 7, 'C')
+      c.timezone('ZZ/TimezoneD', -10, 3, -20, 7)
+    end
+    
+    assert_equal([CountryTimezone.new('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B'),
+      CountryTimezone.new('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A'),
+      CountryTimezone.new('ZZ/TimezoneC', -10, 3, -20, 7, 'C'),
+      CountryTimezone.new('ZZ/TimezoneD', -10, 3, -20, 7)],
+      ci.zones)
+    assert(ci.zones.frozen?)
+  end    
+end

data/test/tc_country_timezone.rb

@@ -0,0 +1,121 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'test/unit'
+require 'tzinfo/country_timezone'
+
+include TZInfo
+
+class TCCountryTimezone < Test::Unit::TestCase
+  def test_identifier
+    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)    
+    assert_equal('Europe/London', ct.identifier)
+  end    
+  
+  def test_latitude
+    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    assert_equal(Rational(2059, 40), ct.latitude)
+  end
+  
+  def test_longitude
+    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    assert_equal(Rational(-5, 16), ct.longitude)
+  end
+  
+  def test_description_omit
+    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    assert_nil(ct.description)
+  end
+  
+  def test_description_nil
+    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16, nil)
+    assert_nil(ct.description)
+  end
+  
+  def test_description
+    ct = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+    assert_equal('Eastern Time', ct.description)
+  end
+  
+  def test_timezone    
+    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    assert_kind_of(TimezoneProxy, ct.timezone)
+    assert_equal('Europe/London', ct.timezone.identifier)
+  end
+  
+  def test_description_or_friendly_idenfier_no_description
+    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    assert_equal('London', ct.description_or_friendly_identifier)
+  end
+  
+  def test_description_or_friendly_idenfier_description
+    ct = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+    assert_equal('Eastern Time', ct.description_or_friendly_identifier)
+  end
+  
+  def test_equality_1
+    ct1 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    ct2 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    ct3 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16, 'Description')
+    ct4 = CountryTimezone.new('Europe/LondonB', 2059, 40, -5, 16)
+    ct5 = CountryTimezone.new('Europe/London', 2060, 40, -5, 16)
+    ct6 = CountryTimezone.new('Europe/London', 2059, 40, -6, 16)
+    
+    assert_equal(true, ct1 == ct1)
+    assert_equal(true, ct1 == ct2)
+    assert_equal(false, ct1 == ct3)
+    assert_equal(false, ct1 == ct4)
+    assert_equal(false, ct1 == ct5)
+    assert_equal(false, ct1 == ct6)
+  end
+  
+  def test_equality_2
+    ct1 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+    ct2 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time2')
+    
+    assert_equal(true, ct1 == ct1)
+    assert_equal(false, ct1 == ct2)    
+  end
+  
+  def test_equality_non_country_timezone
+    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    
+    assert_equal(false, ct == Object.new)
+  end
+  
+  def test_eql_1
+    ct1 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    ct2 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    ct3 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16, 'Description')
+    ct4 = CountryTimezone.new('Europe/LondonB', 2059, 40, -5, 16)
+    ct5 = CountryTimezone.new('Europe/London', 2060, 40, -5, 16)
+    ct6 = CountryTimezone.new('Europe/London', 2059, 40, -6, 16)
+    
+    assert_equal(true, ct1.eql?(ct1))
+    assert_equal(true, ct1.eql?(ct2))
+    assert_equal(false, ct1.eql?(ct3))
+    assert_equal(false, ct1.eql?(ct4))
+    assert_equal(false, ct1.eql?(ct5))
+    assert_equal(false, ct1.eql?(ct6))
+  end
+  
+  def test_eql_2
+    ct1 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+    ct2 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time2')
+    
+    assert_equal(true, ct1.eql?(ct1))
+    assert_equal(false, ct1.eql?(ct2))    
+  end
+  
+  def test_eql_non_country_timezone
+    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    
+    assert_equal(false, ct.eql?(Object.new))
+  end
+  
+  def test_hash
+    ct1 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    ct2 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+    
+    assert_equal('Europe/London'.hash ^ 2059.hash ^ 40.hash ^ -5.hash ^ 16.hash ^ nil.hash, ct1.hash)
+    assert_equal('America/New_York'.hash ^ 48857.hash ^ 1200.hash ^ -266423.hash ^ 3600.hash ^ 'Eastern Time'.hash, ct2.hash)
+  end
+end

data/test/tc_data_timezone.rb

@@ -0,0 +1,69 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'test/unit'
+require 'tzinfo/data_timezone'
+require 'tzinfo/timezone_info'
+
+include TZInfo
+
+class TCDataTimezone < Test::Unit::TestCase
+  
+  class TestTimezoneInfo < TimezoneInfo
+    attr_reader :utc
+    attr_reader :local
+    
+    def initialize(identifier, utc_period, local_periods)
+      super(identifier)
+      @utc_period = utc_period
+      @local_periods = local_periods || []
+    end
+    
+    def period_for_utc(utc)
+      @utc = utc
+      @utc_period     
+    end
+    
+    def periods_for_local(local)
+      @local = local      
+      @local_periods
+    end
+  end    
+
+  def test_identifier
+    tz = DataTimezone.new(TestTimezoneInfo.new('Test/Zone', nil, []))
+    assert_equal('Test/Zone', tz.identifier)
+  end
+  
+  def test_period_for_utc
+    # Don't need actual TimezonePeriods. DataTimezone isn't supposed to do
+    # anything with them apart from return them.
+    period = Object.new 
+    tti = TestTimezoneInfo.new('Test/Zone', period, [])
+    tz = DataTimezone.new(tti)
+    
+    t = Time.utc(2006, 6, 27, 22, 50, 12)
+    assert_same(period, tz.period_for_utc(t))
+    assert_same(t, tti.utc)    
+  end
+  
+  def test_periods_for_local
+    # Don't need actual TimezonePeriods. DataTimezone isn't supposed to do
+    # anything with them apart from return them.
+    periods = [Object.new, Object.new] 
+    tti = TestTimezoneInfo.new('Test/Zone', nil, periods)
+    tz = DataTimezone.new(tti)
+    
+    t = Time.utc(2006, 6, 27, 22, 50, 12)
+    assert_same(periods, tz.periods_for_local(t))
+    assert_same(t, tti.local)  
+  end
+  
+  def test_periods_for_local_not_found
+    periods = []
+    tti = TestTimezoneInfo.new('Test/Zone', nil, periods)
+    tz = DataTimezone.new(tti)
+    
+    t = Time.utc(2006, 6, 27, 22, 50, 12)
+    assert_same(periods, tz.periods_for_local(t))
+    assert_same(t, tti.local)
+  end    
+end