relaton-iec 2.1.1 → 2.2.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7ec248ce4ccbda30b47e48cc530425476eb5b0b5d3e908614717d2c0f6cbb1b
-  data.tar.gz: 85f6a7b53e79549f1b5e4aba8521db64fd415336a6ef95c344244bdb4b1015af
+  metadata.gz: dcfb7bd2592c2c1245175ddd175426e8f559fe055e6d116bf896009baec5da94
+  data.tar.gz: 0eef5839d2cbb8fcc085048393a9e0900954fd7c7860770c16497829b6740655
 SHA512:
-  metadata.gz: c2453f2e4e3b1f912f738bf2abb32efc34eb261f9c9507215fe47822c6948d5cc3486cc721f9b2fb09164b497c61fd73aefd1344bc2334d08b4ec02efc89252f
-  data.tar.gz: 478e1f5a249c5811957bdd6f5af09cd13f94ba4482e9549ce5a83f0c247d9a9f891a305a845377a3dc6112d3a8e2a1ed5226617c66a45722e73c6c5b29c8e8c9
+  metadata.gz: eed54a4f4c67ddc98eb5d6d9d0548b48ff626e6a9168c639ddbffc9bb80393bbc6f8d3eaa46f9894cff31606f5ea4179a80bc0b77f3a6bccc85b3b9c27f63ae9
+  data.tar.gz: eef855a8bb64881e2e425822584bb84b6511cb48977890cdb6ed396a7692d24318fd7e3a3ad064c43353b7c2b78e71b2771cef6340c05db6c9931050506c87e4

data/CLAUDE.md

@@ -9,5 +9,5 @@
 ## Testing
 
 - **Framework:** RSpec with VCR cassettes and WebMock
-- **Index fixture:** `spec/fixtures/index-v1.zip` is pre-loaded into `Relaton::Index` pool in `before(:suite)` (configured in `spec/support/webmock.rb`). Run `rake spec:update_index` to refresh from relaton-data-iec.
+- **Index fixture:** `spec/fixtures/index-v2.zip` is pre-loaded into `Relaton::Index` pool in `before(:suite)` (configured in `spec/support/webmock.rb`). Run `rake spec:update_index` to refresh from relaton-data-iec. The fixture is the lean pubid-v2 `to_hash` index (`_type`-tagged rows); rows are deserialized via `Pubid::Iec::Identifier.from_hash` and validated by round-trip in relaton-index (no `id_keys` allowlist).
 - **VCR cassettes:** `spec/vcr_cassettes/` — index download requests are ignored by VCR (handled by fixture).

data/Gemfile

@@ -5,6 +5,13 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in relaton_iec.gemspec
 gemspec
 
+# Use local monorepo sibling gems where available.
+Dir["../*/"].each do |dir|
+  name = File.basename(dir)
+  next if name == File.basename(__dir__)
+  next unless File.exist?(File.join(dir, "#{name}.gemspec"))
+  gem name, path: dir
+end
 
 gem "equivalent-xml", "~> 0.6"
 gem "pry-byebug"

data/README.adoc

@@ -286,7 +286,7 @@ Relaton::Iec uses the relaton-logger gem for logging. By default, it logs to STD
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To update the index test fixture (used by tests), run `rake spec:update_index`. This downloads the latest `index-v1.zip` from the https://github.com/relaton/relaton-data-iec[relaton-data-iec] repository.
+To update the index test fixture (used by tests), run `rake spec:update_index`. This downloads the latest `index-v2.zip` from the https://github.com/relaton/relaton-data-iec[relaton-data-iec] repository.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/Rakefile

@@ -11,8 +11,8 @@ namespace :spec do
     require "net/http"
     require "uri"
 
-    url = "https://raw.githubusercontent.com/relaton/relaton-data-iec/v2/index-v1.zip"
-    dest = File.join(__dir__, "spec", "fixtures", "index-v1.zip")
+    url = "https://raw.githubusercontent.com/relaton/relaton-data-iec/v2/index-v2.zip"
+    dest = File.join(__dir__, "spec", "fixtures", "index-v2.zip")
 
     puts "Downloading \#{url} ..."
     uri = URI.parse(url)

data/lib/relaton/iec/bibliography.rb

@@ -35,12 +35,14 @@ module Relaton
           return iev if ref.casecmp("IEV").zero?
 
           pubid = ::Pubid::Iec::Identifier.parse ref.upcase
-          pubid.year = year.to_i if year
+          if year
+            pubid.date = ::Pubid::Components::Date.new(year: year.to_s)
+          end
 
           ret = iecbib_get(pubid, opts)
           return nil if ret.nil?
 
-          ret = ret.to_most_recent_reference unless pubid.year || opts[:keep_year] ||
+          ret = ret.to_most_recent_reference unless pubid.date&.year || opts[:keep_year] ||
             opts[:publication_date_before] || opts[:publication_date_after]
           ret
         end
@@ -90,11 +92,13 @@ module Relaton
         # @return [Relaton::Iec::ItemData, nil]
         def iecbib_get(pubid, opts) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
           Util.info "Fetching from Relaton repository ...", key: pubid.to_s
-          exclude = opts[:all_parts] ? %i[year part] : %i[year]
+          # pubid 2.x splits multi-level numbers ("61326-2-6") into part +
+          # subpart, so all-parts matching must ignore subpart too.
+          exclude = opts[:all_parts] ? %i[year part subpart] : %i[year]
           result = search(pubid, exclude: exclude) || return
 
           if opts[:all_parts]
-            ret = result.to_all_parts(pubid.year&.to_s, opts)
+            ret = result.to_all_parts(pubid.date&.year&.to_s, opts)
             Util.info "Found: `#{ret&.docidentifier&.first&.content}`", key: pubid.to_s if ret
             return ret
           end
@@ -112,19 +116,20 @@ module Relaton
         # @param opts [Hash]
         # @return [Relaton::Iec::ItemData, nil]
         def find_match(result, pubid, opts = {}) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-          if pubid.year
-            hit = result.detect { |h| h.hit[:id].year == pubid.year }
+          pubid_year = pubid.date&.year
+          if pubid_year
+            hit = result.detect { |h| h.hit[:id].date&.year == pubid_year }
             return fetch_and_check_date(hit, pubid, opts) if hit
           elsif opts[:publication_date_before] || opts[:publication_date_after]
-            candidates = result.select { |h| year_in_range?(h.hit[:id].year.to_i, opts) }
-            candidates = candidates.sort_by { |h| -h.hit[:id].year.to_i }
+            candidates = result.select { |h| year_in_range?(h.hit[:id].date&.year.to_i, opts) }
+            candidates = candidates.sort_by { |h| -h.hit[:id].date&.year.to_i }
             candidates.each do |h|
               ret = fetch_and_check_date(h, pubid, opts)
               return ret if ret
             end
             return nil
           else
-            hit = result.max_by { |h| h.hit[:id].year.to_i }
+            hit = result.max_by { |h| h.hit[:id].date&.year.to_i }
             return unless hit
 
             ret = hit.item
@@ -243,9 +248,9 @@ module Relaton
           Util.info "Not found.", key: pubid.to_s
 
           # Year mismatch: hits exist but not for the requested year
-          if pubid.year && result.any?
-            years = result.map { |h| h.hit[:id].year&.to_s }.compact.uniq.sort
-            Util.info "TIP: No match for edition year `#{pubid.year}`, " \
+          if pubid.date&.year && result.any?
+            years = result.map { |h| h.hit[:id].date&.year&.to_s }.compact.uniq.sort
+            Util.info "TIP: No match for edition year `#{pubid.date&.year}`, " \
                       "but matches exist for `#{years.join('`, `')}`.", key: pubid.to_s
             return
           end

data/lib/relaton/iec/data_fetcher.rb

@@ -28,10 +28,6 @@ module Relaton
         index.save
         save_last_change
         report_errors
-      rescue StandardError => e
-        Util.error do
-          "#{e.message}\n#{e.backtrace.join("\n")}"
-        end
       end
 
       private
@@ -198,7 +194,8 @@ module Relaton
           pubid = parse_pubid(did.to_s)
           index.add_or_update pubid, file if pubid
         end
-        @last_change_max = pub["lastChangeTimestamp"] if last_change_max < pub["lastChangeTimestamp"]
+        ts = pub["lastChangeTimestamp"]
+        @last_change_max = ts if ts && last_change_max < ts
         File.write file, serialize(bib), encoding: "UTF-8"
       end
 

data/lib/relaton/iec/hit_collection.rb

@@ -17,16 +17,17 @@ module Relaton
 
       # @return [Relaton::Iec::ItemData, nil]
       def to_all_parts(r_year, opts = {}) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-        parts = @array.select { |h| h.part && (!r_year || h.hit[:id]&.year&.to_s == r_year) }
+        parts = @array.select { |h| h.part && (!r_year || h.hit[:id]&.date&.year&.to_s == r_year) }
         if opts[:publication_date_before] || opts[:publication_date_after]
-          parts = parts.select { |h| Bibliography.send(:year_in_range?, h.hit[:id].year.to_i, opts) }
+          parts = parts.select { |h| Bibliography.send(:year_in_range?, h.hit[:id].date&.year.to_i, opts) }
         end
         hit = parts.min_by { |h| h.part.to_i }
         return @array.first&.item unless hit
 
         bibitem = hit.item
         all_parts_item = bibitem.to_all_parts
-        parts.reject { |h| h.hit[:id] == hit.hit[:id] }.each do |hi|
+        others = parts.reject { |h| h.hit[:id] == hit.hit[:id] }
+        others.sort_by { |h| part_sort_key(h.hit[:id]) }.each do |hi|
           code = hi.hit[:id].to_s
           bib = ItemData.new(
             formattedref: Bib::Formattedref.new(content: code),
@@ -39,16 +40,18 @@ module Relaton
 
       private
 
-      VALID_ID_KEYS = %i[
-        publisher number year type vap amendments corrigendums copublisher part base fragment edition database sheet
-      ]
+      # Ascending sort key for part ordering, e.g. 61326-2-1 < 61326-2-6.
+      # part/subpart are pubid Code components; coerce via to_s, missing → 0.
+      def part_sort_key(pubid)
+        sub = pubid.respond_to?(:subpart) ? pubid.subpart : nil
+        [pubid.part.to_s.to_i, sub.to_s.to_i]
+      end
 
       def index
         @index ||= Relaton::Index.find_or_create(
           :IEC,
           url: "#{Hit::GHURL}#{INDEXFILE}.zip",
           file: "#{INDEXFILE}.yaml",
-          id_keys: VALID_ID_KEYS,
           pubid_class: ::Pubid::Iec::Identifier
         )
       end
@@ -62,21 +65,60 @@ module Relaton
         part.to_s.split("-").map(&:to_i)
       end
 
-      # Compare pubids for matching, excluding specified fields
+      # Keys pubid re-emits at a default value after `from_hash` but omits on a
+      # fresh `parse` (a lutaml render_default asymmetry: a deserialized
+      # attribute loses its using_default flag, so render_default: false no
+      # longer suppresses it). Equality must ignore them so a deserialized index
+      # row compares equal to the freshly-parsed query. Values are the
+      # stringified defaults (see #stringify).
+      LEAKING_DEFAULTS = { "publisher" => "IEC", "all_parts" => "false", "database" => "false" }.freeze
+
+      # Map a flat exclude symbol to the lean to_hash key it removes (at every
+      # nesting level). :type removes the polymorphic `_type` discriminator.
+      EXCLUDE_KEYS = { year: "year", part: "part", subpart: "subpart", type: "_type" }.freeze
+
+      # Compare pubids for matching, excluding specified fields.
       # @param row_pubid [Pubid::Iec::Identifier] pubid from index row
       # @return [Boolean]
       def pubid_matches?(row_pubid, exclude)
         return false unless row_pubid
 
-        if exclude.include?(:type)
-          # Can't use exclude(:type) on pubid (subclass re-adds it),
-          # so compare using to_h(add_type: false) hashes
-          exclude_keys = exclude - [:type]
-          ref_hash = @ref.to_h(add_type: false).reject { |k, _| exclude_keys.include?(k) }
-          row_hash = row_pubid.to_h(add_type: false).reject { |k, _| exclude_keys.include?(k) }
-          ref_hash == row_hash
-        else
-          @ref.exclude(*exclude) == row_pubid.exclude(*exclude)
+        canonical_id(@ref, exclude) == canonical_id(row_pubid, exclude)
+      end
+
+      # Build-path-independent comparison key: the lean `to_hash` with keys and
+      # scalars stringified, leaking defaults dropped, and excluded fields
+      # removed at every nesting level. More robust than comparing attribute
+      # objects, whose derived `type`/`stage` differ between a parsed identifier
+      # (component object) and a deserialized one (nil/symbol) — at the top level
+      # and inside `base_identifier`.
+      def canonical_id(pubid, exclude)
+        drop = exclude.filter_map { |e| EXCLUDE_KEYS[e] }
+        prune(stringify(pubid.to_hash), drop)
+      end
+
+      # Stringify hash keys and scalar values so comparison ignores YAML scalar
+      # typing (1 vs "1") and string/symbol key differences.
+      def stringify(value)
+        case value
+        when Hash  then value.to_h { |k, v| [k.to_s, stringify(v)] }
+        when Array then value.map { |v| stringify(v) }
+        when nil   then nil
+        else value.to_s
+        end
+      end
+
+      # Recursively drop nil values, leaking defaults, and excluded keys.
+      def prune(value, drop)
+        case value
+        when Hash
+          value.each_with_object({}) do |(k, v), h|
+            next if v.nil? || drop.include?(k) || LEAKING_DEFAULTS[k] == v
+
+            h[k] = prune(v, drop)
+          end
+        when Array then value.map { |v| prune(v, drop) }
+        else value
         end
       end
 
@@ -86,7 +128,7 @@ module Relaton
         index.search(@ref) do |row|
           pubid_matches?(row[:id], exclude)
         end.sort_by do |row|
-          [row[:id].year.to_i, *part_sort_key(row[:id].part)]
+          [row[:id].date&.year.to_i, *part_sort_key(row[:id].part)]
         end.map do |row|
           Hit.new(row, self)
         end

data/lib/relaton/iec/model/docidentifier.rb

@@ -20,7 +20,7 @@ module Relaton
 
         parsed =
           case value
-          when ::Pubid::Iec::Base then value
+          when ::Pubid::Iec::Identifier then value
           when String
             begin
               ::Pubid::Iec::Identifier.parse(value)
@@ -69,14 +69,16 @@ module Relaton
       end
 
       def remove_date!
-        remove_attr!(:year)
+        remove_attr!(:date)
       end
 
       private
 
       def render_pubid(pubid)
         case type
-        when "URN" then pubid.urn
+        # pubid owns the legacy positional IEC URN format (and the all-parts
+        # ":::ser" series form); render through it.
+        when "URN" then pubid.to_urn.to_s
         else pubid.to_s
         end
       end
@@ -84,15 +86,43 @@ module Relaton
       def remove_attr!(attr)
         return unless @pubid
 
-        @pubid.send("#{attr}=", nil)
-        base = @pubid.base
-        while base
-          base.send("#{attr}=", nil)
-          base = base.base
+        # For supplements (Amendment/Corrigendum, which carry their own
+        # date/version as an addition to the base), preserve the
+        # supplement's own attrs and only clear the base chain — e.g.
+        # "IEC 60027-1:1992/AMD1:1997" should drop the base year but keep
+        # the amendment year. For wrappers (VapIdentifier, ConsolidatedIdentifier),
+        # clear the outer attr too — they re-state the base year and need it
+        # gone everywhere.
+        unless @pubid.is_a?(::Pubid::Iec::SupplementIdentifier)
+          clear_attr_on(@pubid, attr)
+        end
+
+        node = @pubid.base_identifier
+        while node
+          clear_attr_on(node, attr)
+          # ConsolidatedIdentifier carries a sibling collection of bundled
+          # identifiers; clear the attr on each non-supplement entry too.
+          if node.respond_to?(:identifiers) && node.identifiers
+            node.identifiers.each do |id|
+              next if id.is_a?(::Pubid::Iec::SupplementIdentifier)
+
+              clear_attr_on(id, attr)
+            end
+          end
+          node = node.base_identifier
         end
         refresh_content!
       end
 
+      # Clear one attribute on a single pubid; for :part also clear the
+      # paired :subpart (pubid 2.x splits "16-1-1" into part="1" + subpart="1").
+      def clear_attr_on(pubid, attr)
+        pubid.send("#{attr}=", nil) if pubid.respond_to?("#{attr}=")
+        return unless attr == :part && pubid.respond_to?(:subpart=)
+
+        pubid.subpart = nil
+      end
+
       def refresh_content!
         send(:original_content=, to_s)
       end

data/lib/relaton/iec/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Iec
-    VERSION = "2.1.1".freeze
+    VERSION = "2.2.0.pre.alpha.1".freeze
   end
 end

data/lib/relaton/iec.rb

@@ -1,7 +1,7 @@
 require "digest/md5"
 require "net/http"
 require "nokogiri"
-require "pubid/iec"
+require "pubid"
 require "zip"
 require "relaton/index"
 require "relaton/iso"
@@ -20,7 +20,7 @@ require_relative "iec/model/bibdata"
 
 module Relaton
   module Iec
-    INDEXFILE = "index-v1".freeze
+    INDEXFILE = "index-v2".freeze
 
     class << self
       # Returns hash of XML reammar

data/relaton-iec.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
   spec.add_dependency "addressable"
   spec.add_dependency "base64"
-  spec.add_dependency "pubid-iec", "~> 1.15.11"
-  spec.add_dependency "relaton-core", "~> 0.0.13"
-  spec.add_dependency "relaton-index", "~> 0.2.20"
-  spec.add_dependency "relaton-iso", "~> 2.1.0"
+  spec.add_dependency "pubid", "~> 2.0.0.pre.alpha.3"
+  spec.add_dependency "relaton-core", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-index", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-iso", "~> 2.2.0.pre.alpha.1"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0.pre.alpha.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-06 00:00:00.000000000 Z
+date: 2026-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -39,61 +39,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pubid-iec
+  name: pubid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.11
+        version: 2.0.0.pre.alpha.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.11
+        version: 2.0.0.pre.alpha.3
 - !ruby/object:Gem::Dependency
   name: relaton-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 2.2.0.pre.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 2.2.0.pre.alpha.1
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.20
+        version: 2.2.0.pre.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.20
+        version: 2.2.0.pre.alpha.1
 - !ruby/object:Gem::Dependency
   name: relaton-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0.pre.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0.pre.alpha.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,6 @@ files:
 - ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - CLAUDE.md
 - Gemfile
 - LICENSE.txt
@@ -129,11 +128,6 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
-- grammars/basicdoc.rng
-- grammars/biblio-standoc.rng
-- grammars/biblio.rng
-- grammars/relaton-iec-compile.rng
-- grammars/relaton-iec.rng
 - lib/relaton/iec.rb
 - lib/relaton/iec/bibliography.rb
 - lib/relaton/iec/data_fetcher.rb
@@ -167,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.rubocop.yml

@@ -1,12 +0,0 @@
-# This project follows the Ribose OSS style guide.
-# https://github.com/riboseinc/oss-guides
-# All project-specific additions and overrides should be specified in this file.
-
-require: rubocop-rails
-
-inherit_from:
-  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
-AllCops:
-  TargetRubyVersion: 3.2
-Rails:
-  Enabled: false