relaton-nist 1.10.2 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 697ffbbaa6448eea164b59de95e1244955e83fe7520b997bceed7b588db9b6fb
-  data.tar.gz: 01cf4ad824fb4f89b29ab6e052835a0bfdc9519f9e0bdf8366470cbb6771c52c
+  metadata.gz: '095a15201f14cd98e0e838767c84345b6c3963fd40a820c380e2d473d6974911'
+  data.tar.gz: b95ac950a2c35a3f24b788544cc66e064e24abd64e0953e791a343a5a031ac82
 SHA512:
-  metadata.gz: e9edc52477f8e5b6852794efcde512fb7106801aad5f5a408ce9439f9f6ade82a69aae4643f8a798f2478bb7fa38a8ddc63f952c54bd8637e356d4f9ff452f17
-  data.tar.gz: e95bc37a77a6fa657feacb06d33c5e5c10759743c421ad35ec4b0a60da38342036993da513a413927be638b75bcaa192a44db35e3c45de0453e373cac9afaff7
+  metadata.gz: 49830f72fa98e99c018694f8cface13e108cfffe4de3163870e12d02a6434006fe6d48a40480041a3d2ff1a39cded6243fb0c35f07450c2429107a56890e7cc9
+  data.tar.gz: 5d482c2805ee879b8728627b495a638b46604f6aecc898b0f75c2e8a114fc5d23d778e297cd59567b6da8375d7d011729fc5df3b39dc4eed9657c329679086ef

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

@@ -35,12 +35,13 @@ module RelatonNist
       [
         { type: "NIST", id: pub_id(doc), primary: true },
         { type: "DOI", id: fetch_doi(doc) },
-        { type: "NIST", id: anchor(doc), scope: "anchor" },
+        # { 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 fetch_doi(doc) # rubocop:disable Metrics/CyclomaticComplexity
@@ -56,9 +57,9 @@ module RelatonNist
       end
     end
 
-    def anchor(doc)
-      fetch_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>]
@@ -74,7 +75,9 @@ module RelatonNist
       t = doc.xpath("titles/title|titles/subtitle")
       return [] unless t.any?
 
-      RelatonBib::TypedTitleString.from_string t.map(&:text).join, "en", "Latn"
+      # RelatonBib::TypedTitleString.from_string t.map(&:text).join, "en", "Latn"
+      [{ content: t.map(&:text).join, language: "en", script: "Latn",
+         format: "text/plain" }]
     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.2".freeze
+  VERSION = "1.11.2".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.2
+  version: 1.11.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-05-06 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