relaton-calconnect 1.18.0 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac031a527346a0fe8c93195fccb82c8f560916ceb677089b1d3acf4d734d816
-  data.tar.gz: 69af72168bc0f701a12f45cf39e8a97e804451f7886cef5d35a897793144a79c
+  metadata.gz: 9fcb3b4d62f90644c6d413e130c437e25fc5f79e93f4651c0c18b75afd378537
+  data.tar.gz: f701752957ca137ecb8cef0c69741279765b20f6a1d14f8b4cffe4de619dc682
 SHA512:
-  metadata.gz: 4d44f4d1e9c069f95fc626bd624c09af792a40d201853bc508be30e2c91aba0c038e74a27f7fb3361bc94b64a44455ffd251de85c2272be81117ab9aa6e2ba72
-  data.tar.gz: 8c1ec2768962fa88f10f40f3d01903bfb3fc09f99b2ac0eba8e77aa22bd3663738a271de669d811e58c835f24013122f6888e1c85cefc5ac68ae2bfe4288cf63
+  metadata.gz: 20192f06a9d2136cb690d2de1ae3286840fc8bb03443266f341fe27bafdda868c5223d78ceec9b11e078d15c543e02b78a59cff1575d15618cc26e4457f54d94
+  data.tar.gz: e110ed14e5bf719fe138e265f0da3a546db447e7d255da8a4ca3290b029336e68149c7c69d6077909b72d646b809a0fe6a215ff915c2a2a4c438e9d0dfa7d5c3

data/README.adoc

@@ -23,24 +23,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 `RelatonCalconnect.configure` block.
+=== Search for a standard using keywords
 
 [source,ruby]
 ----
 require 'relaton_calconnect'
 => true
 
-RelatonCalconnect.configure do |config|
-  config.logger.level = Logger::DEBUG
-end
-----
-
-=== Search for a standard using keywords
-
-[source,ruby]
-----
 hits = RelatonCalconnect::CcBibliography.search("CC/DIR 10005:2019")
 => <RelatonCalconnect::HitCollection:0x007f98e34a8bb0 @ref=CC/DIR 10005:2019 @fetched=false>
 
@@ -147,6 +136,10 @@ Done in: 20 sec.
 => nil
 ----
 
+=== Logging
+
+RelatonCalconnect 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_calconnect/cc_bibliography.rb

@@ -29,14 +29,14 @@ module RelatonCalconnect
           end
         end
 
-        Util.warn "(#{ref}) Fetching from Relaton repository ..."
+        Util.info "Fetching from Relaton repository ...", key: ref
         result = search(code, year, opts) || (return nil)
         ret = bib_results_filter(result, year)
         if ret[:ret]
-          Util.warn "(#{ref}) Found: `#{ret[:ret].docidentifier.first.id}`"
+          Util.info "Found: `#{ret[:ret].docidentifier.first.id}`", key: ref
           ret[:ret]
         else
-          Util.warn "(#{ref}) No found."
+          Util.info "No found.", key: ref
           fetch_ref_err(code, year, ret[:years])
         end
       end
@@ -55,12 +55,17 @@ module RelatonCalconnect
       #
       # @return [Hash]
       def bib_results_filter(result, year)
-        missed_years = []
+        missed_years = Set.new
         result.each do |r|
           item = r.fetch
           item.fetched = Date.today.to_s
           return { ret: item } if !year
 
+          /:(?<id_year>\d{4})$/ =~ r.hit[:id]
+          return { ret: item } if year.to_i == id_year.to_i
+
+          missed_years << id_year.to_i if id_year
+
           item.date.select { |d| d.type == "published" }.each do |d|
             return { ret: item } if year.to_i == d.on(:year)
 
@@ -75,10 +80,10 @@ module RelatonCalconnect
       # @param missed_years [Array<Strig>]
       def fetch_ref_err(code, year, missed_years)
         # id = year ? "`#{code}` year `#{year}`" : code
-        # Util.warn "WARNING: No match found online for #{id}. " \
+        # Util.info "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
         nil

data/lib/relaton_calconnect/data_fetcher.rb

@@ -67,9 +67,9 @@ module RelatonCalconnect
       write_doc doc["docid"]["id"], bib
       true
     rescue StandardError => e
-      warn "Document: #{doc['docid']['id']}"
-      warn e.message
-      warn e.backtrace[0..5].join("\n")
+      Util.warn "Document: #{doc['docid']['id']}"
+      Util.warn e.message
+      Util.warn e.backtrace[0..5].join("\n")
       false
     end
 
@@ -81,7 +81,7 @@ module RelatonCalconnect
                 end
       file = File.join @output, "#{docid.upcase.gsub(%r{[/\s:]}, '_')}.#{@ext}"
       if @files.include? file
-        warn "#{file} exist"
+        Util.warn "#{file} exist"
       else
         @files << file
       end

data/lib/relaton_calconnect/document_type.rb

@@ -12,7 +12,7 @@ module RelatonCalconnect
 
     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_calconnect/scrapper.rb

@@ -74,9 +74,16 @@ module RelatonCalconnect
         dtps = %w[CC CSD]
         did = array(doc["docid"]).detect { |id| dtps.include? id["type"].upcase }
         did["primary"] = true if did
+        # date_to_hash doc
         doc
       end
 
+      # def date_to_hash(doc)
+      #   return if doc["date"] || !doc["revdate"]
+
+      #   doc["date"] = { "type" => "published", "on" => doc["revdate"] }
+      # end
+
       def update_links(bib, links)
         links.each do |l|
           tu = l.transform_keys(&:to_sym)

data/lib/relaton_calconnect/util.rb

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

data/lib/relaton_calconnect/version.rb

@@ -1,3 +1,3 @@
 module RelatonCalconnect
-  VERSION = "1.18.0".freeze
+  VERSION = "1.19.1".freeze
 end

data/lib/relaton_calconnect/xml_parser.rb

@@ -20,6 +20,10 @@ module RelatonCalconnect
         end
         RelatonBib::EditorialGroup.new eg if eg.any?
       end
+
+      def create_doctype(type)
+        DocumentType.new type: type.text, abbreviation: type[:abbreviation]
+      end
     end
   end
 end

data/lib/relaton_calconnect.rb

@@ -1,7 +1,6 @@
 require "relaton/index"
 require "relaton_bib"
 require "relaton_calconnect/version"
-require "relaton_calconnect/config"
 require "relaton_calconnect/util"
 require "relaton_calconnect/document_type"
 require "relaton_calconnect/cc_bibliography"

data/relaton_calconnect.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "faraday", "~> 2.7.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-calconnect
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,14 +30,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
@@ -80,7 +80,6 @@ files:
 - lib/relaton_calconnect.rb
 - lib/relaton_calconnect/cc_bibliographic_item.rb
 - lib/relaton_calconnect/cc_bibliography.rb
-- lib/relaton_calconnect/config.rb
 - lib/relaton_calconnect/data_fetcher.rb
 - lib/relaton_calconnect/document_type.rb
 - lib/relaton_calconnect/hash_converter.rb
@@ -112,7 +111,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: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem

data/lib/relaton_calconnect/config.rb

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