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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be0c0678a89392cad09e5dd1200d019dae98b3e6cd693a2f9fdb4e6c03fd53c3
-  data.tar.gz: 8225f34a2b5a372b170f654e0b0646d793d04be3951fb7b8ac92ddc961c077ec
+  metadata.gz: 6896cc449a319a193b826b03c471c288a6a23a874aabc884c0fb7d966dc9a859
+  data.tar.gz: 9ae42b212ac48b0bd1f046f3401eaa04a451977f224497fac678b2cd259fa8d3
 SHA512:
-  metadata.gz: 0a4ff2e224ce8c17145f251a47a74b0c529930d85f4d24ea240ec9c301772c3f9f5da16ff81ce701b691d7e1935eff31fe84a8d880a1ddd463a479e60a4bc59d
-  data.tar.gz: bbcd36e70a379f44729df2e49b9cbb6323eeb791bfa5d3faf74600f3a95c099edf1c50f98d178a6d298215afa39267ef0d55d03ee8026916eb0e7d2c78f7f8ea
+  metadata.gz: ecb0566f856fd66dc05155e1b84806dfe9c2a4ea5002fb868b8156c7f50cfd09df7303d4da7c46e298343f73dae9fd15d025eaac3f062c9c64c0b6c7954f0e21
+  data.tar.gz: 2c61a6bc6394d778a45229fc29db686ffd6713ba35598015ea7e96f49cb660b30cd523fef5d5a14effe3b2f7efe71cbf75e2b7ea75b7723df29058f57d91d1f9

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

@@ -15,6 +15,10 @@ module Relaton
         @index ||= Relaton::Index.find_or_create :itu, file: "index-v1.yaml"
       end
 
+      def log_error(msg)
+        Util.error msg
+      end
+
       def fetch(_source = nil)
         start = 0
         empty_pages = 0
@@ -30,7 +34,7 @@ module Relaton
 
           empty_pages = 0
           results.each do |result|
-            bib = DataParserR.parse(result)
+            bib = DataParserR.parse(result, @errors)
             write_file(bib) if bib
           rescue => e # rubocop:disable Style/RescueStandardError
             Util.error "#{e.message}\n#{e.backtrace}"
@@ -39,6 +43,7 @@ module Relaton
           start += ROWS
         end
         index.save
+        report_errors
       end
 
       # @param bib [Relaton::Itu::ItemData]

data/lib/relaton/itu/data_parser_r.rb

@@ -18,7 +18,8 @@ module Relaton
       #
       # @return [Relaton::Itu::ItemData] bibliographic item
       #
-      def parse(result)
+      def parse(result, errors = {})
+        @errors = errors
         doctype = fetch_doctype(result)
         return unless doctype
 
@@ -35,10 +36,12 @@ module Relaton
       def fetch_docid(result)
         title = result["Title"].to_s
         id = title.match(/^(ITU-R\s+\S+)/)&.captures&.first
-        return [] unless id
+        return(@errors[:docid] &&= true; []) unless id
 
         id = id.sub(/\s*\(.*/, "")
-        [Docidentifier.new(type: "ITU", content: id, primary: true)]
+        result_ids = [Docidentifier.new(type: "ITU", content: id, primary: true)]
+        @errors[:docid] &&= result_ids.empty?
+        result_ids
       end
 
       # @param result [Hash]
@@ -47,31 +50,49 @@ module Relaton
         title = result["Title"].to_s
         content = title.sub(/^[^:]+:\s*/, "").strip
         content = title unless content.length > 0
-        [Relaton::Bib::Title.new(type: "main", content: content, language: "en", script: "Latn")]
+        r = [Relaton::Bib::Title.new(type: "main", content: content, language: "en", script: "Latn")]
+        @errors[:title] &&= r.empty?
+        r
       end
 
       # @param result [Hash]
       # @return [Array<Relaton::Bib::Date>]
       def fetch_date(result)
         prop = property(result, "Publication date")
-        return [] unless prop
+        unless prop
+          @errors[:date] &&= true
+          return []
+        end
 
         date = parse_pub_date(prop)
-        return [] unless date
+        unless date
+          @errors[:date] &&= true
+          return []
+        end
 
-        [Relaton::Bib::Date.new(type: "published", at: date)]
+        r = [Relaton::Bib::Date.new(type: "published", at: date)]
+        @errors[:date] &&= r.empty?
+        r
       end
 
       # @param result [Hash]
       # @return [Array<Relaton::Bib::Uri>]
       def fetch_source(result)
         locations = result["Locations"]
-        return [] unless locations.is_a?(Array)
+        unless locations.is_a?(Array)
+          @errors[:source] &&= true
+          return []
+        end
 
         pdf = locations.find { |l| l["Type"] == "pdf" }
-        return [] unless pdf && pdf["RawHref"]
+        unless pdf && pdf["RawHref"]
+          @errors[:source] &&= true
+          return []
+        end
 
-        [Relaton::Bib::Uri.new(type: "pdf", content: pdf["RawHref"])]
+        r = [Relaton::Bib::Uri.new(type: "pdf", content: pdf["RawHref"])]
+        @errors[:source] &&= r.empty?
+        r
       end
 
       # @param result [Hash]
@@ -79,8 +100,12 @@ module Relaton
       def fetch_doctype(result)
         type_value = property(result, "Type")
         mapped = TYPE_MAP[type_value]
-        return unless mapped
+        unless mapped
+          @errors[:doctype] &&= true
+          return
+        end
 
+        @errors[:doctype] &&= false
         Doctype.new(content: mapped)
       end
 

data/lib/relaton/itu/hit_collection.rb

@@ -38,7 +38,7 @@ module Relaton
       def request_document # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
         Util.info "Fetching from Relaton repository ...", key: ref.to_s
         index = Relaton::Index.find_or_create :itu, url: "#{GH_ITU_R}#{INDEXFILE}.zip", file: "#{INDEXFILE}.yaml"
-        row = index.search(ref.to_ref).min_by { |i| i[:id] }
+        row = index.search(ref.to_ref).max_by { |i| i[:id] }
         return unless row
 
         url = "#{GH_ITU_R}#{row[:file]}"

data/lib/relaton/itu/recommendation_parser.rb

@@ -52,7 +52,7 @@ module Relaton
       # @return [Array<Relaton::Bib::LocalizedMarkedUpString>]
       def fetch_abstract
         array(doc["summary"]).map do |content|
-          Relaton::Bib::LocalizedMarkedUpString.new(content: content, language: "en", script: "Latn")
+          Relaton::Bib::Abstract.new(content: content, language: "en", script: "Latn")
         end
       end
 
@@ -142,7 +142,7 @@ module Relaton
 
         fref = titles.empty? ? id : nil
         did = Relaton::Bib::Docidentifier.new(type: "ITU", content: id, primary: true)
-        bibitem = Relaton::Bib::ItemData.new(title: titles, formattedref: fref, docidentifier: [did])
+        bibitem = Relaton::Bib::ItemData.new(title: titles, formattedref: (fref ? Relaton::Bib::Formattedref.new(content: fref) : nil), docidentifier: [did])
         Relaton::Bib::Relation.new(type: type, bibitem: bibitem)
       end
 

data/lib/relaton/itu/scraper.rb

@@ -185,7 +185,8 @@ module Relaton
           uri: [Relaton::Bib::Uri.new(content: url)],
         )
         owner = Relaton::Bib::ContributionInfo.new(organization: org)
-        [Relaton::Bib::Copyright.new(from: parser.doc_date, owner: [owner])]
+        year = parser.doc_date&.match(/\d{4}/)&.to_s
+        [Relaton::Bib::Copyright.new(from: year, owner: [owner])]
       end
     end
   end

data/lib/relaton/itu/version.rb

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

data/relaton_itu.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "parslet", "~> 2.0.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"
 end

metadata

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