isodoc 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76840b2da951a6a5c1ae745cf16f8a50c1c75d74519bc6e9b407847cc91276dd
-  data.tar.gz: 20ee7aa9917bf072e8a8244fc2af47c5585d56394e4bcae5ec1b2d601cde30c5
+  metadata.gz: fd17ce9e2842e1e5407c0be58735af16398e4ab1a73d6cd93bfc5fb3d85039cc
+  data.tar.gz: 271c0ac77d8d5b4d87524b4905716ca01445921039b13758aea8e2279cc0f929
 SHA512:
-  metadata.gz: ac3ba122ef2440b18487f6448f9a6e607180f8c461d339babb96178f318ce0e0483dbe87b55378c37f6a04cba48db824692d47feda0a2ccfd01ab53f092a3607
-  data.tar.gz: 9f264b5c08e2d426a43b115bc8b217a132a15a1ff2bee2aa0cd07c84db4fdba2096b502f6632bdf339f9303cbe32808f4a9e23b3c8af8c6d5c5a8aabe615d1e9
+  metadata.gz: 06a8d496129ea43dc7ef263466801ff47710c824e6ca3cdc9d9038d8408febecb04672f851d1c7be187736813ea6ac92d5241d809e93577abc538bcd9c8f76a7
+  data.tar.gz: 0ec8c4fc83f1fe12dfe02f58b0f3e3f96d03ee616bc26ab8558f946e2db107e5aba7814cd426edafe79e100ba2a856db46b31487b1631e4b5be6efe0dea024ee

data/.rubocop.yml

@@ -3,13 +3,8 @@
 # All project-specific additions and overrides should be specified in this file.
 
 inherit_from:
-  # Thoughtbot's style guide from: https://github.com/thoughtbot/guides
-  - ".rubocop.tb.yml"
-  # Overrides from Ribose
-  - ".rubocop.ribose.yml"
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  DisplayCopNames: false
-  StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.3
 Rails:
   Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.8)
+    isodoc (0.9.9)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -62,7 +62,7 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     metanorma (0.3.0)
-    method_source (0.9.1)
+    method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
@@ -77,7 +77,7 @@ GEM
     parser (2.5.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
-    pry (0.12.0)
+    pry (0.12.1)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rainbow (3.0.0)
@@ -110,7 +110,7 @@ GEM
     ruby-progressbar (1.10.0)
     ruby-xslt (0.9.10)
     ruby_dep (1.5.0)
-    sass (3.7.1)
+    sass (3.7.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -124,7 +124,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     timecop (0.9.1)
     unicode-display_width (1.4.0)

data/lib/isodoc/function/utils.rb

@@ -106,11 +106,10 @@ module IsoDoc::Function
       h = h.to_s.gsub(%r{<br/>}, " ").sub(/<\/?h[12][^>]*>/, "")
       h1 = to_xhtml_fragment(h.dup)
       h1.traverse do |x|
+        x.replace(" ") if x.name == "span" && /mso-tab-count/.match(x["style"])
         x.remove if x.name == "span" && x["class"] == "MsoCommentReference"
         x.remove if x.name == "a" && x["epub:type"] == "footnote"
-        if x.name == "a"
-          x.replace(x.children)
-        end
+        x.replace(x.children) if x.name == "a"
       end
       from_xhtml(h1)
     end

data/lib/isodoc/metadata.rb

@@ -111,16 +111,6 @@ module IsoDoc
       set(:agency, agency.sub(%r{/$}, ""))
     end
 
-    def docnumber(isoxml)
-      docnumber = isoxml.at(ns("//bibdata/docidentifier/project-number"))
-      partnumber = isoxml.at(ns("//bibdata/docidentifier/project-number/@part"))
-      subpartnumber = isoxml.at(ns("//bibdata/docidentifier/project-number/@subpart"))
-      dn = docnumber&.text || ""
-      dn += "-#{partnumber.text}" if partnumber
-      dn += "-#{subpartnumber.text}" if subpartnumber
-      dn
-    end
-
     def docstatus(isoxml, _out)
       docstatus = isoxml.at(ns("//bibdata/status"))
       if docstatus
@@ -133,12 +123,8 @@ module IsoDoc
     end
 
     def docid(isoxml, _out)
-      dn = docnumber(isoxml)
-      docstatus = get[:status]
-      if docstatus && docstatus != "Published"
-        dn = "#{dn} #{docstatus}"
-      end
-      set(:docnumber, dn)
+      dn = isoxml.at(ns("//bibdata/docidentifier"))
+      set(:docnumber, dn&.text)
     end
 
     def draftinfo(draft, revdate)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.8".freeze
+  VERSION = "0.9.9".freeze
 end

data/spec/isodoc/metadata_spec.rb

@@ -12,10 +12,8 @@ RSpec.describe IsoDoc do
     <bibdata type="international-standard">
   <title>The Incredible Mr Ripley</title>
   <title language="en">Cereals and pulses</title>
-  <docidentifier>
-    <project-number part="1">17301</project-number>
-    <tc-document-number>17301</tc-document-number>
-  </docidentifier>
+  <docidentifier>17301-1</docidentifier>
+  <docnumber>17301</docnumber>
   <date type="published"><on>2011</on></date>
   <date type="accessed"><on>2012</on></date>
   <date type="created"><from>2010</from><to>2011</to></date>
@@ -57,7 +55,7 @@ RSpec.describe IsoDoc do
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"17301-1 Committee draft", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :updateddate=>"XXX", :wg=>"WG 3"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"17301-1", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :updateddate=>"XXX", :wg=>"WG 3"}
 OUTPUT
   end
 
@@ -71,10 +69,8 @@ OUTPUT
     <bibdata type="international-standard">
   <title language="fr" format="text/plain">Céréales et légumineuses</ti>
   <title language="en" format="text/plain">Cereals and pulses</title>
-  <docidentifier>
-    <project-number part="1" subpart="3">17301</project-number>
-    <tc-document-number>17301</tc-document-number>
-  </docidentifier>
+  <docidentifier>17301-1-3</docidentifier>
+  <docnumber>17301</docnumber>
   <contributor>
     <role type="author"/>
     <organization>

data/spec/isodoc/postproc_spec.rb

@@ -370,8 +370,8 @@ Content-Location: file:///C:/Doc/test_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
 
-Ci8qIGFuIGVtcHR5IGhlYWRlciAqLwoKU1RBUlQgRE9DIElEOiAxMDAwLTE6IEVORCBET0MgSUQK
-CkZJTEVOQU1FOiB0ZXN0Cgo=
+Ci8qIGFuIGVtcHR5IGhlYWRlciAqLwoKU1RBUlQgRE9DIElEOiAKICAgICAgICAgICAxMDAwCiAg
+ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
 
     OUTPUT
   end
@@ -406,7 +406,7 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
        <p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes">&#xA0;</span>TOC
          \o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
        <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-       <a href="#_Toc">1.<span style="mso-tab-count:1">&#xA0; </span>Clause 4<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <a href="#_Toc">1. Clause 4<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
        <span style="mso-tab-count:1 dotted">. </span>
        </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
        <span style="mso-element:field-begin"></span></span>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath