csl 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9def0950732e2af79808e712e972c454f49c18b8e71f31dcae1917a61d67b65
-  data.tar.gz: 996804a7e5e66aaad59f0679039b6a56b88d408f90a1b0414e6f32741ef0cf26
+  metadata.gz: f7f13898b2b1d72d754e5d7a5049b7a65d91f36df7fe68c6db8b369fa2dd21f7
+  data.tar.gz: ee44d0add3174bff091b2575c1c55dd5fcf25a72e63af5823209dc3504beee85
 SHA512:
-  metadata.gz: f2e5824f038b51ce12dc80cb4bab54d59f2adea043ecf7614fb000742e518f67c082cc09e1f44f0b76ffc52ad24c2f5410c7c866e944ea491b1dd66c599da657
-  data.tar.gz: e51bdbd453bbe73c78fce162643a41c4c61697bb3f443dcdf08f7bea8a8fbea28e89cf5d3bfa07876dab1e188dfe5c010d9cff407dcedc8157c1e8af64f12ed9
+  metadata.gz: c611c353c05cc66d5cc390d2c09054be36a130648afc9a551ae7dd0e5dc5e497ae598d57a0d97de1ee7c9e8f8f78a6cb4412c2840c9213d2f1bc577d07682148
+  data.tar.gz: ea13a2582afd20235caced2ffeb20f3a5ab11d7e6309a3d134a000c78578f4f2c73b0082ac7552690d8da337fbfb903fd7ec44e035180d2c415a4387d99d8287

data/.github/workflows/ci.yml

@@ -14,13 +14,20 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - 3.0
-          - 2.7
-          - 2.6
+          - 3.4
+          - 3.3
+          - 3.2
+          - 3.1
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
       - run: bundle exec rake
+      - name: Upload coverage results
+        if: matrix.ruby-version == '3.3'
+        continue-on-error: true
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ github.token }}

data/BSDL

@@ -1,7 +1,7 @@
 CSL-Ruby. A Ruby CSL parser and library.
 
 Copyright 2012 President and Fellows of Harvard College.
-Copyright 2009-2020 Sylvester Keil. All rights reserved.
+Copyright 2009-2025 Sylvester Keil. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

data/Gemfile

@@ -4,11 +4,12 @@ gemspec
 group :development, :test do
   gem 'rake'
   gem 'rspec'
+  gem 'stringio'
   gem 'cucumber'
 end
 
 group :debug do
-  gem 'byebug', require: false, platforms: :mri
+  gem 'debug', '>= 1.0.0', require: false, platforms: :mri
   gem 'ruby-debug', require: false, platforms: :jruby
 end
 
@@ -25,6 +26,7 @@ end
 
 group :coverage do
   gem 'simplecov', require: false
+  gem 'simplecov-lcov', require: false
 end
 
 # vim: syntax=ruby

data/README.md

@@ -135,7 +135,7 @@ this project as part of [Google Summer of Code](https://developers.google.com/op
 
 Copyright
 ---------
-Copyright 2009-2020 Sylvester Keil. All rights reserved.
+Copyright 2009-2025 Sylvester Keil. All rights reserved.
 
 Copyright 2012 President and Fellows of Harvard College.
 

data/csl.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Sylvester Keil']
   s.email       = ['http://sylvester.keil.or.at']
   s.homepage    = 'https://github.com/inukshuk/csl-ruby'
-  s.licenses     = ['AGPL-3.0','BSD-2-Clause']
+  s.licenses     = ['BSD-2-Clause']
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'A Ruby CSL parser and library'
   s.description = <<~EOS
@@ -30,8 +30,13 @@ Gem::Specification.new do |s|
 
 
   s.required_ruby_version = '>= 2.2'
-  s.add_runtime_dependency('namae', ['~>1.0'])
-  s.add_runtime_dependency('rexml')
+  s.add_dependency('namae', ['~> 1.2'])
+  s.add_dependency('rexml', '~> 3.0')
+  s.add_dependency('forwardable', '~> 1.3')
+  s.add_dependency('open-uri', '< 1.0')
+  s.add_dependency('singleton', '< 1.0')
+  s.add_dependency('set', '~> 1.1')
+  s.add_dependency('time', '< 1.0')
 
   s.files        = `git ls-files`.split("\n") - EXCLUDES
   s.require_path = 'lib'

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

@@ -318,7 +318,7 @@ module CSL
           case
           when node =~ /^\s*</
             @validator[@schema, node]
-          when File.exists?(node)
+          when File.exist?(node)
             @validator[@schema, File.open(node, 'r:UTF-8')]
           else
             glob = Dir.glob(node)

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL
-  VERSION = '2.0.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.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Sylvester Keil
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-01 00:00:00.000000000 Z
+date: 2025-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -16,28 +15,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: forwardable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: open-uri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: singleton
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: set
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: time
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: |
   A Ruby parser and full API for the Citation Style Language (CSL),
   an open XML-based language to describe the formatting of citations
@@ -98,10 +167,8 @@ files:
 - vendor/schema/csl.rng
 homepage: https://github.com/inukshuk/csl-ruby
 licenses:
-- AGPL-3.0
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,8 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A Ruby CSL parser and library
 test_files: []