relaton-bipm 1.18.2 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e3b95a4edc9d788cb85a8ac616dcaf8c3ae1957a3138ee45c049e20d92cd168
-  data.tar.gz: bf39e7f015de4adddbda44451bac4efc9691f1e50df4cc6ea5969067677a5f44
+  metadata.gz: 6169158d13f03ec83666123ca52d0e87b7960ba13fe5b6d5051228c54158f93c
+  data.tar.gz: 46236ffb5e1f875fd042dd89fe866251962a553497dd9a8a474edcd6aa18e2fa
 SHA512:
-  metadata.gz: 31ae9b9e3a97df4ee2bbaaa539a496babf1a28de8749fff8dbdd076251d63f188ac1ec88615ba651764fdfa730f242c4dbef535eb2a1fbe1d61d674e8970e631
-  data.tar.gz: 4b883547bd97402ec22c9896c6aa535708748358aabf637755a2f305c7d64a30cbb2526ef689d3398fb4d5592680f5c40c87da61e71e50c4059d6df3dbd2a260
+  metadata.gz: d1b01efea043f825d7e08dcecc6396e21b56c75ab0131dffd6b5e936ea10e185e9f8412ddf9c30fa21f64eaf9e97408da92e06fedc2a7cbb1d9da581151ab0ea
+  data.tar.gz: 8cc33bc1d0b431ecd6d55c640ddcf5d715e640dfd2a926a5e2db5d72f442fefe93f527275f17236e2a815302cdb65ec9c47f71dd970b9d0eb708133765654d92

data/README.adoc

@@ -179,24 +179,13 @@ Recommendation JCRB/43-1 (2021) / Recommandation JCRB/43-1 (2021)
 JCRB REC JCRB/43-1 (2021)
 ----
 
-=== 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 `RelatonBipm.configure` block.
+==== Examples
 
 [source,ruby]
 ----
-require 'relaton_bipm'
+require "relaton_bipm"
 => true
 
-RelatonBipm.configure do |config|
-  config.logger.level = Logger::DEBUG
-end
-----
-
-==== Examples
-
-[source,ruby]
-----
 # get BIPM brochure
 item = RelatonBipm::BipmBibliography.get "BIPM SI Brochure"
 [relaton-bipm] (BIPM SI Brochure) Fetching from Relaton repository ...
@@ -269,7 +258,7 @@ RelatonBipm::BipmBibliography.get "CIPM REC 1 (2005, FR)"
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="BIPMSIBrochure" type="standard" schema-version="v1.2.1">
+=> "<bibitem id="BIPMSIBrochurePart1" type="standard" schema-version="v1.2.1">
       <fetched>2022-12-02</fetched>
       <title type="main" format="text/plain" language="en">The International System of Units</title>
       <title type="cover" format="text/plain" language="en">The International System of Units (SI)</title>
@@ -367,6 +356,10 @@ Done in: 82 sec.
 => nil
 ----
 
+=== Logging
+
+RelatonBipm 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
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/relaton_bipm/bipm_bibliographic_item.rb

@@ -23,12 +23,12 @@ module RelatonBipm
     # @param structuredidentifier [RelatonBipm::StructuredIdentifier]
     def initialize(**args) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       if args[:docstatus] && !STATUSES.include?(args[:docstatus].stage.value)
-        Util.warn "WARNING: Invalid docstatus: `#{args[:docstatus].stage.value}`. " \
+        Util.warn "Invalid docstatus: `#{args[:docstatus].stage.value}`. " \
                   "It should be one of: `#{STATUSES.join('`, `')}`"
       end
 
       if args[:si_aspect] && !SI_ASPECTS.include?(args[:si_aspect])
-        Util.warn "WARNING: Invalid si_aspect: `#{args[:si_aspect]}``. " \
+        Util.warn "Invalid si_aspect: `#{args[:si_aspect]}``. " \
                   "It should be one of: `#{SI_ASPECTS.join('`, `')}`"
       end
 

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -2,22 +2,22 @@ require "mechanize"
 
 module RelatonBipm
   class BipmBibliography
-    GH_ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-bipm/master/".freeze
+    GH_ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-bipm/main/".freeze
     INDEX_FILE = "index2.yaml".freeze
 
     class << self
       # @param text [String]
       # @return [RelatonBipm::BipmBibliographicItem]
       def search(text, _year = nil, _opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        Util.warn "(#{text}) Fetching from Relaton repository ..."
+        Util.info "Fetching from Relaton repository ...", key: text
         ref = text.sub(/^BIPM\s/, "")
         item = get_bipm ref
         unless item
-          Util.warn "(#{text}) Not found."
+          Util.info "Not found.", key: text
           return
         end
 
-        Util.warn("(#{text}) Found: `#{item.docidentifier[0].id}`")
+        Util.info "Found: `#{item.docidentifier[0].id}`", key: text
         item
       rescue Mechanize::ResponseCodeError => e
         raise RelatonBib::RequestError, e.message unless e.response_code == "404"

data/lib/relaton_bipm/committee.rb

@@ -11,7 +11,7 @@ module RelatonBipm
     def initialize(acronym:, content: nil)
       acronyms = YAML.load_file File.join(__dir__, "acronyms.yaml")
       unless acronyms[acronym]
-        Util.warn "WARNING: Invalid acronym: `#{acronym}`. Allowed " \
+        Util.warn "Invalid acronym: `#{acronym}`. Allowed " \
                   "values: `#{acronyms.map { |k, _v| k }.join '`, `'}`"
       end
 

data/lib/relaton_bipm/data_fetcher.rb

@@ -57,7 +57,7 @@ module RelatonBipm
     def write_file(path, item, warn_duplicate: true)
       content = serialize item
       if @files.include?(path)
-        warn "File #{path} already exists" if warn_duplicate
+        Util.warn "File #{path} already exists" if warn_duplicate
       else
         @files << path
       end

data/lib/relaton_bipm/document_type.rb

@@ -22,7 +22,7 @@ module RelatonBipm
     #
     def check_type(type)
       # unless DOCTYPES.include? type
-      #   Util.warn "WARNING: invalid doctype: `#{type}`"
+      #   Util.warn "invalid doctype: `#{type}`"
       # end
     end
   end

data/lib/relaton_bipm/id_parser.rb

@@ -95,7 +95,7 @@ module RelatonBipm
       @id = match.named_captures.compact.transform_keys(&:to_sym)
       self
     rescue StandardError => e
-      Util.warn "WARNING: Incorrect reference: `#{id}`"
+      Util.warn "Incorrect reference: `#{id}`"
       raise RelatonBib::RequestError, e
     end
 

data/lib/relaton_bipm/rawdata_bipm_metrologia/article_parser.rb

@@ -161,10 +161,9 @@ module RelatonBipm
       # @return [RelatonBib::FullName] full name
       #
       def fullname(name)
-        fname = forename name.at("./given-names")
-        sname = name.at("./surname").text
-        surname = RelatonBib::LocalizedString.new sname, "en", "Latn"
-        RelatonBib::FullName.new surname: surname, forename: fname
+        cname = [name.at("./given-names"), name.at("./surname")].compact.map(&:text).join(" ")
+        completename = RelatonBib::LocalizedString.new cname, "en", "Latn"
+        RelatonBib::FullName.new completename: completename
       end
 
       #

data/lib/relaton_bipm/rawdata_bipm_metrologia/fetcher.rb

@@ -31,7 +31,7 @@ module RelatonBipm
       def fetch_articles # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         Dir["#{DIR}/**/*.xml"].each do |path|
           item = ArticleParser.parse path
-          file = "#{item.docidentifier.first.id.downcase.gsub(' ', '-')}.#{@data_fetcher.ext}"
+          file = "#{item.docidentifier.first.id.downcase.tr(' ', '-')}.#{@data_fetcher.ext}"
           out_path = File.join(@data_fetcher.output, file)
           key = Id.new.parse(item.docidentifier.first.id).to_hash
           @data_fetcher.index2.add_or_update key, out_path

data/lib/relaton_bipm/util.rb

@@ -1,9 +1,6 @@
 module RelatonBipm
   module Util
     extend RelatonBib::Util
-
-    def self.logger
-      RelatonBipm.configuration.logger
-    end
+    PROGNAME = "relaton-bipm".freeze
   end
 end

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.18.2".freeze
+  VERSION = "1.19.1".freeze
 end

data/lib/relaton_bipm/xml_parser.rb

@@ -97,6 +97,10 @@ module RelatonBipm
       #     conts << RelatonBib::Address.new(city: city, country: country)
       #   end
       # end
+
+      def create_doctype(type)
+        DocumentType.new type: type.text, abbreviation: type[:abbreviation]
+      end
     end
   end
 end

data/lib/relaton_bipm.rb

@@ -3,7 +3,6 @@ require "fileutils"
 require "parslet"
 require "relaton_bib"
 require "relaton/index"
-require "relaton_bipm/config"
 require "relaton_bipm/util"
 require "relaton_bipm/id_parser"
 require "relaton_bipm/version"

data/relaton_bipm.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.add_dependency "faraday", "~> 2.7.0"
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "parslet", "~> 2.0.0"
-  spec.add_dependency "relaton-bib", "~> 1.18.0"
+  spec.add_dependency "relaton-bib", "~> 1.19.0"
   spec.add_dependency "relaton-index", "~> 0.2.2"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.18.2
+  version: 1.19.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-18 00:00:00.000000000 Z
+date: 2024-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,6 @@ files:
 - lib/relaton_bipm/bipm_si_brochure_parser.rb
 - lib/relaton_bipm/comment_periond.rb
 - lib/relaton_bipm/committee.rb
-- lib/relaton_bipm/config.rb
 - lib/relaton_bipm/data_fetcher.rb
 - lib/relaton_bipm/data_outcomes_parser.rb
 - lib/relaton_bipm/document_relation.rb

data/lib/relaton_bipm/config.rb

@@ -1,10 +0,0 @@
-module RelatonBipm
-  module Config
-    include RelatonBib::Config
-  end
-  extend Config
-
-  class Configuration < RelatonBib::Configuration
-    PROGNAME = "relaton-bipm".freeze
-  end
-end