tzinfo 1.2.5 → 2.0.5

data/lib/tzinfo.rb

@@ -1,40 +1,85 @@
-# Top level module for TZInfo.
+# encoding: UTF-8
+# frozen_string_literal: true
+
+# The top level module for TZInfo.
 module TZInfo
+  class << self
+    # Instructs the current {DataSource} to load all timezone and country data
+    # into memory (initializing the {DataSource} first if not previously
+    # accessed or set).
+    #
+    # This may be desirable in production environments to improve copy-on-write
+    # performance and to avoid flushing the constant cache every time a new
+    # timezone or country is loaded from {DataSources::RubyDataSource}.
+    def eager_load!
+      DataSource.get.eager_load!
+    end
+  end
+end
+
+# Object#untaint is a deprecated no-op in Ruby >= 2.7 and will be removed in
+# 3.2. Add a refinement to either silence the warning, or supply the method if
+# needed.
+if !Object.new.respond_to?(:untaint) || RUBY_VERSION =~ /\A(\d+)\.(\d+)(?:\.|\z)/ && ($1 == '2' && $2.to_i >= 7 || $1.to_i >= 3)
+  require_relative 'tzinfo/untaint_ext'
 end
 
-require 'tzinfo/ruby_core_support'
-require 'tzinfo/offset_rationals'
-require 'tzinfo/time_or_datetime'
+require_relative 'tzinfo/version'
+
+require_relative 'tzinfo/string_deduper'
+
+require_relative 'tzinfo/timestamp'
+
+require_relative 'tzinfo/with_offset'
+require_relative 'tzinfo/datetime_with_offset'
+require_relative 'tzinfo/time_with_offset'
+require_relative 'tzinfo/timestamp_with_offset'
+
+require_relative 'tzinfo/timezone_offset'
+require_relative 'tzinfo/timezone_transition'
+require_relative 'tzinfo/transition_rule'
+require_relative 'tzinfo/annual_rules'
 
-require 'tzinfo/timezone_definition'
+require_relative 'tzinfo/data_sources'
+require_relative 'tzinfo/data_sources/timezone_info'
+require_relative 'tzinfo/data_sources/data_timezone_info'
+require_relative 'tzinfo/data_sources/linked_timezone_info'
+require_relative 'tzinfo/data_sources/constant_offset_data_timezone_info'
+require_relative 'tzinfo/data_sources/transitions_data_timezone_info'
 
-require 'tzinfo/timezone_offset'
-require 'tzinfo/timezone_transition'
-require 'tzinfo/timezone_transition_definition'
+require_relative 'tzinfo/data_sources/country_info'
 
-require 'tzinfo/timezone_index_definition'
+require_relative 'tzinfo/data_sources/posix_time_zone_parser'
+require_relative 'tzinfo/data_sources/zoneinfo_reader'
 
-require 'tzinfo/timezone_info'
-require 'tzinfo/data_timezone_info'
-require 'tzinfo/linked_timezone_info'
-require 'tzinfo/transition_data_timezone_info'
-require 'tzinfo/zoneinfo_timezone_info'
+require_relative 'tzinfo/data_source'
+require_relative 'tzinfo/data_sources/ruby_data_source'
+require_relative 'tzinfo/data_sources/zoneinfo_data_source'
 
-require 'tzinfo/data_source'
-require 'tzinfo/ruby_data_source'
-require 'tzinfo/zoneinfo_data_source'
+require_relative 'tzinfo/timezone_period'
+require_relative 'tzinfo/offset_timezone_period'
+require_relative 'tzinfo/transitions_timezone_period'
+require_relative 'tzinfo/timezone'
+require_relative 'tzinfo/info_timezone'
+require_relative 'tzinfo/data_timezone'
+require_relative 'tzinfo/linked_timezone'
+require_relative 'tzinfo/timezone_proxy'
 
-require 'tzinfo/timezone_period'
-require 'tzinfo/timezone'
-require 'tzinfo/info_timezone'
-require 'tzinfo/data_timezone'
-require 'tzinfo/linked_timezone'
-require 'tzinfo/timezone_proxy'
+require_relative 'tzinfo/country'
+require_relative 'tzinfo/country_timezone'
 
-require 'tzinfo/country_index_definition'
-require 'tzinfo/country_info'
-require 'tzinfo/ruby_country_info'
-require 'tzinfo/zoneinfo_country_info'
+require_relative 'tzinfo/format2'
+require_relative 'tzinfo/format2/country_definer'
+require_relative 'tzinfo/format2/country_index_definer'
+require_relative 'tzinfo/format2/country_index_definition'
+require_relative 'tzinfo/format2/timezone_definer'
+require_relative 'tzinfo/format2/timezone_definition'
+require_relative 'tzinfo/format2/timezone_index_definer'
+require_relative 'tzinfo/format2/timezone_index_definition'
 
-require 'tzinfo/country'
-require 'tzinfo/country_timezone'
+require_relative 'tzinfo/format1'
+require_relative 'tzinfo/format1/country_definer'
+require_relative 'tzinfo/format1/country_index_definition'
+require_relative 'tzinfo/format1/timezone_definer'
+require_relative 'tzinfo/format1/timezone_definition'
+require_relative 'tzinfo/format1/timezone_index_definition'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tzinfo
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 2.0.5
 platform: ruby
 authors:
 - Philip Ross
@@ -10,44 +10,43 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDdDCCAlygAwIBAgIBATANBgkqhkiG9w0BAQUFADBAMRIwEAYDVQQDDAlwaGls
-  LnJvc3MxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTAeFw0xNzEwMjMxOTQ2MDJaFw0xODEwMjMxOTQ2MDJaMEAxEjAQBgNVBAMMCXBo
-  aWwucm9zczEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkZzB+qfhmyY+XRvU
-  u310LMTGsTkR4/8JFCMF0YeQX6ZKmLr1fKzF3At1+DlI+v0t/G2FS6Dic0V3l8MK
-  JczyFh72NANOaQhAo0GHh8WkaeCf2DLL5K6YJeLpvkvp39oxzn00A4zosnzxM50f
-  Xrjx2HmurcJQurzafeCDj67QccaNE+5H+mcIVAJlsA1h1f5QFZ3SqQ4mf8St40pE
-  6YR4ev/Eq6Hb8aUoUq30otxbeHAEHh8cdVhTNFq7sPWb0psQRF2D/+o0MLgHt8PY
-  EUm49szlLsnjVXAMCHU7wH9CmDR/5Lzcrgqh3DgyI8ay6DnlSQ213eYZH/Nkn1Yz
-  TcNLCQIDAQABo3kwdzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU
-  D5nzO9/MG4B6ygch/Pv6PF9Q5x8wHgYDVR0RBBcwFYETcGhpbC5yb3NzQGdtYWls
-  LmNvbTAeBgNVHRIEFzAVgRNwaGlsLnJvc3NAZ21haWwuY29tMA0GCSqGSIb3DQEB
-  BQUAA4IBAQAHbabsU8fIQudX8XYwqZJYO76Y4LbHnMqZZz9nmRBWJlFE3E5jaF8Y
-  p9v1LkOLlo04z9bdnIS0/RfSqvHkNYcdpYXHnmr5/GYItKt8LWpFDA5cLaeWv5cU
-  FQB6a0HlkirTSTbevJNssymV/E206AFAoPK9vzjROn+/2MG4VlvYf/zr2nSQG76M
-  BMVs6uF68qxYpWjHisX2oy6R1k4G32jopKfLpdh1WCnN2/U5jqND/b25SRZ2ZRxy
-  YbX/8MDD3wwHu+knVnVsGNVuu/leNr+hJGgTUGXgcsu6nqYc4QVD+Amj1rI8D6at
-  IYlrSPqJ7q3pK9kchFKrrktRA6yVf+fR
+  MIIDPDCCAiSgAwIBAgIBATANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDDBlwaGls
+  LnJvc3MvREM9Z21haWwvREM9Y29tMB4XDTE5MTIyNDE0NTU0N1oXDTM5MTIyNDE0
+  NTU0N1owJDEiMCAGA1UEAwwZcGhpbC5yb3NzL0RDPWdtYWlsL0RDPWNvbTCCASIw
+  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJGcwfqn4ZsmPl0b1Lt9dCzExrE5
+  EeP/CRQjBdGHkF+mSpi69XysxdwLdfg5SPr9LfxthUug4nNFd5fDCiXM8hYe9jQD
+  TmkIQKNBh4fFpGngn9gyy+SumCXi6b5L6d/aMc59NAOM6LJ88TOdH1648dh5rq3C
+  ULq82n3gg4+u0HHGjRPuR/pnCFQCZbANYdX+UBWd0qkOJn/EreNKROmEeHr/xKuh
+  2/GlKFKt9KLcW3hwBB4fHHVYUzRau7D1m9KbEERdg//qNDC4B7fD2BFJuPbM5S7J
+  41VwDAh1O8B/Qpg0f+S83K4Kodw4MiPGsug55UkNtd3mGR/zZJ9WM03DSwkCAwEA
+  AaN5MHcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFA+Z8zvfzBuA
+  esoHIfz7+jxfUOcfMB4GA1UdEQQXMBWBE3BoaWwucm9zc0BnbWFpbC5jb20wHgYD
+  VR0SBBcwFYETcGhpbC5yb3NzQGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEA
+  J80xgZ3gGdQVA8N+8NJANU5HLuZIU9jOaAlziU9ImoTgPiOHKGZC4as1TwT4kBt1
+  Qcnu7YSANYRrxP5tpOHsWPF/MQYgerAFCZS5+PzOTudwZ+7OsMW4/EMHy6aCVHEd
+  c7HzQRC4mSrDRpWxzyBnZ5nX5OAmIkKA8NgeKybT/4Ku6iFPPUQwlyxQaO+Wlxdo
+  FqHwpjRyoiVSpe4RUTNK3d3qesWPYi7Lxn6k6ZZeEdvG6ya33AXktE3jmmF+jPR1
+  J3Zn/kSTjTekiaspyGbczC3PUaeJNxr+yCvR4sk71Xmk/GaKKGOHedJ1uj/LAXrA
+  MR0mpl7b8zCg0PFC1J73uw==
   -----END CERTIFICATE-----
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-description: TZInfo provides daylight savings aware transformations between times
-  in different time zones.
+        version: '1.0'
+description: TZInfo provides access to time zone data and allows times to be converted
+  using time zone rules.
 email: phil.ross@gmail.com
 executables: []
 extensions: []
@@ -60,112 +59,64 @@ files:
 - CHANGES.md
 - LICENSE
 - README.md
-- Rakefile
 - lib/tzinfo.rb
+- lib/tzinfo/annual_rules.rb
 - lib/tzinfo/country.rb
-- lib/tzinfo/country_index_definition.rb
-- lib/tzinfo/country_info.rb
 - lib/tzinfo/country_timezone.rb
 - lib/tzinfo/data_source.rb
+- lib/tzinfo/data_sources.rb
+- lib/tzinfo/data_sources/constant_offset_data_timezone_info.rb
+- lib/tzinfo/data_sources/country_info.rb
+- lib/tzinfo/data_sources/data_timezone_info.rb
+- lib/tzinfo/data_sources/linked_timezone_info.rb
+- lib/tzinfo/data_sources/posix_time_zone_parser.rb
+- lib/tzinfo/data_sources/ruby_data_source.rb
+- lib/tzinfo/data_sources/timezone_info.rb
+- lib/tzinfo/data_sources/transitions_data_timezone_info.rb
+- lib/tzinfo/data_sources/zoneinfo_data_source.rb
+- lib/tzinfo/data_sources/zoneinfo_reader.rb
 - lib/tzinfo/data_timezone.rb
-- lib/tzinfo/data_timezone_info.rb
+- lib/tzinfo/datetime_with_offset.rb
+- lib/tzinfo/format1.rb
+- lib/tzinfo/format1/country_definer.rb
+- lib/tzinfo/format1/country_index_definition.rb
+- lib/tzinfo/format1/timezone_definer.rb
+- lib/tzinfo/format1/timezone_definition.rb
+- lib/tzinfo/format1/timezone_index_definition.rb
+- lib/tzinfo/format2.rb
+- lib/tzinfo/format2/country_definer.rb
+- lib/tzinfo/format2/country_index_definer.rb
+- lib/tzinfo/format2/country_index_definition.rb
+- lib/tzinfo/format2/timezone_definer.rb
+- lib/tzinfo/format2/timezone_definition.rb
+- lib/tzinfo/format2/timezone_index_definer.rb
+- lib/tzinfo/format2/timezone_index_definition.rb
 - lib/tzinfo/info_timezone.rb
 - lib/tzinfo/linked_timezone.rb
-- lib/tzinfo/linked_timezone_info.rb
-- lib/tzinfo/offset_rationals.rb
-- lib/tzinfo/ruby_core_support.rb
-- lib/tzinfo/ruby_country_info.rb
-- lib/tzinfo/ruby_data_source.rb
-- lib/tzinfo/time_or_datetime.rb
+- lib/tzinfo/offset_timezone_period.rb
+- lib/tzinfo/string_deduper.rb
+- lib/tzinfo/time_with_offset.rb
+- lib/tzinfo/timestamp.rb
+- lib/tzinfo/timestamp_with_offset.rb
 - lib/tzinfo/timezone.rb
-- lib/tzinfo/timezone_definition.rb
-- lib/tzinfo/timezone_index_definition.rb
-- lib/tzinfo/timezone_info.rb
 - lib/tzinfo/timezone_offset.rb
 - lib/tzinfo/timezone_period.rb
 - lib/tzinfo/timezone_proxy.rb
 - lib/tzinfo/timezone_transition.rb
-- lib/tzinfo/timezone_transition_definition.rb
-- lib/tzinfo/transition_data_timezone_info.rb
-- lib/tzinfo/zoneinfo_country_info.rb
-- lib/tzinfo/zoneinfo_data_source.rb
-- lib/tzinfo/zoneinfo_timezone_info.rb
-- test/tc_country.rb
-- test/tc_country_index_definition.rb
-- test/tc_country_info.rb
-- test/tc_country_timezone.rb
-- test/tc_data_source.rb
-- test/tc_data_timezone.rb
-- test/tc_data_timezone_info.rb
-- test/tc_info_timezone.rb
-- test/tc_linked_timezone.rb
-- test/tc_linked_timezone_info.rb
-- test/tc_offset_rationals.rb
-- test/tc_ruby_core_support.rb
-- test/tc_ruby_country_info.rb
-- test/tc_ruby_data_source.rb
-- test/tc_time_or_datetime.rb
-- test/tc_timezone.rb
-- test/tc_timezone_definition.rb
-- test/tc_timezone_index_definition.rb
-- test/tc_timezone_info.rb
-- test/tc_timezone_london.rb
-- test/tc_timezone_melbourne.rb
-- test/tc_timezone_new_york.rb
-- test/tc_timezone_offset.rb
-- test/tc_timezone_period.rb
-- test/tc_timezone_proxy.rb
-- test/tc_timezone_transition.rb
-- test/tc_timezone_transition_definition.rb
-- test/tc_timezone_utc.rb
-- test/tc_transition_data_timezone_info.rb
-- test/tc_zoneinfo_country_info.rb
-- test/tc_zoneinfo_data_source.rb
-- test/tc_zoneinfo_timezone_info.rb
-- test/test_utils.rb
-- test/ts_all.rb
-- test/ts_all_ruby.rb
-- test/ts_all_zoneinfo.rb
-- test/tzinfo-data/tzinfo/data.rb
-- test/tzinfo-data/tzinfo/data/definitions/America/Argentina/Buenos_Aires.rb
-- test/tzinfo-data/tzinfo/data/definitions/America/New_York.rb
-- test/tzinfo-data/tzinfo/data/definitions/Australia/Melbourne.rb
-- test/tzinfo-data/tzinfo/data/definitions/EST.rb
-- test/tzinfo-data/tzinfo/data/definitions/Etc/GMT__m__1.rb
-- test/tzinfo-data/tzinfo/data/definitions/Etc/GMT__p__1.rb
-- test/tzinfo-data/tzinfo/data/definitions/Etc/UTC.rb
-- test/tzinfo-data/tzinfo/data/definitions/Europe/Amsterdam.rb
-- test/tzinfo-data/tzinfo/data/definitions/Europe/Andorra.rb
-- test/tzinfo-data/tzinfo/data/definitions/Europe/London.rb
-- test/tzinfo-data/tzinfo/data/definitions/Europe/Paris.rb
-- test/tzinfo-data/tzinfo/data/definitions/Europe/Prague.rb
-- test/tzinfo-data/tzinfo/data/definitions/UTC.rb
-- test/tzinfo-data/tzinfo/data/indexes/countries.rb
-- test/tzinfo-data/tzinfo/data/indexes/timezones.rb
-- test/tzinfo-data/tzinfo/data/version.rb
-- test/zoneinfo/America/Argentina/Buenos_Aires
-- test/zoneinfo/America/New_York
-- test/zoneinfo/Australia/Melbourne
-- test/zoneinfo/EST
-- test/zoneinfo/Etc/UTC
-- test/zoneinfo/Europe/Amsterdam
-- test/zoneinfo/Europe/Andorra
-- test/zoneinfo/Europe/London
-- test/zoneinfo/Europe/Paris
-- test/zoneinfo/Europe/Prague
-- test/zoneinfo/Factory
-- test/zoneinfo/iso3166.tab
-- test/zoneinfo/leapseconds
-- test/zoneinfo/posix/Europe/London
-- test/zoneinfo/posixrules
-- test/zoneinfo/right/Europe/London
-- test/zoneinfo/zone.tab
-- test/zoneinfo/zone1970.tab
-- tzinfo.gemspec
-homepage: http://tzinfo.github.io
+- lib/tzinfo/transition_rule.rb
+- lib/tzinfo/transitions_timezone_period.rb
+- lib/tzinfo/untaint_ext.rb
+- lib/tzinfo/version.rb
+- lib/tzinfo/with_offset.rb
+homepage: https://tzinfo.github.io
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/tzinfo/tzinfo/issues
+  changelog_uri: https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md
+  documentation_uri: https://rubydoc.info/gems/tzinfo/2.0.5
+  homepage_uri: https://tzinfo.github.io
+  source_code_uri: https://github.com/tzinfo/tzinfo/tree/v2.0.5
 post_install_message: 
 rdoc_options:
 - "--title"
@@ -178,16 +129,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
-summary: Daylight savings aware timezone library
+summary: Time Zone Library
 test_files: []

data/Rakefile

@@ -1,107 +0,0 @@
-require 'rubygems'
-require 'rubygems/package_task'
-require 'fileutils'
-require 'rake/testtask'
-
-# Ignore errors loading rdoc/task (the rdoc tasks will be excluded if
-# rdoc is unavailable).
-begin
-  require 'rdoc/task'
-rescue LoadError, RuntimeError
-end
-
-BASE_DIR = File.expand_path(File.dirname(__FILE__))
-
-task :default => [:test]
-
-spec = eval(File.read('tzinfo.gemspec'))
-
-class TZInfoPackageTask < Gem::PackageTask
-  alias_method :orig_sh, :sh
-  private :orig_sh
-
-  def sh(*cmd, &block)
-    if cmd[0] == '__tar_with_owner__' && cmd[1] =~ /\A-?[zjcvf]+\z/
-      opts = cmd[1]
-      cmd = ['tar', 'c', '--owner', '0', '--group', '0', "#{opts.start_with?('-') ? '' : '-'}#{opts.gsub('c', '')}"] + cmd.drop(2)
-    elsif cmd.first =~ /\A__tar_with_owner__ -?([zjcvf]+)(.*)\z/
-      opts = $1
-      args = $2
-      cmd[0] = "tar c --owner 0 --group 0 -#{opts.gsub('c', '')}#{args}"    
-    end
-  
-    orig_sh(*cmd, &block)
-  end
-end
-
-def add_signing_key(spec)
-  # Attempt to find the private key and add options to sign the gem if found.
-  private_key_path = File.expand_path(File.join(BASE_DIR, '..', 'key', 'gem-private_key.pem'))
-  
-  if File.exist?(private_key_path)
-    spec = spec.clone
-    spec.signing_key = private_key_path
-    spec.cert_chain = [File.join(BASE_DIR, 'gem-public_cert.pem')]
-  else
-    puts 'WARNING: Private key not found. Not signing gem file.'
-  end
-  
-  spec
-end
-
-package_task = TZInfoPackageTask.new(add_signing_key(spec)) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar_gz = true
-  pkg.tar_command = '__tar_with_owner__'
-end
-
-# Skip the rdoc task if RDoc::Task is unavailable
-if defined?(RDoc) && defined?(RDoc::Task)
-  RDoc::Task.new do |rdoc|
-    rdoc.rdoc_dir = 'doc'
-    rdoc.options.concat spec.rdoc_options
-    rdoc.rdoc_files.include(spec.extra_rdoc_files) 
-    rdoc.rdoc_files.include('lib')  
-  end
-end
-
-Rake::Task[package_task.package_dir_path].enhance do
-  recurse_chmod(package_task.package_dir_path)
-end
-
-Rake::Task[:package].enhance do
-  FileUtils.rm_rf(package_task.package_dir_path)
-end
-
-def recurse_chmod(dir)
-  File.chmod(0755, dir)
-  
-  Dir.entries(dir).each do |entry|
-    if entry != '.' && entry != '..'    
-      path = File.join(dir, entry)
-      if File.directory?(path)
-        recurse_chmod(path)
-      else
-        File.chmod(0644, path)
-      end
-    end
-  end
-end
-
-desc 'Run tests using RubyDataSource, then ZoneinfoDataSource'
-task :test => [:test_ruby, :test_zoneinfo] do
-end
-
-def setup_tests(test_task, type)
-  test_task.libs = [File.join(BASE_DIR, 'lib')]
-  test_task.pattern = File.join(BASE_DIR, 'test', "ts_all_#{type}.rb")
-  test_task.warning = true
-end
-
-Rake::TestTask.new(:test_ruby) do |t|
-  setup_tests(t, :ruby)
-end
-
-Rake::TestTask.new(:test_zoneinfo) do |t|
-  setup_tests(t, :zoneinfo)
-end

data/lib/tzinfo/country_index_definition.rb

@@ -1,31 +0,0 @@
-module TZInfo
-  # The country index file includes CountryIndexDefinition which provides
-  # a country method used to define each country in the index.
-  #
-  # @private
-  module CountryIndexDefinition #:nodoc:
-    def self.append_features(base)
-      super
-      base.extend(ClassMethods)
-      base.instance_eval { @countries = {} }
-    end
-    
-    # Class methods for inclusion.
-    #
-    # @private
-    module ClassMethods #:nodoc:
-      # Defines a country with an ISO 3166 country code, name and block. The
-      # block will be evaluated to obtain all the timezones for the country.
-      # Calls Country.country_defined with the definition of each country.
-      def country(code, name, &block)
-        @countries[code] = RubyCountryInfo.new(code, name, &block)      
-      end
-      
-      # Returns a frozen hash of all the countries that have been defined in
-      # the index.
-      def countries
-        @countries.freeze
-      end
-    end
-  end
-end

data/lib/tzinfo/country_info.rb

@@ -1,42 +0,0 @@
-module TZInfo  
-  # Represents a country and references to its timezones as returned by a
-  # DataSource.
-  class CountryInfo
-    # The ISO 3166 country code.
-    attr_reader :code
-    
-    # The name of the country.
-    attr_reader :name
-    
-    # Constructs a new CountryInfo with an ISO 3166 country code and name
-    def initialize(code, name)
-      @code = code
-      @name = name
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #@code>"
-    end
-    
-    # Returns a frozen array of all the zone identifiers for the country.
-    # The identifiers are ordered by importance according to the DataSource.
-    def zone_identifiers
-      raise_not_implemented('zone_identifiers')
-    end
-    
-    # Returns a frozen array of all the timezones for the for the country as
-    # CountryTimezone instances.
-    #
-    # The timezones are ordered by importance according to the DataSource.
-    def zones
-      raise_not_implemented('zones')
-    end
-
-    private
-
-    def raise_not_implemented(method_name)
-      raise NotImplementedError, "Subclasses must override #{method_name}"
-    end
-  end
-end

data/lib/tzinfo/data_timezone_info.rb

@@ -1,55 +0,0 @@
-module TZInfo
-  # Represents a defined timezone containing transition data.
-  class DataTimezoneInfo < TimezoneInfo  
-  
-    # Returns the TimezonePeriod for the given UTC time.
-    def period_for_utc(utc)
-      raise_not_implemented('period_for_utc')
-    end
-    
-    # Returns the set of TimezonePeriods for the given local time as an array.    
-    # Results returned are ordered by increasing UTC start date.
-    # Returns an empty array if no periods are found for the given time.
-    def periods_for_local(local)
-      raise_not_implemented('periods_for_local')
-    end
-    
-    # Returns an Array of TimezoneTransition instances representing the times
-    # where the UTC offset of the timezone changes.
-    #
-    # Transitions are returned up to a given date and time up to a given date 
-    # and time, specified in UTC (utc_to).
-    #
-    # A from date and time may also be supplied using the utc_from parameter
-    # (also specified in UTC). If utc_from is not nil, only transitions from 
-    # that date and time onwards will be returned.
-    #
-    # Comparisons with utc_to are exclusive. Comparisons with utc_from are
-    # inclusive. If a transition falls precisely on utc_to, it will be excluded.
-    # If a transition falls on utc_from, it will be included.
-    #
-    # Transitions returned are ordered by when they occur, from earliest to 
-    # latest.
-    #
-    # utc_to and utc_from can be specified using either DateTime, Time or 
-    # integer timestamps (Time.to_i).
-    #
-    # If utc_from is specified and utc_to is not greater than utc_from, then
-    # transitions_up_to raises an ArgumentError exception.
-    def transitions_up_to(utc_to, utc_from = nil)
-      raise_not_implemented('transitions_up_to')
-    end
-    
-    # Constructs a Timezone instance for the timezone represented by this
-    # DataTimezoneInfo.
-    def create_timezone
-      DataTimezone.new(self)
-    end
-
-    private
-
-    def raise_not_implemented(method_name)
-      raise NotImplementedError, "Subclasses must override #{method_name}"
-    end
-  end
-end

data/lib/tzinfo/linked_timezone_info.rb

@@ -1,26 +0,0 @@
-module TZInfo
-  # Represents a timezone that is defined as a link or alias to another zone.
-  class LinkedTimezoneInfo < TimezoneInfo
-        
-    # The zone that provides the data (that this zone is an alias for).
-    attr_reader :link_to_identifier
-    
-    # Constructs a new LinkedTimezoneInfo with an identifier and the identifier
-    # of the zone linked to.
-    def initialize(identifier, link_to_identifier)
-      super(identifier)
-      @link_to_identifier = link_to_identifier      
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #@identifier,#@link_to_identifier>"
-    end
-    
-    # Constructs a Timezone instance for the timezone represented by this
-    # DataTimezoneInfo.
-    def create_timezone
-      LinkedTimezone.new(self)
-    end
-  end
-end