relaton-plateau 2.0.0.pre.alpha.1 → 2.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb3cc6cdfa3cd0363255bab96606035fb447b921604c6e1714eadda34aefe7de
-  data.tar.gz: c11916205329861dfc3f39a4a3f2d0850c6befff87fa8e9e42597fefb8b26ffa
+  metadata.gz: e319307851d018547c6ee5249c4a25494143187ae4de543a852c514b14db18ab
+  data.tar.gz: 280d98098a0940e148b4ad0cb2c682245553523aceed83cfe737f6e5b519b9d1
 SHA512:
-  metadata.gz: e5302a8675a7ffc39319b8dddbc784cc7e63984ed516b4aaeae5fcf28625fc34e03b1251b655df91f731f968d17da98d1c47453c2f140307f6ce409daebd6eb0
-  data.tar.gz: 80f019f1da353cf7dc1bdebba2d20a1eee0b49205d892d7d703f43def4f59c9eeedfe67397f73f0683a9b2d2f131df7cfcfea336a7dc0be69e424214ff013607
+  metadata.gz: ea7ca91ad74199efc694e6b76ae631feb9c8d2d5da3ab9b5446d599c86f4e886e988761e831adc2fba114749280324b6af8cffe97f735bd0bcda755fe2b073ca
+  data.tar.gz: dd49dc77518ce931f5ae868065f20f1ea28ce0505779df16897b6741edf79a5b4133625c09b2fd58417765c46c714af9a441f56ff8a90af29e9a3b8292ecb0a3

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

@@ -16,6 +16,10 @@ module Relaton
         @index ||= Relaton::Index.find_or_create :plateau, file: "#{INDEXFILE}.yaml"
       end
 
+      def log_error(msg)
+        Util.error msg
+      end
+
       def fetch(source)
         case source
         when "plateau-handbooks" then extract_handbooks_data
@@ -90,11 +94,12 @@ module Relaton
           doctype = entry["slug"].match("-") ? "annex" : "handbook"
 
           handbook["versions"].each do |version|
-            item = HandbookParser.new(version: version, entry: entry, doctype: doctype).parse
+            item = HandbookParser.new(version: version, entry: entry, doctype: doctype, errors: @errors).parse
             save_document(item)
           end
         end
         index.save
+        report_errors
       end
 
       #
@@ -104,9 +109,10 @@ module Relaton
         data = fetch_json_data(TECHNICAL_REPORTS_URL)
         Util.info "Extracting technical reports data..."
         data["pageProps"]["nodes"].map do |entry|
-          save_document(TechnicalReportParser.new(entry).parse)
+          save_document(TechnicalReportParser.new(entry, @errors).parse)
         end
         index.save
+        report_errors
       end
 
       def save_document(item)

data/lib/relaton/plateau/handbook_parser.rb

@@ -3,10 +3,10 @@
 module Relaton
   module Plateau
     class HandbookParser < Parser
-      def initialize(version:, entry:, doctype:)
+      def initialize(version:, entry:, doctype:, errors: {})
         @version = version
         @entry = entry
-        super entry["handbook"]
+        super(entry["handbook"], errors)
         @doctype = doctype
       end
 
@@ -17,36 +17,58 @@ module Relaton
       end
 
       def parse_docnumber
-        "Handbook ##{@entry["slug"]} #{edition}"
+        @errors[:hb_docnumber] &&= @entry["slug"].nil? || @entry["slug"].to_s.empty?
+        ["Handbook ##{@entry["slug"]}", edition].compact.join(" ")
       end
 
       def parse_abstract
-        return [] unless @item["description"]
+        unless @item["description"]
+          @errors[:hb_abstract] &&= true
+          return []
+        end
 
-        @item["description"].split("<br />").filter_map do |part|
+        result = @item["description"].split("<br />").filter_map do |part|
           text = part.strip
           next if text.empty?
 
           lang, script = detect_lang(text)
           create_abstract(text, lang, script)
         end
+        @errors[:hb_abstract] &&= result.empty?
+        result
       end
 
       def parse_edition
+        if edition.nil? || edition.empty?
+          @errors[:hb_edition] &&= true
+          return
+        end
+
         number = edition.match(/\d\.\d/)[0]
-        Bib::Edition.new(content: edition, number: number)
+        result = Bib::Edition.new(content: edition, number: number)
+        @errors[:hb_edition] &&= result.nil?
+        result
       end
 
       def parse_date
-        super << create_date(@version["date"].gsub(".", "-"))
+        if @version["date"].nil? || @version["date"].empty?
+          @errors[:hb_date] &&= true
+          return super
+        end
+
+        result = super << create_date(@version["date"].gsub(".", "-"))
+        @errors[:hb_date] &&= result.empty?
+        result
       end
 
       def parse_source
-        %w[pdf html].map do |type|
+        result = %w[pdf html].map do |type|
           next unless @version[type]
 
           create_link(@version[type], type)
         end.compact
+        @errors[:hb_source] &&= result.empty?
+        result
       end
 
       def parse_ext
@@ -57,9 +79,13 @@ module Relaton
           doctype: Doctype.new(content: @doctype),
           flavor: "plateau",
           structuredidentifier: [strid],
-          filesize: @version["filesize"].to_i
+          filesize: filesize
         )
       end
+      def filesize
+        @errors[:hb_filesize] &&= @version["filesize"].nil?
+        @version["filesize"].to_i
+      end
     end
   end
 end

data/lib/relaton/plateau/parser.rb

@@ -5,8 +5,9 @@ module Relaton
       ATTRIS = %i[docidentifier docnumber title abstract depiction edition type
                   date source contributor keyword ext].freeze
 
-      def initialize(item)
+      def initialize(item, errors = {})
         @item = item
+        @errors = errors
       end
 
       def parse
@@ -19,7 +20,9 @@ module Relaton
       private
 
       def parse_docidentifier
-        [create_docid("PLATEAU #{parse_docnumber}")]
+        result = [create_docid("PLATEAU #{parse_docnumber}")]
+        @errors[:parse_docidentifier] &&= result.empty?
+        result
       end
 
       def parse_docnumber; end
@@ -29,7 +32,7 @@ module Relaton
       end
 
       def create_abstract(content, lang = "ja", script = "Jpan")
-        Bib::LocalizedMarkedUpString.new(content: content, language: lang, script: script)
+        Bib::Abstract.new(content: content, language: lang, script: script)
       end
 
       def detect_lang(text)
@@ -42,7 +45,9 @@ module Relaton
 
       def parse_title
         lang, script = detect_lang(@item["title"])
-        [create_title(@item["title"], lang, script)]
+        result = [create_title(@item["title"], lang, script)]
+        @errors[:title] &&= result.empty?
+        result
       end
 
       def create_title(title, lang, script)
@@ -57,7 +62,9 @@ module Relaton
         mimetype += image_ext == "jpg" ? "jpeg" : image_ext
         src = "https://www.mlit.go.jp/#{@item["thumbnail"]["mediaItemUrl"]}"
         image = Bib::Image.new(src: src, mimetype: mimetype)
-        Bib::Depiction.new(scope: "cover", image: [image])
+        result = Bib::Depiction.new(scope: "cover", image: [image])
+        @errors[:parse_depiction] &&= result.nil?
+        [result]
       end
 
       def parse_edition; raise "Not implemented" end
@@ -74,7 +81,9 @@ module Relaton
           ),
         ]
         org = Bib::Organization.new(name: name, abbreviation: Bib::LocalizedString.new(content: "MLIT"))
-        [Bib::Contributor.new(organization: org, role: [Bib::Contributor::Role.new(type: "publisher")])]
+        result = [Bib::Contributor.new(organization: org, role: [Bib::Contributor::Role.new(type: "publisher")])]
+        @errors[:parse_contributor] &&= result.empty?
+        result
       end
 
       def create_date(date, type = "published")

data/lib/relaton/plateau/technical_report_parser.rb

@@ -1,42 +1,65 @@
 module Relaton
   module Plateau
     class TechnicalReportParser < Parser
-      def initialize(entry)
+      def initialize(entry, errors = {})
         @entry = entry
-        super entry["technicalReport"]
+        super(entry["technicalReport"], errors)
       end
 
       private
 
       def parse_docnumber
+        @errors[:tr_docnumber] &&= @entry["slug"].nil? || @entry["slug"].to_s.empty?
         "Technical Report ##{@entry["slug"]} #{edition_number}"
       end
 
       def parse_abstract
-        super << create_abstract(@item["subtitle"])
+        if @item["subtitle"].nil? || @item["subtitle"].empty?
+          @errors[:tr_abstract] &&= true
+          return super
+        end
+
+        result = super << create_abstract(@item["subtitle"])
+        @errors[:tr_abstract] &&= result.empty?
+        result
       end
 
       def parse_edition
-        Bib::Edition.new(content: edition_number, number: edition_number)
+        result = Bib::Edition.new(content: edition_number, number: edition_number)
+        result
       end
 
-      def edition_number
-        "1.0"
-      end
+      def edition_number = "1.0"
 
       def parse_date
+        if @entry["date"].nil? || @entry["date"].empty?
+          @errors[:tr_date] &&= true
+          return super
+        end
+
         date_str = @entry["date"].sub(/T.*/, "")
-        super << create_date(date_str)
+        result = super << create_date(date_str)
+        @errors[:tr_date] &&= result.empty?
+        result
       end
 
       def parse_source
-        super << create_link(@item["pdf"], "pdf")
+        if @item["pdf"].nil? || @item["pdf"].empty?
+          @errors[:tr_source] &&= true
+          return super
+        end
+
+        result = super << create_link(@item["pdf"], "pdf")
+        @errors[:tr_source] &&= result.empty?
+        result
       end
 
       def parse_keyword
-        @entry["globalTags"]["nodes"].map do |tag|
-          Bib::Keyword.new(taxon: [Bib::LocalizedString.new(content: tag["name"])])
+        result = @entry["globalTags"]["nodes"].map do |tag|
+          Bib::Keyword.new(vocab: Bib::LocalizedString.new(content: tag["name"]))
         end
+        @errors[:tr_keyword] &&= result.empty?
+        result
       end
 
       def parse_ext
@@ -49,12 +72,19 @@ module Relaton
           subdoctype: parse_subdoctype,
           flavor: "plateau",
           structuredidentifier: [strid],
-          filesize: @item["filesize"].to_i
+          filesize: filesize
         )
       end
 
+      def filesize
+        @errors[:tr_filesize] &&= @item["filesize"].nil?
+        @item["filesize"].to_i
+      end
+
       def parse_subdoctype
-        @entry["technicalReportCategories"]["nodes"].dig(0, "name")
+        result = @entry["technicalReportCategories"]["nodes"].dig(0, "name")
+        @errors[:tr_subdoctype] &&= result.nil?
+        result
       end
     end
   end

data/lib/relaton/plateau/version.rb

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

data/relaton_plateau.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
 
   # spec.add_dependency "pubid", "~> 0.1.1"
   spec.add_dependency "base64"
+  spec.add_dependency "relaton-core", "~> 0.0.13"
   spec.add_dependency "relaton-index", "~> 0.2.12"
   spec.add_dependency "relaton-logger", "~> 0.2.0"
-  spec.add_dependency "relaton-iso", "~> 2.0.0-alpha.2"
-  spec.add_dependency "relaton-core", "~> 0.0.9"
+  spec.add_dependency "relaton-iso", "~> 2.0.0-alpha.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-plateau
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.1
+  version: 2.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Ribose Inc.
@@ -24,61 +24,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: relaton-index
+  name: relaton-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
-  name: relaton-logger
+  name: relaton-index
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.12
 - !ruby/object:Gem::Dependency
-  name: relaton-iso
+  name: relaton-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.2
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: relaton-core
+  name: relaton-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 2.0.0.pre.alpha.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 2.0.0.pre.alpha.7
 description: Retrieve Project PLATEAU bibliographic items.
 email:
 - open.source@ribose.com