tzinfo 1.2.6 → 2.0.1

data/lib/tzinfo/version.rb

@@ -0,0 +1,7 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+
+module TZInfo
+  # The TZInfo version number.
+  VERSION = '2.0.1'
+end

data/lib/tzinfo/with_offset.rb

@@ -0,0 +1,61 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+
+module TZInfo
+  # The {WithOffset} module is included in {TimeWithOffset},
+  # {DateTimeWithOffset} and {TimestampWithOffset}. It provides an override for
+  # the {strftime} method that handles expanding the `%Z` directive according to
+  # the {TimezoneOffset#abbreviation abbreviation} of the {TimezoneOffset}
+  # associated with a local time.
+  module WithOffset
+    # Overrides the `Time`, `DateTime` or {Timestamp} version of `strftime`,
+    # replacing `%Z` with the {TimezoneOffset#abbreviation abbreviation} of the
+    # associated {TimezoneOffset}. If there is no associated offset, `%Z` is
+    # expanded by the base class instead.
+    #
+    # All the format directives handled by the base class are supported.
+    #
+    # @param format [String] the format string.
+    # @return [String] the formatted time.
+    # @raise [ArgumentError] if `format` is `nil`.
+    def strftime(format)
+      raise ArgumentError, 'format must be specified' unless format
+
+      if_timezone_offset do |o|
+        abbreviation = nil
+
+        format = format.gsub(/%(%*)Z/) do
+          if $1.length.odd?
+            # Return %%Z so the real strftime treats it as a literal %Z too.
+            "#$1%Z"
+          else
+            "#$1#{abbreviation ||= o.abbreviation.gsub(/%/, '%%')}"
+          end
+        end
+      end
+
+      super
+    end
+
+    protected
+
+    # Performs a calculation if there is an associated {TimezoneOffset}.
+    #
+    # @param result [Object] a result value that can be manipulated by the block
+    #   if there is an associated {TimezoneOffset}.
+    # @yield [period, result] if there is an associated {TimezoneOffset}, the
+    #   block is yielded to in order to calculate the method result.
+    # @yieldparam period [TimezoneOffset] the associated {TimezoneOffset}.
+    # @yieldparam result [Object] the `result` parameter.
+    # @yieldreturn [Object] the result of the calculation performed if there is
+    #   an associated {TimezoneOffset}.
+    # @return [Object] the result of the block if there is an associated
+    #   {TimezoneOffset}, otherwise the `result` parameter.
+    #
+    # @private
+    def if_timezone_offset(result = nil) #:nodoc:
+      to = timezone_offset
+      to ? yield(to, result) : result
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tzinfo
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 2.0.1
 platform: ruby
 authors:
 - Philip Ross
@@ -32,21 +32,21 @@ cert_chain:
 date: 2019-12-24 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: []
@@ -59,109 +59,53 @@ files:
 - CHANGES.md
 - LICENSE
 - README.md
-- Rakefile
 - lib/tzinfo.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/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/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: {}
@@ -177,7 +121,7 @@ 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:
   - - ">="
@@ -187,5 +131,5 @@ requirements: []
 rubygems_version: 3.1.2
 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