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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90678f8153fbe6d491167a572472f8d39e9068f7ff7a85329cf15d15c89e6714
-  data.tar.gz: 3643899f4251f2f5855db1793c01b6e696cf9afb14fc7e5dbfc35e318cfe4dd0
+  metadata.gz: 9cfbc84c1c8b6e734df1aa7ee14a9e7ad70ba6d700cf4a3742c55a6ce682d7a0
+  data.tar.gz: 66cbf24bea596b7324bc61731165b528937a85393d5b9fe5d94248b397a60c99
 SHA512:
-  metadata.gz: ba824ba54cc142c4ab836461ad0973fe1db823a1955cf8e07385360aa1e905f4c26c5d4b567813466c61d6accfb7e5e62b56b3478c4cd1bbc7e2b7301d1b36cb
-  data.tar.gz: 0b0f923561036d8cc54fb989efe0fcbc7ac753cd008007c83a50910b9894838b82ba4459f14054ce00527f7d8ba0c21dccf7a1235809b06dc37ad6b23a893aec
+  metadata.gz: 8fed77dee49a7fe3ae389a12f46b25c74ba499f09de7a5270ce29332639c85e911213f824e3104628a34cd99999e4f68d593458e90a104cf7a106ebbc02b5487
+  data.tar.gz: a3e244bc4e45743a0f07527a7dbfb042a436805805b244839047c2842b71f6dfbe76ff7f4bfe8b093b32e041ca8a9c20d741bfdf367750fde726790f5c29c56c

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

@@ -18,10 +18,6 @@ module Relaton
         @dupids = Set.new
       end
 
-      def gh_issue_channel
-        ["relaton/relaton-ogc", "Error fetching OGC documents"]
-      end
-
       def log_error(msg)
         Util.error msg
       end
@@ -39,13 +35,14 @@ module Relaton
           end
           self.etag = etag if no_errors
           index.save
+          report_errors
         end
       end
 
       def fetch_doc(hit)
         return if hit["type"] == "CC"
 
-        bib = Scraper.parse_page hit
+        bib = Scraper.parse_page hit, @errors
         write_document bib
         true
       rescue StandardError => e

data/lib/relaton/ogc/scraper.rb

@@ -2,7 +2,7 @@
 
 module Relaton
   module Ogc
-    module Scraper
+    class Scraper
       TYPES = {
         "AS" => { type: "abstract-specification-topic" },
         "BP" => { type: "best-practice", subtype: "general" },
@@ -30,173 +30,195 @@ module Relaton
         "RP" => { type: "discussion-paper" },
       }.freeze
 
-      class << self
-        # @param hit [Hash]
-        # @return [Relaton::Ogc::Item]
-        def parse_page(hit) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-          type = fetch_type(hit["type"])
-          contribs = fetch_contributor(hit)
-          contribs << fetch_editorialgroup_contributor
-          ItemData.new(
-            type: "standard",
-            title: fetch_title(hit["title"]),
-            docidentifier: fetch_docid(hit["identifier"]),
-            source: fetch_link(hit),
-            status: fetch_status(type[:stage]),
-            edition: fetch_edition(hit["identifier"]),
-            abstract: fetch_abstract(hit["description"]),
-            contributor: contribs,
-            language: ["en"],
-            script: ["Latn"],
-            date: fetch_date(hit["date"]),
-            ext: Ext.new(
-              doctype: fetch_doctype(type[:type]),
-              subdoctype: type[:subtype],
-              flavor: "ogc",
-            ),
-          )
-        end
+      def self.parse_page(hit, errors = Hash.new(true))
+        new(hit, errors).parse
+      end
 
-        private
-
-        def fetch_editorialgroup_contributor # rubocop:disable Metrics/MethodLength
-          desc = Bib::LocalizedMarkedUpString.new(content: "committee")
-          role = Bib::Contributor::Role.new(
-            type: "author", description: [desc],
-          )
-          ogc = "Open Geospatial Consortium"
-          org = Bib::Organization.new(
-            name: [Bib::TypedLocalizedString.new(content: ogc)],
-            abbreviation: Bib::LocalizedString.new(content: "OGC"),
-            subdivision: [Bib::Subdivision.new(
-              type: "technical-committee",
-              name: [Bib::TypedLocalizedString.new(content: "technical")],
-            )],
-          )
-          Bib::Contributor.new(role: [role], organization: org)
-        end
+      # @param hit [Hash]
+      # @param errors [Hash]
+      def initialize(hit, errors = Hash.new(true))
+        @hit = hit
+        @errors = errors
+      end
 
-        # @param title [String]
-        # @return [Array<Bib::Title>]
-        def fetch_title(title)
-          Bib::Title.from_string title, "en", "Latn"
-        end
+      # @return [Relaton::Ogc::ItemData]
+      def parse # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        type = fetch_type(@hit["type"])
+        contribs = fetch_contributor(@hit)
+        contribs << fetch_editorialgroup_contributor
+        ItemData.new(
+          type: "standard",
+          title: fetch_title(@hit["title"]),
+          docidentifier: fetch_docid(@hit["identifier"]),
+          source: fetch_link(@hit),
+          status: fetch_status(type[:stage]),
+          edition: fetch_edition(@hit["identifier"]),
+          abstract: fetch_abstract(@hit["description"]),
+          contributor: contribs,
+          language: ["en"],
+          script: ["Latn"],
+          date: fetch_date(@hit["date"]),
+          ext: Ext.new(
+            doctype: fetch_doctype(type[:type]),
+            subdoctype: type[:subtype],
+            flavor: "ogc",
+          ),
+        )
+      end
 
-        # @param identifier [String]
-        # @return [Array<Bib::Docidentifier>]
-        def fetch_docid(identifier)
-          id = Docidentifier.new(
-            content: identifier, type: "OGC", primary: true,
-          )
-          [id]
-        end
+      private
+
+      def fetch_editorialgroup_contributor # rubocop:disable Metrics/MethodLength
+        desc = Bib::LocalizedMarkedUpString.new(content: "committee")
+        role = Bib::Contributor::Role.new(
+          type: "author", description: [desc],
+        )
+        ogc = "Open Geospatial Consortium"
+        org = Bib::Organization.new(
+          name: [Bib::TypedLocalizedString.new(content: ogc)],
+          abbreviation: Bib::LocalizedString.new(content: "OGC"),
+          subdivision: [Bib::Subdivision.new(
+            type: "technical-committee",
+            name: [Bib::TypedLocalizedString.new(content: "technical")],
+          )],
+        )
+        Bib::Contributor.new(role: [role], organization: org)
+      end
 
-        # @param hit [Hash]
-        # @return [Array<Bib::Uri>]
-        def fetch_link(hit) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
-          link = []
-          uri = hit["URI"].to_s.strip
-          unless uri.empty?
-            link << Bib::Uri.new(type: "src", content: uri)
-          end
-          return link unless hit["URL"] && !hit["URL"].strip.empty?
-
-          type = link_type(hit["URL"])
-          link << Bib::Uri.new(type: type, content: hit["URL"].strip)
-        end
+      # @param title [String]
+      # @return [Array<Bib::Title>]
+      def fetch_title(title)
+        result = Bib::Title.from_string title, "en", "Latn"
+        @errors[:title] &&= result.empty?
+        result
+      end
 
-        def link_type(url)
-          ext = url.match(/(?<=\.)(?<ext>pdf|html|doc)$/)
-          return ext[:ext] if ext
+      # @param identifier [String]
+      # @return [Array<Bib::Docidentifier>]
+      def fetch_docid(identifier)
+        @errors[:docid] &&= identifier.to_s.strip.empty?
+        id = Docidentifier.new(
+          content: identifier, type: "OGC", primary: true,
+        )
+        [id]
+      end
 
-          case url
-          when /portal\.(ogc|opengeospatial)\.org/,
-               /usgif\.org/
-            "pdf"
-          else "html"
-          end
+      # @param hit [Hash]
+      # @return [Array<Bib::Uri>]
+      def fetch_link(hit) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
+        link = []
+        uri = hit["URI"].to_s.strip
+        unless uri.empty?
+          link << Bib::Uri.new(type: "src", content: uri)
         end
+        return link unless hit["URL"] && !hit["URL"].strip.empty?
 
-        # @param type [String]
-        # @return [Doctype]
-        def fetch_doctype(type)
-          Doctype.new(content: type)
-        end
+        type = link_type(hit["URL"])
+        link << Bib::Uri.new(type: type, content: hit["URL"].strip)
+      ensure
+        @errors[:link] &&= link.empty?
+      end
 
-        # @param type [String]
-        # @return [Hash]
-        def fetch_type(type)
-          TYPES[type.sub(/^D-/, "")] || { type: "other" }
+      def link_type(url)
+        ext = url.match(/(?<=\.)(?<ext>pdf|html|doc)$/)
+        return ext[:ext] if ext
+
+        case url
+        when /portal\.(ogc|opengeospatial)\.org/,
+             /usgif\.org/
+          "pdf"
+        else "html"
         end
+      end
 
-        # @param stage [String, nil]
-        # @return [Bib::Status, nil]
-        def fetch_status(stage)
-          return unless stage
+      # @param type [String]
+      # @return [Doctype]
+      def fetch_doctype(type)
+        Doctype.new(content: type)
+      end
 
-          stg = Bib::Status::Stage.new(content: stage)
-          Bib::Status.new(stage: stg)
-        end
+      # @param type [String]
+      # @return [Hash]
+      def fetch_type(type)
+        TYPES[type.sub(/^D-/, "")] || { type: "other" }
+      end
 
-        # @param identifier [String]
-        # @return [String, nil]
-        def fetch_edition(identifier)
-          %r{(?<=r)(?<edition>\d+)$} =~ identifier
-          edition && Bib::Edition.new(content: edition)
-        end
+      # @param stage [String, nil]
+      # @return [Bib::Status, nil]
+      def fetch_status(stage)
+        @errors[:status] &&= stage.nil?
+        return unless stage
 
-        # @param description [String]
-        # @return [Array<Bib::LocalizedMarkedUpString>]
-        def fetch_abstract(description)
-          abs = Bib::LocalizedMarkedUpString.new(
-            content: description, language: "en", script: "Latn",
-          )
-          [abs]
-        end
+        stg = Bib::Status::Stage.new(content: stage)
+        Bib::Status.new(stage: stg)
+      end
 
-        # @param doc [Hash]
-        # @return [Array<Bib::Contributor>]
-        def fetch_contributor(doc)
-          contribs = doc["creator"].to_s.split(", ").map do |name|
-            person_contrib name
-          end
-          contribs << org_contrib(doc["publisher"]) if doc["publisher"]
-          contribs
-        end
+      # @param identifier [String]
+      # @return [String, nil]
+      def fetch_edition(identifier)
+        %r{(?<=r)(?<edition>\d+)$} =~ identifier
+        @errors[:edition] &&= edition.nil?
+        edition && Bib::Edition.new(content: edition)
+      end
 
-        # @param name [String]
-        # @return [Bib::Contributor]
-        def person_contrib(name)
-          Bib::Contributor.new(
-            person: Bib::Person.new(
-              name: Bib::FullName.new(
-                completename: Bib::LocalizedString.new(content: name),
-              ),
-            ),
-            role: [Bib::Contributor::Role.new(type: "author")],
-          )
+      # @param description [String]
+      # @return [Array<Bib::LocalizedMarkedUpString>]
+      def fetch_abstract(description)
+        @errors[:abstract] &&= description.to_s.strip.empty?
+        abs = Bib::Abstract.new(
+          content: description, language: "en", script: "Latn",
+        )
+        [abs]
+      end
+
+      # @param doc [Hash]
+      # @return [Array<Bib::Contributor>]
+      def fetch_contributor(doc)
+        contribs = doc["creator"].to_s.split(", ").map do |name|
+          person_contrib name
         end
+        contribs << org_contrib(doc["publisher"]) if doc["publisher"]
+        @errors[:contributor] &&= contribs.empty?
+        contribs
+      end
 
-        # @param name [String]
-        # @return [Bib::Contributor]
-        def org_contrib(name)
-          Bib::Contributor.new(
-            organization: Bib::Organization.new(
-              name: [Bib::TypedLocalizedString.new(content: name)],
+      # @param name [String]
+      # @return [Bib::Contributor]
+      def person_contrib(name)
+        Bib::Contributor.new(
+          person: Bib::Person.new(
+            name: Bib::FullName.new(
+              completename: Bib::LocalizedString.new(content: name),
             ),
-            role: [Bib::Contributor::Role.new(type: "publisher")],
-          )
-        end
+          ),
+          role: [Bib::Contributor::Role.new(type: "author")],
+        )
+      end
 
-        # @param date [String, nil]
-        # @return [Array<Bib::Date>]
-        def fetch_date(date)
-          return [] unless date
+      # @param name [String]
+      # @return [Bib::Contributor]
+      def org_contrib(name)
+        Bib::Contributor.new(
+          organization: Bib::Organization.new(
+            name: [Bib::TypedLocalizedString.new(content: name)],
+          ),
+          role: [Bib::Contributor::Role.new(type: "publisher")],
+        )
+      end
 
-          [Bib::Date.new(type: "published", at: date)]
-        rescue Date::Error
-          []
-        end
+      # @param date [String, nil]
+      # @return [Array<Bib::Date>]
+      def fetch_date(date)
+        result = if date
+                   [Bib::Date.new(type: "published", at: date)]
+                 else
+                   []
+                 end
+        @errors[:date] &&= result.empty?
+        result
+      rescue Date::Error
+        @errors[:date] &&= true
+        []
       end
     end
   end

data/lib/relaton/ogc/version.rb

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

data/relaton_ogc.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
 
   spec.add_dependency "faraday", "~> 2.7"
+  spec.add_dependency "relaton-core", "~> 0.0.13"
   spec.add_dependency "relaton-index", "~> 0.2.0"
-  spec.add_dependency "relaton-iso", "~> 2.0.0-alpha.2"
+  spec.add_dependency "relaton-iso", "~> 2.0.0-alpha.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ogc
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.2
+  version: 2.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Ribose Inc.
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: relaton-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -43,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.2
+        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.2
+        version: 2.0.0.pre.alpha.7
 description: 'Relaton::Ogc: retrieve OGC Standards for bibliographic use using the
   OgcBibliographicItem model'
 email: