relaton-cie 1.18.1 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77819e2a66f24e47e3f6243e78a1039479df977d0ad72092a60578061b5910f7
-  data.tar.gz: bd90bc7f6825c106daf9b8b850540616e0584ccaa184bb1585c7c707f6fe780f
+  metadata.gz: 627b1bcb3a18832150a60b686359abb325bdaa25301642e70dcfbc42d002f18e
+  data.tar.gz: 3bdf913d421a7e46a36104b2a11a3ae64a4fd0c1f64ca683c9530eced7562a05
 SHA512:
-  metadata.gz: cd8746ae6e0a79a8b8529d5632b321ae5f6178278f95fe2c5d9490d72911a4b4c11636f020108ec457fb9e6fb597a9d705be81fafb7fbe41caa2812a9bbef353
-  data.tar.gz: e121bbb8920727982b3d6732a276b278d72bfe30ee3bf74ed004234f9fe8d6c33119fd1e77acda206e629514069ce4a5a36c2db0855a4ea6dc9a55b901bdb1ce
+  metadata.gz: 50b3583178756e980ef3cf7e22deff8a960d6d5a962d1c50ecad44cff4a051b4786e37d5dc9cccc891809cf7ca7115cc29d5783808db43b8af7ad2a184512378
+  data.tar.gz: aa3b3187b62363dda6e32c5aa174f63fa0a337b3384d5e84307d5dbaffa5799fa274de0cc461987271207af7e457391ba32a0310d92d4156afc0167ff79f6b5b

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

@@ -1,6 +1,6 @@
 module RelatonCie
   module Scrapper
-    ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-cie/master/".freeze
+    ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-cie/main/".freeze
     INDEX_FILE = "index-v1.yaml".freeze
 
     class << self

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.1".freeze
+  VERSION = "1.19.1".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

@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
 
   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.1
+  version: 1.19.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -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

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