relaton-nist 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6904cbde4499524d13afe026233d523943a7be4bd90b099c9cbf13326fea209c
-  data.tar.gz: 952f261685119de525a3427aae8611080e4ad9cbc27f9d5a3a643b3aadbed1b0
+  metadata.gz: 3efd113d39aa3ae5803492db6fedb79c6c77b8e6c346f545d7e56aedf5ccb90c
+  data.tar.gz: 15bbf418f6ea804ccfb295fd566029bebf6e197d0d5985d5ee63f19909ce3bdc
 SHA512:
-  metadata.gz: cce2b8ebb750f482c4eb7e74856b447179756d3d8ddd1f6927657b424fb5480caec4cdacbc86c49e8e62213df3a14b7b4916eb153ffbaadbcf2bfe3197660e06
-  data.tar.gz: 19d173f3010316364ac1712f2b30e54221c67bd137ca691f9837cf8975d93454464f7161ad6b7bee0e290966ac9ce8ebd834d1d0d2fe8861993b3cbad5b6f0d5
+  metadata.gz: 69b106a55f829e861510cd4cd71eda6c11e689f0b78742cafe8333d81a0e6fcba87d708825439d85eb88543ea6a223749565b6d99469c34cf2889f87e429a88e
+  data.tar.gz: 00fba574ac9177d32e8af0d9fc3d09947c13c2075a6bcdcf01d3525ee296e9b993f53033f6213dee59a8c33250606cb5034201697a1c1e022bfab2daa770ef2f

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

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -680,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -828,6 +828,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>
@@ -920,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

@@ -20,6 +20,7 @@ module RelatonNist
       @output = output
       @format = format
       @ext = format.sub(/^bib/, "")
+      @files = []
     end
 
     def parse_docid(doc) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
@@ -32,17 +33,18 @@ module RelatonNist
       # end
       # anchor = doi.split("/")[1..-1].join "/"
       [
-        { type: "NIST", id: pub_id(doc) },
-        { type: "DOI", id: doi(doc) },
-        { type: "NIST", id: anchor(doc), scope: "anchor" },
+        { type: "NIST", id: pub_id(doc), primary: true },
+        { 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"
@@ -55,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>]
@@ -114,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]
@@ -191,17 +196,17 @@ module RelatonNist
     def write_file(bib) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       id = bib.docidentifier[0].id.gsub(%r{[/\s:.]}, "_").upcase.sub(/^NIST_IR/, "NISTIR")
       file = File.join(@output, "#{id}.#{@ext}")
-      if File.exist? file
+      if @files.include? file
         warn "File #{file} exists. Docid: #{bib.docidentifier[0].id}"
         # warn "Link: #{bib.link.detect { |l| l.type == 'src' }.content}"
-      else
-        output = case @format
-                 when "yaml" then bib.to_hash.to_yaml
-                 when "xml" then bib.to_xml bibdata: true
-                 else bib.send "to_#{@format}"
-                 end
-        File.write file, output, encoding: "UTF-8"
+      else @files << file
       end
+      output = case @format
+               when "yaml" then bib.to_hash.to_yaml
+               when "xml" then bib.to_xml bibdata: true
+               else bib.send "to_#{@format}"
+               end
+      File.write file, output, encoding: "UTF-8"
     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/scrapper.rb

@@ -15,7 +15,7 @@ module RelatonNist
         titles = fetch_titles(hit_data)
         unless /^(SP|NISTIR|FIPS) /.match? item_data[:docid][0].id
           item_data[:docid][0] = RelatonBib::DocumentIdentifier.new(
-            id: titles[0][:content].upcase, type: "NIST",
+            id: titles[0][:content].upcase, type: "NIST", primary: true,
           )
         end
         item_data[:fetched] = Date.today.to_s
@@ -56,7 +56,7 @@ module RelatonNist
         item_ref = docid
         # item_ref ||= "?"
         item_ref.sub!(/\sAddendum$/, "-Add")
-        [RelatonBib::DocumentIdentifier.new(id: item_ref, type: "NIST")]
+        [RelatonBib::DocumentIdentifier.new(id: item_ref, type: "NIST", primary: true)]
       end
 
       # Fetch status.

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.10.0".freeze
+  VERSION = "1.11.0".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.0"
+  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.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-04-10 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.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement