relaton-iec 1.16.3 → 1.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f56f331501e59dbf8da01e6444c93abf2bb7df8ec1dc2ed7ce12d2db4499ffbe
-  data.tar.gz: 6a2f4faf1ebddfa0c6909816eb6f4876fc57c2fdefec52e2a1fb9250706eebbd
+  metadata.gz: 101c12e86e42473965841a2ba577d7ef661ad41cd3466ab5f3b4488675a8446a
+  data.tar.gz: be02f4aeeda35aab505380d35352b0f906b53efa680fbbf139364fcd90a8952b
 SHA512:
-  metadata.gz: ada90e3aabddb40bc0e780d4959b7182f13b560741cf8058a000c1e372813d0023366f5835217a54afd4ef8149bf913e12c3084f2818031ca6eaa8fdf096f457
-  data.tar.gz: e1386d61a2525dee63591cb02abbcc728ad28d9d4f87758ec2f39aba6aedf37be1f05ecd9ab09af2c487481ca8025ae2d4d8b37a027bccad82a44f8017317435
+  metadata.gz: 2cd438a1c74b7b79f7a2ac3a909543a15cecc20c96c36fe2a83223088cafee149e5e33c32bcabfa7fac8adc893bed21ac7cb2e561373b8c15d7c39f50979b303
+  data.tar.gz: 8e579abea1e3e46268999b9d68658761778ce10caee7f6a571d7286a0f86507e1649025ef4fd152a96c11075fd2b99cbc88e4e87df942447ae8c9d2cc26a8857

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_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.16.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.16.3
+  version: 1.16.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-01 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable