relaton-nist 1.16.4 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9584f82c13f12da662266b2de0e11eb37241a6b3c4994d28720af44bdb713632
-  data.tar.gz: 1d14d47f043644e96cd42a8419117e12111623e5e80a7a2cb37ac6c1420d37c1
+  metadata.gz: 4dcfa351621f17ad754376d1c7d3b593fdfda7bb1fdd91624cb357f1655d2eed
+  data.tar.gz: b4d12a7e12b1c8356683e457904f571133fe353e74b30ff012664d8f45f88dad
 SHA512:
-  metadata.gz: 1d86cd19ea38a1743044ce99e28c6c5c0adc4805d5c45d6145ff4f724b10a9f9115a495cd226514fbd66e2213dce3ba807baddf3275528ae438917c36f3784a8
-  data.tar.gz: 0c8f579f4b9eca0402d1a28c986ad188d72b2dac57a8f4cc92d18a17ea235d7fe7ebd03a3f38dcd17e91496adc595ce347b8a1c73f449d48008e54655c5ce9e1
+  metadata.gz: 77bf2aabe8e5be940d974da17cf4e07433ced3b2b7eae49a9930087b46b5f4fca80dc4f4771f93922adb5c8eb5bca2a0ff124b5a6c6d1e847a08280a8a369ea1
+  data.tar.gz: 9ed7ce8b419bfefcb6d3c5ee4034720e7fc24220e392a7a2d5edd5f6b12ffa5dad459f14c4fe54920f9f5468768357cdfa10778580fc0811153c5f30493496f7

data/README.adoc

@@ -103,7 +103,7 @@ item = hit_collection[0].fetch
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="NISTIR8200" type="standard" schema-version="v1.2.4">
+=> "<bibitem id="NISTIR8200" type="standard" schema-version="v1.2.5">
       <fetched>2023-10-16</fetched>
       <title format="text/plain" language="en" script="Latn">Interagency report on the status of international cybersecurity standardization for the internet of things (IoT)</title>
       ...
@@ -113,7 +113,7 @@ With argument `bibdata: true` it outputs XML wrapped by `bibdata` element and ad
 [source,ruby]
 ----
 item.to_xml bibdata: true
-=> "<bibdata type="standard" schema-version="v1.2.4">
+=> "<bibdata type="standard" schema-version="v1.2.5">
       <fetched>2023-10-16</fetched>
       <title format="text/plain" language="en" script="Latn">Interagency report on the status of international cybersecurity standardization for the internet of things (IoT)</title>
       ...

data/grammars/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/grammars/biblio.rng

@@ -942,6 +942,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/relaton_nist/hash_converter.rb

@@ -1,49 +1,50 @@
 module RelatonNist
-  class HashConverter < RelatonBib::HashConverter
-    class << self
-      # @override RelatonBib::HashConverter.hash_to_bib
-      # @param args [Hash]
-      # @param nested [TrueClass, FalseClass]
-      # @return [Hash]
-      def hash_to_bib(args)
-        ret = super
-        return if ret.nil?
-
-        commentperiod_hash_to_bib(ret)
-        ret
-      end
-
-      private
-
-      # @param item_hash [Hash]
-      # @return [RelatonNist::NistBibliographicItem]
-      def bib_item(item_hash)
-        NistBibliographicItem.new(**item_hash)
-      end
-
-      def commentperiod_hash_to_bib(ret)
-        return unless ret[:commentperiod]
-
-        ret[:commentperiod] = CommentPeriod.new(**ret[:commentperiod])
-      end
-
-      # @param ret [Hash]
-      def relations_hash_to_bib(ret)
-        super
-        return unless ret[:relation]
-
-        ret[:relation] = ret[:relation].map { |r| DocumentRelation.new(**r) }
-
-        # ret[:relation] = array(ret[:relation])
-        # ret[:relation]&.each do |r|
-        #   if r[:description]
-        #     r[:description] = FormattedString.new r[:description]
-        #   end
-        #   relation_bibitem_hash_to_bib(r)
-        #   relation_locality_hash_to_bib(r)
-        #   relation_source_locality_hash_to_bib(r)
-        # end
-      end
+  module HashConverter
+    include RelatonBib::HashConverter
+    extend self
+
+    # @override RelatonBib::HashConverter.hash_to_bib
+    # @param args [Hash]
+    # @param nested [TrueClass, FalseClass]
+    # @return [Hash]
+    def hash_to_bib(args)
+      ret = super
+      return if ret.nil?
+
+      commentperiod_hash_to_bib(ret)
+      ret
+    end
+
+    private
+
+    # @param item_hash [Hash]
+    # @return [RelatonNist::NistBibliographicItem]
+    def bib_item(item_hash)
+      NistBibliographicItem.new(**item_hash)
+    end
+
+    def commentperiod_hash_to_bib(ret)
+      return unless ret[:commentperiod]
+
+      ret[:commentperiod] = CommentPeriod.new(**ret[:commentperiod])
+    end
+
+    # @param ret [Hash]
+    def relations_hash_to_bib(ret)
+      super
+      return unless ret[:relation]
+
+      ret[:relation] = ret[:relation].map { |r| DocumentRelation.new(**r) }
+
+      # ret[:relation] = array(ret[:relation])
+      # ret[:relation]&.each do |r|
+      #   if r[:description]
+      #     r[:description] = FormattedString.new r[:description]
+      #   end
+      #   relation_bibitem_hash_to_bib(r)
+      #   relation_locality_hash_to_bib(r)
+      #   relation_source_locality_hash_to_bib(r)
+      # end
     end
   end
 end

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -1,8 +1,5 @@
 module RelatonNist
   class NistBibliographicItem < RelatonBib::BibliographicItem
-    # @return [String]
-    attr_reader :doctype
-
     # @return [Array<RelatonNist::Keyword>]
     # attr_reader :keyword
 
@@ -88,7 +85,7 @@ module RelatonNist
       super date_format: :short, **opts do |b|
         if opts[:bibdata]
           ext = b.ext do
-            b.doctype doctype if doctype
+            doctype&.to_xml b
             commentperiod&.to_xml b
           end
           ext["schema-version"] = ext_schema unless opts[:embedded]

data/lib/relaton_nist/scrapper.rb

@@ -32,7 +32,7 @@ module RelatonNist
         item_data[:fetched] = Date.today.to_s
         item_data[:type] = "standard"
         item_data[:title] = titles
-        item_data[:doctype] = "standard"
+        item_data[:doctype] = RelatonBib::DocumentType.new(type: "standard")
 
         NistBibliographicItem.new(**item_data)
       end

data/lib/relaton_nist/tech_pubs_parser.rb

@@ -12,7 +12,7 @@ module RelatonNist
       "hasPart" => "hasPart",
     }.freeze
 
-    ATTRS = %i[docid title link abstract date edition contributor relation docstatus place series].freeze
+    ATTRS = %i[docid title link abstract date doctype edition contributor relation docstatus place series].freeze
     NS = "http://www.crossref.org/relations.xsd".freeze
 
     def initialize(doc, series)
@@ -41,8 +41,7 @@ module RelatonNist
     #
     def parse
       RelatonNist::NistBibliographicItem.new(
-        type: "standard", language: [@doc["language"]], script: ["Latn"],
-        doctype: "standard", **args
+        type: "standard", language: [@doc["language"]], script: ["Latn"], **args
       )
     rescue StandardError => e
       warn "Document: `#{@doc.at('doi').text}`"
@@ -135,6 +134,10 @@ module RelatonNist
       end
     end
 
+    def parse_doctype
+      RelatonBib::DocumentType.new(type: "standard")
+    end
+
     # @return [String]
     def parse_edition
       @doc.at("edition_number")&.text

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.16.4".freeze
+  VERSION = "1.17.0".freeze
 end

data/relaton_nist.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "relaton-bib", "~> 1.16.0"
+  spec.add_dependency "relaton-bib", "~> 1.17.0"
   spec.add_dependency "relaton-index", "~> 0.2.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.16.4
+  version: 1.17.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-bib
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement