relaton-iana 2.0.0.pre.alpha.2 → 2.0.0.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4256503fe01467a1a69d8491597940f3f825355385cbf67fa2020b107b9c3115
-  data.tar.gz: 862d46fd0beba7dbcc80395f42c112c95029141ff94ec6d2b2c4ea8ff1ce28eb
+  metadata.gz: c6ea8919d2b6d8ba46ccebedc2598ad4a1e258c315a9cc4617fcc4ca0533b50c
+  data.tar.gz: 759d101f2b3a9ac288c030d5560ea336ee9be43076d5d27597a88ffb911e0cfe
 SHA512:
-  metadata.gz: 44a288beab0a82d297cf3a216c4d86f5c1dbd7e05d8a4e27e6562b83d91f78a481d3112594ec15617ac543ea644da32779510968a326fbf532b49f7d31b49d13
-  data.tar.gz: ca3cd9b1363fee8601804e2626032acbc53db5b430e18934c4f4470aa9c33b7f7008d11df1ddbb56afa55efe4b24d2567e2a23cce1a58d0d2b37090aa6a4ccd2
+  metadata.gz: a8325164a29a1aa1293e5f85ebd704482e10e5449737ee9c69d4e41d83fdcd9fe28c85a84aa84e5ad110d099bd7b83c16db6e9cb0a64062b2ca56ebdfeeeab2a
+  data.tar.gz: ee69c0dfe8160241140a5557879eff6c3e7d9ad67964ef9a6cfdbeede4c3126f0526a4f3e951fce9e20ba87681fe1f2efd0e46d72fcd4f1f436660823c003d6f

data/README.adoc

@@ -50,7 +50,7 @@ item = Relaton::Iana::Bibliography.get "IANA service-names-port-numbers"
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="IANAservicenamesportnumbers" type="standard" schema-version="v1.4.1">
+=> "<bibitem id="IANAservicenamesportnumbers" type="standard" schema-version="v1.5.6">
       <fetched>2026-01-27</fetched>
       <title language="en" script="Latn">Service Name and Transport Protocol Port Number Registry</title>
       <uri type="self">https://www.iana.org/assignments/service-names-port-numbers</uri>

data/grammars/basicdoc.rng

@@ -187,6 +187,15 @@ Applicable to modify and delete</a:documentation>
         <a:documentation>Optional caption of this block</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="position">
+        <a:documentation>For an "add" change, whether the change is added before or after the location</a:documentation>
+        <choice>
+          <value>before</value>
+          <value>after</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <element name="location">
         <a:documentation>The location(s) in the original document which have undergone the change described in this block</a:documentation>
@@ -208,11 +217,15 @@ Applicable to modify and delete</a:documentation>
     </zeroOrMore>
     <optional>
       <element name="newcontent">
-        <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
+        <a:documentation>New content to be added to the document; applicable to add and modify.
+Can be blocks and/or sections</a:documentation>
         <ref name="OptionalId"/>
         <zeroOrMore>
           <ref name="BasicBlock"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="section"/>
+        </zeroOrMore>
       </element>
     </optional>
     <zeroOrMore>

data/grammars/biblio.rng

@@ -1142,11 +1142,11 @@ NOTE: This should preferably be encoded as  a URI or short identifier, rather th
         <a:documentation>Information about how long the current description of the bibliographic item is valid for</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction">
         <a:documentation>Depiction of the bibliographic item, typically an image</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="ReducedBibliographicItem">
     <a:documentation>Reduced description of a bibliographic resource, without mandatory title and docidentifier, used for document relations
@@ -1939,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>
@@ -2063,13 +2063,13 @@ provided that it is not the entire bibliographic item that is so related</a:docu
           <ref name="LocalizedString"/>
         </element>
       </optional>
-      <oneOrMore>
+      <zeroOrMore>
         <element name="taxon">
           <a:documentation>The keywords as a hierarchical taxonomy. For example, the sequence of `taxon` elements
 `pump`, `centrifugal pump`, `line shaft pump` represents a taxonomic classification</a:documentation>
           <ref name="LocalizedString"/>
         </element>
-      </oneOrMore>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="vocabid">
           <a:documentation>Identifiers for the keyword as a controlled vocabulary</a:documentation>

data/lib/relaton/iana/data_fetcher.rb

@@ -8,6 +8,10 @@ module Relaton
       #
       # Parse documents
       #
+      def log_error(msg)
+        Util.error msg
+      end
+
       def fetch(_source = nil)
         Dir["iana-registries/**/*.xml"].each do |file|
           content = File.read file, encoding: "UTF-8"
@@ -16,6 +20,7 @@ module Relaton
           Util.error "Error: #{e.message}. File: #{file}"
         end
         index.save
+        report_errors
       end
 
       private
@@ -27,9 +32,9 @@ module Relaton
       def parse(content)
         xml = Nokogiri::XML(content)
         registry = xml.at("/xmlns:registry")
-        doc = Parser.parse registry
+        doc = Parser.parse registry, nil, @errors
         save_doc doc
-        registry.xpath("./xmlns:registry").each { |r| save_doc Parser.parse(r, doc) }
+        registry.xpath("./xmlns:registry").each { |r| save_doc Parser.parse(r, doc, @errors) }
       end
 
       #

data/lib/relaton/iana/parser.rb

@@ -6,9 +6,10 @@ module Relaton
       #
       # @param [Nokogiri::XML::Element] xml
       #
-      def initialize(xml, rootdoc)
+      def initialize(xml, rootdoc, errors = {})
         @xml = xml
         @rootdoc = rootdoc
+        @errors = errors
       end
 
       #
@@ -18,8 +19,8 @@ module Relaton
       #
       # @return [Relaton::Iana::ItemData, nil] bibliographic item
       #
-      def self.parse(xml, rootdoc = nil)
-        new(xml, rootdoc).parse
+      def self.parse(xml, rootdoc = nil, errors = {})
+        new(xml, rootdoc, errors).parse
       end
 
       #
@@ -50,7 +51,9 @@ module Relaton
       #
       def parse_title
         content = @xml.at("./xmlns:title")&.text || @xml[:id]
-        [Bib::Title.new(content: content, language: "en", script: "Latn")]
+        result = [Bib::Title.new(content: content, language: "en", script: "Latn")]
+        @errors[:title] &&= result.empty?
+        result
       end
 
       #
@@ -59,11 +62,15 @@ module Relaton
       # @return [Array<Relaton::Bib::Uri>] link
       #
       def parse_source
-        if @rootdoc then @rootdoc.source
-        else
-          uri = URI.join "https://www.iana.org/assignments/", @xml[:id]
-          [Bib::Uri.new(type: "src", content: uri.to_s)]
-        end
+        result = if @rootdoc then @rootdoc.source
+                 elsif @xml[:id]
+                   uri = URI.join "https://www.iana.org/assignments/", @xml[:id]
+                   [Bib::Uri.new(type: "src", content: uri.to_s)]
+                 else
+                   []
+                 end
+        @errors[:source] &&= result.empty?
+        result
       end
 
       #
@@ -72,7 +79,9 @@ module Relaton
       # @return [Arra<RelatonBib::DocumentIdentifier>] docidentifier
       #
       def parse_docid
-        [Bib::Docidentifier.new(type: "IANA", content: pub_id, primary: true)]
+        result = [Bib::Docidentifier.new(type: "IANA", content: pub_id, primary: true)]
+        @errors[:docid] &&= result.empty?
+        result
       end
 
       #
@@ -101,7 +110,9 @@ module Relaton
       def docnumber
         dn = ""
         dn += "#{@rootdoc.docnumber}/" if @rootdoc
-        dn + @xml["id"]
+        id = @xml["id"].to_s
+        @errors[:docnumber] &&= id.empty?
+        dn + id
       end
 
       #
@@ -110,10 +121,12 @@ module Relaton
       # @return [Array<Relaton::Bib::Date>] date
       #
       def parse_date
-        d = @xml.xpath("./xmlns:created|./xmlns:published|./xmlns:updated").map do |d|
-          Bib::Date.new(type: d.name, at: d.text)
+        d = @xml.xpath("./xmlns:created|./xmlns:published|./xmlns:updated").map do |dt|
+          Bib::Date.new(type: dt.name, at: dt.text)
         end
-        d.none? && @rootdoc ? @rootdoc.date : d
+        result = d.none? && @rootdoc ? @rootdoc.date : d
+        @errors[:date] &&= result.empty?
+        result
       end
 
       #

data/lib/relaton/iana/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Iana
-    VERSION = "2.0.0-alpha.2".freeze
+    VERSION = "2.0.0-alpha.3".freeze
   end
 end

data/relaton_iana.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "faraday", "~> 2.7.0"
-  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.4"
-  spec.add_dependency "relaton-core", "~> 0.0.9"
+  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.7"
+  spec.add_dependency "relaton-core", "~> 0.0.13"
   spec.add_dependency "relaton-index", "~> 0.2.0"
 
   # Uncomment to register a new dependency of your gem

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iana
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.2
+  version: 2.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Ribose Inc.
@@ -29,28 +29,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.4
+        version: 2.0.0.pre.alpha.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.4
+        version: 2.0.0.pre.alpha.7
 - !ruby/object:Gem::Dependency
   name: relaton-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement