isodoc 0.9.21 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8d6a328ec654bc09eb32877b7fdaa77eeb3a29d9801314c3217e379dd2b1ab0
-  data.tar.gz: 44458471ad66d02c9a624f2db2802728093e093263ec579b3d7a58eb38c24561
+  metadata.gz: 95becf2d354c0a7eca13689fadbde7a7f210bbc24d9d62bd8539b1275b937fea
+  data.tar.gz: 83bfc4071f99c990cc78038ff267f2db8b8b8d960ffefa649b8dd46f315faaee
 SHA512:
-  metadata.gz: a5291949f4106b7786c76f906dc2feea4f00eb647a51c939fd3a0001071b6d2f0e583789fa327d8f88ce4c02fa431833ce82bfbbe87f4978fddde05eb9a310d1
-  data.tar.gz: 41bdb19fda29e0dc3096c350161c07f0d59f2c63c4b4dc062a591b94e8e92e0f07c8c1f8b0d0ac351f8c824844113a7bfb02c8728c9c3a11e540a9fcecd4988d
+  metadata.gz: 529ea441de414d60b1d6c5316e57ba2dbc05693a231434929d0279fb8ae1f0a26d714f4c9f6453ee6f2ff3e6cca7549d54df0b893da80e951649d236b179e9fb
+  data.tar.gz: a547b7fad7468b36bab9e2684c9b564813a9c16d17a0a6a8cc690ef56b5657e7a4aca6f273ef7f2f486a22e48330d34c36d36f320ab0e536dee532d9d493e235

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.21)
+    isodoc (0.9.22)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -17,7 +17,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    asciidoctor (2.0.7)
+    asciidoctor (2.0.8)
     asciimath (1.0.8)
     ast (2.4.0)
     byebug (9.1.0)
@@ -68,7 +68,7 @@ GEM
     mime-types-data (3.2019.0331)
     mini_portile2 (2.4.0)
     nenv (0.3.0)
-    nokogiri (1.10.2)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -92,7 +92,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)

data/lib/isodoc/convert.rb

@@ -5,6 +5,7 @@ require "fileutils"
 module IsoDoc
   class Convert < ::IsoDoc::Common
     attr_reader :options
+    attr_writer :labels
 
     # htmlstylesheet: Generic stylesheet for HTML
     # wordstylesheet: Generic stylesheet for Word

data/lib/isodoc/metadata.rb

@@ -1,7 +1,7 @@
 module IsoDoc
   class Metadata
     DATETYPES = %w{published accessed created implemented obsoleted confirmed
-    updated issued received}.freeze
+    updated issued received transmitted copied unchanged circulated}.freeze
 
     def ns(xpath)
       Common::ns(xpath)
@@ -49,7 +49,7 @@ module IsoDoc
     def extract_person_affiliations(authors)
       authors.inject([]) do |m, a|
         name = a&.at(ns("./affiliation/organization/name"))&.text
-        location = a&.at(ns("./affiliation/organization/contact/address/"\
+        location = a&.at(ns("./affiliation/organization/address/"\
                             "formattedAddress"))&.text
         m << ((!name.nil? && !location.nil?) ? "#{name}, #{location}" :
           (name || location || ""))
@@ -206,6 +206,17 @@ module IsoDoc
     end
 
     def relations(isoxml, _out)
+      relations_obsoletes(isoxml)
+      relations_partof(isoxml)
+    end
+
+    def relations_partof(isoxml)
+      std = isoxml.at(ns("//bibdata/relation[@type = 'partOf']")) || return
+      id = std.at(ns(".//docidentifier"))
+      set(:partof, id.text) if id
+    end
+
+    def relations_obsoletes(isoxml)
       std = isoxml.at(ns("//bibdata/relation[@type = 'obsoletes']")) || return
       locality = std.at(ns(".//locality"))
       id = std.at(ns(".//docidentifier"))

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.21".freeze
+  VERSION = "0.9.22".freeze
 end

data/spec/isodoc/metadata_spec.rb

@@ -24,6 +24,12 @@ RSpec.describe IsoDoc do
   <date type="created"><from>2010</from><to>2011</to></date>
   <date type="activated"><on>2013</on></date>
   <date type="obsoleted"><on>2014</on></date>
+  <date type="circulated"><on>2015</on></date>
+  <date type="copied"><on>2016</on></date>
+  <date type="confirmed"><on>2017</on></date>
+  <date type="updated"><on>2018</on></date>
+  <date type="unchanged"><on>2019</on></date>
+  <date type="transmitted"><on>2020</on></date>
   <edition>2</edition>
 <version>
   <revision-date>2016-05-01</revision-date>
@@ -50,9 +56,9 @@ RSpec.describe IsoDoc do
       </name>
       <affiliation>
       <organization><name>Slate Inc.</name>
-      <contact><address>
+      <address>
       <formattedAddress>Bedrock</formattedAddress>
-      </address></contact>
+      </address>
         </organization>
       </affiliation>
     </person>
@@ -85,7 +91,7 @@ RSpec.describe IsoDoc do
 </bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :html=>"URL B", :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :unpublished=>true, :updateddate=>"XXX", :url=>"URL A", :wg=>"WG 3", :xml=>"URL C"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :circulateddate=>"2015", :confirmeddate=>"2017", :copieddate=>"2016", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :html=>"URL B", :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :transmitteddate=>"2020", :unchangeddate=>"2019", :unpublished=>true, :updateddate=>"2018", :url=>"URL A", :wg=>"WG 3", :xml=>"URL C"}
 OUTPUT
   end
 
@@ -134,6 +140,9 @@ OUTPUT
     <locality type="clause"><referenceFrom>3.1</referenceFrom></locality>
     <docidentifier>IEC 8121</docidentifier>
   </relation>
+  <relation type="partOf">
+    <docidentifier>IEC 8122</docidentifier>
+  </relation>
   <editorialgroup>
     <technical-committee number="34" type="ABC">Food products</technical-committee>
     <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
@@ -147,7 +156,7 @@ OUTPUT
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :edition=>nil, :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :status=>"Published", :tc=>"ABC 34", :unpublished=>false, :updateddate=>"XXX", :wg=>"GHI 3"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :edition=>nil, :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :status=>"Published", :tc=>"ABC 34", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX", :wg=>"GHI 3"}
 OUTPUT
   end
 

metadata

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