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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 769a8ebd6c928209e699b186ac472824fc0b50f40323eaec113d3e2e06088bc8
-  data.tar.gz: 9ac611550c5bbaea64c31fb153e39fa16a1ef7d376e05a8a70572d129dcd0784
+  metadata.gz: 5c1eea58ab0f0e2daccb544bc1ee8a0a6ba8da806867a3ac1f778b43e766d874
+  data.tar.gz: 2b8fb6271f97269b294d709b81c5d136865708c5fa300587c62b298d1c44c50d
 SHA512:
-  metadata.gz: 404e35f9413afde1f27121c96926ed7e6b9756380acf21a9d7e922bb9e9ed90037bb6c76d2ff9d46a81e97558197cd8080a37818e4b8ac0990d8b2e5fbee9fa7
-  data.tar.gz: 335852adcf7471b126c6c17ef14a8d8a17657d4576d97392e4733c298c81a64656cf535b55790d8067cf82f94b9c140a0eb06d5e0fb0bc99721d276b6defe960
+  metadata.gz: f851acdff7eca4ec36e169a93a1dc410c104e3b249e4c043f7a462b433d1d247f03324d55b400931e9132fbe51e29c847734056b977a64e4395fc6a9fa479812
+  data.tar.gz: 34842d3043bd09c9037cfd189d81250b6055b516775da3a87ebe934991ee81137f1ea3a994029d4a36e7975ed44ad539a3f1880155f65cf9863a8e16025a77b1

data/Gemfile

@@ -5,6 +5,13 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in relaton_iho.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 "byebug"
 gem "equivalent-xml", "~> 0.6"

data/lib/relaton/iho/bibliography.rb

@@ -16,7 +16,12 @@ module Relaton
         def search(text, _year = nil, _opts = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           pubid = text.is_a?(String) ? ::Pubid::Iho::Identifier.parse(text) : text
           Util.info "Fetching from Relaton repository ...", key: pubid.to_s
-          row = index.search { |r| pubid_match?(r[:id], pubid) }.min_by { |r| row_version(r[:id]) }
+          # Pass the pubid so Relaton::Index narrows candidates by number via
+          # binary search before applying the block. Every row's `:id` is a
+          # Pubid::Iho::Identifiers::* (Relaton::Index deserialized it via the
+          # `pubid_class` passed in `#index`), so `pubid_match?` compares pubids.
+          row = index.search(pubid) { |r| pubid_match?(r[:id], pubid) }
+                     .min_by { |r| r[:id].version.to_s }
           unless row
             Util.info "Not found.", key: pubid.to_s
             return
@@ -84,40 +89,24 @@ module Relaton
             :iho,
             url: "#{ENDPOINT}#{INDEXFILE}.zip",
             file: "#{INDEXFILE}.yaml",
-            id_keys: %i[publisher number type version part appendix annex supplement],
-            pubid_class: ::Pubid::Iho::Identifier,
+            pubid_class: ::Pubid::Iho::Identifiers::Base,
           )
         end
 
+        # Both `row_id` and `query` are Pubid::Iho::Identifiers::* instances.
+        # Class identity pins the series (S/P/M/B/C). Subdivision keys
+        # (part/appendix/annex/supplement) use strict equality — a nil query
+        # must match a nil row (the umbrella), not an arbitrary subdivision
+        # under the same (number, version). Only :version stays nil-tolerant: an
+        # unqualified `IHO B-11` query is expected to find the latest edition.
         def pubid_match?(row_id, query)
-          row_attrs = row_attributes(row_id)
-          return false unless row_attrs
-
-          query_attrs = query.to_h
-          # Subdivision keys (part/appendix/annex/supplement) use strict
-          # equality — a nil query must match a nil row (the umbrella),
-          # not an arbitrary subdivision under the same (number, version).
-          # Only :version stays nil-tolerant: an unqualified `IHO B-11`
-          # query is expected to find the latest edition.
-          row_attrs[:publisher] == query_attrs[:publisher] &&
-            row_attrs[:type] == query_attrs[:type] &&
-            row_attrs[:number] == query_attrs[:number] &&
-            (query_attrs[:version].nil? || row_attrs[:version].to_s == query_attrs[:version].to_s) &&
-            row_attrs[:part].to_s == query_attrs[:part].to_s &&
-            row_attrs[:appendix].to_s == query_attrs[:appendix].to_s &&
-            row_attrs[:annex].to_s == query_attrs[:annex].to_s &&
-            row_attrs[:supplement].to_s == query_attrs[:supplement].to_s
-        end
-
-        def row_attributes(row_id)
-          return row_id.to_h if row_id.is_a?(::Pubid::Core::Identifier::Base)
-          return row_id if row_id.is_a?(Hash)
-
-          nil
-        end
-
-        def row_version(row_id)
-          row_attributes(row_id)&.dig(:version).to_s
+          row_id.class == query.class &&
+            row_id.number == query.number &&
+            row_id.part.to_s == query.part.to_s &&
+            row_id.appendix.to_s == query.appendix.to_s &&
+            row_id.annex.to_s == query.annex.to_s &&
+            row_id.supplement.to_s == query.supplement.to_s &&
+            (query.version.nil? || row_id.version.to_s == query.version.to_s)
         end
       end
     end

data/lib/relaton/iho/docidentifier.rb

@@ -15,16 +15,12 @@ module Relaton
         @pubid = ::Pubid::Iho::Identifier.parse(value) if value
       end
 
-      def to_h
-        @pubid&.to_h || super
-      end
-
       def remove_part!
         @pubid&.part = nil
       end
 
       def remove_date!
-        @pubid&.year = nil
+        @pubid&.date = nil
       end
 
       def to_all_parts!

data/lib/relaton/iho/processor.rb

@@ -47,7 +47,7 @@ module Relaton
       #
       def remove_index_file
         require_relative "../iho"
-        Relaton::Index.find_or_create(:iho, url: true, file: "#{INDEXFILE}.yaml}").remove_file
+        Relaton::Index.find_or_create(:iho, url: true, file: "#{INDEXFILE}.yaml").remove_file
       end
     end
   end

data/lib/relaton/iho/version.rb

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

data/lib/relaton/iho.rb

@@ -1,6 +1,6 @@
 require "relaton/bib"
 require "relaton/index"
-require "pubid/iho"
+require "pubid"
 require_relative "iho/version"
 require_relative "iho/util"
 require_relative "iho/docidentifier"
@@ -11,7 +11,7 @@ require_relative "iho/bibliography"
 
 module Relaton
   module Iho
-    INDEXFILE = "index-v2".freeze
+    INDEXFILE = "index-v3".freeze
 
     class Error < StandardError; end
 

data/relaton-iho.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   end
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
+  s.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
   s.add_dependency "base64"
-  s.add_dependency "pubid-iho", "~> 1.15.16"
-  s.add_dependency "relaton-bib", "~> 2.1.0"
-  s.add_dependency "relaton-core", "~> 0.0.13"
-  s.add_dependency "relaton-index", "~> 0.2.0"
+  s.add_dependency "pubid", "~> 2.0.0.pre.alpha.3"
+  s.add_dependency "relaton-bib", "~> 2.2.0.pre.alpha.1"
+  s.add_dependency "relaton-core", "~> 2.2.0.pre.alpha.1"
+  s.add_dependency "relaton-index", "~> 2.2.0.pre.alpha.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iho
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0.pre.alpha.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 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: base64
@@ -25,61 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pubid-iho
+  name: pubid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.16
+        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.16
+        version: 2.0.0.pre.alpha.3
 - !ruby/object:Gem::Dependency
   name: relaton-bib
   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: 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.0
+        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.0
+        version: 2.2.0.pre.alpha.1
 description: 'Relaton::Iho: retrieve IHO Standards for bibliographic using the BibliographicItem
   model'
 email:
@@ -92,17 +92,11 @@ files:
 - ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - CLAUDE.md
 - Gemfile
 - README.adoc
 - Rakefile
 - bin/rspec
-- grammars/basicdoc.rng
-- grammars/biblio-standoc.rng
-- grammars/biblio.rng
-- grammars/relaton-iho-compile.rng
-- grammars/relaton-iho.rng
 - lib/relaton/iho.rb
 - lib/relaton/iho/bibdata.rb
 - lib/relaton/iho/bibitem.rb
@@ -133,7 +127,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