relaton-nist 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f8ebd25c3d58d4680e06a0e3deea8771165830e754b8bdba7efa33e11438ae9
-  data.tar.gz: 49039dee4164341953e7d3f4b0c886f25a568987e88d63656057dbb4733cb30c
+  metadata.gz: 8ec7538ac2ee5dc9e864f3953e6bd28eed9997a24dcd78984cea6eb62ee02033
+  data.tar.gz: aa9ba4e4bfb1388f04752c4e17574f6aaa052f8cfcd7cb2faefdb733249c8576
 SHA512:
-  metadata.gz: 6e5021613582dfbd5ae9ece8a805d436e86e917f0041d6d6584f6955fd6f7c6b52c6e9e93ba3ed821f6adfc4d7789001eabcbe06863a82ec29b89f681b4ac87f
-  data.tar.gz: a2ad1bffcbfe3bc948d63d3b0d9ffc2b287a344fa6baf9f62e4fc672dc8b3bdacd4ff3c5ef669cf1325dbf5c4a994a468fbcc187624353d00dc84e2a67fa19ff
+  metadata.gz: c47176f1d352f01bbf6c7839acbf84ab9f2f9150bcf0f7c626757f62037c60ec07eb06147c72bf4d2720d5b51fc32a0ad057c0cb4af56efd525136afc240f48d
+  data.tar.gz: fb7604fcf82b6ddf4cf5d6ea5710dc809e7de71b2e832575aacbdce70dbc931067f3198c3f7389ba74296b38e438f856872d0afc7e73484d19f5deab20e17e84

data/grammars/biblio.rng

@@ -88,7 +88,7 @@
       <text/>
     </element>
   </define>
-  <define name="LocalizedString">
+  <define name="LocalizedString1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -98,6 +98,16 @@
     </optional>
     <text/>
   </define>
+  <define name="LocalizedString">
+    <choice>
+      <ref name="LocalizedString1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedString1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <!--
     Unlike UML, change type to format: type is overloaded
     Would be need if plain were default value and could omit the attribute
@@ -121,7 +131,7 @@
     </optional>
     <ref name="LocalizedStringOrXsAny"/>
   </define>
-  <define name="LocalizedStringOrXsAny">
+  <define name="LocalizedStringOrXsAny1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -136,6 +146,16 @@
       </choice>
     </oneOrMore>
   </define>
+  <define name="LocalizedStringOrXsAny">
+    <choice>
+      <ref name="LocalizedStringOrXsAny1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedStringOrXsAny1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <define name="contributor">
     <element name="contributor">
       <zeroOrMore>
@@ -641,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -1001,7 +1021,17 @@
       <optional>
         <ref name="to"/>
       </optional>
-      <ref name="owner"/>
+      <oneOrMore>
+        <ref name="owner"/>
+      </oneOrMore>
+      <optional>
+        <ref name="copyright_scope"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright_scope">
+    <element name="scope">
+      <text/>
     </element>
   </define>
   <define name="from">

data/grammars/isodoc.rng

@@ -53,6 +53,14 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="case">
+            <choice>
+              <value>capital</value>
+              <value>lowercase</value>
+            </choice>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -902,7 +910,15 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termexample">

data/grammars/isostandard.rng

@@ -91,6 +91,12 @@
     </define>
     <define name="sections">
       <element name="sections">
+        <zeroOrMore>
+          <choice>
+            <ref name="note"/>
+            <ref name="admonition"/>
+          </choice>
+        </zeroOrMore>
         <ref name="clause"/>
         <optional>
           <choice>
@@ -263,6 +269,8 @@
         <value>publicly-available-specification</value>
         <value>international-workshop-agreement</value>
         <value>guide</value>
+        <value>amendment</value>
+        <value>technical-corrigendum</value>
       </choice>
     </define>
     <define name="structuredidentifier">
@@ -510,7 +518,7 @@
         </attribute>
       </optional>
       <oneOrMore>
-        <ref name="paragraph-with-footnote"/>
+        <ref name="BasicBlock"/>
       </oneOrMore>
     </element>
   </define>

data/lib/relaton_nist/scrapper.rb

@@ -325,7 +325,9 @@ module RelatonNist
       # @param doc [Nokigiri::HTML::Document]
       # @return [Array<Hash>]
       def fetch_abstract(doc)
-        abstract_content = doc.xpath('//div[contains(@class, "pub-abstract-callout")]/div[1]/p').text
+        abstract_content = doc.xpath(
+          '//div[contains(@class, "pub-abstract-callout")]/div[1]/p',
+        ).text
         [{
           content: abstract_content,
           language: "en",
@@ -336,7 +338,7 @@ module RelatonNist
 
       # Fetch copyright.
       # @param doc [Nokogiri::HTL::Document, String]
-      # @return [Hash]
+      # @return [Array<Hash>]
       def fetch_copyright(doc)
         name = "National Institute of Standards and Technology"
         url = "www.nist.gov"
@@ -345,9 +347,11 @@ module RelatonNist
               doc.at("//span[@id='pub-release-date']").text.strip
             end
         from = d.match(/\d{4}/).to_s
-        { owner: { name: name, abbreviation: "NIST", url: url }, from: from }
+        [{ owner: [{ name: name, abbreviation: "NIST", url: url }], from: from }]
       end
 
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+
       # Fetch links.
       # @param doc [Nokogiri::HTML::Document, Hash]
       # @return [Array<Hash>]
@@ -365,6 +369,7 @@ module RelatonNist
         links << { type: "doi", content: doi } if doi
         links
       end
+      # rubocop:enable Metrics/MethodLength
 
       # Fetch relations.
       # @param doc [Nokogiri::HTML::Document]
@@ -382,6 +387,7 @@ module RelatonNist
           doc_relation "updates", r.text, DOMAIN + r[:href]
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def fetch_relations_json(doc)
         relations = doc["supersedes"].map do |r|
@@ -409,6 +415,8 @@ module RelatonNist
         )
       end
 
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+
       # @param doc [Nokogiri::HTML::Document]
       # @return [Array<RelatonBib::Series>]
       def fetch_series(doc)
@@ -418,14 +426,14 @@ module RelatonNist
           next if s.name == "span"
 
           iter = if idx.zero? then "I"
-                   #  elsif status == "final" && idx == (series.size - 1) then "F"
                  else idx + 1
                  end
 
           content = s.text.match(/^[^\(]+/).to_s.strip.squeeze " "
 
           ref = case s.text
-                when /^Draft/ then content.match(/(?<=Draft\s).+/).to_s + " (#{iter}PD)"
+                when /^Draft/
+                  content.match(/(?<=Draft\s).+/).to_s + " (#{iter}PD)"
                 when /\(Draft\)/ then content + " (#{iter}PD)"
                 else content
                 end
@@ -436,6 +444,7 @@ module RelatonNist
           RelatonBib::Series.new(formattedref: fref)
         end.select { |s| s }
       end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       # @param doc [Nokogiri::HTML::Document, Hash]
       # @return [Array<RelatonNist::Keyword>]
@@ -448,6 +457,7 @@ module RelatonNist
         kws.map { |kw| kw.is_a?(String) ? kw : kw.text }
       end
 
+      # rubocop:disable Metrics/AbcSize
       # @param doc [Nokogiri::HTML::Document]
       # @return [RelatonNist::CommentPeriod, NilClass]
       def fetch_commentperiod(doc)
@@ -459,11 +469,13 @@ module RelatonNist
         d = doc.at("//span[@id='pub-release-date']").text.strip
         from = Date.strptime(d, "%B %Y").to_s
 
-        ex = doc.at "//strong[contains(.,'The comment closing date has been extended to')]"
+        ex = doc.at "//strong[contains(.,'The comment closing date has been "\
+        "extended to')]"
         ext = ex&.text&.match(/\w+\s\d{2},\s\d{4}/).to_s
         extended = ext.empty? ? nil : Date.strptime(ext, "%B %d, %Y")
         CommentPeriod.new from: from, to: to, extended: extended
       end
+      # rubocop:enable Metrics/AbcSize
 
       # @param json [Hash]
       # @return [RelatonNist::CommentPeriod, NilClass]

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.0.2".freeze
+  VERSION = "1.1.0".freeze
 end

data/relaton_nist.gemspec

@@ -34,6 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", ">= 1.0.4"
+  spec.add_dependency "relaton-bib", "~> 1.1.0"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -154,16 +154,16 @@ dependencies:
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement