relaton-3gpp 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3dde90217a532390e200d4fc35039d7bc15b975fe183c2eb830c25025c7fa55
-  data.tar.gz: 2767355041bb1b5d16c85e084f808e64f5ab4a7696ce11d55e7281706d93ed77
+  metadata.gz: eac224a4609354886ca793dd735e6cef536cd98299f5758e39e6346cc062c6eb
+  data.tar.gz: 8e27c8e34ab23b7771a364bff3e42a9407b1372dd8fee36d8e29a5fb0734ecd7
 SHA512:
-  metadata.gz: 0e7a4e7bb55d8b520be6a4bcd796e76283dd07e70b99f1e1f2d6c275d19412d14d936cec0297d92cf5b232c342f36dd4f11247142116e4a95a7842dc429ef75d
-  data.tar.gz: 4d235cffb4d8f772e89f532157e648e1c27e3a4483039f51da88307fb9ec8ad639c4acf7c9facc67acae56712053a8852d04a0d3778f4be659f533a7e71ed4d6
+  metadata.gz: 0ed99e89b880d82467bd2f8d37dec4e2279abf9cb8f6bd5c916f0bf8453042498021090802104043278e7e3266ee5eec4981a9b2dccd00d00d4c80c09710c5da
+  data.tar.gz: f08d3c529632c1c3c9457fec5b2c221aa492223becea38b3e833d4453f0ab4d355f6d12602670892e3d2103ccfcf1d85e37dfa76fc8455e8494ab98bac04e822

data/.gitignore

@@ -11,3 +11,4 @@
 .rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
 Gemfile.lock
 .vscode/
+.rspec_status

data/grammars/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>
@@ -624,6 +626,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -634,6 +639,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -641,7 +649,12 @@
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -822,7 +835,9 @@
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
@@ -835,7 +850,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
@@ -849,7 +866,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">

data/grammars/biblio.rng

@@ -401,9 +401,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>

data/grammars/isodoc.rng

@@ -32,6 +32,56 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="index">
+      <element name="index">
+        <optional>
+          <attribute name="to">
+            <data type="IDREF"/>
+          </attribute>
+        </optional>
+        <element name="primary">
+          <oneOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </oneOrMore>
+        </element>
+        <optional>
+          <element name="secondary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+        <optional>
+          <element name="tertiary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+    </define>
+    <define name="bibitem">
+      <element name="bibitem">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="hidden">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <ref name="BibliographicItem"/>
+      </element>
+    </define>
     <define name="section-title">
       <element name="title">
         <zeroOrMore>
@@ -690,6 +740,7 @@
             <ref name="terms"/>
             <ref name="term-clause"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </oneOrMore>
       </element>
@@ -1013,6 +1064,26 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="sub">
+      <element name="sub">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sup">
+      <element name="sup">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="pagebreak">
       <element name="pagebreak">
         <optional>
@@ -1680,6 +1751,7 @@
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
+          <ref name="floating-title"/>
         </choice>
       </oneOrMore>
     </choice>
@@ -1722,6 +1794,7 @@
           <ref name="terms"/>
           <ref name="definitions"/>
           <ref name="references"/>
+          <ref name="floating-title"/>
         </choice>
       </zeroOrMore>
     </group>
@@ -1796,6 +1869,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1959,7 +2046,11 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
@@ -1973,7 +2064,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammar-info">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -2182,7 +2273,18 @@
           <ref name="MultilingualRenderingType"/>
         </attribute>
       </optional>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="formula"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="quote"/>
+          <ref name="sourcecode"/>
+          <ref name="paragraph"/>
+          <ref name="figure"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termsource">
@@ -2516,4 +2618,17 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="floating-title">
+    <element name="floating-title">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="depth">
+        <data type="int"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
 </grammar>

data/grammars/reqt.rng

@@ -58,6 +58,14 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -101,7 +109,9 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
@@ -175,6 +185,14 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_3gpp/data_fetcher.rb

@@ -52,8 +52,9 @@ module Relaton3gpp
       specs = dbs["Specs_GSM+3G"]
       specrels = dbs["Specs_GSM+3G_release-info"]
       releases = dbs["Releases"]
+      tstatus = dbs["temp-status"]
       dbs["2001-04-25_schedule"].each do |row|
-        fetch_doc row, specs, specrels, releases
+        fetch_doc row, specs, specrels, releases, tstatus
       end
       File.write CURRENT, @current.to_yaml, encoding: "UTF-8"
     end
@@ -91,12 +92,15 @@ module Relaton3gpp
     # Fetch document
     #
     # @param [Hash] row row from mdb
-    # @param [Mdb] dbs mdb
+    # @param [Array<Hash>] specs specs
+    # @param [Array<Hash>] specrels specrels
+    # @param [Array<Hash>] releases releases
+    # @param [Array<Hash>] tstatus tstatus
     #
     # @return [Relaton3gpp::BibliographicItem, nil] bibliographic item
     #
-    def fetch_doc(row, specs, specrels, releases)
-      doc = Parser.parse row, specs, specrels, releases
+    def fetch_doc(row, specs, specrels, releases, tstatus)
+      doc = Parser.parse row, specs, specrels, releases, tstatus
       save_doc doc
     rescue StandardError => e
       warn "Error: #{e.message}"

data/lib/relaton_3gpp/parser.rb

@@ -7,8 +7,9 @@ module Relaton3gpp
     # @param [Array<Hash>] specrels Spec + Release table
     # @param [Array<Hash>] relaeases Releases table
     # @param [Array<Hash>] specs Specs table
+    # @param [Array<Hash>] tstatus temp status-table
     #
-    def initialize(row, specs, specrels, releases) # rubocop:disable Metrics/AbcSize
+    def initialize(row, specs, specrels, releases, tstatus) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
       @row = row
       @spec = specs.detect { |s| s[:Number] == row[:spec] }
       if @spec
@@ -17,6 +18,7 @@ module Relaton3gpp
         end
         @rel = releases.detect { |r| r[:Release_code] == row[:release] }
       end
+      @tstatus = tstatus.detect { |t| t[:Number] == row[:spec] }
     end
 
     #
@@ -26,11 +28,12 @@ module Relaton3gpp
     # @param [Array<Hash>] specrels Spec + Release table
     # @param [Array<Hash>] relaeases Releases table
     # @param [Array<Hash>] specs Specs table
+    # @param [Array<Hash>] tstatus temp status-table
     #
     # @return [RelatonBib:BibliographicItem, nil] bibliographic item
     #
-    def self.parse(row, specs, specrels, relaeases)
-      new(row, specs, specrels, relaeases).parse
+    def self.parse(row, specs, specrels, relaeases, tstatus)
+      new(row, specs, specrels, relaeases, tstatus).parse
     end
 
     #
@@ -60,7 +63,7 @@ module Relaton3gpp
         common_ims_spec: @spec[:ComIMS] == "1",
         # internal: @spec[:"For publication"] == "0",
         release: parse_release,
-        # contributor: contributor,
+        contributor: parse_contributor,
       )
     end
 
@@ -103,11 +106,7 @@ module Relaton3gpp
     # @return [Arra<RelatonBib::DocumentIdentifier>] docidentifier
     #
     def parse_docid
-      [
-        RelatonBib::DocumentIdentifier.new(type: "3GPP", id: "3GPP #{number}"),
-        RelatonBib::DocumentIdentifier.new(type: "rapporteurId",
-                                           id: @spec[:"rapporteur id"]),
-      ]
+      [RelatonBib::DocumentIdentifier.new(type: "3GPP", id: "3GPP #{number}")]
     end
 
     #
@@ -151,20 +150,22 @@ module Relaton3gpp
     #
     # @return [RelatonBib::EditorialGroup] editorialgroups
     #
-    def parse_editorialgroup # rubocop:disable Metrics/MethodLength
-      wgp = RelatonBib::WorkGroup.new(name: @spec[:"WG prime"], type: "prime")
-      eg = [RelatonBib::TechnicalCommittee.new(wgp)]
-      if @spec[:"WG other"]
-        wgo = RelatonBib::WorkGroup.new(name: @spec[:"WG other"], type: "other")
-        eg << RelatonBib::TechnicalCommittee.new(wgo)
+    def parse_editorialgroup # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      eg = [create_workgroup(@spec[:"WG prime"], "prime")]
+      if @spec[:"WG other"] && @spec[:"WG other"] != "-"
+        eg << create_workgroup(@spec[:"WG other"], "other")
       end
       if @spec[:"former WG"]
-        wgf = RelatonBib::WorkGroup.new(name: @spec[:"former WG"], type: "former")
-        eg << RelatonBib::TechnicalCommittee.new(wgf)
+        eg << create_workgroup(@spec[:"former WG"], "former")
       end
       RelatonBib::EditorialGroup.new eg
     end
 
+    def create_workgroup(name, type)
+      wgf = RelatonBib::WorkGroup.new(name: name, type: type)
+      RelatonBib::TechnicalCommittee.new(wgf)
+    end
+
     #
     # Parse note
     #
@@ -172,10 +173,10 @@ module Relaton3gpp
     #
     def parse_note
       n = []
-      if @specrel && @specrel[:remarks]
+      if @specrel && @specrel[:remarks] && @specrel[:remarks] != "."
         n << RelatonBib::BiblioNote.new(type: "remark", content: @specrel[:remarks])
       end
