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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 914fa3e24551ec08498f01443af832ed47eb9f1df5328a95036948289762094f
-  data.tar.gz: 83ab92ec0faede150506b29c144ffcb5ee18393da934f5daeaeb24ac5e332dd6
+  metadata.gz: e66091ac00e7a3627997d643fae3005bb08040a9a1b78af24c9999fe17395a3d
+  data.tar.gz: d51269340fb6078839dd76428f17bb162bf732c94e9e907e85122655bf90fd15
 SHA512:
-  metadata.gz: 5e96436c4d20a2577615bd3c6f249cacb0abf9d8d628e7a437b2257957f81086227cb0f07259c7c343cfa4f31c8ca7c5ef9fba9794ca23c6fb6b3b3773dc0f05
-  data.tar.gz: 697a9a084d519f4fcfee103557c4eec3b841f5720a8c7f460aa2950e073523b268a559d87b18398c3da2719b84c256879816b35769715ff367b47749279b5ff5
+  metadata.gz: f220190b3521496cc9aefce09bd9e26b0a7d028650abb691b599d1093ce7685a092da47839379067e036f9c4c763257f7239164a5e41743fa6206f800592f366
+  data.tar.gz: ae4809955aa747f00ff44cb582c9eeb4fa2e709966c5691a7bc90b715b252e2cb6d1ee4904497ce01a9035b6bdb8faebb127a3acf8cffc6f3fad1ca6e95e6f7f

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/w3c/data_fetcher.rb

@@ -14,6 +14,10 @@ module Relaton
         @index ||= Relaton::Index.find_or_create(:W3C, file: "#{INDEXFILE}.yaml")
       end
 
+      def log_error(msg)
+        Util.error msg
+      end
+
       def client
         @client ||= W3cApi::Client.new
       end
@@ -33,11 +37,12 @@ module Relaton
           specs = specs.next
         end
         index.save
+        report_errors
       end
 
       def fetch_spec(unrealized_spec)
         spec = realize unrealized_spec
-        save_doc DataParser.parse(spec)
+        save_doc DataParser.parse(spec, @errors)
 
         if spec.links.respond_to?(:version_history) && spec.links.version_history
           version_history = realize spec.links.version_history

data/lib/relaton/w3c/data_parser.rb

@@ -27,8 +27,13 @@ module Relaton
       #
       # @param [W3cApi::Models::SpecVersion] spec
       #
-      def initialize(spec)
+      ERROR_KEYS = %i[status title doc_uri formattedref series date
+                      relation contributor doctype].freeze
+
+      def initialize(spec, errors = {})
         @spec = spec
+        @errors = errors
+        ERROR_KEYS.each { |k| @errors[k] = true unless @errors.key?(k) }
       end
 
       #
@@ -38,8 +43,8 @@ module Relaton
       #
       # @return [Relaton::W3c::ItemData, nil] bibliographic item
       #
-      def self.parse(spec)
-        new(spec).parse
+      def self.parse(spec, errors = {})
+        new(spec, errors).parse
       end
 
       #
@@ -52,9 +57,9 @@ module Relaton
           type: "standard",
           language: ["en"],
           script: ["Latn"],
-          status: parse_docstatus,
+          status: parse_status,
           title: parse_title,
-          source: parse_link,
+          source: parse_source,
           docidentifier: parse_docid,
           formattedref: parse_formattedref,
           docnumber: identifier,
@@ -73,7 +78,8 @@ module Relaton
       #
       def parse_ext
         dt = parse_doctype
-        Ext.new(doctype: dt, flavor: "w3c")
+        result = Ext.new(doctype: dt, flavor: "w3c")
+        result
       end
 
       #
@@ -81,10 +87,12 @@ module Relaton
       #
       # @return [Bib::Status, nil] document status
       #
-      def parse_docstatus
-        return unless @spec.respond_to?(:status) && @spec.status
-
-        Bib::Status.new(stage: Bib::Status::Stage.new(content: @spec.status))
+      def parse_status
+        result = if @spec.respond_to?(:status) && @spec.status
+                   Bib::Status.new(stage: Bib::Status::Stage.new(content: @spec.status))
+                 end
+        @errors[:status] &&= result.nil?
+        result
       end
 
       #
@@ -93,11 +101,17 @@ module Relaton
       # @return [Array<Bib::Title>] title
       #
       def parse_title(spec = @spec)
-        [Bib::Title.new(content: spec.title, language: "en", script: "Latn")]
+        return [] unless spec&.title && spec.title.strip != ""
+
+        result = [Bib::Title.new(content: spec.title, language: "en", script: "Latn")]
+        @errors[:title] &&= result.empty?
+        result
       end
 
       def doc_uri(spec = @spec)
-        spec.respond_to?(:uri) ? spec.uri : spec.shortlink
+        result = spec.respond_to?(:uri) ? spec.uri : spec.shortlink
+        @errors[:doc_uri] &&= result.nil?
+        result
       end
 
       #
@@ -105,7 +119,7 @@ module Relaton
       #
       # @return [Array<Bib::Uri>] link
       #
-      def parse_link
+      def parse_source
         [Bib::Uri.new(type: "src", content: doc_uri)]
       end
 
@@ -159,10 +173,14 @@ module Relaton
       # @return [Array<Bib::Series>] series
       #
       def parse_series
-        return [] unless type
-
-        title = Bib::Title.new(content: "W3C #{type}", language: "en", script: "Latn")
-        [Bib::Series.new(title: [title], number: identifier)]
+        result = if type
+                   title = Bib::Title.new(content: "W3C #{type}", language: "en", script: "Latn")
+                   [Bib::Series.new(title: [title], number: identifier)]
+                 else
+                   []
+                 end
+        @errors[:series] &&= result.empty?
+        result
       end
 
       #
@@ -181,7 +199,9 @@ module Relaton
       #
       def parse_doctype
         t = DOCTYPES[type] || DOCTYPES[type_from_link]
-        Doctype.new(content: t) if t
+        result = Doctype.new(content: t) if t
+        @errors[:doctype] &&= result.nil?
+        result
       end
 
       #
@@ -199,9 +219,13 @@ module Relaton
       # @return [Array<Bib::Date>] date
       #
       def parse_date
-        return [] unless @spec.respond_to?(:date)
-
-        [Bib::Date.new(type: "published", at: @spec.date.to_date.to_s)]
+        result = if @spec.respond_to?(:date)
+                   [Bib::Date.new(type: "published", at: @spec.date.to_date.to_s)]
+                 else
+                   []
+                 end
+        @errors[:date] &&= result.empty?
+        result
       end
 
       #
@@ -210,12 +234,14 @@ module Relaton
       # @return [Array<Bib::Relation>] relation
       #
       def parse_relation
-        if @spec.links.respond_to?(:version_history)
-          version_history = realize @spec.links.version_history
-          version_history.links.spec_versions.map { |version| create_relation(version, "hasEdition") }
-        else
-          relations
-        end
+        result = if @spec.links.respond_to?(:version_history)
+                   version_history = realize @spec.links.version_history
+                   version_history.links.spec_versions.map { |version| create_relation(version, "hasEdition") }
+                 else
+                   relations
+                 end
+        @errors[:relation] &&= result.empty?
+        result
       end
 
       #
@@ -268,9 +294,11 @@ module Relaton
       # @return [String, nil] formattedref
       #
       def parse_formattedref
-        return unless @spec.respond_to?(:uri)
-
-        pub_id(@spec.uri)
+        result = if @spec.respond_to?(:uri)
+                   Bib::Formattedref.new(content: pub_id(@spec.uri))
+                 end
+        @errors[:formattedref] &&= result.nil?
+        result
       end
 
       #
@@ -292,7 +320,9 @@ module Relaton
           end
         end
 
-        contribs + parse_deliverers
+        result = contribs + parse_deliverers
+        @errors[:contributor] &&= result.empty?
+        result
       end
 
       def create_editor(unrealized_editor)

data/lib/relaton/w3c/version.rb

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

data/relaton_w3c.gemspec

@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "rdf", "~> 3.2"
   spec.add_dependency "rdf-normalize", "~> 0.6"
-  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.8"
   spec.add_dependency "rubyzip", "~> 2.3"
   spec.add_dependency "shex", "~> 0.7"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-w3c
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.2
+  version: 2.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Ribose Inc.
@@ -71,28 +71,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