TimezoneParser 0.2.0 → 0.3.0

data/lib/timezone_parser/data/cldr.rb

@@ -32,8 +32,8 @@ module TimezoneParser
             return @@Version if @@Version
             content = File.read(source + 'dtd' + 'ldml.dtd')
             content.gsub!(/<!--.*?-->/, '')
-            data = content.match(/\s+cldrVersion\s+[\#\w\s]+\s+"(\d+)"\s*\>/)
-            @@Version = data[1].to_i if data
+            data = content.match(/\s+cldrVersion\s+[\#\w\s]+\s+"([\d\.]+)"\s*\>/)
+            @@Version = data[1] if data
             @@Version
         end
 

data/lib/timezone_parser/data/tzinfo.rb

@@ -49,13 +49,7 @@ module TimezoneParser
 
         def self.getVersion(source = TZDataPath)
             return @@Version if @@Version
-            File.open(source + 'Makefile', 'r', { :encoding => 'UTF-8:UTF-8' }) do |file|
-                file.each_line do |line|
-                    line = line.gsub(/#.*$/, '')
-                    v = line.match(/^\s*VERSION\s*=\s*(\w+)\s*$/)
-                    @@Version = v[1] if v
-                end
-            end
+            @@Version = File.read(source + 'version', { :mode => 'r', :encoding => 'UTF-8:UTF-8' }).strip
             @@Version
         end
 

data/lib/timezone_parser/data/windows.rb

@@ -63,39 +63,85 @@ module TimezoneParser
             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|
+                        muiDisplay = reg.read_s('MUI_Display')
                         muiDlt = reg.read_s('MUI_Dlt')
                         muiStd = reg.read_s('MUI_Std')
 
-                        offsets[self.parseMUI(muiDlt)] = ['daylight', key]
-                        offsets[self.parseMUI(muiStd)] = ['standard', key]
+                        offsets[self.parseMUI(muiDisplay)] = { 'Type' => 'display', 'Name' => key }
+                        offsets[self.parseMUI(muiDlt)] = { 'Type' => 'daylight', 'Name' => key }
+                        offsets[self.parseMUI(muiStd)] = { 'Type' => 'standard', 'Name' => key }
                     end
                 end
             rescue Win32::Registry::Error => e
                 @@Errors << e.message
             end
-            puts @@Errors
-            offsets
+            puts @@Errors unless @@Errors.empty?
+            Hash[offsets.to_a.sort_by { |o| o.first }]
         end
 
         def self.parseMUI(str)
-            str.split(',').last.to_i.abs
+            parts = str.split(',')
+            puts "Warning: Unexpected dll name #{parts.first}" if parts.first != '@tzres.dll'
+            parts.last.to_i.abs
         end
 
-        def self.parseMetazones(metazoneList, offsets)
-            metazones = {}
-            metazoneList.each do |lcid, data|
+        def self.getLocales(lcids)
+            locales = {}
+            lcids.each do |lcid|
                 localeMem = Fiddle::Pointer.malloc(LOCALE_NAME_MAX_LENGTH)
                 chars = LCIDToLocaleName.call(lcid, localeMem, LOCALE_NAME_MAX_LENGTH, 0)
-                return nil if chars.zero?
+                if chars.zero?
+                    puts "Warning: Failed to translate LCID (#{lcid}) to locale name!"
+                    next
+                end
                 locale = localeMem.to_s((chars-1)*2).force_encoding(Encoding::UTF_16LE).encode(Encoding::UTF_8)
+                locales[lcid] = locale
+            end
+            locales
+        end
+
+        def self.collectMUIOffsets(metazoneList, locales)
+            enUS = locales.key('en-US')
+            baseMetazone = metazoneList[enUS]
+            types = ['display', 'daylight', 'standard']
+            type_bases = [0, 0, 0, 3, 3, 3, nil, 7, 7, 7]
+            offsets = {}
+            baseMetazone.each do |id, name|
+                data = {}
+                type = id % 10
+                type_base = type_bases[type]
+                data['Type'] = types[type - type_base]
+                data['Name'] = baseMetazone[(id / 10) * 10 + type_base + types.index('standard')]
+                offsets[id] = data unless data['Name'].nil?
+            end
+            offsets
+        end
+
+        def self.parseMetazones(metazoneList, offsets, locales)
+            metazones = {}
+            metazoneList.each do |lcid, data|
+                locale = locales[lcid]
+                if locale.nil?
+                    puts "Warning: No translation to locale name from LCID (#{lcid}), skipping!"
+                    next
+                end
                 metazones[locale] = {}
                 offsets.each do |id, info|
+                    unless data.has_key?(id)
+                        puts "Warning: Didn't found timezone name for #{id} for #{locale} locale, skipping!"
+                        next
+                    end
                     name = data[id]
                     metazones[locale][name] ||= {}
                     metazones[locale][name]['Types'] ||= []
                     metazones[locale][name]['Metazones'] ||= []
-                    metazones[locale][name]['Types'] << info.first
-                    metazones[locale][name]['Metazones'] << info.last
+                    types = []
+                    types << info['Type'] if info.has_key?('Type')
+                    if info['Type'] == 'display'
+                        types = ['daylight', 'standard']
+                    end
+                    metazones[locale][name]['Types'] += types
+                    metazones[locale][name]['Metazones'] << info['Name']
                     metazones[locale][name]['Types'].uniq!
                     metazones[locale][name]['Metazones'].uniq!
                 end

data/lib/timezone_parser/version.rb

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

data/spec/abbreviation_spec.rb

@@ -35,9 +35,9 @@ describe TimezoneParser do
             context 'before specified time' do
                 it 'should return correct offsets for ADT' do
                     expect(TimezoneParser::Abbreviation.new('ADT').setTime(DateTime.parse('1982-04-30T21:00:00+00:00')).getOffsets).to eq([-10800])
-                    expect(TimezoneParser::Abbreviation.new('ADT').setTime(DateTime.parse('1982-04-30T21:00:01+00:00')).getOffsets).to eq([-10800, 14400])
-                    expect(TimezoneParser::Abbreviation.new('ADT').setTime(DateTime.parse('1982-09-30T19:59:59+00:00')).getOffsets).to eq([-10800, 14400])
-                    expect(TimezoneParser::Abbreviation.new('ADT').setTime(DateTime.parse('1982-09-30T20:00:00+00:00')).getOffsets).to eq([-10800, 14400])
+                    expect(TimezoneParser::Abbreviation.new('ADT').setTime(DateTime.parse('1982-04-30T21:00:01+00:00')).getOffsets).to eq([-10800])
+                    expect(TimezoneParser::Abbreviation.new('ADT').setTime(DateTime.parse('1982-09-30T19:59:59+00:00')).getOffsets).to eq([-10800])
+                    expect(TimezoneParser::Abbreviation.new('ADT').setTime(DateTime.parse('1982-09-30T20:00:00+00:00')).getOffsets).to eq([-10800])
                     expect(TimezoneParser::Abbreviation.new('ADT').setTime(DateTime.parse('1983-03-30T21:00:00+00:00'), DateTime.parse('1982-09-30T20:00:00+00:00')).getOffsets).to eq([-10800])
                 end
             end
@@ -56,9 +56,9 @@ describe TimezoneParser do
             context 'in specified region' do
                 it 'should return correct offsets for ADT' do
                     expect(TimezoneParser::Abbreviation.new('ADT').set([]).getOffsets).to eq([-10800])
-                    expect(TimezoneParser::Abbreviation.new('ADT').set(['IQ']).getOffsets).to eq([14400])
+                    expect(TimezoneParser::Abbreviation.new('ADT').set(['BM']).getOffsets).to eq([-10800])
                     expect(TimezoneParser::Abbreviation.new('ADT').set(['GL']).getOffsets).to eq([-10800])
-                    expect(TimezoneParser::Abbreviation.new('ADT').setTime(DateTime.parse('2007-10-01T00:00:00+00:00')).set(['IQ', 'CA']).getOffsets).to eq([-10800, 14400])
+                    expect(TimezoneParser::Abbreviation.new('ADT').setTime(DateTime.parse('2007-10-01T00:00:00+00:00')).set(['BM', 'CA']).getOffsets).to eq([-10800])
                 end
             end
 
@@ -96,7 +96,7 @@ describe TimezoneParser do
 
         describe '.isValid?' do
             it 'should be valid abbreviation' do
-                expect(TimezoneParser::Abbreviation::isValid?('WGT')).to be true
+                expect(TimezoneParser::Abbreviation::isValid?('WAST')).to be true
             end
         end
 
@@ -115,14 +115,14 @@ describe TimezoneParser do
         end
 
         describe '.getOffsets' do
-            it 'should return offsets for WGT abbreviation in GL region' do
-                expect(TimezoneParser::Abbreviation::getOffsets('WGT', DateTime.now, nil, ['GL'])).to eq([-10800])
+            it 'should return offsets for WAST abbreviation in NA region' do
+                expect(TimezoneParser::Abbreviation::getOffsets('WAST', DateTime.now, nil, ['NA'])).to eq([7200])
             end
         end
 
         describe '.getTimezones' do
-            it 'should return timezones for WGT abbreviation' do
-                expect(TimezoneParser::Abbreviation::getTimezones('WGT', DateTime.parse('1916-07-28T03:26:56+00:00'), DateTime.parse('1916-07-28T01:14:40+00:00'), ['GL'])).to eq(['America/Danmarkshavn'])
+            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'])
             end
         end
 

data/spec/rails_zone_spec.rb

@@ -58,7 +58,7 @@ describe TimezoneParser do
 
         describe '.getOffsets' do
             it 'should return all offsets for "Nuku\'alofa"' do
-                expect(TimezoneParser::RailsZone::getOffsets('Nuku\'alofa', DateTime.now, nil, ['en', 'ru'], true)).to eq([46800])
+                expect(TimezoneParser::RailsZone::getOffsets('Nuku\'alofa', DateTime.now, nil, ['en', 'ru'], true)).to eq([46800, 50400])
             end
         end
 

data/spec/timezone_spec.rb

@@ -20,14 +20,14 @@ describe TimezoneParser do
 
             it 'should be valid case-insensitive' do
                 expect(TimezoneParser::Timezone.new('büsingen').isValid?).to be true
-                pending('TODO: Unicode case insensitivity')
                 expect(TimezoneParser::Timezone.new('bÜsingen').isValid?).to be true
+                expect(TimezoneParser::Timezone.new('bÜsinGEN').isValid?).to be true
             end
         end
 
         describe '#getOffsets' do
-            it 'should return all offsets for "Պարսկաստանի ամառային ժամանակ"' do
-                expect(TimezoneParser::Timezone.new('Պարսկաստանի ամառային ժամանակ').getOffsets).to eq([16200])
+            it 'should return all offsets for "Ալյասկայի ամառային ժամանակ"' do
+                expect(TimezoneParser::Timezone.new('Ալյասկայի ամառային ժամանակ').getOffsets).to eq([-28800])
             end
         end
 
@@ -62,8 +62,8 @@ describe TimezoneParser do
 
             context 'timezones from specified time range' do
                 it 'should find timezones between specified time range' do
-                    expect(TimezoneParser::Timezone.new('Maskvos laikas').setTime(DateTime.parse('1991-03-30T23:00:00+00:00'), DateTime.parse('1990-06-30T23:00:00+00:00')).getTimezones).to eq(['Europe/Kaliningrad', 'Europe/Minsk', 'Europe/Moscow', 'Europe/Samara', 'Europe/Vilnius', 'Europe/Zaporozhye'])
-                    expect(TimezoneParser::Timezone.new('Maskvos laikas').setTime(DateTime.parse('2010-03-27T22:00:00+00:00'), DateTime.parse('1997-03-30T01:00:00+00:00')).getTimezones).to eq(['Europe/Moscow', 'Europe/Volgograd'])
+                    expect(TimezoneParser::Timezone.new('Maskvos laikas').setTime(DateTime.parse('1991-03-30T23:00:00+00:00'), DateTime.parse('1990-06-30T23:00:00+00:00')).getTimezones).to eq(['Europe/Minsk', 'Europe/Moscow', 'Europe/Samara', 'Europe/Zaporozhye'])
+                    expect(TimezoneParser::Timezone.new('Maskvos laikas').setTime(DateTime.parse('2010-03-27T22:00:00+00:00'), DateTime.parse('1997-03-30T01:00:00+00:00')).getTimezones).to eq(["Europe/Astrakhan", "Europe/Moscow", "Europe/Saratov", "Europe/Ulyanovsk", "Europe/Volgograd"])
                 end
             end
         end
@@ -93,8 +93,8 @@ describe TimezoneParser do
         end
 
         describe '.getTimezones' do
-            it 'should return all timezones for "Grinwish gaƒoƒome"' do
-                expect(TimezoneParser::Timezone::getTimezones('Grinwish gaƒoƒome', nil, nil, ['dz', 'ee'], ['IM'])).to eq(['Europe/London'])
+            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'])
             end
         end
 

data/spec/windows_zone_spec.rb

@@ -28,7 +28,7 @@ describe TimezoneParser do
 
         describe '#getTimezones' do
             it 'should return all timezones for "كوريا - التوقيت الرسمي"' do
-                expect(TimezoneParser::WindowsZone.new('كوريا - التوقيت الرسمي').getTimezones).to eq(['Asia/Pyongyang', 'Asia/Seoul'])
+                expect(TimezoneParser::WindowsZone.new('كوريا - التوقيت الرسمي').getTimezones).to eq(['Asia/Seoul'])
             end
 
             it 'it should not find "GMT Daylight Time" in "en-GB" locale' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TimezoneParser
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Dāvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -187,8 +187,10 @@ files:
 - data/rails_i18n.dat
 - data/timezones.dat
 - data/version.yml
+- data/windows_locales.yaml
 - data/windows_offsets.dat
 - data/windows_timezones.dat
+- data/windows_tzres.yaml
 - data/windows_zonenames.dat
 - lib/timezone_parser.rb
 - lib/timezone_parser/abbreviation.rb
@@ -228,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Parse Timezone names written in any language to offsets and TimeZone identifiers
@@ -239,4 +241,3 @@ test_files:
 - spec/timezone_parser_spec.rb
 - spec/timezone_spec.rb
 - spec/windows_zone_spec.rb
-has_rdoc: