relaton · andrew2net · Jul 3, 2024 · Mar 25, 2024 · Jun 30, 2024 · Jul 3, 2024
diff --git a/README.adoc b/README.adoc
@@ -35,24 +35,13 @@ $ gem install relaton-cen
 
 For CENELEC standards, use references with the prefix `CEN/CLC`. For example, `CEN/CLC Guide 6`.
 
-=== Configuration
-
-Configuration is optional. The available option is `logger` which is a `Logger` instance. By default, the logger is `Logger.new($stderr)` with `Logger::WARN` level. To change the logger level, use `RelatonCen.configure` block.
+=== Search for a standard using keywords
 
 [source,ruby]
 ----
 require 'relaton_cen'
 => true
 
-RelatonCen.configure do |config|
-  config.logger.level = Logger::DEBUG
-end
-----
-
-=== Search for a standard using keywords
-
-[source,ruby]
-----
 hit_collection = RelatonCen::CenBibliography.search("CEN ISO/TS 21003-7")
 => <RelatonCen::HitCollection:0x00000000017de0 @ref=ISO/TS 21003-7 @fetched=false>
 
@@ -177,6 +166,9 @@ RelatonCen::XMLParser.from_xml File.read("spec/fixtures/bibdata.xml", encoding:
 ...
 ----
 
+=== Logging
+
+RelatonCen uses the relaton-logger gem for logging. By default, it logs to STDOUT. To change the log levels and add other loggers, read the https://github.com/relaton/relaton-logger#usage[relaton-logger] documentation.
 
 == Development
 

diff --git a/grammars/basicdoc.rng b/grammars/basicdoc.rng
@@ -244,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>

diff --git a/lib/relaton_cen.rb b/lib/relaton_cen.rb
@@ -5,15 +5,14 @@
 require "nokogiri"
 require "relaton_iso_bib"
 require_relative "relaton_cen/version"
-require "relaton_cen/config"
-require "relaton_cen/util"
-require "relaton_cen/biblographic_item"
-require "relaton_cen/scrapper"
-require "relaton_cen/hit_collection"
-require "relaton_cen/hit"
-require "relaton_cen/xml_parser"
-require "relaton_cen/hash_converter"
-require "relaton_cen/cen_bibliography"
+require_relative "relaton_cen/util"
+require_relative "relaton_cen/biblographic_item"
+require_relative "relaton_cen/scrapper"
+require_relative "relaton_cen/hit_collection"
+require_relative "relaton_cen/hit"
+require_relative "relaton_cen/xml_parser"
+require_relative "relaton_cen/hash_converter"
+require_relative "relaton_cen/cen_bibliography"
 
 module RelatonCen
   # Returns hash of XML greammar

diff --git a/lib/relaton_cen/cen_bibliography.rb b/lib/relaton_cen/cen_bibliography.rb
@@ -51,7 +51,7 @@ def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLeng
         # Util.warn "WARNING: No match found online for `#{id}`. " \
         #           "The code must be exactly like it is on the standards website."
         unless missed_years.empty?
-          Util.warn "There was no match for `#{year}`, though there " \
+          Util.info "There was no match for `#{year}`, though there " \
                     "were matches found for `#{missed_years.join('`, `')}`."
         end
         # if /\d-\d/.match? code
@@ -102,15 +102,15 @@ def isobib_results_filter(result, year)
 
       def bib_get(code, year, opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
         ref = year.nil? || code.match?(/:\d{4}/) ? code : "#{code}:#{year}"
-        Util.warn "(#{ref}) Fetching from standards.cencenelec.eu ..."
+        Util.info "Fetching from standards.cencenelec.eu ...", key: ref
         result = search_filter(code) || return
         ret = isobib_results_filter(result, year)
         if ret[:ret]
           bib = year || opts[:keep_year] ? ret[:ret] : ret[:ret].to_most_recent_reference
-          Util.warn "(#{ref}) Found: `#{bib.docidentifier.first&.id}`"
+          Util.info "Found: `#{bib.docidentifier.first&.id}`", key: ref
           bib
         else
-          Util.warn "(#{ref}) No found."
+          Util.info "No found.", key: ref
           fetch_ref_err(code, year, ret[:years])
         end
       end

diff --git a/lib/relaton_cen/config.rb b/lib/relaton_cen/config.rb
diff --git a/lib/relaton_cen/util.rb b/lib/relaton_cen/util.rb
@@ -1,9 +1,6 @@
 module RelatonCen
   module Util
     extend RelatonBib::Util
-
-    def self.logger
-      RelatonCen.configuration.logger
-    end
+    PROGNAME = "relaton-cen".freeze
   end
 end
diff --git a/lib/relaton_cen/version.rb b/lib/relaton_cen/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonCen
-  VERSION = "1.18.1"
+  VERSION = "1.19.0"
 end
diff --git a/relaton_cen.gemspec b/relaton_cen.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mechanize", "~> 2.10"
-  spec.add_dependency "relaton-iso-bib", "~> 1.18.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.19.0"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

diff --git a/spec/fixtures/bibdata.xml b/spec/fixtures/bibdata.xml
@@ -1,4 +1,4 @@
-<bibdata type="standard" schema-version="v1.2.8">
+<bibdata type="standard" schema-version="v1.2.9">
   <fetched>2023-09-06</fetched>
   <title type="title-main" format="text/plain" language="en" script="Latn">Multilayer piping systems for hot and cold water installations inside buildings</title>
   <title type="title-part" format="text/plain" language="en" script="Latn">Part 7: Guidance for the assessment of conformity (ISO/TS 21003-7:2019)</title>

diff --git a/spec/fixtures/bibdata.yaml b/spec/fixtures/bibdata.yaml
@@ -1,6 +1,6 @@
 ---
 id: CENISO/TS21003-7-2019
-schema-version: v1.2.8
+schema-version: v1.2.9
 title:
 - type: title-main
   content: Multilayer piping systems for hot and cold water installations inside buildings

diff --git a/spec/relaton_cen/config_spec.rb b/spec/relaton_cen/config_spec.rb
diff --git a/spec/relaton_cen/util_spec.rb b/spec/relaton_cen/util_spec.rb
diff --git a/spec/relaton_cen_spec.rb b/spec/relaton_cen_spec.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 RSpec.describe RelatonCen do
-  before { RelatonCen.instance_variable_set :@configuration, nil }
-
   it "has a version number" do
     expect(RelatonCen::VERSION).not_to be nil
   end
@@ -39,7 +37,7 @@
     expect do
       bib = RelatonCen::CenBibliography.get "EN 13306"
       expect(bib.docidentifier[0].id).to eq "EN 13306"
-    end.to output(/Found: `EN 13306`/).to_stderr
+    end.to output(/Found: `EN 13306`/).to_stderr_from_any_process
   end
 
   it "get ENV", vcr: "env_1993_1_1" do
@@ -66,7 +64,7 @@
     expect do
       bib = RelatonCen::CenBibliography.get "EN 13306", nil, keep_year: true
       expect(bib.docidentifier[0].id).to eq "EN 13306:2017"
-    end.to output(/Found: `EN 13306:2017`/).to_stderr
+    end.to output(/Found: `EN 13306:2017`/).to_stderr_from_any_process
   end
 
   it "get amendment" do
@@ -84,8 +82,6 @@
   end
 
   context "get document by year" do
-    before { RelatonCen.instance_variable_set :@configuration, nil }
-
     it "in code" do
       VCR.use_cassette "cen_iso_ts_21003_7" do
         bib = RelatonCen::CenBibliography.get "CEN ISO/TS 21003-7:2019"
@@ -97,15 +93,15 @@
       expect do
         bib = RelatonCen::CenBibliography.get "CEN ISO/TS 21003-7", "2019"
         expect(bib.docidentifier[0].id).to eq "CEN ISO/TS 21003-7:2019"
-      end.to output(/\(CEN ISO\/TS 21003-7:2019\) Found: `CEN ISO\/TS 21003-7:2019`/).to_stderr
+      end.to output(/\(CEN ISO\/TS 21003-7:2019\) Found: `CEN ISO\/TS 21003-7:2019`/).to_stderr_from_any_process
     end
 
     it "return nil when year is incorrect" do
       VCR.use_cassette "cen_iso_ts_21003_7" do
         bib = ""
         expect do
           bib = RelatonCen::CenBibliography.get "CEN ISO/TS 21003-7", "2018"
-        end.to output(/There was no match for `2018`/).to_stderr
+        end.to output(/There was no match for `2018`/).to_stderr_from_any_process
         expect(bib).to be_nil
       end
     end
@@ -127,7 +123,7 @@
       bib = ""
       expect do
         bib = RelatonCen::CenBibliography.get "CEN NOT FOUND"
-      end.to output(/\[relaton-cen\] \(CEN NOT FOUND\) No found\./).to_stderr
+      end.to output(/\[relaton-cen\] INFO: \(CEN NOT FOUND\) No found\./).to_stderr_from_any_process
       expect(bib).to be_nil
     end
   end

diff --git a/spec/vcr_cassettes/cen_iso_ts_21003_7.yml b/spec/vcr_cassettes/cen_iso_ts_21003_7.yml
diff --git a/spec/vcr_cassettes/cr_12101_5_2000.yml b/spec/vcr_cassettes/cr_12101_5_2000.yml
diff --git a/spec/vcr_cassettes/cwa_14050_21_2000.yml b/spec/vcr_cassettes/cwa_14050_21_2000.yml
diff --git a/spec/vcr_cassettes/en_1325.yml b/spec/vcr_cassettes/en_1325.yml
diff --git a/spec/vcr_cassettes/en_13306.yml b/spec/vcr_cassettes/en_13306.yml
diff --git a/spec/vcr_cassettes/en_285_2015_a1_2021.yml b/spec/vcr_cassettes/en_285_2015_a1_2021.yml
diff --git a/spec/vcr_cassettes/env_1993_1_1.yml b/spec/vcr_cassettes/env_1993_1_1.yml
diff --git a/spec/vcr_cassettes/hd_1215_2_1988.yml b/spec/vcr_cassettes/hd_1215_2_1988.yml
diff --git a/spec/vcr_cassettes/not_found.yml b/spec/vcr_cassettes/not_found.yml
diff --git a/spec/vcr_cassettes/subcommittee.yml b/spec/vcr_cassettes/subcommittee.yml