tzinfo 1.2.4 → 1.2.7

data/lib/tzinfo/country_timezone.rb

@@ -79,7 +79,13 @@ module TZInfo
       # calculated multiple times in concurrently executing threads. It is not 
       # worth the overhead of locking to ensure that @latitude is only 
       # calculated once.
-      @latitude ||= RubyCoreSupport.rational_new!(@latitude_numerator, @latitude_denominator)
+      unless @latitude
+         result = RubyCoreSupport.rational_new!(@latitude_numerator, @latitude_denominator)
+         return result if frozen?
+         @latitude = result
+      end
+
+      @latitude
     end
     
     # The longitude of this timezone in degrees as a Rational.
@@ -88,7 +94,13 @@ module TZInfo
       # calculated multiple times in concurrently executing threads. It is not 
       # worth the overhead of locking to ensure that @longitude is only 
       # calculated once.
-      @longitude ||= RubyCoreSupport.rational_new!(@longitude_numerator, @longitude_denominator)
+      unless @longitude
+        result = RubyCoreSupport.rational_new!(@longitude_numerator, @longitude_denominator)
+        return result if frozen?
+        @longitude = result
+      end
+
+      @longitude
     end
     
     # Returns true if and only if the given CountryTimezone is equal to the

data/lib/tzinfo/data_source.rb

@@ -179,7 +179,7 @@ module TZInfo
       begin
         return ZoneinfoDataSource.new
       rescue ZoneinfoDirectoryNotFound
-        raise DataSourceNotFound, "No source of timezone data could be found.\nPlease refer to http://tzinfo.github.io/datasourcenotfound for help resolving this error."
+        raise DataSourceNotFound, "No source of timezone data could be found.\nPlease refer to https://tzinfo.github.io/datasourcenotfound for help resolving this error."
       end
     end
 

data/lib/tzinfo/ruby_core_support.rb

@@ -137,10 +137,33 @@ module TZInfo
       def self.open_file(file_name, mode, opts, &block)
         File.open(file_name, mode, &block)
       end
-    else
+    elsif RUBY_VERSION =~ /\A1\.9\./
       def self.open_file(file_name, mode, opts, &block)
         File.open(file_name, mode, opts, &block)
       end
+    else
+      # Evaluate method as a string because **opts isn't valid syntax prior to
+      # Ruby 2.0.
+      eval(<<-EOF
+        def self.open_file(file_name, mode, opts, &block)
+          File.open(file_name, mode, **opts, &block)
+        end
+      EOF
+      )
+    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)
+      module UntaintExt
+        refine Object do
+          def untaint
+            self
+          end
+        end
+      end
     end
   end
 end

data/lib/tzinfo/ruby_country_info.rb

@@ -22,7 +22,9 @@ module TZInfo
       # calculated once.
     
       unless @zone_identifiers
-        @zone_identifiers = zones.collect {|zone| zone.identifier}.freeze
+        result = zones.collect {|zone| zone.identifier}.freeze
+        return result if frozen?
+        @zone_identifiers = result
       end
       
       @zone_identifiers
@@ -40,8 +42,10 @@ module TZInfo
       unless @zones
         zones = Zones.new
         @block.call(zones) if @block
+        result = zones.list.freeze
+        return result if frozen?
         @block = nil
-        @zones = zones.list.freeze
+        @zones = result
       end
       
       @zones

data/lib/tzinfo/ruby_data_source.rb

@@ -1,4 +1,8 @@
 module TZInfo
+  # Use send as a workaround for erroneous 'wrong number of arguments' errors
+  # with JRuby 9.0.5.0 when calling methods with Java implementations. See #114.
+  send(:using, RubyCoreSupport::UntaintExt) if RubyCoreSupport.const_defined?(:UntaintExt)
+
   # A DataSource that loads data from the set of Ruby modules included in the
   # TZInfo::Data library (tzinfo-data gem).
   #
@@ -6,15 +10,30 @@ module TZInfo
   #
   #   TZInfo::DataSource.set(:ruby)
   class RubyDataSource < DataSource
-    # Base path for require.
-    REQUIRE_PATH = File.join('tzinfo', 'data', 'definitions')
-    
     # Whether the timezone index has been loaded yet.
     @@timezone_index_loaded = false
     
     # Whether the country index has been loaded yet.
     @@country_index_loaded = false
   
+    # Initializes a new RubyDataSource instance.
+    def initialize
+      tzinfo_data = File.join('tzinfo', 'data')
+      begin
+        require(tzinfo_data)
+
+        data_file = File.join('', 'tzinfo', 'data.rb')
+        path = $".reverse_each.detect {|p| p.end_with?(data_file) }
+        if path
+          @base_path = File.join(File.dirname(path), 'data').untaint
+        else
+          @base_path = tzinfo_data
+        end
+      rescue LoadError
+        @base_path = tzinfo_data
+      end
+    end
+
     # Returns a TimezoneInfo instance for a given identifier. 
     # Raises InvalidTimezoneIdentifier if the timezone is not found or the 
     # identifier is invalid.
@@ -93,27 +112,17 @@ module TZInfo
     end
     
     # Requires an index by its name.
-    def self.require_index(name)
+    def require_index(name)
       require_data(*['indexes', name])
     end
     
     # Requires a file from tzinfo/data.
     def require_data(*file)
-      self.class.require_data(*file)
-    end
-    
-    # Requires a file from tzinfo/data.
-    def self.require_data(*file)
-      require File.join('tzinfo', 'data', *file)
+      require(File.join(@base_path, *file))
     end
     
     # Loads in the index of timezones if it hasn't already been loaded.
     def load_timezone_index
-      self.class.load_timezone_index
-    end
-    
-    # Loads in the index of timezones if it hasn't already been loaded.
-    def self.load_timezone_index
       unless @@timezone_index_loaded
         require_index('timezones')
         @@timezone_index_loaded = true
@@ -122,11 +131,6 @@ module TZInfo
     
     # Loads in the index of countries if it hasn't already been loaded.
     def load_country_index
-      self.class.load_country_index
-    end
-    
-    # Loads in the index of countries if it hasn't already been loaded.
-    def self.load_country_index
       unless @@country_index_loaded
         require_index('countries')
         @@country_index_loaded = true

data/lib/tzinfo/time_or_datetime.rb

@@ -54,11 +54,14 @@ module TZInfo
       # calculated once.
     
       unless @time
-        if @timestamp
-          @time = Time.at(@timestamp).utc
+        result = if @timestamp
+          Time.at(@timestamp).utc
         else
-          @time = Time.utc(year, mon, mday, hour, min, sec, usec)
+          Time.utc(year, mon, mday, hour, min, sec, usec)
         end
+
+        return result if frozen?
+        @time = result
       end
       
       @time      
@@ -78,7 +81,9 @@ module TZInfo
         # Avoid using Rational unless necessary.
         u = usec
         s = u == 0 ? sec : Rational(sec * 1000000 + u, 1000000)
-        @datetime = RubyCoreSupport.datetime_new(year, mon, mday, hour, min, s)
+        result = RubyCoreSupport.datetime_new(year, mon, mday, hour, min, s)
+        return result if frozen?
+        @datetime = result
       end
       
       @datetime
@@ -92,7 +97,9 @@ module TZInfo
       # calculated once.
     
       unless @timestamp
-        @timestamp = to_time.to_i
+        result = to_time.to_i
+        return result if frozen?
+        @timestamp = result
       end
       
       @timestamp

data/lib/tzinfo/timezone.rb

@@ -571,17 +571,21 @@ module TZInfo
     # version 2.0.0, %z will be passed to Time#strftime and DateTime#strftime
     # instead. Some of the formatting options may cease to be available
     # depending on the version of Ruby in use (for example, %:::z is only
