isodoc-i18n 1.1.3 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573397fe43411b36723793fd50893ce1fd5eda84ca84f8e00ba608f6e50f3cd5
-  data.tar.gz: 3117720a218de8fe171ee8c4d3237c97408a87beac521d4bb13d0d1021d329a9
+  metadata.gz: cf80de5e127891bdd42fef149b032db2649100b48e3903255b8045021d11f8d7
+  data.tar.gz: cbb3b8f8791089bd9ec2e161a0d268ae02b3768338963181f452812110aa32bf
 SHA512:
-  metadata.gz: 865a347ccd8f837f4a88f950179d375a79db880ca61de6880d545163ad5e8ca19488410f7dc0a03cf8205a3d948256b58dae49909a442427ffb409635ed7d9c5
-  data.tar.gz: a0a3ba98de7b47388e81f9bbdc8dac86e95f9c91aaca0290b1952d9bf7b9f98d23b5725bc70c75f8018c65d61bbaaa629fe65ee2edb868f6cb1dab1223afa8a3
+  metadata.gz: b6f9db2ae6a42c46dc8b8b6722daaf90b0bcfddd67d3eb244186c9d4e561d76019c837609cce2dcad35d7bf039393c8aaffeeb46e4249688a1c6b1330da2aee1
+  data.tar.gz: b79476f0ca524c142d0135de71206b6a137055286f214a94bbfc0d125d12a8d18a7357cb2162b6e75e3a8308c6b9d85005bd88bcdffc545c8764c22c55911e22

data/isodoc-i18n.gemspec

@@ -1,6 +1,4 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "isodoc/version"
+require_relative "lib/isodoc/i18n/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "isodoc-i18n"
@@ -18,9 +16,11 @@ Gem::Specification.new do |spec|
 
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
-  spec.files         = `git ls-files`.split("\n")
-  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
+  end
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "metanorma-utils", "~> 1.4.0"
@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  #spec.metadata["rubygems_mfa_required"] = "true"
+  # spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/isodoc/{version.rb → i18n/version.rb}

@@ -1,5 +1,5 @@
 module IsoDoc
   class I18n
-    VERSION = "1.1.3".freeze
+    VERSION = "1.1.6".freeze
   end
 end

data/lib/isodoc/i18n.rb

@@ -2,6 +2,7 @@ require "yaml"
 require "htmlentities"
 require "metanorma-utils"
 require "twitter_cldr"
+require_relative "i18n/version"
 
 module IsoDoc
   class I18n
@@ -77,7 +78,7 @@ module IsoDoc
     # function localising spaces and punctuation.
     # Not clear if period needs to be localised for zh
     def l10n(text, lang = @lang, script = @script, locale = @locale)
-      lang == "zh" && script == "Hans" and text = l10n_zh(text)
+      lang == "zh" and text = l10n_zh(text, script)
       lang == "fr" && text = l10n_fr(text, locale || "FR")
       bidiwrap(text, lang, script)
     end
@@ -100,12 +101,12 @@ module IsoDoc
          .default_script(@lang))]
     end
 
-    def l10n_zh(text)
+    def l10n_zh(text, script = "Hans")
       xml = Nokogiri::XML::DocumentFragment.parse(text)
       xml.traverse do |n|
         next unless n.text?
 
-        n.replace(cleanup_entities(l10_zh1(n.text), is_xml: false))
+        n.replace(l10_zh1(cleanup_entities(n.text, is_xml: false), script))
       end
       xml.to_xml(encoding: "UTF-8").gsub(/<b>/, "").gsub("</b>", "")
         .gsub(/<\?[^>]+>/, "")
@@ -116,7 +117,7 @@ module IsoDoc
       xml.traverse do |n|
         next unless n.text?
 
-        n.replace(cleanup_entities(l10n_fr1(n.text, locale), is_xml: false))
+        n.replace(l10n_fr1(cleanup_entities(n.text, is_xml: false), locale))
       end
       xml.to_xml(encoding: "UTF-8")
     end
@@ -125,17 +126,16 @@ module IsoDoc
               "\\p{In Halfwidth And Fullwidth Forms}".freeze
 
     # note: we can't differentiate comma from enumeration comma 、
-    def l10_zh1(text)
+    def l10_zh1(text, _script)
       l10n_zh_remove_space(l10n_zh_punct(text))
     end
 
     def l10n_zh_punct(text)
-      [":：", ",，", ".。", ")）", "]】", ":：", ";；", "?？", "!！"].each do |m|
-        text = text.gsub(/(?<=#{ZH_CHAR})#{Regexp.quote m[0]}/, m[1])
-        text = text.gsub(/^#{Regexp.quote m[0]}/, m[1])
+      [":：", ",，", ".．", ")）", "]］", ":：", ";；", "?？", "!！", "–～"].each do |m|
+        text = text.gsub(/#{Regexp.quote m[0]}/, m[1])
       end
-      ["(（", "[【"].each do |m|
-        text = text.gsub(/#{Regexp.quote m[0]}(?=#{ZH_CHAR})/, m[1])
+      ["(（", "[［"].each do |m|
+        text = text.gsub(/#{Regexp.quote m[0]}/, m[1])
       end
       text
     end
@@ -166,11 +166,16 @@ module IsoDoc
         .sub(/%2/, list[1])
       else
         @labels["multiple_#{conn}"]
-          .sub(/%1/, l10n(list[0..-2].join(", "), @lang, @script))
+          .sub(/%1/, l10n(list[0..-2].join(enum_comma), @lang, @script))
           .sub(/%2/, list[-1])
       end
     end
 
+    def enum_comma
+      %w(Hans Hant).include?(@script) and return "、"
+      ", "
+    end
+
     def cleanup_entities(text, is_xml: true)
       c = HTMLEntities.new
       if is_xml
@@ -185,12 +190,13 @@ module IsoDoc
 
     # ord class is either SpelloutRules or OrdinalRules
     def inflect_ordinal(num, term, ord_class)
-      if @labels["ordinal_keys"].nil? || @labels["ordinal_keys"].empty?
-        tw_cldr_localize(num).to_rbnf_s(ord_class, @labels[ord_class])
-      else
-        tw_cldr_localize(num)
-          .to_rbnf_s(ord_class, @labels[ord_class][ordinal_key(term)])
-      end
+      lbl = if @labels["ordinal_keys"].nil? || @labels["ordinal_keys"].empty?
+              @labels[ord_class]
+            else @labels[ord_class][ordinal_key(term)]
+            end
+      tw_cldr_localize(num).to_rbnf_s(ord_class, lbl)
+    rescue StandardError
+      num.localize(@lang.to_sym).to_rbnf_s(ord_class, lbl)
     end
 
     def tw_cldr_localize(num)

data/lib/isodoc-i18n.rb

@@ -1,5 +1 @@
-require_relative "isodoc/version"
 require_relative "isodoc/i18n"
-
-module IsoDoc
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc-i18n
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -201,26 +201,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
 - ".hound.yml"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
 - README.adoc
-- Rakefile
-- bin/rspec
 - isodoc-i18n.gemspec
 - lib/isodoc-i18n.rb
 - lib/isodoc-yaml/i18n-en.yaml
 - lib/isodoc/i18n.rb
-- lib/isodoc/version.rb
-- spec/assets/de.yaml
-- spec/assets/new.yaml
-- spec/assets/zh-Hans.yaml
-- spec/isodoc/base_spec.rb
-- spec/spec_helper.rb
+- lib/isodoc/i18n/version.rb
 homepage: https://github.com/metanorma/isodoc-i18n
 licenses:
 - BSD-2-Clause
@@ -233,14 +224,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: isodoc-i18n

data/.github/workflows/rake.yml

@@ -1,15 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: rake
-
-on:
-  push:
-    branches: [ master, main ]
-    tags: [ v* ]
-  pull_request:
-
-jobs:
-  rake:
-    uses: metanorma/ci/.github/workflows/generic-rake.yml@main
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -1,24 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: release
-
-on:
-  workflow_dispatch:
-    inputs:
-      next_version:
-        description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
-        required: true
-        default: 'skip'
-  push:
-    tags: [ v* ]
-
-jobs:
-  release:
-    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
-    with:
-      next_version: ${{ github.event.inputs.next_version }}
-    secrets:
-      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/bin/rspec

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path(
-  "../../Gemfile", Pathname.new(__FILE__).realpath
-)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/spec/assets/de.yaml

@@ -1,12 +0,0 @@
-ordinal_keys: [gender,number]
-SpelloutRules:
-  m.sg: spellout-ordinal-r
-  f.sg: spellout-ordinal
-  n.sg: spellout-ordinal-s
-  m.pl: spellout-ordinal
-  f.pl: spellout-ordinal
-  n.pl: spellout-ordinal
-edition: Auflage
-inflection:
-  Auflage:
-    gender: f

data/spec/assets/new.yaml

@@ -1,53 +0,0 @@
-hash:
-  key1: val1
-  key2: val2
-arr: 
-  - arr1
-  - arr2
-text: "text2"
-inflection:
-  Fred:
-    sg: Fred
-    pl: Freds
-  Man:
-    dat: viri
-    acc: virem
-  Woman:
-    sg:
-      nom: mulier
-      gen: mulieris
-    pl:
-      nom: mulieres
-      gen: mulierum
-  Good:
-    sg:
-      nom:
-        masc: bonus
-        fem: bona
-        neut: bonum
-      gen:
-        masc: boni
-        fem: bonae
-        neut: boni
-    pl:
-      nom:
-        masc: boni
-        fem: bonae
-        neut: bona
-      gen:
-        masc: bonorum
-        fem: bonarum
-        neut: bonorum
-  Walk:
-    act:
-      ind:
-        pres:
-          sg:
-            1st: ambulo
-            2nd: ambulas
-      subj:
-        pres:
-          pl:
-            1st: ambulemus
-            2nd: ambuletis
-

data/spec/assets/zh-Hans.yaml

@@ -1,7 +0,0 @@
-ordinal_keys: []
-SpelloutRules: spellout-ordinal
-edition: Auflage
-inflection:
-  Auflage:
-    gender: f
-

data/spec/isodoc/base_spec.rb

@@ -1,158 +0,0 @@
-require "spec_helper"
-
-RSpec.describe IsoDoc::I18n do
-  it "has a version number" do
-    expect(IsoDoc::I18n::VERSION).not_to be nil
-  end
-
-  it "loads language files" do
-    c = IsoDoc::I18n.new("en", "Latn")
-    expect(c.text).to eq "text"
-    expect(c.at).to eq "at"
-    expect(c.language).to eq "en"
-    expect(c.script).to eq "Latn"
-  end
-
-  it "manipulates i18n class" do
-    c = IsoDoc::I18n.new("en", "Latn")
-    expect(c.get["text"]).to eq "text"
-    expect(c.get["fred"]).to be_nil
-    c.set("fred", "frederic")
-    expect(c.get["fred"]).to eq "frederic"
-  end
-
-  it "loads default for missing language files" do
-    c = IsoDoc::I18n.new("tlh", "Klin")
-    expect(c.text).to eq "text"
-    expect(c.at).to eq "at"
-    expect(c.language).to eq "tlh"
-    expect(c.script).to eq "Klin"
-  end
-
-  it "loads language file overrides" do
-    c = IsoDoc::I18n.new("en", "Latn", i18nyaml: "spec/assets/new.yaml")
-    expect(c.text).to eq "text2"
-    expect(c.at).to eq "at"
-    expect(c.hash.to_s).to be_equivalent_to '{"key1"=>"val1", "key2"=>"val2"}'
-    expect(c.arr.to_s).to eq '["arr1", "arr2"]'
-  end
-
-  it "loads language hash overrides" do
-    c = IsoDoc::I18n.new("en", "Latn",
-                         i18nhash: YAML.load_file("spec/assets/new.yaml"))
-    expect(c.text).to eq "text2"
-    expect(c.at).to eq "at"
-    expect(c.hash.to_s).to be_equivalent_to '{"key1"=>"val1", "key2"=>"val2"}'
-    expect(c.arr.to_s).to eq '["arr1", "arr2"]'
-  end
-
-  it "does English localisation" do
-    c = IsoDoc::I18n.new("en", "Latn")
-    expect(c.l10n("Code (hello, world.)"))
-      .to be_equivalent_to "Code (hello, world.)"
-    expect(c.l10n("<a>Code (he<b>l</b>lo, world.)</a>"))
-      .to be_equivalent_to "<a>Code (he<b>l</b>lo, world.)</a>"
-  end
-
-  it "does Chinese localisation" do
-    c = IsoDoc::I18n.new("zh", "Hans")
-    expect(c.l10n("Code (hello, world.)"))
-      .to be_equivalent_to "Code (hello, world.)"
-    expect(c.l10n("计算机代码 (你好, 世界.)"))
-      .to be_equivalent_to " 计算机代码（你好，世界。）"
-    expect(c.l10n("<a>计算机代码</a> (<b>你好,</b> 世界.)"))
-      .to be_equivalent_to "<a>计算机代码</a> (你好， 世界。）"
-  end
-
-  it "does Hebrew RTL localisation" do
-    c = IsoDoc::I18n.new("en", "Hebr")
-    expect(c.l10n("Code (hello, world.)"))
-      .to be_equivalent_to "Code (hello, world.)"
-    expect(c.l10n("Code (hello, world.)", "en", "Latn"))
-      .to be_equivalent_to "&#x200e;Code (hello, world.)&#x200e;"
-    c = IsoDoc::I18n.new("en", "Latn")
-    expect(c.l10n("Code (hello, world.)", "en", "Hebr"))
-      .to be_equivalent_to "&#x200f;Code (hello, world.)&#x200f;"
-  end
-
-  it "does Arabic RTL localisation" do
-    c = IsoDoc::I18n.new("en", "Arab")
-    expect(c.l10n("Code (hello, world.)"))
-      .to be_equivalent_to "Code (hello, world.)"
-    expect(c.l10n("Code (hello, world.)", "en", "Latn"))
-      .to be_equivalent_to "&#x200e;Code (hello, world.)&#x200e;"
-    c = IsoDoc::I18n.new("en", "Latn")
-    expect(c.l10n("Code (hello, world.)", "en", "Arab"))
-      .to be_equivalent_to "&#x61c;Code (hello, world.)&#x61c;"
-  end
-
-  it "does French localisation" do
-    e = HTMLEntities.new
-    c = IsoDoc::I18n.new("fr", "Latn")
-    expect(e.encode(c.l10n("Code; «code» and: code!"), :hexadecimal))
-      .to be_equivalent_to "Code&#x202f;; &#xab;&#x202f;code&#x202f;&#xbb; " \
-                           "and&#xa0;: code&#x202f;!"
-    expect(e.encode(c.l10n("Code; &#xab;code&#xbb; and: code!"), :hexadecimal))
-      .to be_equivalent_to "Code&#x202f;; &#xab;&#x202f;code&#x202f;&#xbb; " \
-                           "and&#xa0;: code&#x202f;!"
-    c = IsoDoc::I18n.new("fr", "Latn", locale: "FR")
-    expect(e.encode(c.l10n("Code; «code» and: code!"), :hexadecimal))
-      .to be_equivalent_to "Code&#x202f;; &#xab;&#x202f;code&#x202f;&#xbb; " \
-                           "and&#xa0;: code&#x202f;!"
-    c = IsoDoc::I18n.new("fr", "Latn", locale: "CH")
-    expect(e.encode(c.l10n("Code; «code» and: code!"), :hexadecimal))
-      .to be_equivalent_to "Code&#x202f;; &#xab;&#x202f;code&#x202f;&#xbb; " \
-                           "and&#x202f;: code&#x202f;!"
-    expect(e.encode(c.l10n("http://xyz a;b"), :hexadecimal))
-      .to be_equivalent_to "http://xyz a;b"
-  end
-
-  it "does boolean conjunctions" do
-    c = IsoDoc::I18n.new("en", "Latn")
-    expect(c.boolean_conj([], "and")).to eq ""
-    expect(c.boolean_conj(%w(a), "and")).to eq "a"
-    expect(c.boolean_conj(%w(a b), "and")).to eq "a and b"
-    expect(c.boolean_conj(%w(a b c), "and")).to eq "a, b, and c"
-    expect(c.boolean_conj(%w(a b c d), "and")).to eq "a, b, c, and d"
-  end
-
-  it "does German ordinals" do
-    c = IsoDoc::I18n.new("de", "Latn", i18nyaml: "spec/assets/de.yaml")
-    term = c.inflection[c.edition]
-    expect(c.inflect_ordinal(5, term, "SpelloutRules"))
-      .to eq "fünfte"
-  end
-
-  it "does Chinese ordinals" do
-    c = IsoDoc::I18n.new("zh", "Hans", i18nyaml: "spec/assets/zh-Hans.yaml")
-    term = c.inflection[c.edition]
-    expect(c.inflect_ordinal(5, term, "SpelloutRules"))
-      .to eq "第五"
-  end
-
-  it "does Klingon ordinals" do
-    c = IsoDoc::I18n.new("tlh", "Hans", i18nyaml: "spec/assets/zh-Hans.yaml")
-    term = c.inflection[c.edition]
-    expect(c.inflect_ordinal(5, term, "SpelloutRules"))
-      .to eq "fifth"
-  end
-
-  it "does inflections" do
-    c = IsoDoc::I18n.new("en", "Latn", i18nyaml: "spec/assets/new.yaml")
-    expect(c.inflect("John", number: "sg")).to eq "John"
-    expect(c.inflect("Fred", number: "sg")).to eq "Fred"
-    expect(c.inflect("Fred", number: "pl")).to eq "Freds"
-    expect(c.inflect("Fred", number: "du")).to eq "Fred"
-    expect(c.inflect("Fred", tense: "pres")).to eq "Fred"
-    expect(c.inflect("Man", case: "dat")).to eq "viri"
-    expect(c.inflect("Man", number: "sg", case: "dat")).to eq "viri"
-    expect(c.inflect("Man", number: "pl", case: "acc")).to eq "virem"
-    expect(c.inflect("Woman", number: "pl", case: "gen")).to eq "mulierum"
-    expect(c.inflect("Good", number: "pl", case: "gen")).to eq "bonorum"
-    expect(c.inflect("Good", number: "pl", case: "gen", gender: "fem"))
-      .to eq "bonarum"
-    expect(c.inflect("Walk", person: "2nd")).to eq "ambulas"
-    expect(c.inflect("Walk", person: "2nd", number: "pl", mood: "subj"))
-      .to eq "ambuletis"
-  end
-end

data/spec/spec_helper.rb

@@ -1,36 +0,0 @@
-require "simplecov"
-SimpleCov.start do
-  add_filter "/spec/"
-end
-
-require "bundler/setup"
-require "isodoc-i18n"
-require "rspec/matchers"
-require "equivalent-xml"
-require "rexml/document"
-
-RSpec.configure do |config|
-  # Enable flags like --only-failures and --next-failure
-  config.example_status_persistence_file_path = ".rspec_status"
-
-  # Disable RSpec exposing methods globally on `Module` and `main`
-  config.disable_monkey_patching!
-
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end
-
-def xmlpp(xml)
-  s = ""
-  f = REXML::Formatters::Pretty.new(2)
-  f.compact = true
-  f.write(REXML::Document.new(xml), s)
-  s
-end
-
-def metadata(hash)
-  hash.sort.to_h.delete_if do |_k, v|
-    v.nil? || (v.respond_to?(:empty?) && v.empty?)
-  end
-end