worldwide 1.7.5 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73b7ac8bf90c9e5184a3422d4672334fc1c66496729fa1014ffac15c6f86960d
-  data.tar.gz: 1e4eb70d0226a58f54a9a59723e6c5940460f41a48e098c06a5a63c517e9d6dd
+  metadata.gz: 1a8ccc240633a76f5c8a4873ce0b1034429bc746e8acb52b1813297aecf4f35f
+  data.tar.gz: c82d68acb68d959683b2a19c6dd54152e5ad76e1dbfe65b6898c16d82a0a26b9
 SHA512:
-  metadata.gz: a7f52ac2eb268b18a05aa816905cc4112b13d5efbccc64001d589fd696394c7e1f0e938654edf16d7fb38a9efa5d2379593081d81004c6afbb722de3039d7a41
-  data.tar.gz: 93ae987d62a19e4afbf7720a861f9a470e18b97d78a01ff1df9d470af2aadaa741793b3c0c7e56fb35dfd609f713311d26429d1cc213bc69ebee2fedf8e7f4d9
+  metadata.gz: 3101d0215fcfc3f1e488571ce66d4e3301f6a9c49124efa162704332dd1ca551cb0adf961f3644621e687486a1c7525a6d2b96d759e51dcce308ed930a35f735
+  data.tar.gz: 76b817ece1b5ae48d6a4eaf92c262c8e22029068ffeb10519ff18252e839f4b54b8455c768b0abe5eaf51c66f1232657b11cf0ed2836a447f184f82e702247cc

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         gemfile:
          - Gemfile
-        ruby: ["3.0", "3.1", "3.2"]
+        ruby: ["3.1", "3.2", "3.3"]
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:

data/.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.1

data/CHANGELOG.md

@@ -26,10 +26,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Security in case of vulnerabilities.
 
 ## [Unreleased]
+- Nil.
 
 ---
 
