csl 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc5ceeb1aaf835b313d9f3ecf27add61c0aaf6affdbcdbe4061e92020619e7f1
-  data.tar.gz: 994ffcf72cffe05d02b80896fab5d766c4c101a73b35b9c1626f8969851404f5
+  metadata.gz: f7f13898b2b1d72d754e5d7a5049b7a65d91f36df7fe68c6db8b369fa2dd21f7
+  data.tar.gz: ee44d0add3174bff091b2575c1c55dd5fcf25a72e63af5823209dc3504beee85
 SHA512:
-  metadata.gz: 880d27b5adb8e6048e919c8c43dd5a3ca32ddf99751a6dddc7cc121c4561b730da786a01694caeb03578132625e2c1a529a16f4ec02e4b70904c141609141aee
-  data.tar.gz: 90571a1c4eafa52e8eaea2d7541e132113e19759623943b2021418dcc6eda3f0a9a8d734b9629f01940f2db237233ca6f14adc45afd071bdae13081952bbe0c4
+  metadata.gz: c611c353c05cc66d5cc390d2c09054be36a130648afc9a551ae7dd0e5dc5e497ae598d57a0d97de1ee7c9e8f8f78a6cb4412c2840c9213d2f1bc577d07682148
+  data.tar.gz: ea13a2582afd20235caced2ffeb20f3a5ab11d7e6309a3d134a000c78578f4f2c73b0082ac7552690d8da337fbfb903fd7ec44e035180d2c415a4387d99d8287

data/lib/csl/locale.rb

@@ -15,7 +15,7 @@ module CSL
     @extension = '.xml'.freeze
     @prefix = 'locales-'.freeze
 
-    @tag_pattern = /^[a-z]{2}(-[A-Z]{2})?|-[A-Z]{2}$/
+    @tag_pattern = /^[a-z]{2}(-[a-z]{4})?(-[a-z]{2})?|-[a-z]{2}$/i
 
     # Default languages/regions.
     # Auto-detection is based on these lists.
@@ -29,12 +29,16 @@ module CSL
       AT de BR pt CA en CH de GB en TW zh
     }.map(&:to_sym)]).freeze
 
+    @scripts = Hash[*%w{
+      sr Latn
+    }.map(&:to_sym)].freeze
+
 
     class << self
       include Loader
 
       attr_accessor :default
-      attr_reader :languages, :regions
+      attr_reader :languages, :regions, :scripts
 
       def load(input = nil)
         input ||= Locale.default
@@ -42,12 +46,13 @@ module CSL
         super(input)
       end
 
-      # Normalizes an IETF tag; adds a language's default region or a
-      # region's default language.
+      # Normalizes an IETF tag; adds default language, region, script.
       #
       # @example
       #   Locale.normalize("en")  #-> "en-US"
       #   Locale.normalize("-BR") #-> "pt-BR"
+      #   Locale.normalize("de-at") #-> "de-AT"
+      #   Locale.normalize("sr") #-> "sr-Latn-RS"
       #
       # @raise [ArgumentError] if the passed-in string is no IETF tag
       #
@@ -56,15 +61,32 @@ module CSL
       def normalize(tag)
         tag = tag.to_s.strip
 
-        raise ArgumentError, "not a valid IETF tag: #{tag.inspect}" unless
-          tag =~ @tag_pattern
+        unless tag =~ @tag_pattern
+          raise ArgumentError, "unsupported IETF tag: #{tag.inspect}"
+        end
+
+        language, *rs = tag.split(/-/)
+        region, script = rs.reverse
 
-        language, region = tag.split(/-/)
+        if language.nil? || language.empty?
+          language = languages[region.to_sym]
+        else
+          language.downcase!
+        end
 
-        return [language, regions[language.to_sym]].compact.join('-') if region.nil?
-        return [languages[region.to_sym], region].join('-') if language.empty?
+        if region.nil?
+          region = regions[language.to_sym]
+        else
+          region.upcase!
+        end
+
+        if script.nil?
+          script = scripts[language.to_sym]
+        else
+          script.capitalize!
+        end
 
-        tag
+        [language, script, region].compact.join('-')
       end
     end
 
@@ -78,7 +100,7 @@ module CSL
 
     has_language
 
-    attr_accessor :region
+    attr_accessor :region, :script
 
     alias_child :metadata, :info
     alias_child :dates, :date
@@ -181,14 +203,15 @@ module CSL
     #
     # @return [self]
     def set(locale)
-      @language, @region = Locale.normalize(locale).split(/-/).map(&:to_sym)
+      @language, *rs = Locale.normalize(locale).split(/-/).map(&:to_sym)
+      @region, @script = rs.reverse
       self
     end
 
-    # Sets the locale's language and region to nil.
+    # Sets the locale's language, script and region to nil.
     # @return [self]
     def clear
-      @language, @region = nil
+      @language, @script, @region = nil
       self
     end
 
@@ -414,11 +437,12 @@ module CSL
     end
 
 
-    # Locales are sorted first by language, then by region; sort order is
-    # alphabetical with the following exceptions: the default locale is
-    # prioritised; in case of a language match the default region of that
-    # language will be prioritised (e.g., de-DE will come before de-AT even
-    # though the alphabetical order would be different).
+    # Locales are sorted first by language, then by region and script;
+    # sort order is alphabetical with the following exceptions:
+    # the default locale is prioritised; in case of a language match
+    # the default region of that language will be prioritised (e.g.,
+    # de-DE will come before de-AT even though the alphabetical order
+    # would be different).
     #
     # @param other [Locale] the locale used for comparison
     # @return [1,0,-1,nil] the result of the comparison
@@ -427,7 +451,7 @@ module CSL
       when !other.is_a?(Locale)
         nil
       when [language, region] == [other.language, other.region]
-        0
+        script <=> other.script
       when default?
         -1
       when other.default?
@@ -448,7 +472,7 @@ module CSL
 
     # @return [String] the Locale's IETF tag
     def to_s
-      [language, region].compact.join('-')
+      [language, script, region].compact.join('-')
     end
 
     # @return [String] a string representation of the Locale

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Sylvester Keil
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -170,7 +169,6 @@ homepage: https://github.com/inukshuk/csl-ruby
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,8 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A Ruby CSL parser and library
 test_files: []