twitter_cldr 6.9.0 → 6.10.0

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/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/version.rb

@@ -4,5 +4,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 module TwitterCldr
-  VERSION = '6.9.0'
+  VERSION = '6.10.0'
 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: দিন

data/resources/locales/bo/calendars.yml

@@ -124,25 +124,57 @@
           0: སྤྱི་ལོ་སྔོན་
           1: སྤྱི་ལོ་
         :name: 
-          0: ""
+          0: BCE
+          1: CE
         :narrow: 
-          0: ""
+          0: BCE
+          1: CE
       :fields: 
         :day: ཉིན།
+        :day-narrow: Day
+        :day-short: Day
         :dayOfYear: "Day Of Year"
+        :dayOfYear-narrow: "Day Of Year"
+        :dayOfYear-short: "Day Of Year"
         :dayperiod: "སྔ་དྲོ། ཕྱི་དྲོ།"
+        :dayperiod-narrow: Dayperiod
+        :dayperiod-short: Dayperiod
         :era: ལོ་རིམ།
+        :era-narrow: Era
+        :era-short: Era
         :hour: ཆུ་ཚོད་
+        :hour-narrow: Hour
+        :hour-short: Hour
         :minute: སྐར་མ།
+        :minute-narrow: Minute
+        :minute-short: Minute
         :month: ཟླ་བ་
+        :month-narrow: Month
+        :month-short: Month
         :quarter: Quarter
+        :quarter-narrow: Quarter
+        :quarter-short: Quarter
         :second: སྐར་ཆ།
+        :second-narrow: Second
+        :second-short: Second
         :week: གཟའ་འཁོར།
+        :week-narrow: Week
+        :week-short: Week
         :weekOfMonth: "Week Of Month"
+        :weekOfMonth-narrow: "Week Of Month"
+        :weekOfMonth-short: "Week Of Month"
         :weekday: གཟའ་འཁོར་གཅིག
+        :weekday-narrow: "Day of the Week"
+        :weekday-short: "Day of the Week"
         :weekdayOfMonth: "Weekday Of Month"
+        :weekdayOfMonth-narrow: "Weekday Of Month"
+        :weekdayOfMonth-short: "Weekday Of Month"
         :year: ལོ།
+        :year-narrow: Year
+        :year-short: Year
         :zone: དུས་ཚོད།
+        :zone-narrow: Zone
+        :zone-short: Zone
       :formats: 
         :date: 
           :full: 

data/resources/locales/bs/calendars.yml

@@ -130,6 +130,7 @@
           1: "Nove ere"
         :narrow: 
           0: p.n.e.
+          1: CE
       :fields: 
         :day: dan
         :day-narrow: dan

data/resources/locales/cy/calendars.yml

@@ -132,6 +132,7 @@
       :fields: 
         :day: diwrnod
         :day-narrow: diwrnod
+        :day-short: Day
         :dayOfYear: "rhif y dydd yn y flwyddyn"
         :dayOfYear-narrow: "dydd y fl."
         :dayOfYear-short: "rhif y dydd yn y fl."

data/resources/locales/el/calendars.yml

@@ -127,7 +127,8 @@
           0: "πριν από την Κοινή Χρονολογία"
           1: "Κοινή Χρονολογία"
         :narrow: 
-          0: ""
+          0: BCE
+          1: CE
       :fields: 
         :day: ημέρα
         :day-narrow: ημ.

data/resources/locales/en/calendars.yml

@@ -130,34 +130,49 @@
           1: A
       :fields: 
         :day: day
+        :day-narrow: Day
         :day-short: day
         :dayOfYear: "day of year"
+        :dayOfYear-narrow: "Day Of Year"
         :dayOfYear-short: "day of yr."
         :dayperiod: AM/PM
+        :dayperiod-narrow: Dayperiod
         :dayperiod-short: AM/PM
         :era: era
+        :era-narrow: Era
         :era-short: era
         :hour: hour
+        :hour-narrow: Hour
         :hour-short: hr.
         :minute: minute
+        :minute-narrow: Minute
         :minute-short: min.
         :month: month
+        :month-narrow: Month
         :month-short: mo.
         :quarter: quarter
+        :quarter-narrow: Quarter
         :quarter-short: qtr.
         :second: second
+        :second-narrow: Second
         :second-short: sec.
         :week: week
+        :week-narrow: Week
         :week-short: wk.
         :weekOfMonth: "week of month"
+        :weekOfMonth-narrow: "Week Of Month"
         :weekOfMonth-short: "wk. of mo."
         :weekday: "day of the week"
+        :weekday-narrow: "Day of the Week"
         :weekday-short: "day of wk."
         :weekdayOfMonth: "weekday of the month"
+        :weekdayOfMonth-narrow: "Weekday Of Month"
         :weekdayOfMonth-short: "wkday. of mo."
         :year: year
+        :year-narrow: Year
         :year-short: yr.
         :zone: "time zone"
+        :zone-narrow: Zone
         :zone-short: zone
       :formats: 
         :date: 

data/resources/locales/en-001/calendars.yml

@@ -131,6 +131,7 @@
           1: A
       :fields: 
         :day: day
+        :day-narrow: Day
         :day-short: day
         :dayOfYear: "day of year"
         :dayOfYear-narrow: "day of yr"
@@ -139,8 +140,10 @@
         :dayperiod-narrow: am/pm
         :dayperiod-short: am/pm
         :era: era
+        :era-narrow: Era
         :era-short: era
         :hour: hour
+        :hour-narrow: Hour
         :hour-short: hr
         :minute: minute
         :minute-narrow: min
@@ -152,6 +155,7 @@
         :quarter-narrow: qtr
         :quarter-short: qtr
         :second: second
+        :second-narrow: Second
         :second-short: sec
         :week: week
         :week-narrow: wk
@@ -166,8 +170,10 @@
         :weekdayOfMonth-narrow: "wkday of mo"
         :weekdayOfMonth-short: "wkday of mo"
         :year: year
+        :year-narrow: Year
         :year-short: yr
         :zone: "time zone"
+        :zone-narrow: Zone
         :zone-short: zone
       :formats: 
         :date: 

data/resources/locales/en-150/calendars.yml

@@ -131,6 +131,7 @@
           1: A
       :fields: 
         :day: day
+        :day-narrow: Day
         :day-short: day
         :dayOfYear: "day of year"
         :dayOfYear-narrow: "day of yr"
@@ -139,8 +140,10 @@
         :dayperiod-narrow: am/pm
         :dayperiod-short: am/pm
         :era: era
+        :era-narrow: Era
         :era-short: era
         :hour: hour
+        :hour-narrow: Hour
         :hour-short: hr
         :minute: minute
         :minute-narrow: min
@@ -152,6 +155,7 @@
         :quarter-narrow: qtr
         :quarter-short: qtr
         :second: second
+        :second-narrow: Second
         :second-short: sec
         :week: week
         :week-narrow: wk
@@ -166,8 +170,10 @@
         :weekdayOfMonth-narrow: "wkday of mo"
         :weekdayOfMonth-short: "wkday of mo"
         :year: year
+        :year-narrow: Year
         :year-short: yr
         :zone: "time zone"
+        :zone-narrow: Zone
         :zone-short: zone
       :formats: 
         :date: 

data/resources/locales/en-AU/calendars.yml

@@ -131,6 +131,7 @@
           1: A
       :fields: 
         :day: day
+        :day-narrow: Day
         :day-short: day
         :dayOfYear: "day of year"
         :dayOfYear-narrow: "day of yr"
@@ -139,6 +140,7 @@
         :dayperiod-narrow: am/pm
         :dayperiod-short: am/pm
         :era: era
+        :era-narrow: Era
         :era-short: era
         :hour: hour
         :hour-narrow: h
@@ -168,8 +170,10 @@
         :weekdayOfMonth-narrow: "wkday of mo"
         :weekdayOfMonth-short: "wkday of mo."
         :year: year
+        :year-narrow: Year
         :year-short: yr
         :zone: "time zone"
+        :zone-narrow: Zone
         :zone-short: zone
       :formats: 
         :date: