isodoc-i18n 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e51e4427e97bf2e0fde14e6f995a35f56771180c5480de0231484927442aa80b
-  data.tar.gz: 7516734ee389ab585094598bab5b8ecc696cf488f91cedf1454f192809dcb075
+  metadata.gz: 40bf798e8180b8b3014f6822a1ac8e5336728231d1436dbfe74c49fd54326551
+  data.tar.gz: d41acbc509af8a536d02fc3e4fd0511972b61e8730eb47d43d1520b0efd9e000
 SHA512:
-  metadata.gz: 876730b932cb38b6fcaa5af50e54b1a7f9b9be6c016ac0f82ad38fd00c0f510a15de812e09be5d733e81a6a16976cf547fc54a9cb113313c82e6762407a2e150
-  data.tar.gz: cabf6cd3651fb0314a701d5bb08aafdd607eed4f90d2a2df74d7ea7895e4f90d6566abad20c56e816cdf9c247e865131a7d27cbd2ea258a4e9b171b6afbe9117
+  metadata.gz: 16aa8550bf43b723bd10576d86be8a371d7fe88cb4967ccd3a88f295f695a6fce19830b250ad587b6a968fee2f8bd4c11cfa37c34c6d49ff7a15ef4544426fe3
+  data.tar.gz: 6e0ddd03856d58eed0655f1c978adaec56442eca6c378da15b81c21fd4177be1daf573d157f63da82d21364b7b10c59df726a0cf10cbfe2c87104e25a0e88adb

data/isodoc-i18n.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-utils", "~> 1.2.8"
+  spec.add_dependency "metanorma-utils", "~> 1.3.0"
   spec.add_dependency "twitter_cldr"
 
   spec.add_development_dependency "debug"

data/lib/isodoc/i18n.rb

@@ -5,9 +5,10 @@ require "twitter_cldr"
 
 module IsoDoc
   class I18n
-    def load_yaml(lang, script, i18nyaml = nil)
+    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
 
       normalise_hash(ret)
     end
@@ -53,10 +54,10 @@ module IsoDoc
       @labels[key] = val
     end
 
-    def initialize(lang, script, i18nyaml = nil)
+    def initialize(lang, script, i18nyaml: nil, i18nhash: nil)
       @lang = lang
       @script = script
-      y = load_yaml(lang, script, i18nyaml)
+      y = load_yaml(lang, script, i18nyaml, i18nhash)
       @labels = y
       @labels["language"] = @lang
       @labels["script"] = @script
@@ -151,13 +152,19 @@ 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?
-        num.localize(tw_cldr_lang).to_rbnf_s(ord_class, @labels[ord_class])
+        tw_cldr_localize(num).to_rbnf_s(ord_class, @labels[ord_class])
       else
-        num.localize(tw_cldr_lang)
+        tw_cldr_localize(num)
           .to_rbnf_s(ord_class, @labels[ord_class][ordinal_key(term)])
       end
     end
 
+    def tw_cldr_localize(num)
+      num.localize(tw_cldr_lang)
+    rescue StandardError
+      num.localize(:en)
+    end
+
     def ordinal_key(term)
       @labels["ordinal_keys"].each_with_object([]) do |k, m|
         m << case k

data/lib/isodoc/version.rb

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

data/spec/isodoc/base_spec.rb

@@ -30,7 +30,15 @@ RSpec.describe IsoDoc::I18n do
   end
 
   it "loads language file overrides" do
-    c = IsoDoc::I18n.new("en", "Latn", "spec/assets/new.yaml")
+    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"}'
@@ -87,16 +95,23 @@ RSpec.describe IsoDoc::I18n do
   end
 
   it "does German ordinals" do
-    c = IsoDoc::I18n.new("de", "Latn", "spec/assets/de.yaml")
+    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", "spec/assets/zh-Hans.yaml")
+    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

@@ -30,7 +30,7 @@ def xmlpp(xml)
 end
 
 def metadata(hash)
-  Hash[hash.sort].delete_if do |_k, v|
+  hash.sort.to_h.delete_if do |_k, v|
     v.nil? || (v.respond_to?(:empty?) && v.empty?)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc-i18n
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: isodoc-i18n