worldwide 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8e1682267c61bc3105042d14c28f05ca21730e15f4da748369a135e30650228
-  data.tar.gz: 0b956ea2386d92d289b5c59982aea7f9469ef383fa2d4047ecb91892391493d9
+  metadata.gz: 5698ac3559f01a07d1bcd4684e6ea9325e8e65b083b54b86e488c508fbfb8f41
+  data.tar.gz: fd120e0befcd5478e4276ae9915a42af2c25c14828a90aaedfda9c97af128f2d
 SHA512:
-  metadata.gz: 737c81fe51007d97a2d1a6e8641f4b532e92c2039c96814477ad805b5db3619ca9ecfe93c67f5585c316f9740247cbc5698731bcb5f20495fe3cad60acad0318
-  data.tar.gz: 5e7c43277a21471884a70def39f0e3a314793587f0542b54906370a95d06cdfbd0ecddc098c191442298aa3d5f065781882ef285b421e22b0a7baca3833cc620
+  metadata.gz: 490595d39d04e77956c61b21f2caae9f1b98c59502611e6e896a5b84709f96a5db5b8a03c681f2e8de71ee658ec0d1fafa224b7a7765a11838d8a04df96c23f0
+  data.tar.gz: 60d1fe3e344b38c0c7e47773892b422b4b5b96ab8dd22077b063709de2bd3423e081278b23a69fbabab16f707e6c23823df425b90d452688caefbe2646adcfbb

data/CHANGELOG.md

@@ -30,6 +30,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [1.14.1] - 2024-11-08
+- Improve Worldwide::Config.configure_i18n performance [#301](https://github.com/Shopify/worldwide/pull/301)
+
 ## [1.14.0] - 2024-11-07
 - Add example_city_zip and priority accessors to Regions [#298](https://github.com/Shopify/worldwide/pull/298)
 - Add tax_type accessor to Regions [#299](https://github.com/Shopify/worldwide/pull/299)

data/Gemfile.lock

@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    worldwide (1.14.0)
+    worldwide (1.14.1)
       activesupport (>= 7.0)
       i18n
       phonelib (~> 0.8)

data/README.md

@@ -411,7 +411,7 @@ $ address.split_address2
 
 The additional address fields that are part of each country's extended address format and their concatenation rules are defined in the country YAML files. For example:
 ```ruby
-# db/data/region/BR.yml
+# data/region/BR.yml
 additional_address_fields:
   - name: streetName
     required: true

data/lib/worldwide/config.rb

@@ -18,6 +18,10 @@ module Worldwide
       "units",
     ].freeze
 
+    CLDR_LOCALE_PATH_REGEX = /locales#{File::SEPARATOR}(?<locale>[\w-]+)#{File::SEPARATOR}(?<component>\w+)\.(?:yml|rb)/
+    OTHER_LOCALE_PATH_REGEX = /#{File::SEPARATOR}(?<locale>[\w-]+)\.(?:yml|rb)/
+    REGIONS_LOCALE_PATH_REGEX = /#{File::SEPARATOR}(?<locale>[\w-]+)\.yml/
+
     class << self
       def configure_i18n(i18n_config: nil, additional_components: [])
         i18n_config ||= I18n.config
@@ -96,18 +100,36 @@ module Worldwide
       end
 
       def add_cldr_data(i18n_config, additional_components:)
+        locale_set = i18n_config.available_locales.map(&:to_s).to_set
         components = REQUIRED_CLDR_DATA + additional_components
-        locales = i18n_config.available_locales
-        i18n_config.load_path +=
-          Dir[File.join(Paths::CLDR_ROOT, "locales", "{#{locales.join(",")}}/{#{components.join(",")}}.{yml,rb}")]
+        i18n_config.load_path += cldr_locale_paths(locale_set, components)
+      end
+
+      def cldr_locale_paths(locale_set, components)
+        Dir[File.join(Paths::CLDR_ROOT, "locales", "*", "*.{yml,rb}")].select do |path|
+          match = path.match(CLDR_LOCALE_PATH_REGEX)
+          match && locale_set.include?(match[:locale]) && components.include?(match[:component])
+        end
       end
 
       def add_other_data(i18n_config)
-        locales = i18n_config.available_locales
-        i18n_config.load_path += Dir[File.join(Paths::OTHER_DATA_ROOT, "**", "{#{locales.join(",")}}.{yml,rb}")]
+        locale_set = i18n_config.available_locales.map(&:to_s).to_set
+        i18n_config.load_path += other_data_path(locale_set)
+        i18n_config.load_path += regions_data_path(locale_set)
+      end
 
-        i18n_config.load_path += Dir[File.join(Paths::REGIONS_ROOT, "??", "{#{locales.join(",")}}.yml")]
-        i18n_config.load_path += Dir[File.join(Paths::REGIONS_ROOT, "_default", "{#{locales.join(",")}}.yml")]
+      def other_data_path(locale_set)
+        Dir[File.join(Worldwide::Paths::OTHER_DATA_ROOT, "*", "*.{yml,rb}")].select do |path|
+          match = path.match(OTHER_LOCALE_PATH_REGEX)
+          match && locale_set.include?(match[:locale])
+        end
+      end
+
+      def regions_data_path(locale_set)
+        Dir[File.join(Worldwide::Paths::REGIONS_ROOT, "*", "*.{yml}")].select do |path|
+          match = path.match(REGIONS_LOCALE_PATH_REGEX)
+          match && locale_set.include?(match[:locale])
+        end
       end
     end
   end

data/lib/worldwide/currencies.rb

@@ -6,7 +6,7 @@ module Worldwide
     extend self
 
     CURRENCY_CODES = YAML.safe_load_file(
-      File.join(Worldwide::Paths::OTHER_DATA_ROOT, "currency/codes.yml"),
+      File.join(Worldwide::Paths::CURRENCY_MAPPINGS, "codes.yml"),
       freeze: true,
     )
     private_constant :CURRENCY_CODES

data/lib/worldwide/currency.rb

@@ -12,11 +12,15 @@ module Worldwide
 
     class << self
       def digits_and_rounding
-        @digits_and_rounding ||= YAML.safe_load_file(File.join(Worldwide::Paths::OTHER_DATA_ROOT, "currency", "digits.yml")).freeze
+        @digits_and_rounding ||= YAML.safe_load_file(
+          File.join(Worldwide::Paths::CURRENCY_MAPPINGS, "digits.yml"),
+        ).freeze
       end
 
       def minor_symbols
-        @minor_symbols ||= YAML.safe_load_file(File.join(Worldwide::Paths::OTHER_DATA_ROOT, "currency", "minor_symbols.yml")).freeze
+        @minor_symbols ||= YAML.safe_load_file(
+          File.join(Worldwide::Paths::CURRENCY_MAPPINGS, "minor_symbols.yml"),
+        ).freeze
       end
     end
 

data/lib/worldwide/deprecated_time_zone_mapper.rb

@@ -16,7 +16,7 @@ module Worldwide
       private
 
       def iana_timezones
-        @iana_timezones ||= YAML.safe_load_file("#{Worldwide::Paths::DB_DATA_ROOT}/iana_to_rails_time_zone.yml")
+        @iana_timezones ||= YAML.safe_load_file("#{Worldwide::Paths::DATA_ROOT}/iana_to_rails_time_zone.yml")
       end
     end
 

data/lib/worldwide/extant_outcodes.rb

@@ -24,7 +24,7 @@ module Worldwide
     end
 
     def extant
-      @extant ||= YAML.safe_load_file("#{::Worldwide::Paths::GEM_ROOT}/db/extant_outcodes.yml").dig("extant_outcodes")&.map do |key, value|
+      @extant ||= YAML.safe_load_file("#{::Worldwide::Paths::DATA_ROOT}/extant_outcodes.yml").dig("extant_outcodes")&.map do |key, value|
         [key, value.to_set]
       end&.to_h || {}
     end

data/lib/worldwide/paths.rb

@@ -6,9 +6,9 @@ module Worldwide
     DATA_ROOT = File.join(GEM_ROOT, "data")
     CLDR_ROOT = File.join(GEM_ROOT, "data/cldr")
     OTHER_DATA_ROOT = File.join(GEM_ROOT, "data/other")
+    CURRENCY_MAPPINGS = File.join(OTHER_DATA_ROOT, "currency/mappings")
     GENERATED_LOCALE_ROOT = File.join(OTHER_DATA_ROOT, "generated")
-    DB_DATA_ROOT = File.join(GEM_ROOT, "db/data")
-    REGIONS_ROOT = File.join(DB_DATA_ROOT, "regions")
+    REGIONS_ROOT = File.join(DATA_ROOT, "regions")
     TIME_ZONE_ROOT = File.join(OTHER_DATA_ROOT, "timezones")
   end
 end

data/lib/worldwide/rails/railtie.rb

@@ -5,7 +5,9 @@ require "rails/railtie"
 module Worldwide
   module Rails
     class Railtie < ::Rails::Railtie
-      initializer "worldwide.setup" do |application|
+      SETUP = "worldwide.setup"
+
+      initializer SETUP do |application|
         application.config.eager_load_namespaces << Worldwide
       end
     end

data/lib/worldwide/regions_loader.rb

@@ -12,7 +12,7 @@ module Worldwide
       @regions_by_cldr_code = {}
       @regions_by_iso_code = {}
 
-      # Load country/region definitions out of the db/data/regions/??.yml files
+      # Load country/region definitions out of the data/regions/??.yml files
       @regions = Dir["#{Worldwide::Paths::REGIONS_ROOT}/*.yml"].map do |filename|
         load_territory(filename)
       end.flatten
@@ -207,7 +207,7 @@ module Worldwide
 
     def country_codes
       @country_codes ||=
-        YAML.safe_load_file("#{Worldwide::Paths::DB_DATA_ROOT}/country_codes.yml")["country_codes"]
+        YAML.safe_load_file("#{Worldwide::Paths::DATA_ROOT}/country_codes.yml")["country_codes"]
     end
 
     def find_region(code:)
@@ -291,7 +291,7 @@ module Worldwide
     end
 
     def world_yml
-      @world_yml ||= YAML.load_file(File.join(Worldwide::Paths::DB_DATA_ROOT, "world.yml"), freeze: true)
+      @world_yml ||= YAML.load_file(File.join(Worldwide::Paths::DATA_ROOT, "world.yml"), freeze: true)
     end
   end
 end

data/lib/worldwide/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Worldwide
-  VERSION = "1.14.0"
+  VERSION = "1.14.1"
 end

data/translation.yml

@@ -5,6 +5,6 @@ components:
   - name: 'buyer'
     audience: buyer
     paths:
-      - db/data/regions/*/{{language}}.yml
+      - data/regions/*/{{language}}.yml
       - data/other/hand_translated/{{language}}.yml
       - data/other/timezones/{{language}}.yml