isodoc 1.2.6 → 1.2.7

data/spec/isodoc/i18n_spec.rb

@@ -70,11 +70,8 @@ RSpec.describe IsoDoc do
         presxml = <<~"PRESXML"
        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>en</language>
+           <language current="true">en</language>
          </bibdata>
-         <local_bibdata>
-  <language>en</language>
-</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -229,12 +226,12 @@ PRESXML
            </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "defaults to English" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>tlh</language>
@@ -301,11 +298,8 @@ PRESXML
         <?xml version='1.0'?>
        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>tlh</language>
+           <language current="true">tlh</language>
          </bibdata>
-         <local_bibdata>
-  <language>tlh</language>
-</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -457,11 +451,8 @@ PRESXML
         presxml = <<~"PRESXML"
         <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>fr</language>
+           <language current="true">fr</language>
          </bibdata>
-         <local_bibdata>
-  <language>fr</language>
-</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -616,7 +607,7 @@ PRESXML
            </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
@@ -700,13 +691,9 @@ PRESXML
         presxml = <<~"PRESXML"
        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>zh</language>
-           <script>Hans</script>
+           <language current="true">zh</language>
+           <script current="true">Hans</script>
          </bibdata>
-         <local_bibdata>
-  <language>zh</language>
-  <script>Hans</script>
-</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -875,11 +862,12 @@ PRESXML
            </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes i18n file" do
+    mock_i18n
     input = <<~"INPUT"
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
@@ -966,27 +954,46 @@ PRESXML
         presxml = <<~OUTPUT
          <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
              <bibdata>
-             <language>eo</language>
-             <script>Latn</script>
+             <language current="true">eo</language>
+             <script current="true">Latn</script>
              <status>
-  <stage>published</stage>
-  <substage>withdrawn</substage>
+             <stage language=''>published</stage>
+<stage language='eo'>publikigita</stage>
+<substage language=''>withdrawn</substage>
+<substage language='eo'>fortirita</substage>
 </status>
 <ext>
-  <doctype>brochure</doctype>
+<doctype language=''>brochure</doctype>
+<doctype language='eo'>bro&#x15D;uro</doctype>
 </ext>
              </bibdata>
-             <local_bibdata>
-  <language>eo</language>
-  <script>Latn</script>
-  <status>
-    <stage>publikigita</stage>
-    <substage>fortirita</substage>
-  </status>
-  <ext>
-    <doctype>bro&#x15D;uro</doctype>
-  </ext>
-</local_bibdata>
+  <localized-strings>
+  <localized-string key='foreword' language='eo'>Anta&#x16D;parolo</localized-string>
+<localized-string key='introduction' language='eo'>Enkonduko</localized-string>
+<localized-string key='clause' language='eo'>kla&#x16D;zo</localized-string>
+<localized-string key='table' language='eo'>Tabelo</localized-string>
+<localized-string key='source' language='eo'>SOURCE</localized-string>
+<localized-string key='modified' language='eo'>modified</localized-string>
+<localized-string key='scope' language='eo'>Amplekso</localized-string>
+<localized-string key='symbols' language='eo'>Simboloj kai mallongigitaj terminoj</localized-string>
+<localized-string key='annex' language='eo'>Aldono</localized-string>
+<localized-string key='normref' language='eo'>Normaj cita&#x135;oj</localized-string>
+<localized-string key='bibliography' language='eo'>Bibliografio</localized-string>
+<localized-string key='inform_annex' language='eo'>informa</localized-string>
+<localized-string key='all_parts' language='eo'>&#x109;iuj partoj</localized-string>
+<localized-string key='norm_annex' language='eo'>normative</localized-string>
+<localized-string key='locality.table' language='eo'>Tabelo</localized-string>
+<localized-string key='doctype_dict.brochure' language='eo'>bro&#x15D;uro</localized-string>
+<localized-string key='doctype_dict.conference_proceedings' language='eo'>konferencaktoj</localized-string>
+<localized-string key='stage_dict.published' language='eo'>publikigita</localized-string>
+<localized-string key='substage_dict.withdrawn' language='eo'>fortirita</localized-string>
+<localized-string key='array.0' language='eo'>elem1</localized-string>
+<localized-string key='array.1' language='eo'>elem2</localized-string>
+<localized-string key='array.2.elem3' language='eo'>elem4</localized-string>
+<localized-string key='array.2.elem5' language='eo'>elem6</localized-string>
+<localized-string key='language' language='eo'>eo</localized-string>
+<localized-string key='script' language='eo'>Latn</localized-string>
+</localized-strings>
              <preface>
              <foreword obligation="informative">
                 <title>Foreword</title>
@@ -1166,4 +1173,11 @@ PRESXML
         expect(xmlpp(IsoDoc::PresentationXMLConvert.new({i18nyaml: "spec/assets/i18n.yaml"}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({i18nyaml: "spec/assets/i18n.yaml"}).convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
+
+  private
+
+  def mock_i18n
+    allow_any_instance_of(::IsoDoc::I18n).to receive(:load_yaml).with("eo", "Latn", "spec/assets/i18n.yaml").and_return(YAML.load_file("spec/assets/i18n.yaml"))
+  end
+
 end

data/spec/isodoc/metadata_spec.rb

@@ -18,6 +18,8 @@ RSpec.describe IsoDoc do
   <uri type="pdf">URL D</uri>
   <uri type="doc">URL E</uri>
   <docidentifier>17301-1</docidentifier>
+  <docidentifier type="ISBN">ISBN 13</docidentifier>
+  <docidentifier type="ISBN10">ISBN 10</docidentifier>
   <docnumber>17301</docnumber>
   <date type="published"><on>2011</on></date>
   <date type="accessed"><on>2012</on></date>
@@ -98,8 +100,6 @@ RSpec.describe IsoDoc do
   <doctype>international-standard</doctype>
   </ext>
 </bibdata>
-    <local_bibdata type="standard">
-    </local_bibdata>
 </iso-standard>
 INPUT
 {:accesseddate=>"2012",
@@ -116,24 +116,31 @@ INPUT
 :docnumeric=>"17301",
 :doctitle=>"Cereals and pulses",
 :doctype=>"International Standard",
+:doctype_display=>"International Standard",
 :docyear=>"2016",
 :draft=>"0.4",
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :html=>"URL B",
 :implementeddate=>"XXX",
+:isbn=>"ISBN 13",
+:isbn10=>"ISBN 10",
 :issueddate=>"XXX",
 :iteration=>"2",
 :keywords=>["KW2", "KW1", "KW3"],
+:lang=>"en",
 :obsoleteddate=>"2014",
 :pdf=>"URL D",
 :publisheddate=>"2011",
 :receiveddate=>"XXX",
 :revdate=>"2016-05-01",
 :revdate_monthyear=>"May 2016",
+:script=>"Latn",
 :stage=>"Committee Draft",
+:stage_display=>"Committee Draft",
 :stageabbr=>"CD",
 :substage=>"Withdrawn",
+:substage_display=>"Withdrawn",
 :title_footnote=>["A footnote", "Another footnote"],
 :transmitteddate=>"2020",
 :unchangeddate=>"2019",
@@ -234,11 +241,13 @@ INPUT
 :docnumeric=>"17301",
 :doctitle=>"Cereals and pulses",
 :doctype=>"International Standard",
+:doctype_display=>"International Standard",
 :docyear=>"2016",
 :draft=>"12",
 :draftinfo=>" (draft 12, 2016-05)",
 :implementeddate=>"XXX",
 :issueddate=>"XXX",
+:lang=>"en",
 :obsoleteddate=>"XXX",
 :obsoletes=>"IEC 8121",
 :obsoletes_part=>"3.1",
@@ -253,7 +262,9 @@ INPUT
 :receiveddate=>"XXX",
 :revdate=>"2016-05",
 :revdate_monthyear=>"May 2016",
+:script=>"Latn",
 :stage=>"Published",
+:stage_display=>"Published",
 :subdivision=>"Subdivision",
 :transmitteddate=>"XXX",
 :unchangeddate=>"XXX",
@@ -271,6 +282,17 @@ OUTPUT
     <bibdata type="standard">
   <language>fr</language>
   <script>Latn</script>
+  <status>
+    <stage lang="">Committee Draft</stage>
+    <stage lang=fr">Projet de comité</stage>
+    <substage lang="">Withdrawn</substage>
+    <substage lang="fr">Rétiré</substage>
+    <iteration>2</iteration>
+  </status>
+<ext>
+<doctype lang="">international-standard</doctype>
+<doctype lang="fr">Standard international</doctype>
+</ext>
   </bibdata>
   </iso-standard>
     INPUT
@@ -307,7 +329,13 @@ OUTPUT
   </contributor>
   <language>fr</language>
   <script>Latn</script>
-  <status><stage>Published</stage></status>
+  <status>
+    <stage language="">Committee Draft</stage>
+    <stage language="fr">Projet de comité</stage>
+    <substage language="">Withdrawn</substage>
+    <substage language="fr">Rétiré</substage>
+    <iteration>2</iteration>
+  </status>
   <copyright>
     <from>2016</from>
     <owner>
@@ -316,6 +344,10 @@ OUTPUT
       </organization>
     </owner>
   </copyright>
+<ext>
+<doctype language="">international-standard</doctype>
+<doctype language="fr">Standard international</doctype>
+</ext>
 </bibdata>
 </iso-standard>
 INPUT
@@ -327,20 +359,29 @@ INPUT
 :createddate=>"XXX",
 :docnumber=>"17301-1-3",
 :docnumeric=>"17301",
-:doctitle=>"Cereals and pulses",
+:doctitle=>"Céréales et légumineuses",
+:doctype=>"International Standard",
+:doctype_display=>"Standard International",
 :docyear=>"2016",
 :implementeddate=>"XXX",
 :issueddate=>"XXX",
+:iteration=>"2",
+:lang=>"fr",
 :obsoleteddate=>"XXX",
 :publisheddate=>"2011-01",
 :publisher=>"International Organization for Standardization et International Electrotechnical Commission",
 :receiveddate=>"XXX",
 :revdate=>"2016-05",
 :revdate_monthyear=>"Mai 2016",
-:stage=>"Published",
+:script=>"Latn",
+:stage=>"Committee Draft",
+:stage_display=>"Projet De Comité",
+:stageabbr=>"CD",
+:substage=>"Withdrawn",
+:substage_display=>"Rétiré",
 :transmitteddate=>"XXX",
 :unchangeddate=>"XXX",
-:unpublished=>false,
+:unpublished=>true,
 :updateddate=>"XXX",
 :vote_endeddate=>"XXX",
 :vote_starteddate=>"XXX"}

data/spec/isodoc/ref_spec.rb

@@ -127,11 +127,8 @@ RSpec.describe IsoDoc do
     presxml = <<~PRESXML
         <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <bibdata>
-            <language>en</language>
+            <language current="true">en</language>
           </bibdata>
-          <local_bibdata>
-  <language>en</language>
-</local_bibdata>
           <preface>
             <foreword>
               <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
@@ -423,7 +420,7 @@ RSpec.describe IsoDoc do
 </html>
 
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 

data/spec/spec_helper.rb

@@ -33,6 +33,8 @@ def metadata(x)
   Hash[x.sort].delete_if{ |k, v| v.nil? || v.respond_to?(:empty?) && v.empty? }
 end
 
+#   expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
+
 def strip_guid(x)
   x.gsub(%r{ id="_[^"]+"}, ' id="_"').gsub(%r{ target="_[^"]+"}, ' target="_"').
     gsub(%r( href="#[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{13}"), ' href="#_"').

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gyoku
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -301,9 +315,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
 - ".rubocop.ribose.yml"
@@ -364,6 +376,7 @@ files:
 - lib/isodoc/html_function/postprocess.rb
 - lib/isodoc/i18n.rb
 - lib/isodoc/metadata.rb
+- lib/isodoc/metadata_contributor.rb
 - lib/isodoc/metadata_date.rb
 - lib/isodoc/pdf_convert.rb
 - lib/isodoc/presentation_function/bibdata.rb

data/.github/workflows/macos.yml

@@ -1,42 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Install Inkscape
-        run: |
-          brew cask install inkscape
-          inkscape --version
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake