isodoc-i18n 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9ff88fde8b9dbc8298939de1c1952d05daa8d7651d04c80efa91c36e8b315fe
-  data.tar.gz: 86373bc0947b2de749b171a937195ed5e63a095b9346b65a8d3394270784faf6
+  metadata.gz: '0702006206028e38503e71c72fc5763c9ddc78798c7db38485ce3db8d1c58b55'
+  data.tar.gz: d55ddad57f401360969c491fc1c8efaa0a375324a09b1a2e1afee31bf9e76156
 SHA512:
-  metadata.gz: c62054bd0e4b0af305a0c8ead2a429d2ca7855f283e2f0a257c85be0fcb86d773d8e9da4f518d8985ea2f47a4cb0b493c51900aa595b9dd0c78430a669707488
-  data.tar.gz: fcd6eb42c29bf00363526889e28ab49682a0c678fd88ec022c5385fbab5b3c49f84e41e17fe72a34a9b4abf0a93a566351e6f4420c55e94d738b01052bc3567d
+  metadata.gz: 3fa9c7108157ebf3e63d7bcba97e37b878527593d4462356d5f23e4d6350da37bb76e173ae165e75a86b025d5b09a193f0cde80505f50a47a5c3396e5323ff41
+  data.tar.gz: 30673e7993504c760358ef70aa18352eae6f5455098f5e86e07080af51fadd68014bc826f056bc5c28908e59651611a4ee4bdf7e2fed953f2bd03e38d050df8c

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

data/lib/isodoc/version.rb

@@ -1,5 +1,5 @@
 module IsoDoc
   class I18n
-    VERSION = "1.0.4".freeze
+    VERSION = "1.0.5".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,21 +95,21 @@ 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", "spec/assets/zh-Hans.yaml")
+    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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc-i18n
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities