twitter_cldr 6.8.0 → 6.11.1

data/lib/twitter_cldr/resources/cldr_locale.rb

@@ -0,0 +1,78 @@
+# encoding: UTF-8
+
+# Copyright 2012 Twitter, Inc
+# http://www.apache.org/licenses/LICENSE-2.0
+
+require 'nokogiri'
+
+module TwitterCldr
+  module Resources
+
+    class CldrLocale
+      attr_reader :base_locale, :cldr_requirement
+
+      def initialize(base_locale, cldr_requirement)
+        @base_locale = base_locale
+        @cldr_requirement = cldr_requirement
+      end
+
+      def ancestors
+        @ancestors ||= [].tap do |ancestry|
+          locale = from_fs(base_locale)
+          ancestry << locale
+
+          loop do
+            cur = from_fs(ancestry.last)
+
+            if parents = parent_locales[cur]
+              ancestry << to_fs(parents)
+            elsif I18n::Locale::Tag.tag(cur).self_and_parents.count > 1
+              ancestry << I18n::Locale::Tag.tag(cur).self_and_parents.last.to_sym
+            else
+              parents = TwitterCldr::Shared::Locale
+                .parse(cur)
+                .permutations
+                .select do |loc|
+                  File.exist?(File.join(cldr_requirement.common_path, 'main', "#{loc}.xml"))
+                end
+
+              ancestry.concat(parents - [cur])
+              break
+            end
+          end
+
+          ancestry << "root"
+          ancestry.freeze
+        end
+      end
+
+      private
+
+      def to_fs(locale)
+        locale.to_s.gsub('_', '-').to_sym
+      end
+
+      def from_fs(locale)
+        locale.to_s.gsub('-', '_')
+      end
+
+      def parent_locales
+        @parent_locales ||= supplemental_data.xpath('//parentLocales/parentLocale').each_with_object({}) do |node, ret|
+          parent = node.attr('parent')
+          locales = node.attr('locales').split(' ')
+
+          locales.each do |locale|
+            ret[locale] = parent
+          end
+        end
+      end
+
+      def supplemental_data
+        @supplemental_data ||= Nokogiri.XML(
+          File.read(File.join(cldr_requirement.common_path, 'supplemental', 'supplementalData.xml'))
+        )
+      end
+    end
+
+  end
+end

data/lib/twitter_cldr/resources/list_formats_importer.rb

@@ -49,7 +49,7 @@ module TwitterCldr
         # locales, we fill in any missing parts at the minor risk of being slightly wrong
         # when formatting lists. In my opinion, it's far better to produce a slightly wrong
         # string than to error or produce an entirely empty string.
-        data = requirements[:cldr].merge_each_ancestor(locale) do |ancestor_locale|
+        data = requirements[:cldr].build_data(locale) do |ancestor_locale|
           ListFormats.new(ancestor_locale, requirements[:cldr]).to_h
         end
 

data/lib/twitter_cldr/resources/loader.rb

@@ -3,6 +3,8 @@
 # Copyright 2012 Twitter, Inc
 # http://www.apache.org/licenses/LICENSE-2.0
 
+require 'yaml'
+
 module TwitterCldr
   module Resources
 
@@ -10,7 +12,18 @@ module TwitterCldr
 
     class Loader
 
+      class << self
+        def load_yaml(yaml, permitted_classes: [])
+          if Psych::VERSION >= '4'
+            YAML.safe_load(yaml, permitted_classes: permitted_classes)
+          else
+            YAML.safe_load(yaml, permitted_classes)
+          end
+        end
+      end
+
       VALID_EXTS = %w(.yml .dump).freeze
+      PERMITTED_YAML_CLASSES = [Range, Regexp, Symbol, Time].freeze
 
       def get_resource(*path)
         resources_cache[resource_file_path(path)]
@@ -105,7 +118,7 @@ module TwitterCldr
       end
 
       def load_yaml_resource(path, merge_custom = true)
-        base = YAML.load(read_resource_file(path))
+        base = load_yaml(read_resource_file(path), permitted_classes: PERMITTED_YAML_CLASSES)
         custom_path = File.join("custom", path)
 
         if merge_custom && custom_resource_exists?(custom_path) && !TwitterCldr.disable_custom_locale_resources
@@ -115,6 +128,10 @@ module TwitterCldr
         base
       end
 
+      def load_yaml(yaml, permitted_classes: [])
+        self.class.load_yaml(yaml, permitted_classes: permitted_classes)
+      end
+
       def load_marshalled_resource(path, _merge_custom = :unused)
         Marshal.load(read_resource_file(path))
       end

data/lib/twitter_cldr/resources/number_formats_importer.rb

@@ -36,7 +36,7 @@ module TwitterCldr
       end
 
       def import_locale(locale)
-        data = requirements[:cldr].merge_each_ancestor(locale) do |ancestor_locale|
+        data = requirements[:cldr].build_data(locale) do |ancestor_locale|
           NumberFormats.new(ancestor_locale, requirements[:cldr]).to_h
         end
 

data/lib/twitter_cldr/resources/readme_renderer.rb

@@ -4,6 +4,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 require 'erb'
+require 'yaml'
 
 module TwitterCldr
   module Resources
@@ -79,8 +80,6 @@ module TwitterCldr
         end
       end
 
-      private
-
       def line_num_from_stack_trace(trace)
         trace[0].split(":")[1].to_i  # kind of a hack...
       end
@@ -101,6 +100,11 @@ module TwitterCldr
           ret
         end
       end
+
+      def tested_ruby_versions
+        workflow = YAML.load_file(File.join(*%w(.github workflows unit_tests.yml)))
+        workflow["jobs"]["build"]["strategy"]["matrix"]["ruby-version"].join(", ")
+      end
     end
 
   end

data/lib/twitter_cldr/resources/requirements/cldr_requirement.rb

@@ -42,15 +42,6 @@ module TwitterCldr
           File.join(source_path, 'common')
         end
 
-        def merge_each_ancestor(locale, merge_root: true)
-          locales = locale_chain(locale)
-          locales << :root if merge_root
-
-          locales.inject({}) do |result, ancestor_locale|
-            deep_merge(yield(ancestor_locale), result)
-          end
-        end
-
         def alt?(node)
           !node.attribute('alt').nil?
         end
@@ -62,49 +53,26 @@ module TwitterCldr
           )
         end
 
-        private
-
-        def locale_chain(locale)
-          locale = from_fs(locale)
-          ancestry = [locale]
-
-          loop do
-            cur = from_fs(ancestry.last)
-
-            if parents = parent_locales[cur]
-              ancestry << to_fs(parents)
-            elsif I18n::Locale::Tag.tag(cur).self_and_parents.count > 1
-              ancestry << I18n::Locale::Tag.tag(cur).self_and_parents.last.to_sym
-            else
-              parents = TwitterCldr::Shared::Locale
-                .parse(cur)
-                .permutations
-                .select do |loc|
-                  File.exist?(File.join(common_path, 'main', "#{loc}.xml"))
-                end
-
-              ancestry += parents - [cur]
-              break
-            end
-          end
-
-          ancestry
+        def build_data(locale, &block)
+          CldrDataBuilder.new(locale_for(locale)).merge_each_ancestor(&block)
         end
 
-        def to_fs(locale)
-          locale.to_s.gsub('_', '-').to_sym
+        def docset(path, root_locale)
+          CldrDocumentSet.new(path, locale_for(root_locale), self)
         end
 
-        def from_fs(locale)
-          locale.to_s.gsub('-', '_')
+        def dtd
+          @dtd ||= CldrDTD.new(self)
         end
 
-        DEEP_MERGER = proc do |key, v1, v2|
-          Hash === v1 && Hash === v2 ? v1.merge(v2, &DEEP_MERGER) : (v2 || v1)
+        private
+
+        def locale_for(locale)
+          locales[locale] ||= CldrLocale.new(locale, self)
         end
 
-        def deep_merge(h1, h2)
-          h1.merge(h2, &DEEP_MERGER)
+        def locales
+          @locales ||= {}
         end
 
         def cldr_url
@@ -134,23 +102,6 @@ module TwitterCldr
             end
           end
         end
-
-        def parent_locales
-          @parent_locales ||= supplemental_data.xpath('//parentLocales/parentLocale').each_with_object({}) do |node, ret|
-            parent = node.attr('parent')
-            locales = node.attr('locales').split(' ')
-
-            locales.each do |locale|
-              ret[locale] = parent
-            end
-          end
-        end
-
-        def supplemental_data
-          @supplemental_data ||= Nokogiri.XML(
-            File.read(File.join(common_path, 'supplemental', 'supplementalData.xml'))
-          )
-        end
       end
 
     end

data/lib/twitter_cldr/resources/territories_importer.rb

@@ -26,7 +26,7 @@ module TwitterCldr
       end
 
       def import_locale(locale)
-        data = requirements[:cldr].merge_each_ancestor(locale) do |ancestor_locale|
+        data = requirements[:cldr].build_data(locale) do |ancestor_locale|
           TerritoryData.new(ancestor_locale, requirements[:cldr]).to_h
         end
 

data/lib/twitter_cldr/resources/timezones_importer.rb

@@ -38,7 +38,7 @@ module TwitterCldr
       end
 
       def import_locale(locale)
-        data = requirements[:cldr].merge_each_ancestor(locale) do |ancestor_locale|
+        data = requirements[:cldr].build_data(locale) do |ancestor_locale|
           TimezoneData.new(ancestor_locale, requirements[:cldr]).to_h
         end
 

data/lib/twitter_cldr/resources/unicode_property_aliases_importer.rb

@@ -17,6 +17,8 @@ module TwitterCldr
       private
 
       def execute
+        FileUtils.mkdir_p(output_path)
+
         File.write(
           File.join(output_path, 'property_value_aliases.yml'),
           YAML.dump(parse_property_value_aliases)

data/lib/twitter_cldr/resources/units_importer.rb

@@ -36,7 +36,7 @@ module TwitterCldr
       end
 
       def import_locale(locale)
-        data = requirements[:cldr].merge_each_ancestor(locale) do |ancestor_locale|
+        data = requirements[:cldr].build_data(locale) do |ancestor_locale|
           Units.new(ancestor_locale, requirements[:cldr]).to_h
         end
 

data/lib/twitter_cldr/resources.rb

@@ -10,6 +10,10 @@ module TwitterCldr
     autoload :BidiTestImporter,               'twitter_cldr/resources/bidi_test_importer'
     autoload :CalendarsImporter,              'twitter_cldr/resources/calendars_importer'
     autoload :CasefolderClassGenerator,       'twitter_cldr/resources/casefolder_class_generator'
+    autoload :CldrDataBuilder,                'twitter_cldr/resources/cldr_data_builder'
+    autoload :CldrDocumentSet,                'twitter_cldr/resources/cldr_document_set'
+    autoload :CldrDTD,                        'twitter_cldr/resources/cldr_dtd'
+    autoload :CldrLocale,                     'twitter_cldr/resources/cldr_locale'
     autoload :CollationTestsImporter,         'twitter_cldr/resources/collation_tests_importer'
     autoload :CollationTriesImporter,         'twitter_cldr/resources/collation_tries_importer'
     autoload :CurrencySymbolsImporter,        'twitter_cldr/resources/currency_symbols_importer'
@@ -25,6 +29,7 @@ module TwitterCldr
     autoload :ParentLocalesImporter,          'twitter_cldr/resources/parent_locales_importer'
     autoload :PostalCodesImporter,            'twitter_cldr/resources/postal_codes_importer'
     autoload :Properties,                     'twitter_cldr/resources/properties'
+    autoload :ResourceLoadError,              'twitter_cldr/resources/loader'
     autoload :SegmentDictionariesImporter,    'twitter_cldr/resources/segment_dictionaries_importer'
     autoload :SegmentRulesImporter,           'twitter_cldr/resources/segment_rules_importer'
     autoload :SegmentTestsImporter,           'twitter_cldr/resources/segment_tests_importer'
@@ -54,6 +59,8 @@ module TwitterCldr
           AliasesImporter,
           Bcp47TimezoneMetadataImporter,
           BidiTestImporter,
+          ValidityDataImporter,
+          UnicodePropertyAliasesImporter,
           CalendarsImporter,
           CasefolderClassGenerator,
           CollationTestsImporter,
@@ -79,9 +86,7 @@ module TwitterCldr
           TransformTestsImporter,
           TransformsImporter,
           UnicodeDataImporter,
-          UnicodePropertyAliasesImporter,
-          UnitsImporter,
-          ValidityDataImporter,
+          UnitsImporter
         ]
       end
 

data/lib/twitter_cldr/shared/calendar.rb

@@ -7,7 +7,7 @@ module TwitterCldr
   module Shared
     class Calendar
 
-      DEFAULT_FORMAT = :'stand-alone'
+      DEFAULT_FORMAT = :format
 
       NAMES_FORMS = [:wide, :narrow, :short, :abbreviated]
       ERAS_NAMES_FORMS = [:abbr, :name]

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.11.1'
 end

data/resources/locales/ar/calendars.yml

@@ -129,7 +129,8 @@
           0: "قبل الحقبة الحالية"
           1: "بعد الميلاد"
         :narrow: 
-          0: ""
+          0: BCE
+          1: CE
       :fields: 
         :day: يوم
         :day-narrow: يوم

data/resources/locales/az/calendars.yml

@@ -126,7 +126,8 @@
           0: "bizim eradan əvvəl"
           1: "bizim era"
         :narrow: 
-          0: ""
+          0: BCE
+          1: CE
       :fields: 
         :day: Gün
         :day-narrow: Gün

data/resources/locales/be/calendars.yml

@@ -127,7 +127,8 @@
           0: "да нашай эры"
           1: "нашай эры"
         :narrow: 
-          0: ""
+          0: BCE
+          1: CE
       :fields: 
         :day: дзень
         :day-narrow: д.

data/resources/locales/bg/calendars.yml

@@ -134,7 +134,8 @@
           0: "преди новата ера"
           1: "след новата ера"
         :narrow: 
-          0: ""
+          0: BCE
+          1: CE
       :fields: 
         :day: ден
         :day-narrow: д

data/resources/locales/bn/calendars.yml

@@ -129,7 +129,8 @@
           0: খ্রিষ্টপূর্বাব্দ
           1: খ্রিষ্টাব্দ
         :narrow: 
-          0: ""
+          0: BCE
+          1: CE
       :fields: 
         :day: দিন
         :day-narrow: দিন