relaton-nist 1.10.1 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d843669047c6d1d170c7cf1e4ec20947cdb90bd888370d7f1bcab3e5eb5b7ab0
-  data.tar.gz: c4c62956580641d0d71ff70cc848803b203d76418e8cdb8b64f572d880f620a2
+  metadata.gz: 6d5db99f4b5678fecd7b926c007b66149d72123c4a6aaaed113589b667c00b8c
+  data.tar.gz: 1f82071f8e6ed586475d915a1d105b5aefba8dedb5042cfe1d0230d0a41a51fa
 SHA512:
-  metadata.gz: 37bbd4792e8c866ed5dae0a703318dc7175946da4e91d223d0f010d4418a0da25380a59291edc7d7746cad8e36af54012d59b6b72cfad23d3c01d500b4724952
-  data.tar.gz: e44ecec41e34b5e5bd575759e08a571eb8bd4db4e102b4bfcac2c4b17f6d20410b069468d7b55de95e49d7c4747fc57ddc71fcc43a27418ccfa50e1820907a17
+  metadata.gz: 14a85ac2317285758f0fd1e18faa6ca70491a53c5dd8aa0a6c53e2d4e91a3bf8c8d8ab63a57aeb68238301bfe07c0e4a97e32ee50f85b26fb576127db309e4b1
+  data.tar.gz: 40e515d019b42731617c8569b40d03a911e9a3c1ba19dec11afa73dec7a52c6762f97085549658c0459ae6d328be28dd4e851a7641f77622f191138666193f93

data/Gemfile

@@ -1,6 +1,3 @@
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
-
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in relaton_nist.gemspec

data/grammars/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>
@@ -624,6 +626,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -634,6 +639,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -641,7 +649,12 @@
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -822,7 +835,9 @@
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
@@ -835,7 +850,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
@@ -849,7 +866,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">

data/grammars/biblio.rng

@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -922,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/grammars/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/grammars/reqt.rng

@@ -58,6 +58,14 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -101,7 +109,9 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
@@ -175,6 +185,14 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_nist/data_fetcher.rb

@@ -34,16 +34,17 @@ module RelatonNist
       # anchor = doi.split("/")[1..-1].join "/"
       [
         { type: "NIST", id: pub_id(doc), primary: true },
-        { type: "DOI", id: doi(doc) },
-        { type: "NIST", id: anchor(doc), scope: "anchor" },
+        { type: "DOI", id: fetch_doi(doc) },
+        # { type: "NIST", id: anchor(doc), scope: "anchor" },
       ]
     end
 
     def pub_id(doc)
-      anchor(doc).gsub(".", " ")
+      # anchor(doc).gsub(".", " ")
+      fetch_doi(doc).split("/")[1..-1].join("/").gsub(".", " ")
     end
 
-    def doi(doc) # rubocop:disable Metrics/CyclomaticComplexity
+    def fetch_doi(doc) # rubocop:disable Metrics/CyclomaticComplexity
       id = doc.at("doi_data/doi").text
       case id
       when "10.6028/NBS.CIRC.e2e" then "10.6028/NBS.CIRC.2e2"
@@ -56,9 +57,9 @@ module RelatonNist
       end
     end
 
-    def anchor(doc)
-      doi(doc).split("/")[1..-1].join "/"
-    end
+    # def anchor(doc)
+    #   fetch_doi(doc).split("/")[1..-1].join "/"
+    # end
 
     # @param doc [Nokogiri::XML::Element]
     # @return [Array<RelatonBib::DocumentIdentifier>]
@@ -115,8 +116,11 @@ module RelatonNist
     # @param doc [Nokogiri::XML::Element]
     # @return [Array<RelatonBib::TypedUri>]
     def fetch_link(doc)
-      url = doc.at("doi_data/resource").text
-      [RelatonBib::TypedUri.new(type: "doi", content: url)]
+      pdf = doc.at("doi_data/resource").text
+      doi = "https://doi.org/#{fetch_doi(doc)}"
+      [{ type: "doi", content: doi }, { type: "pdf", content: pdf }].map do |l|
+        RelatonBib::TypedUri.new(**l)
+      end
     end
 
     # @param doc [Nokogiri::XML::Element]

data/lib/relaton_nist/hit_collection.rb

@@ -137,7 +137,7 @@ module RelatonNist
     # @return [Hash]
     def data
       ctime = File.ctime DATAFILE if File.exist? DATAFILE
-      if !ctime || ctime.to_date < Date.today
+      if !ctime || ctime.to_date < Date.today || File.size(DATAFILE).zero?
         fetch_data(ctime)
       end
       unzip
@@ -163,10 +163,7 @@ module RelatonNist
       return @data if @data
 
       Zip::File.open(DATAFILE) do |zf|
-        zf.each do |f|
-          @data = JSON.parse f.get_input_stream.read
-          break
-        end
+        @data = JSON.parse zf.first.get_input_stream.read
       end
       @data
     end

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -101,5 +101,16 @@ module RelatonNist
       out += commentperiod.to_asciibib prefix if commentperiod
       out
     end
+
+    #
+    # Create BibXML reference attributes
+    #
+    # @return [Hash<Symbol=>String>] attributes
+    #
+    def ref_attrs
+      docidentifier.detect(&:primary)&.tap do |di|
+        return { anchor: di.id.gsub(" ", ".") }
+      end
+    end
   end
 end

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.10.1".freeze
+  VERSION = "1.11.1".freeze
 end

data/relaton_nist.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.10.1"
+  spec.add_dependency "relaton-bib", "~> 1.11.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.10.1
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement