TimezoneParser 0.4.0 → 1.0.0

data/lib/timezone_parser/data/tzinfo.rb

@@ -15,6 +15,7 @@ module TimezoneParser
 
         protected
         @@Version = nil
+        @@Timezones = nil
         @@TimezoneCountries = nil
 
         public
@@ -57,6 +58,13 @@ module TimezoneParser
             ::TZInfo::DataSource.set(:ruby, TZInfoData)
         end
 
+        def self.getTimezones
+            unless @@Timezones
+                @@Timezones = ::TZInfo::Timezone.all_identifiers
+            end
+            @@Timezones
+        end
+
         def self.getTimezoneCountries
             unless @@TimezoneCountries
                 @@TimezoneCountries = {}

data/lib/timezone_parser/rails_zone.rb

@@ -1,34 +1,11 @@
 # encoding: utf-8
 
 module TimezoneParser
-    # Rails zone data
-    class RailsData < Data
-        protected
-        @RailsZone = nil
-
-        public
-        attr_reader :RailsZone
-        def processEntry(data, rails)
-            if rails
-                @RailsZone = rails
-                @Metazones << rails
-                @Timezones << data
-            else
-                rails = Storage.RailsZones[data]
-                if rails
-                    @RailsZone = data
-                    @Metazones << data
-                    @Timezones << rails
-                end
-            end
-            self
-        end
-    end
-
     # Rails zone
     class RailsZone < ZoneInfo
         protected
         @@Locales = []
+        @@Regions = []
 
         public
         # Locales which will be used for RailsZone methods if not specified there
@@ -40,26 +17,38 @@ module TimezoneParser
             @@Locales
         end
 
-        attr_accessor :All
+        # Regions which will be used for WindowsZone methods if not specified there
+        #
+        # Each region is either ISO 3166-1 alpha-2 code
+        # @return [Array<String>] list containing region identifiers
+        # @see http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+        def self.Regions
+            @@Regions
+        end
+
+        attr_accessor :Locales
+        attr_accessor :Regions
+        attr_accessor :Types
 
         # Rails zone instance
         # @param name [String] Rails zone name
         def initialize(name)
             @Name = name
-            @Data = RailsData.new
             @Valid = nil
             setTime
-            set(@@Locales.dup, true)
+            set(@@Locales.dup, @@Regions.dup)
         end
 
-        # Set locales and all
+        # Set locales and regions
         # @param locales [Array<String>] search only in these locales
-        # @param all [Boolean] specify whether should search for all zones or return as soon as found any
-        # @return [RailsZone] self
+        # @param regions [Array<String>] filter for these regions
+        # @return [WindowsZone] self
         # @see Locales
-        def set(locales = nil, all = true)
+        # @see Regions
+        def set(locales = nil, regions = nil, types = nil)
             @Locales = locales unless locales.nil?
-            @All = all ? true : false
+            @Regions = regions unless regions.nil?
+            @Types = types unless types.nil?
             self
         end
 
@@ -67,61 +56,31 @@ module TimezoneParser
         # @return [Boolean] whether Rails zone is valid
         def isValid?
             if @Valid.nil?
-                @Valid = false
-                @Valid = Data::Storage.RailsZones.has_key?(@Name) if (not @Locales) or (@Locales and @Locales.include?('en'))
-                return @Valid if @Valid
-                locales = @Locales
-                locales = Data::Storage.RailsTranslated.keys if locales.empty?
-                locales.each do |locale|
-                    next unless Data::Storage.RailsTranslated.has_key?(locale)
-                    @Valid = Data::Storage.RailsTranslated[locale].has_key?(@Name)
-                    return @Valid if @Valid
+                params = []
+                joins = ''
+                where = ''
+
+                if not @Locales.empty?
+                    joins += ' LEFT JOIN `Locales` AS L ON RI.Locale = L.ID'
+                    where = 'L.Name COLLATE NOCASE IN (' + Array.new(@Locales.count, '?').join(',') + ') AND '
+                    params += @Locales
                 end
-            end
-            @Valid = false
-        end
 
-        # Rails zone data
-        # @return [RailsData] data
-        def getData
-            unless @Loaded
-                @Loaded = true
-                @Valid = false
-                @Valid = Data::Storage.RailsZones.has_key?(@Name) if (not @Locales) or (@Locales and @Locales.include?('en'))
-                if @Valid
-                    @Data.processEntry(Data::Storage.RailsZones[@Name], @Name)
-                    return @Data unless @All
-                end
-                locales = @Locales
-                locales = Data::Storage.RailsTranslated.keys if locales.empty?
-                locales.each do |locale|
-                    next unless Data::Storage.RailsTranslated.has_key?(locale)
-                    entry = Data::Storage.RailsTranslated[locale][@Name]
-                    if entry
-                        @Data.processEntry(entry, false)
-                        @Valid = true
-                        return @Data unless @All
-                    end
-                end
-            end
-            @Data
-        end
+                sql = "SELECT 1 FROM `RailsI18N` RI #{joins} WHERE #{where}RI.`NameLowercase` = ? LIMIT 1"
+                params << @Name.downcase
 
-        # Get UTC offsets in seconds
-        # @return [Array<Fixnum>] list of timezone offsets in seconds
-        def getOffsets
-            if not @Offsets and not getTimezones.empty?
-                @Offsets = @Data.findOffsets(@ToTime, @FromTime).to_a
-            else
-                super
+                @Valid = Data::Storage.getStatement(sql).execute(*params).count > 0
             end
-            @Offsets
+            @Valid
         end
 
         # Rails zone identifier
         # @return [String] Rails zone identifier
         def getZone
-            getData.RailsZone
+            unless @Zone
+                @Zone = self.getFilteredData(:Zone).first
+            end
+            @Zone
         end
 
         # Check if given Rails zone name is a valid timezone
@@ -138,41 +97,93 @@ module TimezoneParser
         # @param toTime [DateTime] look for offsets which came into effect before this date, exclusive
         # @param fromTime [DateTime] look for offsets which came into effect at this date, inclusive
         # @param locales [Array<String>] search zone name only for these locales
-        # @param all [Boolean] specify whether should search for all timezones or return as soon as found any
         # @return [Array<Fixnum>] list of timezone offsets in seconds
         # @see Locales
-        def self.getOffsets(name, toTime = nil, fromTime = nil, locales = nil, all = true)
-            self.new(name).setTime(toTime, fromTime).set(locales, all).getOffsets
+        def self.getOffsets(name, toTime = nil, fromTime = nil, locales = nil, types = nil)
+            self.new(name).setTime(toTime, fromTime).set(locales, nil, types).getOffsets
         end
 
         # Get Timezone identifiers for given Rails zone name
         # @param name [String] Rails zone name
         # @param locales [Array<String>] search zone name only for these locales
-        # @param all [Boolean] specify whether should search for all timezones or return as soon as found any
         # @return [Array<String>] list of timezone identifiers
         # @see Locales
-        def self.getTimezones(name, locales = nil, all = true)
-            self.new(name).set(locales, all).getTimezones
+        def self.getTimezones(name, locales = nil)
+            self.new(name).set(locales).getTimezones
         end
 
         # Get Metazone identifiers for given Rails zone name
         # @param name [String] Rails zone name
         # @param locales [Array<String>] search zone name only for these locales
-        # @param all [Boolean] specify whether should search for all timezones or return as soon as found any
         # @return [Array<String>] list of metazone identifiers
         # @see Locales
         # @see Regions
-        def self.getMetazones(name, locales = nil, all = true)
-            self.new(name).set(locales, all).getMetazones
+        def self.getMetazones(name, locales = nil)
+            self.new(name).set(locales).getMetazones
         end
 
         # Rails zone identifier
         # @param name [String] Rails zone name
         # @param locales [Array<String>] search zone name only for these locales
-        # @param all [Boolean] specify whether should search for all timezones or return as soon as found any
         # @return [String] Timezone identifier
-        def self.getZone(name, locales = nil, all = true)
-            self.new(name).set(locales, all).getZone
+        def self.getZone(name, locales = nil)
+            self.new(name).set(locales).getZone
+        end
+
+
+        protected
+
+        def getFilteredData(dataType)
+            params = []
+            column = nil
+            joins = ''
+            regionJoins = ''
+            useRegionFilter = !@Regions.nil? && !@Regions.empty?
+            case dataType
+            when :Zone
+                column = '`RailsTimezones`.`Name`'
+                joins += ' INNER JOIN `RailsTimezones` ON RailsTimezones.ID = RI.Zone'
+            when :Offsets, :Timezones
+                column = '`Timezones`.`Name`'
+                joins += ' INNER JOIN `RailsTimezones` ON RailsTimezones.ID = RI.Zone'
+                joins += ' INNER JOIN `Timezones` ON RailsTimezones.Timezone = Timezones.ID'
+                regionJoins += ' LEFT JOIN `TimezoneTerritories` ON TimezoneTerritories.Timezone = RailsTimezones.Timezone'
+                regionJoins += ' LEFT JOIN `Territories` ON TimezoneTerritories.Territory = Territories.ID'
+            when :Metazones
+                raise StandardError, "Metazones is not implemented!"
+            when :Types
+                raise StandardError, "Types is not implemented!"
+            else
+                raise StandardError, "Unkown dataType '#{dataType}'"
+            end
+
+            if not @Locales.empty?
+                joins += ' LEFT JOIN `Locales` AS L ON RI.Locale = L.ID'
+                where = 'L.Name COLLATE NOCASE IN (' + Array.new(@Locales.count, '?').join(',')  + ') AND '
+                params += @Locales
+            end
+
+            sql = 'SELECT DISTINCT ' + column + ' FROM `RailsI18N` AS RI'
+            sql += joins
+            if useRegionFilter
+                sql += regionJoins
+            end
+
+            sql += " WHERE #{where}RI.NameLowercase = ?"
+            params << @Name.downcase
+
+            if useRegionFilter
+                sql += ' AND Territories.Territory IN (' + Array.new(@Regions.count, '?').join(',')  + ')'
+                params += @Regions
+            end
+            sql += ' ORDER BY ' + column
+
+            result = Data::Storage.getStatement(sql).execute(*params).collect { |row| row.first }
+            if dataType == :Offsets
+                result = self.class.findOffsets(result, @ToTime, @FromTime, @Types)
+            end
+            result
         end
+
     end
 end

data/lib/timezone_parser/timezone.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'set'
+
 module TimezoneParser
     # Timezone
     class Timezone < ZoneInfo
@@ -31,27 +33,23 @@ module TimezoneParser
 
         attr_accessor :Locales
         attr_accessor :Regions
-        attr_accessor :All
 
         # Timezone instance
         # @param timezone [String] Timezone name
         def initialize(timezone)
             @Timezone = timezone
-            @Data = Data.new
             @Valid = nil
             setTime
-            set(@@Locales.dup, @@Regions.dup, true)
+            set(@@Locales.dup, @@Regions.dup)
         end
 
-        # Set locales, regions and all
+        # Set locales and regions
         # @param locales [Array<String>] search only in these locales
         # @param regions [Array<String>] filter for these regions
-        # @param all [Boolean] specify whether should search for all timezones or return as soon as found any
         # @return [Timezone] self
-        def set(locales = nil, regions = nil, all = true)
+        def set(locales = nil, regions = nil)
             @Locales = locales unless locales.nil?
             @Regions = regions unless regions.nil?
-            @All = all ? true : false
             self
         end
 
@@ -59,50 +57,22 @@ module TimezoneParser
         # @return [Boolean] whether timezone is valid
         def isValid?
             if @Valid.nil?
-                locales = @Locales
-                locales = Data::Storage.Timezones.keys if locales.empty?
-                locales.each do |locale|
-                    next unless Data::Storage.Timezones.has_key?(locale)
-                    if Data::Storage.Timezones[locale].has_key?(@Timezone)
-                        @Valid = true
-                        return @Valid
-                    end
-                end
-            end
-            @Valid = false
-        end
+                params = []
+                joins = ''
+                where = ''
 
-        # Abbreviation data
-        # @return [Data] data
-        def getData
-            unless @Loaded
-                @Loaded = true
-                @Valid = false
-                locales = @Locales
-                locales = Data::Storage.Timezones.keys if locales.empty?
-                locales.each do |locale|
-                    next unless Data::Storage.Timezones.has_key?(locale)
-                    entry = Data::Storage.Timezones[locale][@Timezone]
-                    if entry
-                        @Data.processEntry(entry, @ToTime, @FromTime, @Regions)
-                        @Valid = true
-                        return @Data unless @All
-                    end
+                if not @Locales.empty?
+                    joins += ' LEFT JOIN `Locales` AS L ON TN.Locale = L.ID'
+                    where = 'L.Name COLLATE NOCASE IN (' + Array.new(@Locales.count, '?').join(',') + ') AND '
+                    params += @Locales
                 end
-            end
-            @Data
-        end
 
-        # Get UTC offsets in seconds
-        # @return [Array<Fixnum>] list of timezone offsets in seconds
-        def getOffsets
-            if not @Offsets and not getTimezones.empty?
-                types = [@Type] if @Type
-                @Offsets = @Data.findOffsets(@ToTime, @FromTime, @Regions, types).to_a
-            else
-                super
+                sql = "SELECT 1 FROM `TimezoneNames` TN #{joins} WHERE #{where}TN.NameLowercase = ? COLLATE NOCASE LIMIT 1"
+                params << @Timezone.downcase
+
+                @Valid = Data::Storage.getStatement(sql).execute(*params).count > 0
             end
-            @Offsets
+            @Valid
         end
 
         # Check if given Timezone name is a valid timezone
@@ -120,12 +90,11 @@ module TimezoneParser
         # @param fromTime [DateTime] look for offsets which came into effect at this date, inclusive
         # @param locales [Array<String>] search Timezone name only for these locales
         # @param regions [Array<String>] look for offsets only for these regions
-        # @param all [Boolean] specify whether should search for all timezones or return as soon as found any
         # @return [Array<Fixnum>] list of timezone offsets in seconds
         # @see Locales
         # @see Regions
-        def self.getOffsets(timezone, toTime = nil, fromTime = nil, locales = nil, regions = nil, all = true)
-            self.new(timezone).setTime(toTime, fromTime).set(locales, regions, all).getOffsets
+        def self.getOffsets(timezone, toTime = nil, fromTime = nil, locales = nil, regions = nil)
+            self.new(timezone).setTime(toTime, fromTime).set(locales, regions).getOffsets
         end
 
         # Get Timezone identifiers for given Timezone name
@@ -134,12 +103,11 @@ module TimezoneParser
         # @param fromTime [DateTime] look for timezones which came into effect at this date, inclusive
         # @param locales [Array<String>] search Timezone name only for these locales
         # @param regions [Array<String>] look for timezones only for these regions
-        # @param all [Boolean] specify whether should search for all timezones or return as soon as found any
         # @return [Array<String>] list of timezone identifiers
         # @see Locales
         # @see Regions
-        def self.getTimezones(timezone, toTime = nil, fromTime = nil, locales = nil, regions = nil, all = true)
-            self.new(timezone).setTime(toTime, fromTime).set(locales, regions, all).getTimezones
+        def self.getTimezones(timezone, toTime = nil, fromTime = nil, locales = nil, regions = nil)
+            self.new(timezone).setTime(toTime, fromTime).set(locales, regions).getTimezones
         end
 
         # Get Metazone identifiers for given Timezone name
@@ -148,12 +116,94 @@ module TimezoneParser
         # @param fromTime [DateTime] look for timezones which came into effect at this date, inclusive
         # @param locales [Array<String>] search Timezone name only for these locales
         # @param regions [Array<String>] look for timezones only for these regions
-        # @param all [Boolean] specify whether should search for all timezones or return as soon as found any
         # @return [Array<String>] list of metazone identifiers
         # @see Locales
         # @see Regions
-        def self.getMetazones(timezone, toTime = nil, fromTime = nil, locales = nil, regions = nil, all = true)
-            self.new(timezone).setTime(toTime, fromTime).set(locales, regions, all).getMetazones
+        def self.getMetazones(timezone, toTime = nil, fromTime = nil, locales = nil, regions = nil)
+            self.new(timezone).setTime(toTime, fromTime).set(locales, regions).getMetazones
+        end
+
+        protected
+
+        def getFilteredData(dataType)
+            params = []
+            column = nil
+            joins = ''
+            regionJoins = ''
+            useTimeFilter = false
+            useRegionFilter = !@Regions.nil? && !@Regions.empty?
+            case dataType
+            when :Offsets, :Timezones
+                column = '`Timezones`.`Name`'
+                if dataType == :Offsets
+                    column += ', TN.`Types`'
+                end
+                joins += ' LEFT JOIN `TimezoneName_Timezones` AS T ON T.Name = TN.ID'
+                joins += ' LEFT JOIN `TimezoneName_Metazones` AS M ON M.Name = TN.ID'
+                joins += ' LEFT JOIN `MetazonePeriods` MP ON M.Metazone = MP.Metazone'
+                joins += ' LEFT JOIN `MetazonePeriod_Timezones` MPT ON MPT.MetazonePeriod = MP.ID'
+                joins += ' INNER JOIN `Timezones` ON (T.Timezone = Timezones.ID OR MPT.Timezone = Timezones.ID)'
+                regionJoins += ' LEFT JOIN `TimezoneTerritories` ON (TimezoneTerritories.Timezone = T.Timezone OR TimezoneTerritories.Timezone = MPT.Timezone)'
+                regionJoins += ' LEFT JOIN `Territories` ON TimezoneTerritories.Territory = Territories.ID'
+                useTimeFilter = true
+            when :Metazones
+                column = '`Metazones`.`Name`'
+                joins += ' LEFT JOIN `TimezoneName_Metazones` AS M ON M.Name = TN.ID'
+                joins += ' INNER JOIN `Metazones` ON M.Metazone = Metazones.ID'
+                regionJoins += ' LEFT JOIN `TimezoneName_Timezones` AS T ON T.Name = TN.ID'
+                regionJoins += ' LEFT JOIN `TimezoneTerritories` ON TimezoneTerritories.Timezone = T.Timezone'
+                regionJoins += ' LEFT JOIN `Territories` ON TimezoneTerritories.Territory = Territories.ID'
+            when :Types
+                 column = 'TN.Types'
+                 useRegionFilter = false
+            else
+                raise StandardError, "Unkown dataType '#{dataType}'"
+            end
+
+            if not @Locales.empty?
+                joins += ' LEFT JOIN `Locales` AS L ON TN.Locale = L.ID'
+                where = 'L.Name COLLATE NOCASE IN (' + Array.new(@Locales.count, '?').join(',')  + ') AND '
+                params += @Locales
+            end
+
+            sql = 'SELECT DISTINCT ' + column + ' FROM `TimezoneNames` AS TN'
+            sql += joins
+            if useRegionFilter
+                sql += regionJoins
+            end
+
+            sql += " WHERE #{where}TN.NameLowercase = ?"
+            params << @Timezone.downcase
+            if useTimeFilter and not @FromTime.nil?
+                fromsql = '((MP.`From` IS NULL AND MP.`To` > ?) OR (MP.`To` IS NULL AND MP.`From` <= ?) OR (MP.`From` <= ? AND MP.`To` > ?) OR (MP.`From` IS NULL AND MP.`To` IS NULL))'
+                params += Array.new(4, @FromTime.to_s)
+                if @ToTime.nil?
+                    sql += ' AND ' + fromsql
+                end
+            end
+            if useTimeFilter and not @ToTime.nil?
+                tosql = '((MP.`From` IS NULL AND MP.`To` >= ?) OR (MP.`To` IS NULL AND MP.`From` < ?) OR (MP.`From` < ? AND MP.`To` >= ?) OR (MP.`From` IS NULL AND MP.`To` IS NULL))'
+                params += Array.new(4, @ToTime.to_s)
+                if not @FromTime.nil?
+                    sql += ' AND ((' + fromsql + ') OR (' + tosql + '))'
+                else
+                    sql += ' AND ' + tosql
+                end
+            end
+            if useRegionFilter
+                sql += ' AND Territories.Territory IN (' + Array.new(@Regions.count, '?').join(',')  + ')'
+                params += @Regions
+            end
+            sql += ' ORDER BY ' + column
+
+            if dataType == :Offsets
+                result = self.class.findOffsetsFromTimezonesTypes(Data::Storage.getStatement(sql).execute(*params), @ToTime, @FromTime, nil)
+            else
+                result = Data::Storage.getStatement(sql).execute(*params).collect { |row| row.first }
+                result = self.class.convertTypes(result) if dataType == :Types
+            end
+            result
         end
+
     end
 end