RubyGems - isodoc - Versions diffs - 1.0.1 → 1.0.2 - Mend

isodoc 1.0.1 → 1.0.2

Files changed (8) hide show

checksums.yaml +4 -4
data/Gemfile +8 -1
data/Gemfile.lock +5 -5
data/lib/isodoc/function/references.rb +25 -14
data/lib/isodoc/version.rb +1 -1
data/spec/isodoc/postproc_spec.rb +2 -2
data/spec/isodoc/ref_spec.rb +59 -24
metadata +2 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f012ee1dfcb45c453231b1dbafd3eb84f4e3f1703998d7b804a42101fefbc03
-  data.tar.gz: 48fb80967bdbd2265408c90c3fcabcef3e0539dff92d2d68a5422b3787ca5617
+  metadata.gz: 5dfad47b4bae84826332835e54c1010c3ffb1baad8c847db087255ba8a84099d
+  data.tar.gz: 7eda7444d72c11ef8993306d04fc400a4721174d6d379d12b87a2ba18bc710e6
 SHA512:
-  metadata.gz: ff221e3f46b2e62a9c6bcb9df4676dfb4757dd73cc7d740d6dc366ec68a26cfa657af226a99592554046d78907ba9260fdd55a29d39e832332248887ad37d45c
-  data.tar.gz: 61e23537cffb488ecd57346c1c47e6db6af63cdb7e9e96d3d7066e959cfea08a8709235ca4d0fce92431e823c5b4e3b94a8f7e7566388b687155d3518a936959
+  metadata.gz: 0d739c93248a158a13a553fbc2056883a873508caf32b26fbb61857ec899415f7bc4a06f732bed6885db34c926c79e6bb76199663ec444e6010eebae1239834f
+  data.tar.gz: 85b469117c9c27b0cda0de0979657bb4008bae9a225af388c6e9fc07c0813d56a07fd4812cced716864091406ebd04a41dec4ec7e2ebc7ce5f19e3728b59ca49

data/Gemfile CHANGED

@@ -1,4 +1,11 @@
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}" }
-# Specify your gem's dependencies in ribose.gemspec
 gemspec
+if File.exist? 'Gemfile.devel'
+  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+end

data/Gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (1.0.1)
+    isodoc (1.0.2)
       asciimath
       html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
@@ -28,7 +28,7 @@ GEM
       nokogiri (>= 1.4.3)
     ffi (1.11.1)
     formatador (0.2.5)
-    guard (2.15.0)
+    guard (2.15.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -63,9 +63,9 @@ GEM
       asciidoctor
       htmlentities
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2019.0904)
     mini_portile2 (2.4.0)
     nenv (0.3.0)
     nokogiri (1.10.4)
@@ -74,7 +74,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.17.0)
-    parser (2.6.4.0)
+    parser (2.6.4.1)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)

data/lib/isodoc/function/references.rb CHANGED

@@ -12,10 +12,11 @@ module IsoDoc::Function
     def nonstd_bibitem(list, b, ordinal, bibliography)
       list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
         id = bibitem_ref_code(b)
+        identifier = render_identifier(id)
         if bibliography
-          ref_entry_code(r, ordinal, id)
+          ref_entry_code(r, ordinal, identifier, id)
         else
-          r << "#{id}, "
+          r << "#{identifier}, "
         end
         reference_format(b, r)
       end
@@ -24,7 +25,9 @@ module IsoDoc::Function
     def std_bibitem_entry(list, b, ordinal, biblio)
       list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
         prefix_bracketed_ref(ref, ordinal) if biblio
-        ref << bibitem_ref_code(b)
+        id = bibitem_ref_code(b)
+        identifier = render_identifier(id)
+        ref << identifier
         date_note_process(b, ref)
         ref << ", "
         reference_format(b, ref)
@@ -33,19 +36,28 @@ module IsoDoc::Function
     # if t is just a number, only use that ([1] Non-Standard)
     # else, use both ordinal, as prefix, and t
-    def ref_entry_code(r, ordinal, t)
-      if /^\d+$/.match(t)
+    def ref_entry_code(r, ordinal, t, id)
+      if id["type"] == "metanorma"
         prefix_bracketed_ref(r, t)
       else
         prefix_bracketed_ref(r, ordinal)
-        r << "#{t}, "
+        if !t.empty? && !%w(DOI ISSN ISBN).include?(id["type"])
+          r << "#{t}, "
+        end
       end
     end
     def bibitem_ref_code(b)
-      id = b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma')]"))
-      id ||= b.at(ns("./docidentifier[not(@type = 'DOI')]"))
-      id ||= b.at(ns("./docidentifier")) or return "(NO ID)"
+      id = b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN')]"))
+      id ||= b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN')]"))
+      id ||= b.at(ns("./docidentifier"))
+      return id if id
+      id = Nokogiri::XML::Node.new("docidentifier", b.document)
+      id.text = "(NO ID)"
+      id
+    end
+    def render_identifier(id)
       docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
     end
@@ -110,7 +122,7 @@ module IsoDoc::Function
     def is_standard(b)
       ret = false
       b.xpath(ns("./docidentifier")).each do |id|
-        next if id["type"].nil? || %w(metanorma DOI).include?(id["type"])
+        next if id["type"].nil? || %w(metanorma DOI ISSN ISBN).include?(id["type"])
         ret = true
       end
       ret
@@ -185,12 +197,11 @@ module IsoDoc::Function
     def reference_names(ref)
       isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
-      docid = ref.at(ns("./docidentifier"))
-      prefix = ref.at(ns("./docidentifier/@type"))
-      # return ref_names(ref) unless docid
+      docid = bibitem_ref_code(ref)
+      prefix = docid["type"]
       date = ref.at(ns("./date[@type = 'published']"))
       allparts = ref.at(ns("./extent[@type='part'][referenceFrom='all']"))
-      reference = format_ref(docid_l10n(docid.text), prefix&.text, isopub, date, allparts)
+      reference = format_ref(docid_l10n(docid.text), prefix, isopub, date, allparts)
       @anchors[ref["id"]] = { xref: reference }
     end

data/lib/isodoc/version.rb CHANGED

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

data/spec/isodoc/postproc_spec.rb CHANGED

@@ -861,8 +861,8 @@ TOCLEVEL
     OUTPUT
   end
-    it "propagates example style to paragraphs in postprocessing (Word)" do
-        FileUtils.rm_f "test.doc"
+  it "propagates example style to paragraphs in postprocessing (Word)" do
+    FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/isodoc/ref_spec.rb CHANGED

@@ -10,9 +10,12 @@ RSpec.describe IsoDoc do
     <preface><foreword>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
   <eref bibitemid="ISO712"/>
+  <eref bibitemid="ISBN"/>
+  <eref bibitemid="ISSN"/>
   <eref bibitemid="ISO16634"/>
   <eref bibitemid="ref1"/>
   <eref bibitemid="ref10"/>
+  <eref bibitemid="ref12"/>
   </p>
     </foreword></preface>
     <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
@@ -63,6 +66,28 @@ RSpec.describe IsoDoc do
 </references><references id="_bibliography" obligation="informative">
   <title>Bibliography</title>
+<bibitem id="ISBN" type="ISBN">
+  <title format="text/plain">Chemicals for analytical laboratory use</title>
+  <docidentifier type="ISBN">ISBN</docidentifier>
+  <docidentifier type="metanorma">[1]</docidentifier>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <abbreviation>ISBN</abbreviation>
+    </organization>
+  </contributor>
+</bibitem>
+<bibitem id="ISSN" type="ISSN">
+  <title format="text/plain">Instruments for analytical laboratory use</title>
+  <docidentifier type="ISSN">ISSN</docidentifier>
+  <docidentifier type="metanorma">[2]</docidentifier>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <abbreviation>ISSN</abbreviation>
+    </organization>
+  </contributor>
+</bibitem>
 <bibitem id="ISO3696" type="standard">
   <title format="text/plain">Water for analytical laboratory use</title>
   <docidentifier type="ISO">ISO 3696</docidentifier>
@@ -81,6 +106,10 @@ RSpec.describe IsoDoc do
   <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
   <docidentifier type="IETF">RFC 10</docidentifier>
 </bibitem>
+<bibitem id="ref12">
+  <formattedref format="application/x-isodoc+xml">CitationWorks. 2019. <em>How to cite a reference</em>.</formattedref>
+  <docidentifier type="metanorma">[Citn]</docidentifier>
+</bibitem>
 </references>
@@ -88,37 +117,43 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     #{HTML_HDR}
-               <br/>
-               <div>
-                 <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
+             <br/>
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+               <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
          <a href="#ISO712">ISO 712</a>
+         <a href="#ISBN">[1]</a>
+         <a href="#ISSN">[2]</a>
          <a href="#ISO16634">ISO 16634:-- (all parts)</a>
          <a href="#ref1">ICC 167</a>
          <a href="#ref10">[10]</a>
+         <a href="#ref12">[Citn]</a>
          </p>
-               </div>
-               <p class="zzSTDTitle1"/>
-               <div>
-                 <h1>1.&#160; Normative references</h1>
-                 <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
-                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
-                 <p id="ISO16634" class="NormRef">ISO 16634:-- (all parts)<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a>, <i> Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
-                 <p id="ISO20483" class="NormRef">ISO 20483:2013-2014, <i> Cereals and pulses</i></p>
-                 <p id="ref1" class="NormRef">ICC 167, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
-               </div>
-               <br/>
-               <div>
-                 <h1 class="Section3">Bibliography</h1>
-                 <p id="ISO3696" class="Biblio">[1]&#160; ISO 3696, <i> Water for analytical laboratory use</i></p>
-                 <p id="ref10" class="Biblio">[10]&#160; <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
-                  <p id="ref11" class="Biblio">[3]&#160; IETF RFC 10, <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i></p>
-               </div>
-               <aside id="fn:1" class="footnote">
+             </div>
+             <p class="zzSTDTitle1"/>
+             <div>
+               <h1>1.&#160; Normative references</h1>
+               <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+               <p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
+               <p id="ISO16634" class="NormRef">ISO 16634:-- (all parts)<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a>, <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
+               <p id="ISO20483" class="NormRef">ISO 20483:2013-2014, <i>Cereals and pulses</i></p>
+               <p id="ref1" class="NormRef">ICC 167, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
+             </div>
+             <br/>
+             <div>
+               <h1 class="Section3">Bibliography</h1>
+               <p id="ISBN" class="Biblio">[1]&#160; <i>Chemicals for analytical laboratory use</i></p>
+               <p id="ISSN" class="Biblio">[2]&#160; <i>Instruments for analytical laboratory use</i></p>
+               <p id="ISO3696" class="Biblio">[3]&#160; ISO 3696, <i>Water for analytical laboratory use</i></p>
+               <p id="ref10" class="Biblio">[10]&#160; <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
+               <p id="ref11" class="Biblio">[5]&#160; IETF RFC 10, <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i></p>
+               <p id="ref12" class="Biblio">[Citn]&#160; CitationWorks. 2019. <i>How to cite a reference</i>.</p>
+             </div>
+             <aside id="fn:1" class="footnote">
          <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
        </aside>
-             </div>
-           </body>
+           </div>
+         </body>
        </html>
     OUTPUT
   end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath