isodoc-i18n 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db66af34abba937daa72bbef574be08220618ca75b104c5b1e6275736494e781
-  data.tar.gz: b94275b875363991d526ea1a83ec3be97bdc93dcd0db16681cee8ba0197a8577
+  metadata.gz: 2995acc039a84f2046a7dd94885f6645db44c003e13e3c2d03acc080df6ccf46
+  data.tar.gz: 10aaebe352a542028a9e6bf1d69b3e6d1309416a0fc4329aa34053a520bdc982
 SHA512:
-  metadata.gz: 16e56e238e36071225875002eeb86959c23ddcf2ae874fa7db18e6893978e4d7105b88964867f8cd331718c975bdea5175845533e6ad045b621b035bff34a3c7
-  data.tar.gz: 87da9b7308403c25d52f8008177cb0ef62da042df0d58d8f26864678de53b84a925465dd36b9b40e1a106ca8a8406411d515567f1316903d54643cbbc89dc339
+  metadata.gz: f9aa2d2786ef223580b0cd832dd08d9821e06553975a369abda5e03b947cff9c5d44ad20ace189937e3707c536ffa99b5090b8cdc8ccf6cbf1dfc429ed0df623
+  data.tar.gz: bd0b5bc0c703ae8ffeeeea6d8df3df34d004bc478b4e8e0ec61c450da83b7c1571954e538bd43a3e7af320035496baa96a27e3d6f564dc7ea5afa58c3244638a

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.2".freeze
+    VERSION = "1.1.4".freeze
   end
 end

data/lib/isodoc/i18n.rb

@@ -2,13 +2,17 @@ require "yaml"
 require "htmlentities"
 require "metanorma-utils"
 require "twitter_cldr"
+require_relative "i18n/version"
 
 module IsoDoc
   class I18n
+    Hash.include Metanorma::Utils::Hash
+
     def load_yaml(lang, script, i18nyaml = nil, i18nhash = nil)
       ret = load_yaml1(lang, script)
-      return normalise_hash(ret.merge(YAML.load_file(i18nyaml))) if i18nyaml
-      return normalise_hash(ret.merge(i18nhash)) if i18nhash
+      i18nyaml and
+        return normalise_hash(ret.deep_merge(YAML.load_file(i18nyaml)))
+      i18nhash and return normalise_hash(ret.deep_merge(i18nhash))
 
       normalise_hash(ret)
     end
@@ -118,7 +122,7 @@ module IsoDoc
       xml.to_xml(encoding: "UTF-8")
     end
 
-    ZH_CHAR = "\\p{Han}|\\p{In CJK Symbols And Punctuation}|"\
+    ZH_CHAR = "\\p{Han}|\\p{In CJK Symbols And Punctuation}|" \
               "\\p{In Halfwidth And Fullwidth Forms}".freeze
 
     # note: we can't differentiate comma from enumeration comma 、
@@ -196,13 +200,21 @@ module IsoDoc
       num.localize(:en)
     end
 
+    INFLECTIONS = {
+      number: "sg",
+      case: "nom",
+      gender: "masc",
+      person: "3rd",
+      voice: "act",
+      mood: "ind",
+      tense: "pres",
+    }.freeze
+
+    INFLECTION_ORDER = %i(voice mood tense number case gender person).freeze
+
     def ordinal_key(term)
       @labels["ordinal_keys"].each_with_object([]) do |k, m|
-        m << case k
-             when "gender" then term["gender"]
-             when "number" then term["number"] || "sg"
-             when "case" then term["case"] || "nom"
-             end
+        m << (term[k] || INFLECTIONS[k.to_sym])
       end.join(".")
     end
 
@@ -212,5 +224,18 @@ module IsoDoc
       else @lang.to_sym
       end
     end
+
+    # can skip category if not present
+    def inflect(word, options)
+      i = @labels.dig("inflection", word) or return word
+      i.is_a? String and return i
+
+      INFLECTION_ORDER.each do |x|
+        infl = options[x] || INFLECTIONS[x]
+        i = i[infl] if i[infl]
+        i.is_a? String and return i
+      end
+      word
+    end
   end
 end

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.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-11-09 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.7
 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,7 +0,0 @@
-hash:
-  key1: val1
-  key2: val2
-arr: 
-  - arr1
-  - arr2
-text: "text2"

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,139 +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
-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