relaton-cie 1.18.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0deac3779ff4dbc01a9d36816643325fa943b295b7b123ebeb7cbdad090d4992
-  data.tar.gz: ffb9cd63167e41e9259f8302e674f2a23fced23a6b0361ecf1e55b00fe6960a0
+  metadata.gz: b4142b95abcc0f744193c75ef4e3ecb8b29948385646984a24fec705ad67a0f8
+  data.tar.gz: 7de37e66804ad9a8d1c499fee44074257c3644dd031728d736576d985aa4291f
 SHA512:
-  metadata.gz: fdbcb9de17a34111038f68374e674774f2245a6086524130bacf06a63ab0b364b2b34f5c213a66e3e3ea2d03b9f92dd71a0b5a4472c116dd89693e8bd5c3a82d
-  data.tar.gz: dd0550622ccec9e05dde4bbdc842147fbdced21e103d4c7a294fe2c0049d8a3dc8adf8ce5d7db43e2c6a6235168b1edc48bf0e9eabe9200b1036ee8963ae0f69
+  metadata.gz: 07c7da3c87d3995c8bf4f75a80a05c4fe5d56263b8fb9b80c2ccc59c4d87accaa7b5875611f9a5c61185420c55f0db18a5372f6ada9fa2468d6ab05574100a44
+  data.tar.gz: d3bb0f001a1375c3e4a1db3f6ebf6dd4fcad476b0627d24c18b5f4bbb685d7592a6e5015d37308c15d3a105781cadef1e8abaf3b247c6d2040e578b73de5c81a

data/README.adoc

@@ -29,24 +29,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 `RelatonCie.configure` block.
+=== Search document
 
 [source,ruby]
 ----
 require 'relaton_cie'
 => true
 
-RelatonCie.configure do |config|
-  config.logger.level = Logger::DEBUG
-end
-----
-
-=== Search document
-
-[source,ruby]
-----
 item = RelatonCie::CieBibliography.get 'CIE 001-1980'
 [relaton-cie] (CIE 001-1980) Fetching from Realton repository ...
 [relaton-cie] (CIE 001-1980) Found: `CIE 001-1980`
@@ -127,6 +116,10 @@ Done in: 684 sec.
 => nil
 ----
 
+=== Logging
+
+RelatonCie 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/lib/relaton_cie/cie_bibliography.rb

@@ -15,12 +15,12 @@ module RelatonCie
       # @param opts [Hash] not used
       # @return [RelatonCie::BibliographicItem] Relaton of reference
       def get(code, _year = nil, _opts = {})
-        Util.warn "(#{code}) Fetching from Relaton repository ..."
+        Util.info "Fetching from Relaton repository ...", key: code
         result = search code
         if result
-          Util.warn "(#{code}) Found: `#{result.docidentifier.first.id}`"
+          Util.info "Found: `#{result.docidentifier.first.id}`", key: code
         else
-          Util.warn "(#{code}) Not found."
+          Util.info "Not found.", key: code
         end
         result
       end

data/lib/relaton_cie/data_fetcher.rb

@@ -169,8 +169,10 @@ module RelatonCie
       id = bib.docidentifier[0].id.gsub(%r{[/\s\-:.]}, "_")
       file = "#{@output}/#{id.upcase}.#{@format}"
       if @files.include? file
-        warn "File #{file} exists. Docid: #{bib.docidentifier[0].id}"
-        warn "Link: #{bib.link.detect { |l| l.type == 'src' }.content}"
+        Util.warn do
+          "File #{file} exists. Docid: #{bib.docidentifier[0].id}\n" \
+          "Link: #{bib.link.detect { |l| l.type == 'src' }.content}"
+        end
       else @files << file
       end
       index.add_or_update bib.docidentifier[0].id, file
@@ -199,9 +201,9 @@ module RelatonCie
       )
       write_file item
     rescue StandardError => e
-      warn "Document: #{url}"
-      warn e.message
-      warn e.backtrace
+      Util.error do
+        "Document: #{url}\n#{e.message}\n#{e.backtrace}"
+      end
     end
 
     def fetch(url)

data/lib/relaton_cie/util.rb

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

data/lib/relaton_cie/version.rb

@@ -1,3 +1,3 @@
 module RelatonCie
-  VERSION = "1.18.0".freeze
+  VERSION = "1.19.0".freeze
 end

data/lib/relaton_cie.rb

@@ -5,7 +5,6 @@ require "relaton/index"
 require "relaton_bib"
 # require "relaton_bib/name_parser"
 require "relaton_cie/version"
-require "relaton_cie/config"
 require "relaton_cie/util"
 require "relaton_cie/bibliographic_item"
 require "relaton_cie/cie_bibliography"

data/relaton_cie.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mechanize", "~> 2.8.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.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cie
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,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
@@ -95,7 +95,6 @@ files:
 - lib/relaton_cie.rb
 - lib/relaton_cie/bibliographic_item.rb
 - lib/relaton_cie/cie_bibliography.rb
-- lib/relaton_cie/config.rb
 - lib/relaton_cie/data_fetcher.rb
 - lib/relaton_cie/hash_converter.rb
 - lib/relaton_cie/name_parser.rb
@@ -125,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: 'RelatonEcma: retrieve CIE Standards for bibliographic use using the BibliographicItem

data/lib/relaton_cie/config.rb

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