relaton-3gpp 2.0.0.pre.alpha.3 → 2.0.0.pre.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ada5bf14c17b0d99ad251241de54f501cd4f12197e0d8d9de180ab44d26b0b25
-  data.tar.gz: 2ed4f171bb9ba4d9e9ad424e5aacfaace18e4f1ef68d9f22a2393a77e6a67f95
+  metadata.gz: 36aaf69cf6ab6c4b1e3aac54b311a3ef3ef2d373eaf5817a8ce6217036b7c819
+  data.tar.gz: 98589496e8b8d507208fbf37c2c43ea56f038b0987aed437e54b2291fc82eec5
 SHA512:
-  metadata.gz: b82d46d6e02acf6cfaf8a6a818f059fea88ddbdebd1ebe3d309d85fed318471b120e191508474c572454cf9ec928c7d70b7225fc6a1a89059e1e8fe72e05579d
-  data.tar.gz: 873408391ed636d15d8cb399283774d828cabfb1f8009f0a4a3f6a2ac9b907cbcef60446b3a872936192608facb552946b7b6d1f21809fd5bd44ab3bb0856626
+  metadata.gz: 61237ceb9c0539b8d7bd770b656e051a33d8c8738ca90557f63c1b26f6d23511c14d1687d2b13b6e19f70465e1917fb324dc39fce8312d85474f1e432bfd6e3c
+  data.tar.gz: 403bbe3698c30452bb4a8d5cfe2478e6d6227e6c39de4bd560e426546a83ae405be8f7ea75b5df53ce49ce1a10f7825044468cc7a6e3eee8ed10cb0dc5a92092

data/README.adoc

@@ -64,7 +64,7 @@ item.to_xml bibdata: true
       <docidentifier type="3GPP" primary="true">3GPP TR 00.01U:UMTS/3.0.0</docidentifier>
       <docnumber>TR 00.01U:UMTS/3.0.0</docnumber>
       ...
-        <ext schema-version="v1.0.1">
+        <ext schema-version="v1.0.4">
           <doctype>TR</doctype>
           <editorialgroup>
             <technical-committee type="prime">SMG5</technical-committee>

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/grammars/relaton-3gpp.rng

@@ -13,31 +13,21 @@
         <value>release</value>
       </choice>
     </define>
-    <define name="BibDataExtensionType">
-      <optional>
-        <attribute name="schema-version"/>
-      </optional>
-      <ref name="doctype"/>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="radiotechnology"/>
-      </optional>
-      <optional>
-        <ref name="common-ims-spec"/>
-      </optional>
-      <optional>
-        <ref name="internal"/>
-      </optional>
-      <optional>
-        <ref name="release"/>
-      </optional>
-    </define>
   </include>
+  <define name="BibDataExtensionType" combine="interleave">
+    <optional>
+      <ref name="radiotechnology"/>
+    </optional>
+    <optional>
+      <ref name="common-ims-spec"/>
+    </optional>
+    <optional>
+      <ref name="internal"/>
+    </optional>
+    <optional>
+      <ref name="release"/>
+    </optional>
+  </define>
   <define name="RadioTechnologyType">
     <choice>
       <value>2G</value>

data/lib/relaton/3gpp/data_fetcher.rb

@@ -8,6 +8,10 @@ module Relaton
     class DataFetcher < Core::DataFetcher
       CURRENT = "current.yaml".freeze
 
+      def log_error(msg)
+        Util.error msg
+      end
+
       def index
         @index ||= Relaton::Index.find_or_create "3gpp", file: "#{INDEXFILE}.yaml"
       end
@@ -27,10 +31,11 @@ module Relaton
           index.remove_all # if renewal
         end
         CSV.open(file, "r:bom|utf-8", headers: true).each do |row|
-          save_doc Parser.parse(row)
+          save_doc Parser.parse(row, @errors)
         end
         File.write CURRENT, @current.to_yaml, encoding: "UTF-8"
         index.save
+        report_errors
       end
 
       #
@@ -45,7 +50,7 @@ module Relaton
         @current ||= {}
         n = 0
         begin
-          ftp = Net::FTP.new("www.3gpp.org")
+          ftp = Net::FTP.new("www.3gpp.org", open_timeout: 30)
           ftp.resume = true
           ftp.login
           ftp.chdir "/Information/Databases/"
@@ -60,7 +65,7 @@ module Relaton
 
           tmp_file = File.join Dir.tmpdir, "3gpp.csv"
           ftp.get(file, tmp_file)
-        rescue Net::ReadTimeout => e
+        rescue Net::OpenTimeout, Net::ReadTimeout => e
           n += 1
           retry if n < 5
           raise e

data/lib/relaton/3gpp/parser.rb

@@ -10,19 +10,21 @@ module Relaton
       #
       # @param [CSV::Row] row CSV row
       #
-      def initialize(row)
+      def initialize(row, errors)
         @row = row
+        @errors = errors
       end
 
       #
       # Initialize document parser and run it
       #
       # @param [CSV:Row] row CSV row
+      # @param [Hash] errors collection of parsing errors
       #
       # @return [RelatonBib:BibliographicItem, nil] bibliographic item
       #
-      def self.parse(row)
-        new(row).parse
+      def self.parse(row, errors = {})
+        new(row, errors).parse
       end
 
       #
@@ -58,8 +60,8 @@ module Relaton
       # @return [RelatonBib::TypedTitleStringCollection] title
       #
       def parse_title
+        @errors[:title] &&= @row["Title"].nil? || @row["Title"].empty?
         [Bib::Title.new(content: @row["Title"], type: "main")]
-        # RelatonBib::TypedTitleStringCollection.new [t]
       end
 
       #
@@ -68,6 +70,7 @@ module Relaton
       # @return [Array<RelatonBib::TypedUri>] link
       #
       def parse_source
+        @errors[:source] &&= @row["Link"].nil? || @row["Link"].empty?
         return [] unless @row["Link"]
 
         [Bib::Uri.new(type: "src", content: @row["Link"])]
@@ -90,6 +93,7 @@ module Relaton
       # @return [Arra<RelatonBib::DocumentIdentifier>] docidentifier
       #
       def parse_docid
+        @errors[:docid] &&= @row[0].nil? || @row[0].empty?
         [Bib::Docidentifier.new(type: "3GPP", content: "3GPP #{number}", primary: true)]
       end
 
@@ -109,6 +113,7 @@ module Relaton
       end
 
       def parse_version
+        @errors[:version] &&= version.nil? || version.empty?
         [Bib::Version.new(draft: version)]
       end
 
@@ -117,11 +122,15 @@ module Relaton
       end
 
       def release
-        @release ||=  case @row["WPM Code 2G"]
-                      when /Release_(\d+)/ then "REL-#{$1}"
-                      when /PH(\d+)/ then "Ph#{$1}"
-                      else @row["Release"]
-                      end
+        @release ||= begin
+          r = case @row["WPM Code 2G"]
+              when /Release_(\d+)/ then "REL-#{$1}"
+              when /PH(\d+)/ then "Ph#{$1}"
+              else @row["Release"]
+              end
+          @errors[:release] &&= r.nil? || r.empty?
+          r
+        end
       end
 
       #
@@ -144,6 +153,7 @@ module Relaton
           on = Date.parse(@row["Date"]).to_s
           dates << Bib::Date.new(type: "published", at: on)
         end
+        @errors[:date] &&= dates.empty?
         dates
       end
 
@@ -190,19 +200,29 @@ module Relaton
           role = Bib::Contributor::Role.new type: "author"
           contribs << Bib::Contributor.new(person: person, role: [role])
         end
-        contribs + editorial_group_contributors
+        @errors[:contributor] &&= contribs.empty?
+        contribs + prime_contribs + other_contribs
       end
 
-      def editorial_group_contributors # rubocop:disable Metrics/MethodLength
-        contribs = []
-        prime = @row["Responsible Primary"]
-        contribs << editorial_group_contributor(prime, "prime") unless prime.nil? || prime.empty?
-        @row["Responsible Secondary"].strip.split(", ").each do |wg|
-          contribs << editorial_group_contributor(wg, "other")
+      def other_contribs
+        contribs = @row["Responsible Secondary"].strip.split(", ").map do |wg|
+          editorial_group_contributor(wg, "other")
         end
+        @errors[:editorial_group_contributor_other] &&= contribs.empty?
         contribs
       end
 
+      def prime_contribs
+        prime = @row["Responsible Primary"]
+        if prime.nil? || prime.empty?
+          @errors[:editorial_group_contributor_prime] &&= true
+          return []
+        end
+
+        @errors[:editorial_group_contributor_prime] &&= false
+        [editorial_group_contributor(prime, "prime")]
+      end
+
       def editorial_group_contributor(wg_name, wg_type)
         Bib::Contributor.new(
           role: [Bib::Contributor::Role.new(
@@ -231,15 +251,37 @@ module Relaton
       end
 
       def person
-        surname = Bib::LocalizedString.new content: @row["Last Name"], language: "en", script: "Latn"
-        forename = Bib::FullNameType::Forename.new content: @row["First Name"], language: "en", script: "Latn"
         name = Bib::FullName.new(surname: surname, forename: [forename])
         Bib::Person.new(name: name, affiliation: affiliation)
       end
 
+      def surname
+        if @row["Last Name"].nil? || @row["Last Name"].empty?
+          @errors[:contributor_person_surname] &&= true
+          return nil
+        end
+
+        @errors[:contributor_person_surname] &&= false
+        Bib::LocalizedString.new content: @row["Last Name"], language: "en", script: "Latn"
+      end
+
+      def forename
+        if @row["First Name"].nil? || @row["First Name"].empty?
+          @errors[:contributor_person_forename] &&= true
+          return nil
+        end
+
+        @errors[:contributor_person_forename] &&= false
+        Bib::FullNameType::Forename.new content: @row["First Name"], language: "en", script: "Latn"
+      end
+
       def affiliation
-        return [] if @row["Organisation"].nil? || @row["Organisation"].empty?
+        if @row["Organisation"].nil? || @row["Organisation"].empty?
+          @errors[:contributor_person_affiliation] &&= true
+          return []
+        end
 
+        @errors[:contributor_person_affiliation] &&= false
         name = Bib::TypedLocalizedString.new(content: @row["Organisation"])
         org = Bib::Organization.new(name: [name])
         [Bib::Affiliation.new(organization: org)]
@@ -252,6 +294,7 @@ module Relaton
       def parse_ext
         Ext.new(
           doctype: parse_doctype,
+          flavor: "3gpp",
           radiotechnology: parse_radiotechnology,
           release: parse_release,
         )
@@ -269,12 +312,14 @@ module Relaton
       # @return [String] radio technology
       #
       def parse_radiotechnology
-        case @row["WPM Code 3G"]
-        when /5G/ then "5G"
-        when /4G/ then "LTE"
-        when /3G/ then "3G"
-        else @row["WPM Code 2G"] && "2G"
-        end
+        result = case @row["WPM Code 3G"]
+                 when /5G/ then "5G"
+                 when /4G/ then "LTE"
+                 when /3G/ then "3G"
+                 else @row["WPM Code 2G"] && "2G"
+                 end
+        @errors[:radiotechnology] &&= result.nil?
+        result
       end
 
       #
@@ -283,23 +328,66 @@ module Relaton
       # @return [Relaton3gpp::Release, nil] release
       #
       def parse_release # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        project_start = Date.parse(@row["Project Start"]) if @row["Project Start"]
-        project_end = Date.parse(@row["Project End"]) if @row["Project End"]
+        unless wmp_code2g || wmp_code3g || stage1_freeze || stage2_freeze ||
+            stage3_freeze || close_meeting || project_start || project_end
+          return
+        end
+
         Release.new(
           # version2g: @rel[:version_2g],
           # version3g: @rel[:version_3g],
           # defunct: @rel[:defunct] == "1",
-          wpm_code_2g: @row["WPM Code 2G"],
-          wpm_code_3g: @row["WPM Code 3G"],
+          wpm_code_2g: wmp_code2g,
+          wpm_code_3g: wmp_code3g,
           # freeze_meeting: @rel[:"freeze meeting"],
-          freeze_stage1_meeting: @row["Stage 1 Freeze"],
-          freeze_stage2_meeting: @row["Stage 2 Freeze"],
-          freeze_stage3_meeting: @row["Stage 3 Freeze"],
-          close_meeting: @row["Close Meeting"],
+          freeze_stage1_meeting: stage1_freeze,
+          freeze_stage2_meeting: stage2_freeze,
+          freeze_stage3_meeting: stage3_freeze,
+          close_meeting: close_meeting,
           project_start: project_start,
           project_end: project_end,
         )
       end
+
+      def wmp_code2g
+        @errors[:wmp_code_2g] &&= @row["WPM Code 2G"].nil? || @row["WPM Code 2G"].empty?
+        @row["WPM Code 2G"]
+      end
+
+      def wmp_code3g
+        @errors[:wmp_code_3g] &&= @row["WPM Code 3G"].nil? || @row["WPM Code 3G"].empty?
+        @row["WPM Code 3G"]
+      end
+
+      def stage1_freeze
+        @errors[:freeze_stage1_meeting] &&= @row["Stage 1 Freeze"].nil? || @row["Stage 1 Freeze"].empty?
+        @row["Stage 1 Freeze"]
+      end
+
+      def stage2_freeze
+        @errors[:freeze_stage2_meeting] &&= @row["Stage 2 Freeze"].nil? || @row["Stage 2 Freeze"].empty?
+        @row["Stage 2 Freeze"]
+      end
+
+      def stage3_freeze
+        @errors[:freeze_stage3_meeting] &&= @row["Stage 3 Freeze"].nil? || @row["Stage 3 Freeze"].empty?
+        @row["Stage 3 Freeze"]
+      end
+
+      def close_meeting
+        @errors[:close_meeting] &&= @row["Close Meeting"].nil? || @row["Close Meeting"].empty?
+        @row["Close Meeting"]
+      end
+
+      def project_start
+        @errors[:project_start] &&= @row["Project Start"].nil? || @row["Project Start"].empty?
+        Date.parse(@row["Project Start"]) if @row["Project Start"]
+      end
+
+      def project_end
+        @errors[:project_end] &&= @row["Project End"].nil? || @row["Project End"].empty?
+        Date.parse(@row["Project End"]) if @row["Project End"]
+      end
     end
   end
 end

data/lib/relaton/3gpp/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module ThreeGpp
-    VERSION = "2.0.0-alpha.3"
+    VERSION = "2.0.0-alpha.4"
   end
 end

data/relaton_3gpp.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
 
   spec.add_dependency "csv"
   spec.add_dependency "net-ftp", "~> 0.1.0"
-  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.4"
-  spec.add_dependency "relaton-core", "~> 0.0.8"
+  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.7"
+  spec.add_dependency "relaton-core", "~> 0.0.12"
   spec.add_dependency "relaton-index", "~> 0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.3
+  version: 2.0.0.pre.alpha.4
 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.8
+        version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement