relaton-itu 1.16.2 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443de281f4001442162f16fb86986ab597616e3ae2981a44efe8ae9fccaa0a2b
-  data.tar.gz: 4389f4b0d42563047b6bb7cd927b95872f0ec0a18a5ef377e900df1f2646b473
+  metadata.gz: 3fe7b62f593b31cdf9a2441ecafb931c0e53d3aff3bc0abc089f4b8227dc00bc
+  data.tar.gz: e727a837e88114c9d80d4d606551721f45dcb0de32df74826fd765b2616c3802
 SHA512:
-  metadata.gz: bac3b34ee7dd29bb81d34e684e10310c0d4496745e610fce3bc20668b8ae17ec85171823b9b48d8709137086d7d2171edbf702bc16b7b0956506a95b6273a60a
-  data.tar.gz: 52e8ddec0d293ab9dbe4f0c1ece20562aaf2ea838bca96f3ec423d16117be291251f4cc7b655117fa3edd18e341ecc38559b79e46b8903ac6c1f781c7eefd89b
+  metadata.gz: 5f92d14d1e7b0e019360a1c988abcbaedaf24dc4186e48f6b7308dd605777581ec16c5a5188b0e24ffd1a18f48341b7bfe70440a08b0d01ab0dde245c8a18d32
+  data.tar.gz: 4d075c9d458e88e02741fc017d99e930d516ee5810aa374c08519e2a1964d3c1b20b9156bf11a643318408efe20f080daea7976317467ab809bd2f1de0e58031

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_itu/data_parser_r.rb

@@ -16,7 +16,7 @@ module RelatonItu
         docid: fetch_docid(doc), title: fetch_title(doc),
         abstract: fetch_abstract(doc), date: fetch_date(doc), language: ["en"],
         link: fetch_link(url), script: ["Latn"], docstatus: fetch_status(doc),
-        type: "standard", doctype: type
+        type: "standard", doctype: fetch_doctype(type)
       )
     end
 
@@ -90,5 +90,9 @@ module RelatonItu
 
       RelatonBib::DocumentStatus.new stage: s.text
     end
+
+    def fetch_doctype(type)
+      DocumentType.new(type: type)
+    end
   end
 end

data/lib/relaton_itu/document_type.rb

@@ -0,0 +1,21 @@
+module RelatonItu
+  class DocumentType < RelatonBib::DocumentType
+    TYPES = %w[
+      recommendation recommendation-supplement recommendation-amendment
+      recommendation-corrigendum recommendation-errata recommendation-annex
+      focus-group implementers-guide technical-paper technical-report
+      joint-itu-iso-iec resolution service-publication handbook question
+    ].freeze
+
+    def initialize(type:, abbreviation: nil)
+      check_type type
+      super
+    end
+
+    def check_type(type)
+      unless TYPES.include? type
+        Util.warn "WARNING: Invalid doctype: `#{type}`"
+      end
+    end
+  end
+end

data/lib/relaton_itu/hash_converter.rb

@@ -1,32 +1,37 @@
 module RelatonItu
-  class HashConverter < RelatonBib::HashConverter
-    class << self
-      private
+  module HashConverter
+    include RelatonBib::HashConverter
+    extend self
 
-      #
-      # Ovverides superclass's method
-      #
-      # @param item [Hash]
-      # @retirn [RelatonItu::ItuBibliographicItem]
-      def bib_item(item)
-        ItuBibliographicItem.new(**item)
-      end
+    private
 
-      def editorialgroup_hash_to_bib(ret)
-        eg = ret[:editorialgroup]
-        return unless eg
+    #
+    # Ovverides superclass's method
+    #
+    # @param item [Hash]
+    # @retirn [RelatonItu::ItuBibliographicItem]
+    def bib_item(item)
+      ItuBibliographicItem.new(**item)
+    end
+
+    def editorialgroup_hash_to_bib(ret)
+      eg = ret[:editorialgroup]
+      return unless eg
 
-        ret[:editorialgroup] = EditorialGroup.new **eg
-      end
+      ret[:editorialgroup] = EditorialGroup.new(**eg)
+    end
 
-      # @param ret [Hash]
-      def structuredidentifier_hash_to_bib(ret)
-        return unless ret[:structuredidentifier]
+    # @param ret [Hash]
+    def structuredidentifier_hash_to_bib(ret)
+      return unless ret[:structuredidentifier]
+
+      ret[:structuredidentifier] = StructuredIdentifier.new(
+        **ret[:structuredidentifier]
+      )
+    end
 
-        ret[:structuredidentifier] = StructuredIdentifier.new(
-          **ret[:structuredidentifier]
-        )
-      end
+    def create_doctype(**args)
+      DocumentType.new(**args)
     end
   end
 end

data/lib/relaton_itu/itu_bibliographic_item.rb

@@ -1,19 +1,9 @@
 module RelatonItu
   class ItuBibliographicItem < RelatonBib::BibliographicItem
-    TYPES = %w[
-      recommendation recommendation-supplement recommendation-amendment
-      recommendation-corrigendum recommendation-errata recommendation-annex
-      focus-group implementers-guide technical-paper technical-report
-      joint-itu-iso-iec resolution service-publication handbook question
-    ].freeze
-
     # @params structuredidentifier [RelatonItu::StructuredIdentifier]
-    def initialize(**args)
-      if args[:doctype] && !TYPES.include?(args[:doctype])
-        Util.warn "WARNING: Invalid doctype: `#{args[:doctype]}`"
-      end
-      super
-    end
+    # def initialize(**args)
+    #   super
+    # end
 
     #
     # Fetch flavor schema version

data/lib/relaton_itu/scrapper.rb

@@ -49,7 +49,7 @@ module RelatonItu
           language: ["en"],
           script: ["Latn"],
           title: fetch_titles(doc),
-          doctype: hit.hit[:type],
+          doctype: DocumentType.new(type: hit.hit[:type]),
           docstatus: fetch_status(doc),
           ics: [], # fetch_ics(doc),
           date: fetch_dates(doc),

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "1.16.2".freeze
+  VERSION = "1.17.0".freeze
 end

data/lib/relaton_itu.rb

@@ -6,6 +6,7 @@ require "relaton_bib"
 require "relaton_itu/version"
 require "relaton_itu/config"
 require "relaton_itu/util"
+require "relaton_itu/document_type"
 require "relaton_itu/pubid"
 require "relaton_itu/itu_bibliography"
 require "relaton_itu/data_fetcher"

data/relaton-itu.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 1.16.2
+  version: 1.17.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-15 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -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
@@ -95,6 +95,7 @@ files:
 - lib/relaton_itu/config.rb
 - lib/relaton_itu/data_fetcher.rb
 - lib/relaton_itu/data_parser_r.rb
+- lib/relaton_itu/document_type.rb
 - lib/relaton_itu/editorial_group.rb
 - lib/relaton_itu/hash_converter.rb
 - lib/relaton_itu/hit.rb