relaton-bib 1.18.5 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78cb618453b32794d9e5583b0985965b7dbd449655a86350e3e768bae2ce62fc
-  data.tar.gz: c9588e46e7bac0c6af6253d871642a607be7760a25c723f963bb9abb445fbbc8
+  metadata.gz: '078eeaee528f7e51a51015dc49723903af554087be753a244d69ebb2d1c0ac83'
+  data.tar.gz: 1ab74dea087ac8a1a4366ed24630ca4869774cc8b8f938e275a3684e0a61ec69
 SHA512:
-  metadata.gz: 0434d911a3c19805872da208af341c8750d12bbede958d18e24bece3b74b3852ac9623675aa50b01a9d525639578b314e73f00560dc735ed5c375f951e612582
-  data.tar.gz: ec8c14e1e5da20d4c4fed885acb055e5bb28a38c2019bef254fc3381644deb8e1fff85c873e7dbd67a496aff52cc99d575b9bfc7a15437721af8fb0523704947
+  metadata.gz: 62b65c967d716d9680b6e1ec1a361a3f1f2a0d48f032e793585b3630f1146a49897b2d2563c40e165bc04ceb437aeb7da70f7581945fb3f08a23563c79438e58
+  data.tar.gz: 34f6adc6c2998fe912879615f71079963331d83eb12cbb7d7bcff9c8ce4276da73b252aa8240cc105314a2f0aff786f401c99579a50a7df0255ac87673544059

data/.github/workflows/rake.yml

@@ -11,3 +11,5 @@ on:
 jobs:
   rake:
     uses: relaton/support/.github/workflows/rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.RELATON_CI_PAT_TOKEN }}

data/README.adoc

@@ -27,24 +27,13 @@ Or install it yourself as:
 
 == Usage
 
-=== 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 `RelatonBib.configure` block.
+=== Create bibliographic item
 
 [source,ruby]
 ----
 require 'relaton_bib'
 => true
 
-RelatonBib.configure do |config|
-  config.logger.level = Logger::DEBUG
-end
-----
-
-=== Create bibliographic item
-
-[source,ruby]
-----
 hash = YAML.load_file "spec/examples/bib_item.yml"
 => {"id"=>"ISOTC211",
 "fetched"=>"2022-05-02",
@@ -304,6 +293,10 @@ item.to_bibxml
     </reference>"
 ----
 
+=== Logging
+
+RelatonBib 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/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"/>

data/grammars/versions.json

@@ -1,9 +1,9 @@
 {
-"relaton-models": "v1.2.8",
-"basicdoc-models": "v1.1.2",
+"relaton-models": "v1.2.9",
+"basicdoc-models": "v1.1.3",
 "metanorma-requirements-models": "v1.0.1",
 "relaton-model-ieee": "v1.0.1",
-"relaton-model-iso": "v1.0.0",
+"relaton-model-iso": "v1.0.3",
 "relaton-model-iec": "v1.0.0",
 "relaton-model-bsi": "v1.0.2",
 "relaton-model-gb": "v1.0.0",
@@ -29,6 +29,6 @@
 "relaton-model-oasis": "v1.0.1",
 "relaton-model-jis": "v0.0.1",
 "relaton-model-etsi": "v0.0.3",
-"metanorma-model": "v1.2.11",
-"date": "2024-01-04T03:55:06Z"
+"metanorma-model": "v1.3.0",
+"date": "2024-02-21T18:15:14Z"
 }

data/lib/relaton_bib/bib_item_locality.rb

@@ -18,7 +18,7 @@ module RelatonBib
         whole|table|annex|figure|note|list|example|volume|issue|time|anchor|
         locality:[a-zA-Z0-9_]+}x
       unless type&.match? type_ptrn
-        Util.warn "WARNING: invalid locality type: `#{type}`"
+        Util.warn "Invalid locality type: `#{type}`"
       end
 
       @type           = type

data/lib/relaton_bib/bibliographic_item.rb

@@ -207,7 +207,7 @@ module RelatonBib
     # @option link [String] :content
     def initialize(**args)
       if args[:type] && !TYPES.include?(args[:type])
-        Util.warn %{WARNING: type `#{args[:type]}` is invalid.}
+        Util.warn %{Type `#{args[:type]}` is invalid.}
       end
 
       @title = if args[:title].is_a?(TypedTitleStringCollection)

data/lib/relaton_bib/config.rb

@@ -10,18 +10,6 @@ module RelatonBib
   end
 
   class Configuration
-    PROGNAME = "relaton-bib".freeze
-
-    attr_accessor :logger
-
-    def initialize
-      @logger = ::Logger.new $stderr
-      @logger.level = ::Logger::WARN
-      @logger.progname = self.class::PROGNAME
-      @logger.formatter = proc do |_severity, _datetime, progname, msg|
-        "[#{progname}] #{msg}\n"
-      end
-    end
   end
 
   extend Config

data/lib/relaton_bib/contribution_info.rb

@@ -22,7 +22,7 @@ module RelatonBib
     # @param description [Array<String>]
     def initialize(**args)
       if args[:type] && !TYPES.include?(args[:type])
-        Util.warn %{WARNING: Contributor's type `#{args[:type]}` is invalid.}
+        Util.warn %{Contributor's type `#{args[:type]}` is invalid.}
       end
 
       @type = args[:type]

data/lib/relaton_bib/document_relation.rb

@@ -46,7 +46,7 @@ module RelatonBib
                    source_locality: [])
       type = "obsoletes" if type == "Now withdrawn"
       unless self.class::TYPES.include? type
-        Util.warn "WARNING: invalid relation type: `#{type}`"
+        Util.warn "Invalid relation type: `#{type}`"
       end
       @type = type
       @description = description

data/lib/relaton_bib/hash_converter.rb

@@ -358,7 +358,7 @@ module RelatonBib
       if rel[:bibitem]
         rel[:bibitem] = bib_item hash_to_bib(rel[:bibitem])
       else
-        Util.warn "WARNING: bibitem missing: `#{rel}`"
+        Util.warn "Bibitem missing: `#{rel}`"
         rel[:bibitem] = nil
       end
     end

data/lib/relaton_bib/util.rb

@@ -2,16 +2,15 @@ module RelatonBib
   module Util
     extend self
 
-    def method_missing(...)
-      logger.send(...)
-    end
+    PROGNAME = "relaton-bib".freeze
 
-    def respond_to_missing?(method_name, include_private = false)
-      logger.respond_to?(method_name) || super
+    def method_missing(method_name, msg = nil, prog = nil, **opts, &block)
+      prog ||= self::PROGNAME
+      Relaton.logger_pool.send method_name, msg, prog, **opts, &block
     end
 
-    def logger
-      RelatonBib.configuration.logger
+    def respond_to_missing?(method_name, include_private = false)
+      Relaton.logger_pool.respond_to?(method_name) || super
     end
   end
 end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.18.5".freeze
+  VERSION = "1.19.0".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -17,7 +17,7 @@ module RelatonBib
         if bibitem
           bib_item item_data(bibitem)
         else
-          Util.warn "WARNING: can't find bibitem or bibdata element in the XML"
+          Util.warn "Can't find bibitem or bibdata element in the XML"
           nil
         end
       end

data/lib/relaton_bib.rb

@@ -1,9 +1,9 @@
+require "relaton/logger"
 require "forwardable"
 require "yaml"
 require "htmlentities"
 require "relaton_bib/version"
 require "relaton_bib/deep_dup"
-require "relaton_bib/config"
 require "relaton_bib/util"
 require "relaton_bib/localized_string"
 require "relaton_bib/forename"

data/relaton-bib.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities"
   spec.add_dependency "iso639"
   spec.add_dependency "nokogiri", "~> 1.16"
+  spec.add_dependency "relaton-logger", "~> 0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.18.5
+  version: 1.19.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-22 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: relaton-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: 'RelatonBib: Ruby XMLDOC impementation.'
 email:
 - open.source@ribose.com