relaton 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 451c0d9a82ae4722a2840928ff36a7c9f352dcfd5a2a3c6356eb0629d18141dd
-  data.tar.gz: 2f68099b406013f4a9a4bcc080aeb771060fba85db058251ad78e98ec5989ab8
+  metadata.gz: 4e53eb8b2768e1b80e472312aa1af438457ce7115fe078256318749666261f33
+  data.tar.gz: 670a8f3815488a7b315c1e0b56f6376c16fd317cec1fb444d7c6d0dac9c92107
 SHA512:
-  metadata.gz: da891dd5fb56ea1c68ebf14d88aae5db6c0b861e6d48bac73686ce572b60be8f919145cb53c179521b91b68a22ef3b694156e4b0599553f900a7a842a24300d3
-  data.tar.gz: 5e2cac57ca860937d708dcba84516947f8952ff6b3f7df51811dc54ef4d1f2e97c660a77a6f4f65ce6d87f010e2d556834d940d2baef72f7c27fe156d1bd8fcc
+  metadata.gz: 64186cb269dbd470798c3ccbe2996ea736c909c7258bc385528626e043bee1c7d88a1a6409948392ef73203ea4715a93b8474bfd3437503a08a1e312d430a968
+  data.tar.gz: 434cbc56312aa11577c2227788eeb930ea2e85e9f5c98f37b5738e58d030bfbcf0cbffcdeb623dda7ef31ca7628bc80f7a88a63050814e3b87a0c1883abcb287

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
+        ruby: [ '3.0', '2.7', '2.6' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
     steps:
@@ -24,10 +24,6 @@ jobs:
         with:
           submodules: true
 
-      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
-      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
-        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
-
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 Rails:
   Enabled: false

data/lib/relaton/db.rb

@@ -63,7 +63,7 @@ module Relaton
     #   RelatonOmg::OmgBibliographicItem, RelatonW3c::W3cBibliographicItem]
     ##
     def fetch(code, year = nil, opts = {})
-      stdclass = standard_class(code) || return
+      stdclass = @registry.class_by_ref(code) || return
       processor = @registry.processors[stdclass]
       ref = if processor.respond_to?(:urn_to_code)
               processor.urn_to_code(code)&.first
@@ -101,7 +101,7 @@ module Relaton
 
     # Fetch asynchronously
     def fetch_async(code, year = nil, opts = {}, &block) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-      stdclass = standard_class code
+      stdclass = @registry.class_by_ref code
       if stdclass
         unless @queues[stdclass]
           processor = @registry.processors[stdclass]
@@ -142,7 +142,7 @@ module Relaton
       @registry.processors.each do |name, processor|
         std = name if processor.prefix == stdclass
       end
-      std = standard_class(code) or return nil unless std
+      std = @registry.class_by_ref(code) or return nil unless std
 
       check_bibliocache(code, year, opts, std)
     end
@@ -151,8 +151,8 @@ module Relaton
     # @param code [String]
     # @return [Array]
     def docid_type(code)
-      stdclass = standard_class(code) or return [nil, code]
-      _prefix, code = strip_id_wrapper(code, stdclass)
+      stdclass = @registry.class_by_ref(code) or return [nil, code]
+      _, code = strip_id_wrapper(code, stdclass)
       [@registry.processors[stdclass].idtype, code]
     end
 
@@ -218,7 +218,7 @@ module Relaton
     # @param year [Integer, nil] year to filter
     # @return [BibliographicItem, nil]
     def search_edition_year(file, content, edition, year) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-      processor = @registry.processors[standard_class(file.split("/")[-2])]
+      processor = @registry.processor_by_ref(file.split("/")[-2])
       item = if file.match?(/xml$/) then processor.from_xml(content)
              else processor.hash_to_bib(YAML.safe_load(content))
              end
@@ -269,7 +269,7 @@ module Relaton
                                                          type: "updates")
       end
       divider = stdclass == :relaton_itu ? " " : "/"
