relaton-iho 1.16.2 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86d710da9b97b769ffffa9b42765e8b953b42d78f9a1528ae84e0426562812af
-  data.tar.gz: 2776acafcc19b1e959ecc5c5f183ce74b4fa033ae40a40bfbe83379eebcd2a6f
+  metadata.gz: a34fe61f191f15b4f9bd2896026ad6135ca6ae4e9682668ccc44b3015a83e367
+  data.tar.gz: fb58a578ac9a5af772237ee218cfb160e18b932cf88fa79497da1410e30cd220
 SHA512:
-  metadata.gz: fae3afa87bd593e6245bdaedaed955ea3e4e5ae49f898549ce244e9742591aad80bf33a3436f334a9e1aea4d6898456741d5fada7a3d31d927be428311988f10
-  data.tar.gz: d91cd33057f9ad518a029820609396067d7152d3e75c5a81d10326d32e1107052477274f262225c3335b5e9d5cc31bbbc964e412d1ffa156754d8168ad6a82c3
+  metadata.gz: cf24b4b1dfec02601c32c3be5b0130d5a099bf3cd238dc091834d601c0290fecc89a3fc1a6b9e669996cff94ce968a638ce182edf299a0001b9e250c78cd309c
+  data.tar.gz: a927a1545ff80aeda7cf65cdb888b27fda1d2f7d878fefd96cafcfe1085fb2fbf283cae2163dbf722b9cb1e76717eaf7b40d35eed5b5a04d6aa1547776b9e794

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_iho/document_type.rb

@@ -0,0 +1,17 @@
+module RelatonIho
+  class DocumentType < RelatonBib::DocumentType
+    DOCTYPES = %w[policy-and-procedures best-practices supporting-document
+               report legal directives proposal standard].freeze
+
+    def initialize(type:, abbreviation: nil)
+      check_type type
+      super
+    end
+
+    def check_type(type)
+      unless DOCTYPES.include? type
+        Util.warn "WARNING: invalid doctype: `#{type}`"
+      end
+    end
+  end
+end

data/lib/relaton_iho/hash_converter.rb

@@ -1,54 +1,58 @@
 module RelatonIho
-  class HashConverter < RelatonBib::HashConverter
-    class << self
-      # @override RelatonIsoBib::HashConverter.hash_to_bib
-      # @param args [Hash]
-      # @param nested [TrueClass, FalseClass]
-      # @return [Hash]
-      def hash_to_bib(args)
-        ret = super
-        return if ret.nil?
-
-        commentperiod_hash_to_bib ret
-        ret
-      end
+  module HashConverter
+    include RelatonBib::HashConverter
+    extend self
+    # @override RelatonIsoBib::HashConverter.hash_to_bib
+    # @param args [Hash]
+    # @param nested [TrueClass, FalseClass]
+    # @return [Hash]
+    def hash_to_bib(args)
+      ret = super
+      return if ret.nil?
+
+      commentperiod_hash_to_bib ret
+      ret
+    end
 
-      private
+    private
 
-      # @param item_hash [Hash]
-      # @return [RelatonBib::BibliographicItem]
-      def bib_item(**item_hash)
-        IhoBibliographicItem.new(**item_hash)
-      end
+    # @param item_hash [Hash]
+    # @return [RelatonBib::BibliographicItem]
+    def bib_item(**item_hash)
+      IhoBibliographicItem.new(**item_hash)
+    end
 
-      # @param ret [Hash]
-      def commentperiod_hash_to_bib(ret)
-        ret[:commentperiod] &&= CommentPeriond.new(**ret[:commentperiod])
-      end
+    # @param ret [Hash]
+    def commentperiod_hash_to_bib(ret)
+      ret[:commentperiod] &&= CommentPeriond.new(**ret[:commentperiod])
+    end
 
