relaton-3gpp 1.16.3 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6d8e339275bc2ae0a757ca58f3b1688d1bfd5ca4ba212b8e47729b9fb5f242f
-  data.tar.gz: f11db07abc50daf052dea9b5683f91cca577ee7fc8b841730511dd1613349498
+  metadata.gz: 4993aeee4498d1ebe35e27a116de70929533ee80ac2a9afeb783f9ed34cac737
+  data.tar.gz: cedbd3baeacbc31ca6546cb0effe01fe82bfd9e640f3904d184746169c76819e
 SHA512:
-  metadata.gz: e3b3a94825681714236b9b2a85103b4842f69605d1633c714f7ed115e31bec90c8f66fa1885a5a084c87a1a9784d7056a29ad2d114c6480fe1f14fdc85dcc6f2
-  data.tar.gz: 390a50834d6cd96d21f87b83245eefe224539ee76070380e1127535c2bb0a2c2abdfd2803fa12bcc62118e340ca55a04d96599fe19eb09f973bd53a245e433ff
+  metadata.gz: 68c6dc3d074bcc95b2e24d96179b23c3ade20d0a48f3af32bd3d7df4acc641d2aeb332b8057ff92249330ffd9f0cec72fd3ce1f270cb9f605407876e07e8b8c0
+  data.tar.gz: 13ca9ac5f8abd4e4bc5b2e10cb147eefd061a2be7de4a9c17bd56eda7c5a53df6783d1942b778cd6a5e760dc476c78f5743884f8aad7a73d2642812bc862e8cb

data/grammars/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/grammars/biblio.rng

@@ -942,6 +942,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/relaton_3gpp/bibliographic_item.rb

@@ -1,6 +1,5 @@
 module Relaton3gpp
   class BibliographicItem < RelatonBib::BibliographicItem
-    DOCTYPES = %w[TR TS].freeze
     DOCSUBTYPES = %w[spec release].freeze
     RADIOTECHNOLOGIES = %w[2G 3G LTE 5G].freeze
 
@@ -12,6 +11,7 @@ module Relaton3gpp
     # @param [Relaton3gpp::Release] release
     #
     def initialize(**args) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      Util.warn "WARNING: Doctype is missing" if args[:type].nil?
       @radiotechnology = args.delete(:radiotechnology)
       if @radiotechnology && !RADIOTECHNOLOGIES.include?(@radiotechnology)
         Util.warn "WARNING: Unknown radiotechnology type: `#{@radiotechnology}`"
@@ -19,11 +19,6 @@ module Relaton3gpp
       end
       @common_ims_spec = args.delete(:common_ims_spec)
       @release = args.delete(:release)
-      if args[:doctype].nil? then Util.warn "WARNING: Doctype is missing"
-      elsif !DOCTYPES.include?(args[:doctype])
-        Util.warn "WARNING: Unknown doctype: `#{args[:doctype]}`"
-        Util.warn "WARNING: Possible doctypes: `#{DOCTYPES.join '`, `'}`"
-      end
       if args[:docsubtype] && !DOCSUBTYPES.include?(args[:docsubtype])
         Util.warn "WARNING: Unknown docsubtype: `#{args[:docsubtype]}`"
         Util.warn "WARNING: Possible docsubtypes: `#{DOCSUBTYPES.join '`, `'}`"
@@ -62,7 +57,7 @@ module Relaton3gpp
         if block_given? then yield b
         elsif opts[:bibdata] && has_ext_attrs?
           ext = b.ext do
-            b.doctype doctype if doctype
+            doctype&.to_xml b
             b.subdoctype subdoctype if subdoctype
             editorialgroup&.to_xml b
             ics.each { |i| i.to_xml b }

data/lib/relaton_3gpp/document_type.rb

@@ -0,0 +1,18 @@
+module Relaton3gpp
+  class DocumentType < RelatonBib::DocumentType
+    DOCTYPES = %w[TS TR].freeze
+
+    def initialize(type:, abbreviation: nil)
+      check type
+      super
+    end
+
+    # @param type [String]
+    def check(type)
+      unless DOCTYPES.include? type
+        Util.warn "WARNING: Unknown doctype: `#{type}`"
+        Util.warn "WARNING: Possible doctypes: `#{DOCTYPES.join '`, `'}`"
+      end
+    end
+  end
+end

data/lib/relaton_3gpp/hash_converter.rb

@@ -1,21 +1,26 @@
 module Relaton3gpp
-  class HashConverter < RelatonBib::HashConverter
-    class << self
-      def hash_to_bib(args)
-        hash = super
-        release_hash_to_bib(hash)
-        hash
-      end
+  module HashConverter
+    include RelatonBib::HashConverter
+    extend self
 
-      def release_hash_to_bib(hash)
-        hash[:release] &&= Release.new(**hash[:release])
-      end
+    def hash_to_bib(args)
+      hash = super
+      release_hash_to_bib(hash)
+      hash
+    end
+
+    def release_hash_to_bib(hash)
+      hash[:release] &&= Release.new(**hash[:release])
+    end
+
+    # @param item_hash [Hash]
+    # @return [Relaton3gpp::BibliographicItem]
+    def bib_item(item_hash)
+      BibliographicItem.new(**item_hash)
+    end
 
-      # @param item_hash [Hash]
-      # @return [Relaton3gpp::BibliographicItem]
-      def bib_item(item_hash)
-        BibliographicItem.new(**item_hash)
-      end
+    def create_doctype(**type)
+      DocumentType.new(**type)
     end
   end
 end

data/lib/relaton_3gpp/parser.rb

@@ -54,7 +54,7 @@ module Relaton3gpp
         docid: parse_docid,
         docnumber: number,
         date: parse_date,
-        doctype: @spec[:Type],
+        doctype: DocumentType.new(type: @spec[:Type]),
         editorialgroup: parse_editorialgroup,
         biblionote: parse_note,
         docstatus: parse_status,
@@ -92,7 +92,7 @@ module Relaton3gpp
     #
     # Parse abstract
     #
-    # @return [Array<RelatonBib::FormattedString>] 
+    # @return [Array<RelatonBib::FormattedString>]
     #
     def parse_abstract
       return [] unless @spec[:description]

data/lib/relaton_3gpp/version.rb

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

data/lib/relaton_3gpp.rb

@@ -6,6 +6,7 @@ require "relaton_bib"
 require_relative "relaton_3gpp/version"
 require_relative "relaton_3gpp/config"
 require_relative "relaton_3gpp/util"
+require_relative "relaton_3gpp/document_type"
 require_relative "relaton_3gpp/release"
 require_relative "relaton_3gpp/bibliographic_item"
 require_relative "relaton_3gpp/hash_converter"

data/relaton_3gpp.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mdb", "~> 0.5.0"
   spec.add_dependency "net-ftp", "~> 0.1.0"
-  spec.add_dependency "relaton-bib", "~> 1.16.0"
+  spec.add_dependency "relaton-bib", "~> 1.17.0"
   spec.add_dependency "relaton-index", "~> 0.2.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.16.3
+  version: 1.17.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-07 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mdb
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,7 @@ files:
 - lib/relaton_3gpp/bibliography.rb
 - lib/relaton_3gpp/config.rb
 - lib/relaton_3gpp/data_fetcher.rb
+- lib/relaton_3gpp/document_type.rb
 - lib/relaton_3gpp/hash_converter.rb
 - lib/relaton_3gpp/parser.rb
 - lib/relaton_3gpp/processor.rb