-    # supported by Time#strftime from MRI version 2.0.0 onwards.)
+    # supported by Time#strftime from MRI version 2.0.0 onwards).
     def strftime(format, utc = Time.now.utc)      
+      utc = TimeOrDateTime.wrap(utc)
       period = period_for_utc(utc)
-      local = period.to_local(utc)      
-      local = Time.at(local).utc unless local.kind_of?(Time) || local.kind_of?(DateTime)
+      local_wrapped = period.to_local(utc)
+      local = local_wrapped.to_orig
+      local = local_wrapped.to_time unless local.kind_of?(Time) || local.kind_of?(DateTime)
       abbreviation = period.abbreviation.to_s.gsub(/%/, '%%')
       
-      format = format.gsub(/%(%*)(Z|:*z)/) do
+      format = format.gsub(/%(%*)([sZ]|:*z)/) do
         if $1.length.odd?
           # Escaped literal percent or series of percents. Pass on to strftime.          
           "#$1%#$2"
+        elsif $2 == "s"
+          "#$1#{utc.to_i}"
         elsif $2 == "Z"
           "#$1#{abbreviation}"
         else
@@ -600,8 +604,8 @@ module TZInfo
             # Passing the invalid format string through to Time#strftime or
             # DateTime#strtime would normally result in it being returned in the
             # result. However, with Ruby 1.8.7 on Windows (as tested with Ruby
-            # 1.8.7-p374 from http://rubyinstaller.org/downloads/archives), this
-            # causes Time#strftime to always return an empty string (e.g.
+            # 1.8.7-p374 from https://rubyinstaller.org/downloads/archives),
+            # this causes Time#strftime to always return an empty string (e.g.
             # Time.now.strftime('a %::::z b') returns '').
             #
             # Escape the percent to force it to be evaluated as a literal.

data/lib/tzinfo/timezone_offset.rb

@@ -1,11 +1,34 @@
 module TZInfo
   # Represents an offset defined in a Timezone data file.
   class TimezoneOffset
-    # The base offset of the timezone from UTC in seconds.
+    # The base offset of the timezone from UTC in seconds. This does not include
+    # any adjustment made for daylight savings time and will typically remain
+    # constant throughout the year.
+    #
+    # To obtain the currently observed offset from UTC, including the effect of
+    # daylight savings time, use utc_total_offset instead.
+    #
+    # Note that zoneinfo files only include the value of utc_total_offset and a
+    # DST flag. When using ZoneinfoDataSource, the utc_offset will be derived
+    # from changes to the UTC total offset and the DST flag. As a consequence,
+    # utc_total_offset will always be correct, but utc_offset may be inaccurate.
+    #
+    # If you require utc_offset to be accurate, install the tzinfo-data gem and
+    # set RubyDataSource as the DataSource.
     attr_reader :utc_offset
     
-    # The offset from standard time for the zone in seconds (i.e. non-zero if 
-    # daylight savings is being observed).
+    # The offset from the time zone's standard time in seconds. Zero
+    # when daylight savings time is not in effect. Non-zero (usually 3600 = 1
+    # hour) if daylight savings is being observed.
+    #
+    # Note that zoneinfo files only include the value of utc_total_offset and
+    # a DST flag. When using DataSources::ZoneinfoDataSource, the std_offset
+    # will be derived from changes to the UTC total offset and the DST flag. As
+    # a consequence, utc_total_offset will always be correct, but std_offset
+    # may be inaccurate.
+    #
+    # If you require std_offset to be accurate, install the tzinfo-data gem
+    # and set RubyDataSource as the DataSource.
     attr_reader :std_offset
     
     # The total offset of this observance from UTC in seconds 

data/lib/tzinfo/timezone_period.rb

@@ -38,14 +38,36 @@ module TZInfo
       @utc_total_offset_rational = nil      
     end
             
-    # Base offset of the timezone from UTC (seconds).
+    # The base offset of the timezone from UTC in seconds. This does not include
+    # any adjustment made for daylight savings time and will typically remain
+    # constant throughout the year.
+    #
+    # To obtain the currently observed offset from UTC, including the effect of
+    # daylight savings time, use utc_total_offset instead.
+    #
+    # Note that zoneinfo files only include the value of utc_total_offset and a
+    # DST flag. When using ZoneinfoDataSource, the utc_offset will be derived
+    # from changes to the UTC total offset and the DST flag. As a consequence,
+    # utc_total_offset will always be correct, but utc_offset may be inaccurate.
+    #
+    # If you require utc_offset to be accurate, install the tzinfo-data gem and
+    # set RubyDataSource as the DataSource.
     def utc_offset
       @offset.utc_offset
     end
     
-    # Offset from the local time where daylight savings is in effect (seconds).
-    # E.g.: utc_offset could be -5 hours. Normally, std_offset would be 0. 
-    # During daylight savings, std_offset would typically become +1 hours.
+    # The offset from the time zone's standard time in seconds. Zero
+    # when daylight savings time is not in effect. Non-zero (usually 3600 = 1
+    # hour) if daylight savings is being observed.
+    #
+    # Note that zoneinfo files only include the value of utc_total_offset and
+    # a DST flag. When using DataSources::ZoneinfoDataSource, the std_offset
+    # will be derived from changes to the UTC total offset and the DST flag. As
+    # a consequence, utc_total_offset will always be correct, but std_offset
+    # may be inaccurate.
+    #
+    # If you require std_offset to be accurate, install the tzinfo-data gem
+    # and set RubyDataSource as the DataSource.
     def std_offset
       @offset.std_offset
     end
@@ -71,7 +93,9 @@ module TZInfo
       # to ensure that @zone_identifiers is only calculated once.
     
       unless @utc_total_offset_rational
-        @utc_total_offset_rational = OffsetRationals.rational_for_offset(utc_total_offset) 
+        result = OffsetRationals.rational_for_offset(utc_total_offset)
+        return result if frozen?
+        @utc_total_offset_rational = result
       end
       @utc_total_offset_rational
     end

data/lib/tzinfo/timezone_proxy.rb

@@ -93,7 +93,13 @@ module TZInfo
         # calculated multiple times in concurrently executing threads. It is not 
         # worth the overhead of locking to ensure that @real_timezone is only 
         # calculated once.
-        @real_timezone ||= Timezone.get(@identifier)
+        unless @real_timezone
+          result = Timezone.get(@identifier)
+          return result if frozen?
+          @real_timezone = result
+        end
+
+        @real_timezone
       end     
   end 
 end

data/lib/tzinfo/timezone_transition.rb

@@ -43,7 +43,12 @@ module TZInfo
       # worth the overhead of locking to ensure that @local_end_at is only
       # calculated once.
     
-      @local_end_at = at.add_with_convert(@previous_offset.utc_total_offset) unless @local_end_at
+      unless @local_end_at
+        result = at.add_with_convert(@previous_offset.utc_total_offset)
+        return result if frozen?
+        @local_end_at = result
+      end
+
       @local_end_at
     end
     
@@ -67,7 +72,12 @@ module TZInfo
       # worth the overhead of locking to ensure that @local_start_at is only
       # calculated once.
     
-      @local_start_at = at.add_with_convert(@offset.utc_total_offset) unless @local_start_at
+      unless @local_start_at
+        result = at.add_with_convert(@offset.utc_total_offset)
+        return result if frozen?
+        @local_start_at = result
+      end
+
       @local_start_at
     end
     

data/lib/tzinfo/timezone_transition_definition.rb

@@ -71,13 +71,16 @@ module TZInfo
       # overhead of locking to ensure that @at is only calculated once.
       
       unless @at
