Refine EtOrbi.zone_abbreviation(zone_name, time)

floraison · Mar 31, 2024 · ac15d51 · ac15d51
1 parent 599fbc9
commit ac15d51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/lib/et-orbi/zones.rb b/lib/et-orbi/zones.rb
@@ -165,13 +165,12 @@ def zone_abbreviation(zone_name, time)
 
       tz = ::TZInfo::Timezone.get(zone_name)
 
-      a = [
-        tz.period_for_local(time, false).abbreviation.to_s,
-        tz.period_for_local(time, true).abbreviation.to_s
-          ].uniq
-      a.reverse! if time.month < 6
+      ts = tz.period_for_local(time, true) rescue -1
+      tw = tz.period_for_local(time, false) rescue -2
 
-      a.first
+      return ts.abbreviation.to_s if ts == tw
+
+      tz.period_for_local(time + 2 * 3600).abbreviation.to_s
     end
 
     def tweak_zone_name(name)

diff --git a/spec/module_spec.rb b/spec/module_spec.rb
@@ -962,13 +962,19 @@ class << t; def zone; 'ECT'; end; end
     { [ 'Europe/Tallinn', '2012-07-28' ] => 'EEST',
       [ 'Europe/Tallinn', '2012-10-28' ] => 'EEST',
       [ 'Europe/Tallinn', '2012-12-28' ] => 'EET',
+
+      [ 'Europe/Tallinn', '2012-03-25 02:00' ] => 'EET',
+      [ 'Europe/Tallinn', '2012-03-25 03:00' ] => 'EEST',
+      [ 'Europe/Tallinn', '2012-03-25 04:00' ] => 'EEST',
+      [ 'Europe/Tallinn', '2012-03-25 05:00' ] => 'EEST',
+
       [ 'Europe/Tallinn', '2012-10-28 00:00' ] => 'EEST',
       [ 'Europe/Tallinn', '2012-10-28 02:59' ] => 'EEST',
       [ 'Europe/Tallinn', '2012-10-28 03:00' ] => 'EET',
       [ 'Europe/Tallinn', '2012-10-28 03:30' ] => 'EET',
       [ 'Europe/Tallinn', '2012-10-28 04:30' ] => 'EET',
 
-      # note, it favours non-DST...
+      # in case of ambiguity, .zone_abbreviation goes 2 hours forward...
 
     }.each do |(zone, time), v|