-## [1.7.5] = 2024-08-01
+## [1.9.0] - 2024-08-12
+- add support for additional address fields streetName, streetNumber in DE [#273](https://github.com/Shopify/worldwide/pull/273)
+- set additional_field neighborhood as required in BR [#279](https://github.com/Shopify/worldwide/pull/279)
+
+
+## [1.8.0] - 2024-08-09
+- Bump Ruby to 3.3.1; drop support for 3.0.x [#264](https://github.com/Shopify/worldwide/pull/264)
+- Add support for partial zip matching for SG [#271](https://github.com/Shopify/worldwide/pull/271)
+
+## [1.7.5] - 2024-08-01
 - Update legacy timezone mappings for America/Indianapolis and Asia/Calcutta [#267](https://github.com/Shopify/worldwide/pull/267)
 
 ## [1.7.4] - 2024-08-01

data/Gemfile.lock

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

data/db/data/regions/BR.yml

@@ -35,6 +35,7 @@ additional_address_fields:
     required: true
   - name: line2
   - name: neighborhood
+    required: true
 combined_address_format:
   default:
     address1:

data/db/data/regions/DE.yml

@@ -20,12 +20,25 @@ languages:
 - de
 - en
 example_address:
-  address1: Willy-Brandt-Straße 1
+  address1: Willy-Brandt-Straße ⁠1
   city: Berlin
   zip: '10557'
   phone: "+49 30 182722720"
 format:
   edit: "{country}_{firstName}{lastName}_{company}_{address1}_{address2}_{zip}{city}_{phone}"
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{country}_{phone}"
+format_extended:
+  edit: "{country}_{firstName}{lastName}_{company}_{streetName}{streetNumber}_{address2}_{zip}{city}_{phone}"
+additional_address_fields:
+  - name: streetName
+    required: true
+  - name: streetNumber
+    required: true
+combined_address_format:
+  default:
+    address1:
+      - key: streetName
+      - key: streetNumber
+        decorator: " "
 emoji: "\U0001F1E9\U0001F1EA"
 timezone: Europe/Berlin

data/db/data/regions/SG.yml

@@ -8,6 +8,7 @@ tax_name: GST
 group: Asian Countries
 group_name: Asia
 zip_regex: "^\\d{6}$"
+partial_zip_regex: "^\\d{2}$"
 zip_example: '546080'
 phone_number_prefix: 65
 building_number_required: true

data/lib/worldwide/calendar.rb

@@ -4,32 +4,27 @@ require "worldwide/calendar/gregorian"
 
 module Worldwide
   module Calendar
-    class << self
-      def first_week_day(territory_code)
-        first_day_data[territory_code.to_sym] || first_day_data.fetch(:"001")
+    data = YAML.load_file(File.join(Worldwide::Paths::CLDR_ROOT, "week_data.yml"))["first_day"]
+    weekday_numbers = {
+      sun: 0,
+      mon: 1,
+      tue: 2,
+      wed: 3,
+      thu: 4,
+      fri: 5,
+      sat: 6,
+    }
+    FIRST_DAY_DATA = data.each_with_object({}) do |(day, territories), memo|
+      territories.each do |territory|
+        memo[territory.to_sym] = weekday_numbers.fetch(day.to_sym)
       end
+    end
+    FIRST_DAY_DATA.freeze
+    private_constant :FIRST_DAY_DATA
 
-      private
-
-      def first_day_data
-        return @first_day_data if defined?(@first_day_data)
-
-        weekday_numbers = {
-          sun: 0,
-          mon: 1,
-          tue: 2,
-          wed: 3,
-          thu: 4,
-          fri: 5,
-          sat: 6,
-        }
-
-        data = YAML.load_file(File.join(Worldwide::Paths::CLDR_ROOT, "week_data.yml"))["first_day"]
-        @first_day_data = data.each_with_object({}) do |(day, territories), memo|
-          territories.each do |territory|
-            memo[territory.to_sym] = weekday_numbers.fetch(day.to_sym)
-          end
-        end
+    class << self
+      def first_week_day(territory_code)
+        FIRST_DAY_DATA[territory_code.to_sym] || FIRST_DAY_DATA.fetch(:"001")
       end
     end
   end

data/lib/worldwide/cldr/fallbacks.rb

@@ -26,7 +26,10 @@ module Worldwide
       private
 
       def cldr_defined_parents
-        @cldr_defined_parents ||= YAML.load_file(File.join(Worldwide::Paths::CLDR_ROOT, "parent_locales.yml")).to_h { |k, v| [k.to_sym, v.to_sym] }
+        @cldr_defined_parents ||= YAML.load_file(
+          File.join(Worldwide::Paths::CLDR_ROOT, "parent_locales.yml"),
+          symbolize_names: true,
+        ).transform_values(&:to_sym)
       end
 
       def ancestry(locale)

data/lib/worldwide/currencies.rb

@@ -4,15 +4,24 @@ module Worldwide
   module Currencies
     include Enumerable
     extend self
-    CURRENCIES_FILE_PATH = File.join(Worldwide::Paths::CLDR_ROOT, "locales", "en", "currencies.yml")
-    CURRENCY_CODES_FILE_PATH = File.join(Worldwide::Paths::OTHER_DATA_ROOT, "currency", "codes.yml")
+
+    CURRENCY_CODES = YAML.safe_load_file(
+      File.join(Worldwide::Paths::OTHER_DATA_ROOT, "currency/codes.yml"),
+      freeze: true,
+    )
+    private_constant :CURRENCY_CODES
+
+    NUMERIC_THREE_TO_ALPHA_THREE_DB = CURRENCY_CODES.to_h do |key, value|
+      [value["three_digit_code"].to_i, key.to_s.upcase.to_sym]
+    end.freeze
+    private_constant :NUMERIC_THREE_TO_ALPHA_THREE_DB
 
     def each(&block)
-      all_currencies.each(&block)
+      ALL_CURRENCIES.each(&block)
     end
 
     def all
-      all_currencies
+      ALL_CURRENCIES
     end
 
     # Convert ISO-4217 numeric-three code to ISO-4217 alpha-three code
@@ -23,39 +32,25 @@ module Worldwide
       else
         numeric_code&.to_s&.to_i
       end
-      numeric_three_to_alpha_three_db[lookup_code]&.to_s
+      NUMERIC_THREE_TO_ALPHA_THREE_DB[lookup_code]&.to_s
     end
 
     # Convert ISO-4217 alpha-three code to ISO-4217 numeric-three code
     # Note that we support some currencies (e.g. JEP) that are not recognized by ISO,
     # and there is no numeric-three code for these currencies, so nil will be returned.
     def numeric_code_for(alpha_code)
-      currency_codes.dig(alpha_code&.to_s&.upcase, "three_digit_code")&.to_i
-    end
-
-    private
-
-    def all_currencies
-      @all_currencies ||= begin
-        currencies = {}
-        YAML.load_file(CURRENCIES_FILE_PATH)["en"]["currencies"].map do |code, _name|
-          currencies[code] = Currency.new(code: code)
-        end.sort_by(&:currency_code)
-      end
+      CURRENCY_CODES.dig(alpha_code&.to_s&.upcase, "three_digit_code")&.to_i
     end
 
-    def currency_codes
-      @currency_codes ||= YAML.safe_load_file(CURRENCY_CODES_FILE_PATH)
-    end
-
-    def map_alpha_three_to_numeric_three
-      currency_codes
-    end
-
-    def numeric_three_to_alpha_three_db
-      @map_numeric_three_to_alpha_three ||= currency_codes.to_h do |key, value|
-        [value["three_digit_code"].to_i, key.to_s.upcase.to_sym]
-      end
+    currencies = YAML.load_file(
+      File.join(Worldwide::Paths::CLDR_ROOT, "locales/en/currencies.yml"),
+      freeze: true,
+    )
+    ALL_CURRENCIES = currencies["en"]["currencies"].map do |code, _name|
+      Currency.new(code: code)
     end
+    ALL_CURRENCIES.sort_by!(&:currency_code)
+    ALL_CURRENCIES.freeze
+    private_constant :ALL_CURRENCIES
   end
 end

data/lib/worldwide/locale.rb

@@ -2,13 +2,6 @@
 
 module Worldwide
   class Locale
-    class << self
-      def unknown
-        # Special CLDR value
-        @unknown = Locale.new("und")
-      end
-    end
-
     attr_reader :code
 
     def initialize(code)
@@ -20,6 +13,10 @@ module Worldwide
       @name_cache = {}
     end
 
+    # Special CLDR value
+    @unknown = new("und")
+    singleton_class.attr_reader(:unknown)
+
     def language_subtag
       code.to_s.split("-", 2).first
     end

data/lib/worldwide/regions_loader.rb

@@ -287,7 +287,7 @@ module Worldwide
     end
 
     def world_yml
-      @world_yml ||= YAML.load_file(File.join(Worldwide::Paths::DB_DATA_ROOT, "world.yml"))
+      @world_yml ||= YAML.load_file(File.join(Worldwide::Paths::DB_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.7.5"
+  VERSION = "1.9.0"
 end

data/lib/worldwide.rb

@@ -17,8 +17,8 @@ require "worldwide/address_validator"
 require "worldwide/calendar"
 require "worldwide/cldr"
 require "worldwide/cldr/context_transforms"
-require "worldwide/currencies"
 require "worldwide/currency"
+require "worldwide/currencies"
 require "worldwide/deprecated_time_zone_mapper"
 require "worldwide/discounts"
 require "worldwide/fields"
@@ -109,4 +109,6 @@ module Worldwide
       Units
     end
   end
+
+  Regions.instance # eagerload
 end

data/worldwide.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   spec.add_dependency("activesupport", ">= 7.0")
   spec.add_dependency("i18n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldwide
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.9.0
 platform: ruby
 authors:
 - Shopify
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -8498,14 +8498,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.17
 signing_key:
 specification_version: 4
 summary: Internationalization and localization APIs