twitter_cldr 6.8.0 → 6.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb3f9e357d9106f3b87744f5a8203eda30efd0dac40a24dacfbfaca6122431bc
-  data.tar.gz: a39e1373d65e2665124caedba55b039d62214950ced3db2e79636e38aef9e9e6
+  metadata.gz: c8aceda15c987295a62672bd4f7a78546b34eed2a83eb9178b58bd5a5efa49be
+  data.tar.gz: b179d63e855785bdd871b12dda0f7c0ecd67b91106510972d89f74ab93b8ec5d
 SHA512:
-  metadata.gz: 0e810877761c6898a5e5efb187c2f16a91536bf5e2bf784d802eb99ef9fe482140c79490f20e2c3748622147f340be3905cdc2cebc1c046e7eff9c5929130c8d
-  data.tar.gz: 2e9d84af9731ba6ada0cd0fc63224a54fbdb4f7de6b3de1d0f4748d20f71c6f17b65b490b5d32b56e269273c5c05dc94fa704da8fe89af077a62e50aad562023
+  metadata.gz: 92f18ec12c13f8ed66b23a9453c9b932e502738266957b326a62493ef1062878ae29932d16f4963658f0b30591528de8415293f1e1c90e394a3e2b4fba2b1244
+  data.tar.gz: b34f99bbb5e5e37d3c95d63ce56d47c097d2aac14730ed56d72fc2f5e3c5a0db26b1ff0d20ea599a200d4e75bb3c38cd22ecf5321ece0a606967f0f49290738d

data/lib/twitter_cldr/timezones/generic_location.rb

@@ -21,18 +21,18 @@ module TwitterCldr
       Territories = TwitterCldr::Shared::Territories
       Utils = TwitterCldr::Utils
 
-      def display_name_for(date, fmt = :generic_location)
+      def display_name_for(date, fmt = :generic_location, dst = TZInfo::Timezone.default_dst, &block)
         case fmt
           when :generic_location
             generic_location_display_name
           when :generic_short
-            generic_short_display_name(date) || generic_location_display_name
+            generic_short_display_name(date, dst, &block) || generic_location_display_name
           when :generic_long
-            generic_long_display_name(date) || generic_location_display_name
+            generic_long_display_name(date, dst, &block) || generic_location_display_name
           when :specific_short
-            specific_short_display_name(date)
+            specific_short_display_name(date, dst, &block)
           when :specific_long
-            specific_long_display_name(date)
+            specific_long_display_name(date, dst, &block)
           when :exemplar_location
             exemplar_city
           else
@@ -58,20 +58,20 @@ module TwitterCldr
         end
       end
 
-      def generic_short_display_name(date)
-        format_display_name(date, :generic, :short)
+      def generic_short_display_name(date, dst = TZInfo::Timezone.default_dst, &block)
+        format_display_name(date, :generic, :short, dst, &block)
       end
 
-      def generic_long_display_name(date)
-        format_display_name(date, :generic, :long)
+      def generic_long_display_name(date, dst = TZInfo::Timezone.default_dst, &block)
+        format_display_name(date, :generic, :long, dst, &block)
       end
 
-      def specific_short_display_name(date)
-        format_display_name(date, :specific, :short)
+      def specific_short_display_name(date, dst = TZInfo::Timezone.default_dst, &block)
+        format_display_name(date, :specific, :short, dst, &block)
       end
 
-      def specific_long_display_name(date)
-        format_display_name(date, :specific, :long)
+      def specific_long_display_name(date, dst = TZInfo::Timezone.default_dst, &block)
+        format_display_name(date, :specific, :long, dst, &block)
       end
 
       # From ICU source, TimeZoneGenericNames.java, formatGenericNonLocationName():
@@ -86,9 +86,9 @@ module TwitterCldr
       # 4. If a generic non-location string is not available, use generic location
       #    string.
       #
-      def format_display_name(date, type, fmt)
+      def format_display_name(date, type, fmt, dst = TZInfo::Timezone.default_dst, &block)
         date_int = date.strftime('%s').to_i
-        period = tz.period_for_local(date)
+        period = tz.period_for_local(date, dst, &block)
 
         flavor = if type == :generic
           :generic

data/lib/twitter_cldr/timezones/gmt_location.rb

@@ -10,8 +10,8 @@ module TwitterCldr
       DEFAULT_FORMAT = :long_gmt
       DEFAULT_GMT_ZERO_FORMAT = 'GMT'.freeze
 
-      def display_name_for(date, format = DEFAULT_FORMAT)
-        offset = tz.period_for_local(date).offset
+      def display_name_for(date, format = DEFAULT_FORMAT, dst = TZInfo::Timezone.default_dst, &block)
+        offset = tz.period_for_local(date, dst, &block).offset
         offset_secs = offset.utc_offset + offset.std_offset
         return gmt_zero_format if offset_secs == 0
 

data/lib/twitter_cldr/timezones/iso8601_location.rb

@@ -27,8 +27,8 @@ module TwitterCldr
         :iso_extended_local_full
       ].freeze
 
-      def display_name_for(date, fmt)
-        offset = tz.period_for_local(date).offset
+      def display_name_for(date, fmt, dst = TZInfo::Timezone.default_dst, &block)
+        offset = tz.period_for_local(date, dst, &block).offset
         offset_secs = offset.utc_offset + offset.std_offset
 
         case fmt

data/lib/twitter_cldr/timezones/timezone.rb

@@ -47,17 +47,17 @@ module TwitterCldr
         @locale = locale
       end
 
-      def display_name_for(date, format = :generic_location)
+      def display_name_for(date, format = :generic_location, dst = TZInfo::Timezone.default_dst, &block)
         case format
           when *GenericLocation::FORMATS
-            generic_location.display_name_for(date, format) ||
-              gmt_location.display_name_for(date, GENERIC_TO_GMT_MAP[format])
+            generic_location.display_name_for(date, format, dst, &block) ||
+              gmt_location.display_name_for(date, GENERIC_TO_GMT_MAP[format], dst, &block)
 
           when *GmtLocation::FORMATS
-            gmt_location.display_name_for(date, format)
+            gmt_location.display_name_for(date, format, dst, &block)
 
           when *Iso8601Location::FORMATS
-            iso_location.display_name_for(date, format)
+            iso_location.display_name_for(date, format, dst, &block)
 
           when :zone_id
             identifier
@@ -75,8 +75,12 @@ module TwitterCldr
         tz.identifier
       end
 
-      def period_for_local(date)
-        tz.period_for_local(date)
+      def period_for_local(*args, &block)
+        tz.period_for_local(*args, &block)
+      end
+
+      def period_for_utc(time)
+        tz.period_for_utc(time)
       end
 
       def transitions_up_to(date)

data/lib/twitter_cldr/version.rb

@@ -4,5 +4,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 module TwitterCldr
-  VERSION = '6.8.0'
+  VERSION = '6.9.0'
 end

data/spec/timezones/timezone_spec.rb

@@ -266,4 +266,45 @@ describe 'Timezones' do
       end
     end
   end
+
+  describe '#display_name_for' do
+    let(:tz) { TwitterCldr::Timezones::Timezone.instance('America/New_York', :en) }
+
+    it 'accepts a dst argument', :aggregate_failures do
+      zoned_date = Time.new(2021, 11, 7, 1, 1, 23, -4 * 3600)
+      dst_date = Time.new(2021, 11, 7, 1, 1, 23, 0)
+      non_dst_date = Time.new(2021, 11, 7, 12, 1, 23, 0)
+
+      expect(tz.display_name_for(zoned_date, :specific_long, true)).to eq 'Eastern Daylight Time'
+      expect(tz.display_name_for(dst_date, :specific_long, true)).to eq 'Eastern Daylight Time'
+      expect(tz.display_name_for(non_dst_date, :specific_long, false)).to eq 'Eastern Standard Time'
+      expect(tz.display_name_for(zoned_date, :iso_extended_local_full, true)).to eq '-04:00'
+      expect(tz.display_name_for(dst_date, :iso_extended_local_full, true)).to eq '-04:00'
+      expect(tz.display_name_for(non_dst_date, :iso_extended_local_full, false)).to eq '-05:00'
+    end
+
+    it 'accepts a block to handle ambiguous times' do
+      # Known ambiguous time
+      time = Time.new(2021, 11, 7, 1, 1, 23, 0)
+
+      expect { tz.display_name_for(time, :generic_short) }.to raise_error(TZInfo::AmbiguousTime)
+      expect { tz.display_name_for(time, :generic_short, &:first) }.to_not raise_error
+    end
+  end
+
+  describe '#period_for_local' do
+    let(:tz) { TwitterCldr::Timezones::Timezone.instance('America/New_York', :en) }
+    # Known ambiguous time
+    let(:time) { Time.new(2021, 11, 7, 1, 1, 23, 0) }
+
+    it 'accepts a block to handle ambiguous times' do
+      expect { tz.period_for_local(time) }.to raise_error(TZInfo::AmbiguousTime)
+      expect { tz.period_for_local(time, &:first) }.to_not raise_error
+    end
+
+    it 'accepts a dst argument', :aggregate_failures do
+      expect(tz.period_for_local(time, false).dst?).to be false
+      expect(tz.period_for_local(time, true).dst?).to be true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_cldr
 version: !ruby/object:Gem::Version
-  version: 6.8.0
+  version: 6.9.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: camertron-eprun