-      # @param ret [Hash]
-      def editorialgroup_hash_to_bib(ret)
-        eg = ret[:editorialgroup]
-        return unless eg.is_a?(Hash) || eg&.any?
+    # @param ret [Hash]
+    def editorialgroup_hash_to_bib(ret)
+      eg = ret[:editorialgroup]
+      return unless eg.is_a?(Hash) || eg&.any?
 
-        collection = RelatonBib.array(eg).map do |g|
-          EditorialGroup.new(RelatonBib.array(g).map { |wg| iho_workgroup wg })
-        end
-        ret[:editorialgroup] = EditorialGroupCollection.new collection
+      collection = RelatonBib.array(eg).map do |g|
+        EditorialGroup.new(RelatonBib.array(g).map { |wg| iho_workgroup wg })
       end
+      ret[:editorialgroup] = EditorialGroupCollection.new collection
+    end
 
-      # @param ihowg [Hash]
-      # @return [RelatonIho::Committee, RelatonIho::Workgroup,
-      #          RelatonIho::Commission]
-      def iho_workgroup(ihowg)
-        key, value = ihowg&.first
-        return unless key && value.is_a?(Hash)
-
-        klass = Object.const_get "RelatonIho::#{key.capitalize}"
-        wgs = %i[committee workgroup commission]
-        subwg = value.select { |k, _| wgs.include? k }
-        klass.new value[:abbreviation], value[:name], iho_workgroup(subwg)
-      end
+    # @param ihowg [Hash]
+    # @return [RelatonIho::Committee, RelatonIho::Workgroup,
+    #          RelatonIho::Commission]
+    def iho_workgroup(ihowg)
+      key, value = ihowg&.first
+      return unless key && value.is_a?(Hash)
+
+      klass = Object.const_get "RelatonIho::#{key.capitalize}"
+      wgs = %i[committee workgroup commission]
+      subwg = value.select { |k, _| wgs.include? k }
+      klass.new value[:abbreviation], value[:name], iho_workgroup(subwg)
+    end
+
+    def create_doctype(**args)
+      DocumentType.new(**args)
     end
   end
 end

data/lib/relaton_iho/iho_bibliographic_item.rb

@@ -1,8 +1,5 @@
 module RelatonIho
   class IhoBibliographicItem < RelatonBib::BibliographicItem
-    TYPES = %w[policy-and-procedures best-practices supporting-document
-               report legal directives proposal standard].freeze
-
     # @return [RelatonIho::CommentPeriod, NilClass]
     attr_reader :commentperiod
 
@@ -39,7 +36,7 @@ module RelatonIho
         if opts[:bibdata] && (doctype || editorialgroup&.presence? ||
                               ics.any? || commentperiod)
           ext = b.ext do
-            b.doctype doctype if doctype
+            doctype&.to_xml b
             editorialgroup&.to_xml b
             ics.each { |i| i.to_xml b }
             commentperiod&.to_xml b

data/lib/relaton_iho/version.rb

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

data/lib/relaton_iho.rb

@@ -5,6 +5,7 @@ require "relaton/index"
 require "relaton_iho/version"
 require "relaton_iho/config"
 require "relaton_iho/util"
+require "relaton_iho/document_type"
 require "relaton_iho/iho_bibliography"
 require "relaton_iho/hash_converter"
 require "relaton_iho/xml_parser"

data/relaton_iho.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  s.add_dependency "relaton-bib", "~> 1.16.0"
+  s.add_dependency "relaton-bib", "~> 1.17.0"
   s.add_dependency "relaton-index", "~> 0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iho
 version: !ruby/object:Gem::Version
-  version: 1.16.2
+  version: 1.17.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-14 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-bib
@@ -16,14 +16,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
@@ -63,6 +63,7 @@ files:
 - lib/relaton_iho.rb
 - lib/relaton_iho/comment_periond.rb
 - lib/relaton_iho/config.rb
+- lib/relaton_iho/document_type.rb
 - lib/relaton_iho/editorial_group.rb
 - lib/relaton_iho/eg.yml
 - lib/relaton_iho/hash_converter.rb