-      if @row[:comment]
+      if @row[:comment] && @row[:comment] != "."
         n << RelatonBib::BiblioNote.new(type: "comment", content: @row[:comment])
       end
       RelatonBib::BiblioNoteCollection.new n
@@ -207,38 +208,54 @@ module Relaton3gpp
       end
     end
 
+    #
+    # Parse release
+    #
+    # @return [Relaton3gpp::Release, nil] release
+    #
     def parse_release # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       if @rel
         project_start = Date.parse(@rel[:"rel-proj-start"]).to_s if @rel[:"rel-proj-start"]
         project_end = Date.parse(@rel[:"rel-proj-end"]).to_s if @rel[:"rel-proj-end"]
+        Release.new(
+          version2g: @rel[:version_2g],
+          version3g: @rel[:version_3g],
+          defunct: @rel[:defunct] == "1",
+          wpm_code_2g: @rel[:wpm_code_2g],
+          wpm_code_3g: @rel[:wpm_code_3g],
+          freeze_meeting: @rel[:"freeze meeting"],
+          freeze_stage1_meeting: @rel[:Stage1_freeze],
+          freeze_stage2_meeting: @rel[:Stage2_freeze],
+          freeze_stage3_meeting: @rel[:Stage3_freeze],
+          close_meeting: @rel[:Closed],
+          project_start: project_start,
+          project_end: project_end,
+        )
       end
-      Release.new(
-        version2g: @rel[:version_2g],
-        version3g: @rel[:version_3g],
-        defunct: @rel[:defunct] == "1",
-        wpm_code_2g: @rel[:wpm_code_2g],
-        wpm_code_3g: @rel[:wpm_code_3g],
-        freeze_meeting: @rel[:"freeze meeting"],
-        freeze_stage1_meeting: @rel[:Stage1_freeze],
-        freeze_stage2_meeting: @rel[:Stage2_freeze],
-        freeze_stage3_meeting: @rel[:Stage3_freeze],
-        close_meeting: @rel[:Closed],
-        project_start: project_start,
-        project_end: project_end,
-      )
     end
 
     #
-    # Create contributor
+    # Create contributors
     #
-    # @return [Array<RelatonBib::Contribution>] contributor
+    # @return [Array<RelatonBib::ContributionInfo>] contributor
     #
-    # def contributor
-    #   org = RelatonBib::Organization.new(
-    #     name: "Internet Assigned Numbers Authority", abbreviation: "IANA",
-    #   )
-    #   role = { type: "publisher" }
-    #   [RelatonBib::ContributionInfo.new(entity: org, role: [role])]
-    # end
+    def parse_contributor # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      org = RelatonBib::Organization.new(
+        name: "3rd Generation Partnership Project", abbreviation: "3GPP",
+      )
+      contribs = [RelatonBib::ContributionInfo.new(entity: org, role: [type: "author"])]
+      return contribs unless @tstatus && @tstatus[:rapporteur]
+
+      aff = []
+      if @tstatus[:"rapp org"]
+        org = RelatonBib::Organization.new(name: @tstatus[:"rapp org"])
+        cn = RelatonBib::LocalizedString.new @tstatus[:rapporteur], "en", "Latn"
+        name = RelatonBib::FullName.new(completename: cn)
+        aff << RelatonBib::Affiliation.new(organization: org)
+      end
+      person = RelatonBib::Person.new(name: name, affiliation: aff)
+      role = { type: "author" }
+      contribs << RelatonBib::ContributionInfo.new(entity: person, role: [role])
+    end
   end
 end

data/lib/relaton_3gpp/release.rb

@@ -39,7 +39,7 @@ module Relaton3gpp
       builder.release do
         builder.version2G @version2g if @version2g
         builder.version3G @version3g if @version3g
-        builder.defunct @defunct if @defunct
+        builder.defunct @defunct unless @defunct.nil?
         builder.send "wpm-code-2G", @wpm_code_2g if @wpm_code_2g
         builder.send "wpm-code-3G", @wpm_code_3g if @wpm_code_3g
         builder.send "freeze-meeting", @freeze_meeting if @freeze_meeting

data/lib/relaton_3gpp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Relaton3gpp
-  VERSION = "1.9.1"
+  VERSION = "1.10.0"
 end

data/relaton_3gpp.gemspec

@@ -45,6 +45,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock", "~> 3.14.0"
 
   spec.add_dependency "mdb", "~> 0.5.0"
-  spec.add_dependency "relaton-bib", "~> 1.9.0"
+  spec.add_dependency "relaton-bib", "~> 1.10.0"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement