isodoc-i18n 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db66af34abba937daa72bbef574be08220618ca75b104c5b1e6275736494e781
-  data.tar.gz: b94275b875363991d526ea1a83ec3be97bdc93dcd0db16681cee8ba0197a8577
+  metadata.gz: 573397fe43411b36723793fd50893ce1fd5eda84ca84f8e00ba608f6e50f3cd5
+  data.tar.gz: 3117720a218de8fe171ee8c4d3237c97408a87beac521d4bb13d0d1021d329a9
 SHA512:
-  metadata.gz: 16e56e238e36071225875002eeb86959c23ddcf2ae874fa7db18e6893978e4d7105b88964867f8cd331718c975bdea5175845533e6ad045b621b035bff34a3c7
-  data.tar.gz: 87da9b7308403c25d52f8008177cb0ef62da042df0d58d8f26864678de53b84a925465dd36b9b40e1a106ca8a8406411d515567f1316903d54643cbbc89dc339
+  metadata.gz: 865a347ccd8f837f4a88f950179d375a79db880ca61de6880d545163ad5e8ca19488410f7dc0a03cf8205a3d948256b58dae49909a442427ffb409635ed7d9c5
+  data.tar.gz: a0a3ba98de7b47388e81f9bbdc8dac86e95f9c91aaca0290b1952d9bf7b9f98d23b5725bc70c75f8018c65d61bbaaa629fe65ee2edb868f6cb1dab1223afa8a3

data/lib/isodoc/i18n.rb

@@ -5,10 +5,13 @@ require "twitter_cldr"
 
 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 +121,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 +199,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 +223,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/version.rb

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

data/spec/assets/new.yaml

@@ -5,3 +5,49 @@ 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/isodoc/base_spec.rb

@@ -90,18 +90,18 @@ RSpec.describe IsoDoc::I18n 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 ; « code » "\
+      .to be_equivalent_to "Code ; « code » " \
                            "and : code !"
     expect(e.encode(c.l10n("Code; «code» and: code!"), :hexadecimal))
-      .to be_equivalent_to "Code ; « code » "\
+      .to be_equivalent_to "Code ; « code » " \
                            "and : code !"
     c = IsoDoc::I18n.new("fr", "Latn", locale: "FR")
     expect(e.encode(c.l10n("Code; «code» and: code!"), :hexadecimal))
-      .to be_equivalent_to "Code ; « code » "\
+      .to be_equivalent_to "Code ; « code » " \
                            "and : code !"
     c = IsoDoc::I18n.new("fr", "Latn", locale: "CH")
     expect(e.encode(c.l10n("Code; «code» and: code!"), :hexadecimal))
-      .to be_equivalent_to "Code ; « code » "\
+      .to be_equivalent_to "Code ; « code » " \
                            "and : code !"
     expect(e.encode(c.l10n("http://xyz a;b"), :hexadecimal))
       .to be_equivalent_to "http://xyz a;b"
@@ -136,4 +136,23 @@ RSpec.describe IsoDoc::I18n do
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc-i18n
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities