relaton-etsi 2.1.3 → 2.2.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa85e08fdfc8bdf38586efe511d5d4b691dbf4658482d94a62e3ce36d1461c99
-  data.tar.gz: 7ceebacb43bd91dd55598aa379bc208063f5da0cf370298e5369a61c72d07711
+  metadata.gz: ff1636c1bb3156d61f72e353407b35129e7c086d89b9395075ece25fdba34b0a
+  data.tar.gz: def81a646a2fdd82b80f817630923beee69ca5abeeee372abea6344056529c02
 SHA512:
-  metadata.gz: fe7a9a7f8f51b03a6e2f9f13482f0f7ac3ea6409623f49e339df55f6605b9870e37d667afc53d1731ba605031a95ef05987f741b36f1d6bef25c2d28ce0d1472
-  data.tar.gz: 9cc85312ff8360ac5c4a5fbf5423ad8f98d6e6a885154deedae875d136c3140b86efa79fa772203fac83b7575f7bfe2e8b07c503cc534deacfbc0add24bed1ff
+  metadata.gz: 3090daadd4f1d5664bf971d08bb9bf4ba22c05f0a70f5e2b4164a531cea6f54c36a2dbe4c93aaed50de43d7f308e5ed2cd689f2aa97251d5fd6c784f961f35d2
+  data.tar.gz: f3d8ca8cbf88bff6d2d2f0048f0669f27df21dee31aed03e023978715641ed28927298c8b2eb9c94b310b0f22516588bfd862fe5dbaf2e868607b9bbac0e90f3

data/CLAUDE.md

@@ -60,7 +60,7 @@ Uses Lutaml for serialization:
 
 ### Data Flow
 
-1. `Bibliography.get(ref)` searches the relaton-data-etsi index. `Bibliography#best_match` keeps the rows that match the whole document number, then picks the highest version, and among equal versions the latest date. The index matches a String query with `include?`, so this filter is what stops `ETSI TS 103 1` from matching `ETSI TS 103 104`.
+1. `Bibliography.get(ref)` searches the relaton-data-etsi index
 2. Fetches YAML from GitHub, converts to `Item` using `from_yaml`
 3. `DataFetcher.fetch` pulls CSV from etsi.org, parses with `DataParser`, saves to output folder
 

data/README.adoc

@@ -37,24 +37,6 @@ item = Relaton::Etsi::Bibliography.get("ETSI GS ZSM 012 V1.1.1")
 ...
 ----
 
-=== Reference matching
-
-A reference matches a whole ETSI document number. Neither `ETSI TS 103 1` nor
-`ETSI TS 103` matches `ETSI TS 103 104`. A reference without a part number
-matches every part of the document. The `ETSI` prefix is optional.
-
-A reference without a version returns the newest edition of the document. A
-reference with a version and a date returns that edition.
-
-[source,ruby]
-----
-Relaton::Etsi::Bibliography.get("ETSI EN 319 401")
-[relaton-etsi] INFO: (ETSI EN 319 401) Found: `ETSI EN 319 401 V3.2.1 (2026-01)`
-
-Relaton::Etsi::Bibliography.get("ETSI EN 319 401 V2.3.1 (2021-05)")
-[relaton-etsi] INFO: (ETSI EN 319 401 V2.3.1 (2021-05)) Found: `ETSI EN 319 401 V2.3.1 (2021-05)`
-----
-
 === XML serialization
 
 [source,ruby]

data/lib/relaton/etsi/bibliography.rb

@@ -6,16 +6,11 @@ module Relaton
     module Bibliography
       SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-etsi/refs/heads/v2/"
 
-      # What follows the document number in an index id: the part numbers, then
-      # the version. A reference matches a whole number only, so a part number
-      # is optional but a group of digits of the number is not.
-      SUFFIX = /\A(?:-\d+)*\s(?:V\d|ed\.\d)/
-
       # @param text [String]
       # @return [Relaton::Etsi::ItemData, nil]
       def search(text) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         index = Relaton::Index.find_or_create :etsi, url: "#{SOURCE}index-v1.zip", file: INDEX_FILE
-        row = best_match(index, text)
+        row = index.search(text).min_by { |r| r[:id] }
         return unless row
 
         url = "#{SOURCE}#{row[:file]}"
@@ -45,64 +40,6 @@ module Relaton
         result
       end
 
-      # Match the reference against the index and return the newest edition.
-      #
-      # An index id renders as `ETSI <type> <number> <V1.2.3|ed.4> (<yyyy-mm>)`.
-      # The index matches a String query with `include?`, so a bare reference
-      # matches every edition of the document, but also longer numbers. The
-      # `matches?` filter drops the longer numbers, then `edition_key` picks the
-      # highest version, and among equal versions the latest date.
-      #
-      # @param index [Relaton::Index::Type]
-      # @param text [String] the reference
-      # @return [Hash, nil] the winning index row (`{ id:, file: }`)
-      def best_match(index, text)
-        ref = normalize(text)
-        index.search(ref)
-          .select { |row| matches? ref, row[:id] }
-          .max_by { |row| edition_key row[:id] }
-      end
-
-      private
-
-      # Every index id has the `ETSI` prefix. A reference can omit it.
-      #
-      # @param text [String] the reference
-      # @return [String]
-      def normalize(text)
-        ref = text.strip.squeeze(" ").sub(/\AETSI\s+/i, "")
-        "ETSI #{ref}"
-      end
-
-      # `ETSI EN 319 142` matches every part of the document. Neither
-      # `ETSI EN 319 14` nor `ETSI EN 319` matches anything: the first stops
-      # inside a group of digits, the second stops before the last group.
-      #
-      # @param ref [String] the normalized reference
-      # @param id [String] the index id
-      # @return [Boolean]
-      def matches?(ref, id)
-        return true if id == ref
-
-        rest = id[ref.length..]
-        !rest.nil? && rest.match?(SUFFIX)
-      end
-
-      # Sort key of one edition. The numbers keep `V19.0.0` above `V9.0.0` and
-      # `ed.11` above `ed.9`, which a comparison of the strings does not. The id
-      # is the last element to make the order of equal editions stable.
-      #
-      # A `V` version and an `ed.` edition give keys of a different length. No
-      # ETSI document has the two forms together, and `matches?` keeps the rows
-      # of one document number only, so the two forms do not meet here.
-      #
-      # @param id [String] the index id
-      # @return [Array]
-      def edition_key(id)
-        version = id[/\sV(\d+(?:\.\d+)*)/, 1] || id[/\sed\.(\d+)/, 1] || ""
-        [version.split(".").map(&:to_i), id[/\((\d{4}-\d{2})\)/, 1].to_s, id]
-      end
-
       extend Bibliography
     end
   end

data/lib/relaton/etsi/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module Etsi
-    VERSION = "2.1.3"
+    VERSION = "2.2.0.pre.alpha.1"
   end
 end

data/relaton-etsi.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
                   "using the BibliographicItem model"
   spec.homepage = "https://github.com/relaton/relaton-etsi"
   spec.license = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 
@@ -35,9 +35,9 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mechanize", "~> 2.8"
-  spec.add_dependency "relaton-bib", "~> 2.1.0"
-  spec.add_dependency "relaton-core", "~> 0.0.13"
-  spec.add_dependency "relaton-index", "~> 0.2.7"
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-etsi
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0.pre.alpha.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-28 00:00:00.000000000 Z
+date: 2026-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -30,42 +30,42 @@ dependencies:
     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.7
+        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.7
+        version: 2.2.0.pre.alpha.1
 description: 'Relaton::Etsi: retrieve ETSI Standards for bibliographic using the BibliographicItem
   model'
 email:
@@ -75,7 +75,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
-- ".rubocop.yml"
 - CLAUDE.md
 - LICENSE.txt
 - README.adoc
@@ -110,7 +109,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