TimezoneParser 0.3.3 → 0.4.0

data/lib/timezone_parser/data/cldr.rb

@@ -3,6 +3,7 @@ require 'cldr'
 require 'cldr/download'
 require 'cldr/export/data'
 require 'cldr/export/data/timezones'
+require 'cldr/export/data/territories_containment'
 require 'pathname'
 
 module TimezoneParser
@@ -14,6 +15,8 @@ module TimezoneParser
 
         protected
         @@Version = nil
+        @@Locales = nil
+        @@Territories = nil
 
         public
         def self.download(source = 'http://unicode.org/Public/cldr/latest/core.zip', target = nil)
@@ -37,9 +40,26 @@ module TimezoneParser
             @@Version
         end
 
+        def self.getLocales
+            unless @@Locales
+                @@Locales = Cldr::Export::Data.locales.sort
+            end
+            @@Locales
+        end
+
+        def self.getTerritories
+            unless @@Territories
+                @@Territories = {}
+                Cldr::Export::Data::TerritoriesContainment.new.territories.each do |territory, info|
+                    @@Territories[territory] = info[:contains]
+                end
+            end
+            @@Territories
+        end
+
         def self.getTimezones
             timezones = { }
-            Cldr::Export::Data.locales.sort.each do |locale|
+            getLocales.each do |locale|
                 tz = Cldr::Export::Data::Timezones.new(locale)
                 next if tz.timezones.empty? and tz.metazones.empty?
 
@@ -84,7 +104,7 @@ module TimezoneParser
         end
 
         def self.updateAbbreviations(abbreviations)
-            Cldr::Export::Data.locales.sort.each do |locale|
+            getLocales.each do |locale|
                 tz = Cldr::Export::Data::Timezones.new(locale)
                 next if tz.timezones.empty? and tz.metazones.empty?
                 tz.timezones.each do |timezone, data|

data/lib/timezone_parser/data/storage.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'yaml'
 require 'date'
 require 'insensitive_hash'
 
@@ -19,6 +18,7 @@ module TimezoneParser
             @@RailsTranslated = nil
 
             public
+
             def self.Abbreviations
                 unless @@Abbreviations
                     @@Abbreviations = Marshal.load(File.open(Data::DataDir + 'abbreviations.dat'))

data/lib/timezone_parser/data/tzinfo.rb

@@ -68,6 +68,11 @@ module TimezoneParser
                         @@TimezoneCountries[timezone].sort!
                     end
                 end
+                ::TZInfo::Timezone.all_linked_zones.each do |zone|
+                    timezone = zone.identifier
+                    actual_timezone = zone.canonical_zone.identifier
+                    @@TimezoneCountries[timezone] = @@TimezoneCountries[actual_timezone].dup unless @@TimezoneCountries[actual_timezone].nil?
+                end
                 @@TimezoneCountries = Hash[@@TimezoneCountries.to_a.sort_by { |pair| pair.first }]
             end
             @@TimezoneCountries

data/lib/timezone_parser/data/windows.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'win32/registry'
 require 'fiddle'
+require 'insensitive_hash/minimal'
 
 module TimezoneParser
     # Windows module
@@ -32,6 +33,10 @@ module TimezoneParser
 
         def self.getTimezones(path = TimeZonePath)
             timezones = {}
+
+            timezones['North Pacific Standard Time'] = { 'standard' => 3600 * -8, 'daylight' => 3600 * -7 }
+            timezones['Russia TZ 5 Standard Time']   = { 'standard' => 3600 *  6, 'daylight' => 3600 *  6 }
+
             begin
                 Win32::Registry::HKEY_LOCAL_MACHINE.open(path, Win32::Registry::KEY_READ).each_key do |key, wtime|
                     Win32::Registry::HKEY_LOCAL_MACHINE.open(path + '\\' + key, Win32::Registry::KEY_READ) do |reg|
@@ -54,10 +59,21 @@ module TimezoneParser
             rescue Win32::Registry::Error => e
                 @@Errors << e.message
             end
+
             timezones = Hash[timezones.to_a.sort_by { |d| d.first } ]
             timezones
         end
 
+        def self.getTimezonesUTC()
+            timezones = {}
+            ((1..13).to_a + (-12..-1).to_a.reverse).each do |o|
+                name = "UTC%+03d" % o
+                timezones[name] = { 'standard' => 3600 * o }
+                timezones[name]['daylight'] = timezones[name]['standard']
+            end
+            timezones
+        end
+
         def self.getMUIOffsets(path = TimeZonePath)
             offsets = {}
             begin
@@ -141,7 +157,7 @@ module TimezoneParser
                     puts "Warning: No translation to locale name from LCID (#{lcid}), skipping!"
                     next
                 end
-                metazones[locale] = {}
+                metazones[locale] = InsensitiveHash.new
                 offsets.each do |id, info|
                     unless data.has_key?(id)
                         puts "Warning: Didn't found timezone name for #{id} for #{locale} locale, skipping!"

data/lib/timezone_parser/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module TimezoneParser
     # Version
-    VERSION = '0.3.3'
+    VERSION = '0.4.0'
 end

data/spec/abbreviation_spec.rb

@@ -116,13 +116,13 @@ describe TimezoneParser do
 
         describe '.getOffsets' do
             it 'should return offsets for WAST abbreviation in NA region' do
-                expect(TimezoneParser::Abbreviation::getOffsets('WAST', DateTime.now, nil, ['NA'])).to eq([7200])
+                expect(TimezoneParser::Abbreviation::getOffsets('WAST', DateTime.now, nil, ['NA'])).to eq([3600])
             end
         end
 
         describe '.getTimezones' do
             it 'should return timezones for WAST abbreviation' do
-                expect(TimezoneParser::Abbreviation::getTimezones('WAST', DateTime.parse('1988-07-28T03:26:56+00:00'), DateTime.parse('1994-07-28T01:14:40+00:00'), ['NA'])).to eq(['Africa/Windhoek'])
+                expect(TimezoneParser::Abbreviation::getTimezones('WAST', DateTime.parse('1994-07-28T01:14:40+00:00'), DateTime.parse('1988-07-28T03:26:56+00:00'), ['NA'])).to eq(['Africa/Windhoek'])
             end
         end
 

data/spec/timezone_spec.rb

@@ -56,7 +56,7 @@ describe TimezoneParser do
                 end
 
                 it 'should find timezones in only "GR", "FI" and "BG" regions' do
-                    expect(TimezoneParser::Timezone.new('აღმოსავლეთ ევროპის დრო').set(nil, ['GR', 'FI', 'BG']).getTimezones).to eq(['Europe/Athens', 'Europe/Helsinki', 'Europe/Sofia'])
+                    expect(TimezoneParser::Timezone.new('აღმოსავლეთ ევროპის დრო').set(nil, ['GR', 'FI', 'BG']).getTimezones).to eq(['Europe/Athens', 'Europe/Helsinki', 'Europe/Mariehamn', 'Europe/Sofia'])
                 end
             end
 
@@ -93,8 +93,8 @@ describe TimezoneParser do
         end
 
         describe '.getTimezones' do
-            it 'should return all timezones for "Britain dzomeŋɔli gaƒoƒome"' do
-                expect(TimezoneParser::Timezone::getTimezones('Britain dzomeŋɔli gaƒoƒome', nil, nil, ['dz', 'ee'], ['IM'])).to eq(['Europe/London'])
+            it 'should return all timezones for "British dzomeŋɔli gaƒoƒo me"' do
+                expect(TimezoneParser::Timezone::getTimezones('British dzomeŋɔli gaƒoƒo me', nil, nil, ['dz', 'ee'], ['IM'])).to eq(['Europe/London'])
             end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TimezoneParser
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Dāvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -174,6 +174,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - ".yardopts"
 - Gemfile
 - README.md
@@ -181,17 +182,28 @@ files:
 - TimezoneParser.gemspec
 - UNLICENSE
 - data/abbreviations.dat
+- data/abbreviations.yaml
 - data/countries.dat
+- data/countries.yaml
+- data/locales.yaml
 - data/metazones.dat
+- data/metazones.yaml
 - data/rails.dat
+- data/rails.yaml
 - data/rails_i18n.dat
+- data/rails_i18n.yaml
+- data/territories.yaml
 - data/timezones.dat
-- data/version.yml
+- data/timezones.yaml
+- data/version.yaml
 - data/windows_locales.yaml
 - data/windows_offsets.dat
+- data/windows_offsets.yaml
 - data/windows_timezones.dat
+- data/windows_timezones.yaml
 - data/windows_tzres.yaml
 - data/windows_zonenames.dat
+- data/windows_zonenames.yaml
 - lib/timezone_parser.rb
 - lib/timezone_parser/abbreviation.rb
 - lib/timezone_parser/data.rb

data/data/version.yml

@@ -1,5 +0,0 @@
----
-TZInfo: 2017b
-CLDR: 31.0.1
-Rails: 5.1.3
-WindowsZones: 7e10400