relaton-iec 1.16.3 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f56f331501e59dbf8da01e6444c93abf2bb7df8ec1dc2ed7ce12d2db4499ffbe
-  data.tar.gz: 6a2f4faf1ebddfa0c6909816eb6f4876fc57c2fdefec52e2a1fb9250706eebbd
+  metadata.gz: 2781711712e741e20c857da5cbd0c7f7f62eaf85fc671c016899beeb0e817af8
+  data.tar.gz: 13e84464bcaa91c46b9ce1565dc2b2a4ce061f525cb5daaa39fcbe9fa4b32fe0
 SHA512:
-  metadata.gz: ada90e3aabddb40bc0e780d4959b7182f13b560741cf8058a000c1e372813d0023366f5835217a54afd4ef8149bf913e12c3084f2818031ca6eaa8fdf096f457
-  data.tar.gz: e1386d61a2525dee63591cb02abbcc728ad28d9d4f87758ec2f39aba6aedf37be1f05ecd9ab09af2c487481ca8025ae2d4d8b37a027bccad82a44f8017317435
+  metadata.gz: 7bd673ddef434b3b2e5eadff79a8412cc9134ccae892c13a318777cff1658d07172bedf6c1c5644b88c89808a2de40a0b025b98777d2d517bf82ca13113e2e26
+  data.tar.gz: d26ed19cacb261f11de2863d244db709fe0e118251535460fdfeb8a1bfbeeb3e9ac97686f5664db45b79d1440e7292be0b8bb94512b684ea666149e63f31b391

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_iec/data_parser.rb

@@ -15,6 +15,14 @@ module RelatonIec
       "CISPR" => ["International special committee on radio interference", "www.iec.ch"],
     }.freeze
 
+    DOCTYPES = {
+      "IS" => "international-standard",
+      "TR" => "technical-report",
+      "TS" => "technical-specification",
+      "PAS" => "publicly-available-specification",
+      "SRD" => "system-reference-deliverable",
+    }
+
     #
     # Initialize new instance.
     #
@@ -233,14 +241,8 @@ module RelatonIec
     # @return [String] document type
     #
     def doctype
-      case @pub["stdType"]
-      when "IS" then "international-standard"
-      when "TR" then "technical-report"
-      when "TS" then "technical-specification"
-      when "PAS" then "publicly-available-specification"
-      when "SRD" then "system-reference-deliverable"
-      else @pub["stdType"].downcase
-      end
+      type = DOCTYPES[@pub["stdType"]] || @pub["stdType"].downcase
+      DocumentType.new type: type
     end
 
     #

data/lib/relaton_iec/document_type.rb

@@ -0,0 +1,20 @@
+module RelatonIec
+  class DocumentType < RelatonBib::DocumentType
+    DOCTYPES = %w[
+      international-standard technical-specification technical-report
+      publicly-available-specification international-workshop-agreement
+      guide industry-technical-agreement system-reference-deliverable
+    ].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_iec/hash_converter.rb

@@ -1,14 +1,15 @@
 module RelatonIec
-  class HashConverter < RelatonIsoBib::HashConverter
-    class << self
-      #
-      # Ovverides superclass's method
-      #
-      # @param item [Hash]
-      # @retirn [RelatonIec::IecBibliographicItem]
-      def bib_item(item)
-        IecBibliographicItem.new(**item)
-      end
+  module HashConverter
+    include RelatonIsoBib::HashConverter
+    extend self
+
+    #
+    # Ovverides superclass's method
+    #
+    # @param item [Hash]
+    # @retirn [RelatonIec::IecBibliographicItem]
+    def bib_item(item)
+      IecBibliographicItem.new(**item)
     end
   end
 end

data/lib/relaton_iec/hit_collection.rb

@@ -6,7 +6,7 @@ require "addressable/uri"
 module RelatonIec
   # Page of hit collection.
   class HitCollection < RelatonBib::HitCollection
-    def_delegators :@array, :detect, :map
+    def_delegators :@array, :detect, :map, :last, :[], :max_by
 
     INDEX_FILE = "index1.yaml"
 

data/lib/relaton_iec/iec_bibliographic_item.rb

@@ -1,11 +1,5 @@
 module RelatonIec
   class IecBibliographicItem < RelatonIsoBib::IsoBibliographicItem
-    DOCTYPES = %w[
-      international-standard technical-specification technical-report
-      publicly-available-specification international-workshop-agreement
-      guide industry-technical-agreement system-reference-deliverable
-    ].freeze
-
     SUBDOCTYPES = %w[specification method-of-test vocabulary code-of-practice].freeze
 
     FUNCTION = %w[emc safety enviroment quality-assurance].freeze
@@ -38,9 +32,9 @@ module RelatonIec
         Util.warn "Allowed function values are: `#{FUNCTION.join('`, `')}`"
       end
       if args[:updates_document_type] &&
-          !DOCTYPES.include?(args[:updates_document_type])
+          !DocumentType::DOCTYPES.include?(args[:updates_document_type])
         Util.warn "WARNING: Invalid updates_document_type: `#{args[:updates_document_type]}`"
-        Util.warn "Allowed updates_document_type values are: `#{DOCTYPES.join('`, `')}`"
+        Util.warn "Allowed updates_document_type values are: `#{DocumentType::DOCTYPES.join('`, `')}`"
       end
       @function = args.delete :function
       @updates_document_type = args.delete :updates_document_type
@@ -77,7 +71,7 @@ module RelatonIec
       super(**opts) do |b|
         if opts[:bibdata]
           ext = b.ext do
-            b.doctype doctype if doctype
+            doctype&.to_xml b
             b.horizontal horizontal unless horizontal.nil?
             b.function function if function
             editorialgroup&.to_xml b

data/lib/relaton_iec/iec_bibliography.rb

@@ -177,12 +177,12 @@ module RelatonIec
       # has a title (amendments do not).
       # If no match, returns any years which caused mismatch, for error reporting
       def results_filter(result, ref, year, opts)
-        r_code, r_year, r_amd = code_year ref
+        r_code, r_year, r_amd, r_consv = code_year ref
         r_year ||= year
         if opts[:all_parts]
           ret = result.to_all_parts(r_year)
         else
-          ret, missed_parts = match_result(result, r_code, r_year, r_amd)
+          ret, missed_parts = match_result(result, r_code, r_year, r_amd, r_consv)
         end
         { ret: ret, years: missed_years(result, r_year), missed_parts: missed_parts }
       end
@@ -198,23 +198,27 @@ module RelatonIec
       # @param [String] code code of the document
       # @param [String] year year of the document
       # @param [String] amd amendment of the document
+      # @param [String] consv consolidated version of the document
       #
       # @return [Array<RelatonIec::IecBibliographicItem, Array, nil>] result, missed parts
       #
-      def match_result(result, code, year, amd) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
+      def match_result(result, code, year, amd, consv) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
         missed_parts = false
-        ret = result.detect do |h|
-          h_codes, h_years, h_amds = codes_years h.hit[:code]
+        res = result.select do |h|
+          h_codes, h_years, h_amds, h_consv = codes_years h.hit[:code]
           match_code = h_codes.include? code
           match_year = h_years.include?(year)
           missed_parts ||= !match_code
-          match_code && (!year || match_year) && match_amd(amd, h_amds)
-        end&.fetch
+          match_code && (!year || match_year) && match_amd(amd, h_amds) && h_consv.first == consv
+        end
+        hit = year ? res.first : res.max_by { |h| code_year(h.hit[:code])[1].to_i }
+        ret = hit&.fetch
         [ret, missed_parts]
       end
 
       def match_amd(amd, h_amds)
-        (!amd && h_amds.empty?) || h_amds.include?(amd)
+        # (!amd && h_amds.empty?) || h_amds.include?(amd)
+        h_amds.first == amd
       end
 
       # @param ref [String]
@@ -225,8 +229,9 @@ module RelatonIec
           ^(?<code>\S+\s[^:/]+)
           (?::(?<year>\d{4}))?
           (?:/(?<amd>\w+)(?::\d{4})?)?
+          (?:\+(?<consv>\w+)(?::\d{4})?)?
         }x =~ ref
-        [code, year, amd&.upcase]
+        [code, year, amd&.upcase, consv&.upcase]
       end
 
       # @param ref [String]

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.16.3".freeze
+  VERSION = "1.17.0".freeze
 end

data/lib/relaton_iec.rb

@@ -9,6 +9,7 @@ require "relaton_iec/hit"
 require "relaton_iec/version"
 require "relaton_iec/config"
 require "relaton_iec/util"
+require "relaton_iec/document_type"
 require "relaton_iec/iec_bibliography"
 require "relaton_iec/iec_bibliographic_item"
 require "relaton_iec/xml_parser"

data/relaton_iec.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "addressable"
   spec.add_dependency "relaton-index", "~> 0.2.0"
-  spec.add_dependency "relaton-iso-bib", "~> 1.16.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.17.0"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 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-11-01 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -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: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +112,7 @@ files:
 - lib/relaton_iec/config.rb
 - lib/relaton_iec/data_fetcher.rb
 - lib/relaton_iec/data_parser.rb
+- lib/relaton_iec/document_type.rb
 - lib/relaton_iec/hash_converter.rb
 - lib/relaton_iec/hit.rb
 - lib/relaton_iec/hit_collection.rb