relaton-calconnect 1.14.2 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 181a7e1a48eb95ff2558f0895621f59fb8a52f167c0ccac81433f5346e52e38a
-  data.tar.gz: a24dae24e0803340a07ddf3882a0343bb8ba52f05bb2d923df016d33dfd4e7cb
+  metadata.gz: 61a4cc200fc734369371f45f1333152f0680a618d00789df5e2eb59d67ffedff
+  data.tar.gz: 79b164ad5afcffd22d57d6ca80edf4cb17ceb7302151be4d9267633c835f4600
 SHA512:
-  metadata.gz: aab8cae2f19844f9a7d8d999b568d16f1a22344d88d3df81f924ef0e7c225f58d0c05616b6f6b73e3a6d3b8b116bc3df7c33e5ca3f3cd187391c1b7d4d4163fc
-  data.tar.gz: 12b98b7c9ae142bebd87bf4201889c471f28b5c477dc364936e0d94d3c6a3a0c1dd4a8a01cce9367b44183a2fcde70bdde43a50d2f58da04433318ab2f58939a
+  metadata.gz: 50e66f424c080ee02333e8af0c49b130c27303c0ec737191a0d201b2f111331748011f6835c0ab2f87fa56db3260fb795272b33576d1ef0b34fc9fb4914fe5af
+  data.tar.gz: db45ccdedfa3f1885445592fe7ff5a0fed0305ffcfda55a0cee8bd083e55c64842817ebdde40a4191e9750bdf91aeea0e3be28ae1d051be67971ae8f9bce3791

data/.github/workflows/release.yml

@@ -7,7 +7,8 @@ on:
     inputs:
       next_version:
         description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+          Next release version. Possible values: x.y.z, major, minor, patch (or pre|rc|etc).
+          Also, you can pass 'skip' to skip 'git tag' and do 'gem push' for the current version
         required: true
         default: 'skip'
   repository_dispatch:

data/grammars/biblio.rng

@@ -1283,7 +1283,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>

data/lib/relaton_calconnect/cc_bibliography.rb

@@ -29,11 +29,11 @@ module RelatonCalconnect
           end
         end
 
-        warn "[relaton-calconnect] (\"#{ref}\") fetching..."
+        Util.warn "(#{ref}) fetching..."
         result = search(code, year, opts) || (return nil)
         ret = bib_results_filter(result, year)
         if ret[:ret]
-          warn "[relaton-calconnect] (\"#{ref}\") found #{ret[:ret].docidentifier.first.id}"
+          Util.warn "(#{ref}) found `#{ret[:ret].docidentifier.first.id}`"
           ret[:ret]
         else
           fetch_ref_err(code, year, ret[:years])
@@ -73,12 +73,12 @@ module RelatonCalconnect
       # @param year [String]
       # @param missed_years [Array<Strig>]
       def fetch_ref_err(code, year, missed_years)
-        id = year ? "#{code} year #{year}" : code
-        warn "[relaton-calconnect] WARNING: no match found online for #{id}. " \
-             "The code must be exactly like it is on the standards website."
+        id = year ? "`#{code}` year `#{year}`" : code
+        Util.warn "WARNING: no match found online for #{id}. " \
+                  "The code must be exactly like it is on the standards website."
         unless missed_years.empty?
-          warn "[relaton-calconnect] (There was no match for #{year}, though " \
-               "there were matches found for #{missed_years.join(', ')}.)"
+          Util.warn "(There was no match for `#{year}`, though there " \
+                    "were matches found for `#{missed_years.join('`, `')}`.)"
         end
         nil
       end

data/lib/relaton_calconnect/config.rb

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

data/lib/relaton_calconnect/util.rb

@@ -0,0 +1,9 @@
+module RelatonCalconnect
+  module Util
+    extend RelatonBib::Util
+
+    def self.logger
+      RelatonCalconnect.configuration.logger
+    end
+  end
+end

data/lib/relaton_calconnect/version.rb

@@ -1,3 +1,3 @@
 module RelatonCalconnect
-  VERSION = "1.14.2".freeze
+  VERSION = "1.16.1".freeze
 end

data/lib/relaton_calconnect/xml_parser.rb

@@ -3,7 +3,7 @@ module RelatonCalconnect
     class << self
       # override RelatonBib::BibliographicItem.bib_item method
       # @param item_hash [Hash]
-      # @return [RelatonIsoBib::IsoBibliographicItem]
+      # @return [RelatonCalconnect::CcBibliographicItem]
       def bib_item(item_hash)
         CcBibliographicItem.new(**item_hash)
       end

data/lib/relaton_calconnect.rb

@@ -1,6 +1,8 @@
 require "relaton/index"
 require "relaton_bib"
 require "relaton_calconnect/version"
+require "relaton_calconnect/config"
+require "relaton_calconnect/util"
 require "relaton_calconnect/cc_bibliography"
 require "relaton_calconnect/hit_collection"
 require "relaton_calconnect/hit"
@@ -17,9 +19,9 @@ module RelatonCalconnect
   # Returns hash of XML reammar
   # @return [String]
   def self.grammar_hash
-    gem_path = File.expand_path "..", __dir__
-    grammars_path = File.join gem_path, "grammars", "*"
-    grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
-    Digest::MD5.hexdigest grammars
+    # gem_path = File.expand_path "..", __dir__
+    # grammars_path = File.join gem_path, "grammars", "*"
+    # grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
+    Digest::MD5.hexdigest RelatonCalconnect::VERSION + RelatonBib::VERSION # grammars
   end
 end

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.14.0"
+  spec.add_dependency "relaton-bib", "~> 1.16.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.14.2
+  version: 1.16.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,7 @@ 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/hash_converter.rb
 - lib/relaton_calconnect/hit.rb
@@ -87,6 +88,7 @@ files:
 - lib/relaton_calconnect/processor.rb
 - lib/relaton_calconnect/scrapper.rb
 - lib/relaton_calconnect/technical_committee.rb
+- lib/relaton_calconnect/util.rb
 - lib/relaton_calconnect/version.rb
 - lib/relaton_calconnect/xml_parser.rb
 - relaton_calconnect.gemspec