-      refs[1..-1].each_with_object(doc) do |c, d|
+      refs[1..].each_with_object(doc) do |c, d|
         bib = check_bibliocache(ref + divider + c, year, opts, stdclass)
         if bib
           d.relation << RelatonBib::DocumentRelation.new(
@@ -279,18 +279,6 @@ module Relaton
       end
     end
 
-    # @param code [String] code of standard
-    # @return [Symbol] standard class name
-    def standard_class(code)
-      @registry.processors.each do |name, processor|
-        return name if /^(urn:)?#{processor.prefix}/i.match?(code) ||
-          processor.defaultprefix.match(code)
-      end
-      Util.log <<~WARN, :info
-        [relaton] #{code} does not have a recognised prefix
-      WARN
-    end
-
     # TODO: i18n
     # Fofmat ID
     # @param code [String]

data/lib/relaton/registry.rb

@@ -77,6 +77,34 @@ module Relaton
       processors.values.detect { |v| v.prefix == type&.upcase }
     end
 
+    #
+    # Find processor by reference or prefix
+    #
+    # @param [String] ref reference or prefix
+    #
+    # @return [Relaton::Processor] processor
+    #
+    def processor_by_ref(ref)
+      @processors[class_by_ref(ref)]
+    end
+
+    #
+    # Find processor by refernce or prefix
+    #
+    # @param ref [String] reference or prefix
+    #
+    # @return [Symbol, nil] standard class name
+    #
+    def class_by_ref(ref)
+      @processors.each do |class_name, processor|
+        return class_name if /^(urn:)?#{processor.prefix}(?!\w)/i.match?(ref) ||
+          processor.defaultprefix.match(ref)
+      end
+      Util.log <<~WARN, :info
+        [relaton] #{ref} does not have a recognised prefix
+      WARN
+    end
+
     private
 
     def camel_case(gem_name)

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.11.2".freeze
+  VERSION = "1.11.3".freeze
 end

data/relaton.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.add_dependency "relaton-3gpp", "~> 1.11.0"
   spec.add_dependency "relaton-bipm", "~> 1.11.0"

data/spec/relaton/registry_spec.rb

@@ -70,6 +70,7 @@ RSpec.describe Relaton::Registry do
 
     it "BIPM" do
       expect(Relaton::Registry.instance.by_type("BIPM")).to be_instance_of RelatonBipm::Processor
+      expect(Relaton::Registry.instance.processor_by_ref("CCTF")).to be_instance_of RelatonBipm::Processor
     end
 
     it "ECMA" do

data/spec/relaton_spec.rb

@@ -196,10 +196,10 @@ RSpec.describe Relaton::Db do
       expect(File.exist?("testcache2")).to be true
       testcache = Relaton::DbCache.new "testcache"
       expect(testcache["IETF(RFC 8341)"]).to include "<docidentifier "\
-        "type=\"RFC\" scope=\"anchor\">RFC8341</docidentifier>"
+        "type=\"RFC\" primary=\"true\">RFC 8341</docidentifier>"
       testcache = Relaton::DbCache.new "testcache2"
       expect(testcache["IETF(RFC 8341)"]).to include "<docidentifier "\
-        "type=\"RFC\" scope=\"anchor\">RFC8341</docidentifier>"
+        "type=\"RFC\" primary=\"true\">RFC 8341</docidentifier>"
     end
   end
 

data/spec/vcr_cassetes/3gpp_tr_00_01u_umts_3_0_0.yml

@@ -41,29 +41,29 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - 687A:10CE7:F2C38C:107FE9E:6278EE7D
+      - FEF4:1395A:3E1BC8:42A2CE:6290BA99
       Accept-Ranges:
       - bytes
       Date:
-      - Mon, 09 May 2022 10:35:41 GMT
+      - Fri, 27 May 2022 11:48:42 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-vie6353-VIE
+      - cache-vie6371-VIE
       X-Cache:
       - MISS
       X-Cache-Hits:
       - '0'
       X-Timer:
-      - S1652092541.458281,VS0,VE220
+      - S1653652122.797835,VS0,VE233
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
       - "*"
       X-Fastly-Request-Id:
-      - bc2e33f28bbade3cfbf583259d99518383e6f9f3
+      - 740cb118933ba3ba55fcbdb02f6f313a4eb80f39
       Expires:
-      - Mon, 09 May 2022 10:40:41 GMT
+      - Fri, 27 May 2022 11:53:42 GMT
       Source-Age:
       - '0'
     body:
@@ -143,6 +143,5 @@ http_interactions:
           freeze_stage3_meeting: SMG-28
           close_meeting: SP-28
           project_end: '1999-02-12'
-    http_version:
-  recorded_at: Mon, 09 May 2022 10:35:41 GMT
-recorded_with: VCR 5.1.0
+  recorded_at: Fri, 27 May 2022 11:48:41 GMT
+recorded_with: VCR 6.1.0