-        unless @denominator 
-          @at = TimeOrDateTime.new(@numerator_or_time)
+        result = unless @denominator
+          TimeOrDateTime.new(@numerator_or_time)
         else
           r = RubyCoreSupport.rational_new!(@numerator_or_time, @denominator)
           dt = RubyCoreSupport.datetime_new!(r, 0, Date::ITALY)
-          @at = TimeOrDateTime.new(dt)
+          TimeOrDateTime.new(dt)
         end
+
+        return result if frozen?
+        @at = result
       end
       
       @at

data/lib/tzinfo/zoneinfo_country_info.rb

@@ -20,7 +20,9 @@ module TZInfo
       # calculated once.
     
       unless @zone_identifiers
-        @zone_identifiers = zones.collect {|zone| zone.identifier}.freeze
+        result = zones.collect {|zone| zone.identifier}.freeze
+        return result if frozen?
+        @zone_identifiers = result
       end
       
       @zone_identifiers

data/lib/tzinfo/zoneinfo_data_source.rb

@@ -1,4 +1,12 @@
 module TZInfo
+  # Use send as a workaround for an issue on JRuby 9.2.9.0 where using the
+  # refinement causes calls to RubyCoreSupport.file_open to fail to pass the
+  # block parameter.
+  #
+  # https://travis-ci.org/tzinfo/tzinfo/jobs/628812051#L1931
+  # https://github.com/jruby/jruby/issues/6009
+  send(:using, TZInfo::RubyCoreSupport::UntaintExt) if TZInfo::RubyCoreSupport.const_defined?(:UntaintExt)
+
   # An InvalidZoneinfoDirectory exception is raised if the DataSource is
   # set to a specific zoneinfo path, which is not a valid zoneinfo directory
   # (i.e. a directory containing index files named iso3166.tab and zone.tab

data/lib/tzinfo/zoneinfo_timezone_info.rb

@@ -1,4 +1,8 @@
 module TZInfo
+  # Use send as a workaround for erroneous 'wrong number of arguments' errors
+  # with JRuby 9.0.5.0 when calling methods with Java implementations. See #114.
+  send(:using, RubyCoreSupport::UntaintExt) if RubyCoreSupport.const_defined?(:UntaintExt)
+
   # An InvalidZoneinfoFile exception is raised if an attempt is made to load an
   # invalid zoneinfo file.
   class InvalidZoneinfoFile < StandardError
@@ -93,19 +97,21 @@ module TZInfo
           if offset[:is_dst]
             utc_offset_from_next = transition[:utc_offset_from_next]
 
-            difference_to_previous = utc_total_offset - (utc_offset_from_previous || utc_total_offset)
-            difference_to_next = utc_total_offset - (utc_offset_from_next || utc_total_offset)
+            difference_to_previous = (utc_total_offset - (utc_offset_from_previous || utc_total_offset)).abs
+            difference_to_next = (utc_total_offset - (utc_offset_from_next || utc_total_offset)).abs
 
-            utc_offset = if difference_to_previous > 0 && difference_to_next > 0
+            utc_offset = if difference_to_previous == 3600
+              utc_offset_from_previous
+            elsif difference_to_next == 3600
+              utc_offset_from_next
+            elsif difference_to_previous > 0 && difference_to_next > 0
               difference_to_previous < difference_to_next ? utc_offset_from_previous : utc_offset_from_next
             elsif difference_to_previous > 0
               utc_offset_from_previous
             elsif difference_to_next > 0
               utc_offset_from_next
-            else # difference_to_previous <= 0 && difference_to_next <= 0
-              # DST, but the either the offset has stayed the same or decreased
-              # relative to both the previous and next used base utc offset, or
-              # there are no non-DST offsets. Assume a 1 hour offset from base.
+            else
+              # No difference, assume a 1 hour offset from standard time.
               utc_total_offset - 3600
             end