isodoc-i18n 1.0.4 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9ff88fde8b9dbc8298939de1c1952d05daa8d7651d04c80efa91c36e8b315fe
-  data.tar.gz: 86373bc0947b2de749b171a937195ed5e63a095b9346b65a8d3394270784faf6
+  metadata.gz: ce8cb0d922cdc28fe16fc3605db3d205fe66c12d0224282f6597d9510d44ee6d
+  data.tar.gz: 6fe8fc95e446fdc6b57eb9172d6f4d0665fd2f48ed0c29877819c3d8398805dc
 SHA512:
-  metadata.gz: c62054bd0e4b0af305a0c8ead2a429d2ca7855f283e2f0a257c85be0fcb86d773d8e9da4f518d8985ea2f47a4cb0b493c51900aa595b9dd0c78430a669707488
-  data.tar.gz: fcd6eb42c29bf00363526889e28ab49682a0c678fd88ec022c5385fbab5b3c49f84e41e17fe72a34a9b4abf0a93a566351e6f4420c55e94d738b01052bc3567d
+  metadata.gz: 75991361380709948d84f9707bb999e3637f634433ebd83ee3f0b24e783381131326fa824e1897f8900a6cf8c30522a56589887fc93def7458480eadaaa60c21
+  data.tar.gz: 0e1a2149f1a06190962dda186978f01677d35ef25caf711dd058753741dca79b74c3de98cb04cbe0be4d1ba770b5f649589d7fd0b9f12e6dafb04b58372fa7fe

data/.github/workflows/rake.yml

@@ -10,6 +10,6 @@ on:
 
 jobs:
   rake:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/generic-rake.yml@main
+    uses: metanorma/ci/.github/workflows/generic-rake.yml@main
     secrets:
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -0,0 +1,24 @@
+# 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/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.4.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

data/lib/isodoc/version.rb

@@ -1,5 +1,5 @@
 module IsoDoc
   class I18n
-    VERSION = "1.0.4".freeze
+    VERSION = "1.0.7".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.7
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-09-05 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.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".hound.yml"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
@@ -224,7 +225,7 @@ homepage: https://github.com/metanorma/isodoc-i18n
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -239,8 +240,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: isodoc-i18n
 test_files: []