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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8b0045d6e630a2ef1fad333aa3b30c8c449de5a1b93a10c556fec356f790b4e
-  data.tar.gz: cc649f73ecc1d2a528e144a231dbf19fe7d6718fe4370adad47e54f054eac742
+  metadata.gz: f6dadc2f316707adc00f35ba37954880922144fdcfbc95db999598651b19575b
+  data.tar.gz: 3394b66fc3b8d02615f983e61dd63a0c0f5d88f4ef2bfed9ca146fdcd78e14c7
 SHA512:
-  metadata.gz: 42a3288c6cf4097d19a190a8552001754bc8384b026e77b0f3da8c60c7045ef4b8d1227ff9726e34f6b0c03dac2c79fc34cf16ff6368e765992666cb9c50f8f6
-  data.tar.gz: d375f30c7f6116fc74f2db735a87eb3aae27a7ddca1dea24fae4d9e31b35ecf50249ef3d1b76deb39718a6f9963afe31ed7fa467adf8551c0c85a5eb9d44383c
+  metadata.gz: a8e288f96cdff7bf2855ac63de3cb370fc28dee4b8d9cc5bfae4a4e02a7118f083b04e9b12759fc281a216f36611281c0f4db5225b4a6f5ae4bd808b7437b565
+  data.tar.gz: 7e85367d93ed5b61ce96d5ed3adfaa83d6d0d88a8bd22864e49e4bc961d75403d47211b159c884521bdeae41e341fc02ae54bc3523490dba7aa04cca2b79f802

data/Gemfile

@@ -5,6 +5,13 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in relaton-ccsds.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 "rake", "~> 13.0"

data/lib/relaton/ccsds/data/fetcher.rb

@@ -1,7 +1,7 @@
 require "json"
 require "mechanize"
 require "relaton/index"
-require "pubid/ccsds"
+require "pubid"
 require_relative "../../ccsds"
 require_relative "parser"
 
@@ -18,6 +18,11 @@ module Relaton
         @agent
       end
 
+      # Pubid index (index-v2): `:id` is the lean pubid hash. index-v1 (the
+      # pubid-v1 hash index for the released gem line) is rebuilt separately by
+      # the data repo's build_index_v1.rb, in its own process with a pubid-v1
+      # bundle, because pubid v1 and v2 both define Pubid::Ccsds::Identifier and
+      # cannot coexist here.
       def index
         @index ||= Relaton::Index.find_or_create(
           :ccsds, file: "#{INDEXFILE}.yaml", pubid_class: Pubid::Ccsds::Identifier
@@ -113,20 +118,24 @@ module Relaton
       # @return [void]
       #
       def search_relations(bibid, bib)
-        index.search do |row|
+        bibid_pid = ::Pubid::Ccsds::Identifier.parse(bibid)
+        # search(bibid_pid) narrows candidates by number via binary search first.
+        index.search(bibid_pid) do |row|
           id = row[:id].exclude(:language)
           # TODO: smiplify this line?
-          next if id != bibid || row[:id] == bib.docidentifier.first.content
+          next if id != bibid_pid || row[:id] == bib.docidentifier.first.content
 
           create_relations bib, row[:file]
         end
       end
 
       def search_translations(bibid, bib)
+        bibid_pid = ::Pubid::Ccsds::Identifier.parse(bibid)
         # will call create_instance_relation if
         # there are same identifiers in index but with word "Translated"
-        index.search do |row|
-          next unless row[:id].language && row[:id].exclude(:language) == bibid
+        # search(bibid_pid) narrows candidates by number via binary search first.
+        index.search(bibid_pid) do |row|
+          next unless row[:id].language && row[:id].exclude(:language) == bibid_pid
 
           create_instance_relation bib, row[:file]
         end

data/lib/relaton/ccsds/hit_collection.rb

@@ -17,6 +17,8 @@ module Relaton
         raise Relaton::RequestError, e.message
       end
 
+      # Pubid index (index-v2): `:id` deserializes to a Pubid::Ccsds::Identifier
+      # via pubid_class, so search narrows by number with binary search.
       def index
         @index ||= Relaton::Index.find_or_create(
           :ccsds, url: "#{GHURL}#{INDEXFILE}.zip", file: "#{INDEXFILE}.yaml", pubid_class: Pubid::Ccsds::Identifier
@@ -30,9 +32,9 @@ module Relaton
       def rows
         if pubid.edition
           index.search(pubid)
-          # index.search { |r| Pubid::Ccsds::Identifier.create(**r[:id]) == pubid }
         else
-          index.search { |r| r[:id].exclude(:edition) == pubid }
+          # search(pubid) narrows candidates by number via binary search first.
+          index.search(pubid) { |r| r[:id].exclude(:edition) == pubid }
         end
       end
     end

data/lib/relaton/ccsds/version.rb

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

data/lib/relaton/ccsds.rb

@@ -4,7 +4,7 @@
 # require "relaton/core"
 # require "relaton/bib"
 require "relaton/index"
-require "pubid/ccsds"
+require "pubid"
 require_relative "ccsds/version"
 # require_relative "ccsds/processor"
 require_relative "ccsds/util"
@@ -15,7 +15,10 @@ require_relative "ccsds/bibliography"
 
 module Relaton
   module Ccsds
-    INDEXFILE = "index-v1"
+    # The pubid-v2 (lean hash) index this gem produces and consumes. The legacy
+    # index-v1 (pubid-v1 hash, for the released gem line) is rebuilt separately
+    # by the data repo's build_index_v1.rb.
+    INDEXFILE = "index-v2"
 
     class Error < StandardError; end
     # Your code goes here...

data/relaton-ccsds.gemspec

@@ -21,16 +21,15 @@ 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")
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "csv", "~> 3.3"
   spec.add_dependency "mechanize", "~> 2.10"
-  spec.add_dependency "openssl", "~> 3.3.2"
-  spec.add_dependency "pubid-ccsds", "~> 1.15.2"
-  spec.add_dependency "relaton-bib", "~> 2.1.0"
-  spec.add_dependency "relaton-core", "~> 0.0.9"
-  spec.add_dependency "relaton-index", "~> 0.2.16"
+  spec.add_dependency "pubid", "~> 2.0.0.pre.alpha.3"
+  spec.add_dependency "relaton-bib", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-core", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-index", "~> 2.2.0.pre.alpha.1"
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ccsds
 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-12 00:00:00.000000000 Z
+date: 2026-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -39,75 +39,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.10'
 - !ruby/object:Gem::Dependency
-  name: openssl
+  name: pubid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: 2.0.0.pre.alpha.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.2
-- !ruby/object:Gem::Dependency
-  name: pubid-ccsds
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.15.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.15.2
+        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.9
+        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.9
+        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.16
+        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.16
+        version: 2.2.0.pre.alpha.1
 description: 'Relaton::Ccsds: retrive www.ccsds.org Standards'
 email:
 - open.source@ribose.com
@@ -119,7 +105,6 @@ files:
 - ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - CLAUDE.md
 - Gemfile
 - README.adoc
@@ -128,12 +113,6 @@ files:
 - bin/rspec
 - bin/setup
 - ccsdsallpubs.html
-- grammars/basicdoc.rng
-- grammars/biblio-compile.rng
-- grammars/biblio-standoc.rng
-- grammars/biblio.rng
-- grammars/relaton-ccsds-compile.rng
-- grammars/relaton-ccsds.rng
 - lib/relaton/ccsds.rb
 - lib/relaton/ccsds/bibliography.rb
 - lib/relaton/ccsds/data/fetcher.rb
@@ -163,7 +142,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