relaton 1.11.0 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ba66eb8e85f33add05b73475aec5b97e27533f2e11922f4455b6762f7e68356
-  data.tar.gz: 6fc85eb07f89fdce73b80c3ed6228ed55ab18e0ab00375fc2b4febb111851ab1
+  metadata.gz: 4e53eb8b2768e1b80e472312aa1af438457ce7115fe078256318749666261f33
+  data.tar.gz: 670a8f3815488a7b315c1e0b56f6376c16fd317cec1fb444d7c6d0dac9c92107
 SHA512:
-  metadata.gz: 5b59b213a48233449cd87a46652c627cc14b4a805c0186198f6cba402998a6e4aaeabbaddfcedc51014caba82e203900c1627069146972fb92e15eb6aaa6d5f3
-  data.tar.gz: 13a342631fa1f3b403571d8a2d7201d7eeac7402e9232967b418c10b52e0ecdb9c2e22a0e89ee3b15477aa5f18ebaf8111e58d591c8e04e3a037dfe6e79c142a
+  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/Gemfile

@@ -1,6 +1,3 @@
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
-
 source "https://rubygems.org"
   
 # Specify your gem's dependencies in gemspec

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,32 +269,16 @@ 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(
-            type: reltype, description: reldesc, bibitem: bib
+            type: reltype, description: reldesc, bibitem: bib,
           )
         end
       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
-      allowed = @registry.processors.reduce([]) do |m, (_k, v)|
-        m << v.prefix
-      end
-      Util.log <<~WARN, :info
-        [relaton] #{code} does not have a recognised prefix: #{allowed.join(', ')}.
-        See https://github.com/relaton/relaton/ for instructions on prefixing and wrapping document identifiers to disambiguate them.
-      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/util.rb

@@ -6,7 +6,7 @@ module Relaton
       log_types = Relaton.configuration.logs.map(&:to_s) || []
 
       if log_types.include?(type.to_s)
-        warn(message)
+        warn CGI.unescapeHTML(message)
       end
     end
   end

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.11.0".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"
@@ -63,6 +63,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-rails", "~> 2.10.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "vcr", "~> 5"
+  spec.add_development_dependency "vcr", "~> 6"
   spec.add_development_dependency "webmock"
 end

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/util_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe Relaton::Util do
+  it "logs HTML entities" do
+    expect do
+      Relaton::Util.log("Kolbe & Gröger 2003")
+    end.to output("Kolbe & Gröger 2003\n").to_stderr
+  end
+end

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
 
@@ -293,8 +293,8 @@ RSpec.describe Relaton::Db do
   end
 
   it "get CEN reference" do
-    VCR.use_cassette "cen_en_10160_1999" do
-      bib = @db.fetch "CEN EN 10160:1999"
+    VCR.use_cassette "en_10160_1999" do
+      bib = @db.fetch "EN 10160:1999"
       expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
     end
   end
@@ -381,9 +381,9 @@ RSpec.describe Relaton::Db do
       end
     end
 
-    context "HIST" do
+    context "NIST" do
       it "included" do
-        VCR.use_cassette "hist_cmbined_included" do
+        VCR.use_cassette "nist_combined_included" do
           bib = @db.fetch "NIST SP 800-38A, Add"
           expect(bib.docidentifier[0].id).to eq "NIST SP 800-38A, Add"
           expect(bib.relation[0].type).to eq "updates"

data/spec/vcr_cassetes/3gpp_tr_00_01u_umts_3_0_0.yml

@@ -23,7 +23,7 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '742'
+      - '746'
       Cache-Control:
       - max-age=300
       Content-Security-Policy:
@@ -31,7 +31,7 @@ http_interactions:
       Content-Type:
       - text/plain; charset=utf-8
       Etag:
-      - W/"5a6b504923740a5333699cfb900329bc0771ece2c2c583a91a69ec17cb44852f"
+      - W/"7b1fd8c3cc8a83e47b78d925027060ef4583c418e75be5749d38f6a37e0f01ca"
       Strict-Transport-Security:
       - max-age=31536000
       X-Content-Type-Options:
@@ -41,29 +41,29 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - 4B02:2F62:87AF2:FB38E:6252D29A
+      - FEF4:1395A:3E1BC8:42A2CE:6290BA99
       Accept-Ranges:
       - bytes
       Date:
-      - Sun, 10 Apr 2022 12:50:35 GMT
+      - Fri, 27 May 2022 11:48:42 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-sof1510027-SOF
+      - cache-vie6371-VIE
       X-Cache:
       - MISS
       X-Cache-Hits:
       - '0'
       X-Timer:
-      - S1649595035.930194,VS0,VE374
+      - S1653652122.797835,VS0,VE233
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
       - "*"
       X-Fastly-Request-Id:
-      - 1c06f92c3c3310d10355e9f3400ed3debbe4c8f8
+      - 740cb118933ba3ba55fcbdb02f6f313a4eb80f39
       Expires:
-      - Sun, 10 Apr 2022 12:55:35 GMT
+      - Fri, 27 May 2022 11:53:42 GMT
       Source-Age:
       - '0'
     body:
@@ -102,6 +102,7 @@ http_interactions:
               postcode: '06921'
           role:
           - author
+          - publisher
         - person:
             name:
               completename:
@@ -126,7 +127,7 @@ http_interactions:
             value: withdrawn
         place:
         - Sophia Antipolis Cedex, France
-        fetched: '2022-03-30'
+        fetched: '2022-04-30'
         doctype: TR
         editorialgroup:
         - name: SMG5
@@ -142,6 +143,5 @@ http_interactions:
           freeze_stage3_meeting: SMG-28
           close_meeting: SP-28
           project_end: '1999-02-12'
-    http_version:
-  recorded_at: Sun, 10 Apr 2022 12:50:35 GMT
-recorded_with: VCR 5.1.0
+  recorded_at: Fri, 27 May 2022 11:48:41 GMT
+recorded_with: VCR 6.1.0