relaton-un 1.14.1 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e704658b3773eb8347be22f467a49f320cc5efd06503e72095ee9b2398803b0
-  data.tar.gz: 5d25a613fe0d9a9f8e44246d092962907f1794aef97b4dc2a0296c03d474785b
+  metadata.gz: 8f1fa9196d2c00a4740b08e4ed793b3f0073defdfe9efde37f609aa3ae8755e8
+  data.tar.gz: 97752fd7f24738baa8fe97de080c141dba11eab434697cbd04eca1dd158af5f6
 SHA512:
-  metadata.gz: 3bf607afc7975c55eb50bad68d30b710f90e3db0774629fec910df6e0aff35cc2e5520769e18ee459de7b802609a5c9b6d025bc681b992c1294addc56e23c4bf
-  data.tar.gz: d48eb2b4e1195a91e2ee47e00d6146c6bc396c6eef357020fc71c9527e8dfafa0896c81f80630de0b32c1b42dc8ee67ece8c0ac7058883886b40371d3576b091
+  metadata.gz: 5af293100d6b96a28da1b8c56e5f404f282bfcf06ea77408f3297b7a65d5a24375a2da5350f5e2fad4a75262d491e51eb334223f0ca5a90ecca2851d3bd1634b
+  data.tar.gz: 2eb898c7ec22ee17ba302a7bdfb2d167466b1e0500b04048ab0be68f8ec118006f8d18a7af2596c5bf65573674b525516319f1a5bc1bd9a34b89e5b490b40a5a

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/.gitignore

@@ -8,6 +8,7 @@
 /tmp/
 /.pryrc
 /.rubocop-https*
+/vendor/
 
 .rspec_status
 .vscode/

data/Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in relaton-un.gemspec
 gemspec
 
+gem "equivalent-xml", "~> 0.6"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "ruby-jing"

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_un/config.rb

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

data/lib/relaton_un/hit_collection.rb

@@ -23,6 +23,9 @@ module RelatonUn
       # ca_file = "/Users/andrej/Library/Preferences/httptoolkit/ca.pem"
       # @http.cert_store.set_default_paths
       # @http.cert_store.add_file ca_file
+      if RUBY_VERSION.to_f > 3.0
+        @http.ssl_version = :TLSv1_2 # rubocop:disable Naming/VariableNumber
+      end
       @http.read_timeout = 120
       if (form_resp = get_page)
         # doc = Nokogiri::HTML page_resp(form_resp, text).body

data/lib/relaton_un/un_bibliographic_item.rb

@@ -24,7 +24,7 @@ module RelatonUn
     # @param job_number [String, nil]
     def initialize(**args)
       if args[:distribution] && !DISTRIBUTIONS.has_value?(args[:distribution])
-        warn "[relaton-un] WARNING: invalid distribution: #{args[:distribution]}"
+        Util.warn "WARNING: invalid distribution: `#{args[:distribution]}`"
       end
       @submissionlanguage = args.delete :submissionlanguage
       @distribution = args.delete :distribution

data/lib/relaton_un/un_bibliography.rb

@@ -21,13 +21,15 @@ module RelatonUn
       # @param opts [Hash] options
       # @return [RelatonUn::UnBibliographicItem]
       def get(ref, _year = nil, _opts = {})
-        warn "[relaton-un] (\"#{ref}\") fetching..."
+        Util.warn "(#{ref}) fetching..."
         /^(?:UN\s)?(?<code>.*)/ =~ ref
         result = isobib_search_filter(code)
         if result
-          warn "[relaton-un] (\"#{ref}\") "\
-            "found #{result.fetch.docidentifier[0].id}"
+          Util.warn "(#{ref}) found `#{result.fetch.docidentifier[0].id}`"
           result.fetch
+        else
+          Util.warn "(#{ref}) nothing found"
+          nil
         end
       end
 

data/lib/relaton_un/util.rb

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

data/lib/relaton_un/version.rb

@@ -1,3 +1,3 @@
 module RelatonUn
-  VERSION = "1.14.1".freeze
+  VERSION = "1.16.1".freeze
 end

data/lib/relaton_un.rb

@@ -1,6 +1,8 @@
 require "addressable"
 require "relaton_bib"
 require "relaton_un/version"
+require "relaton_un/config"
+require "relaton_un/util"
 require "relaton_un/un_bibliographic_item"
 require "relaton_un/un_bibliography"
 require "relaton_un/hit_collection"
@@ -16,9 +18,9 @@ module RelatonUn
   # 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 RelatonUn::VERSION + RelatonBib::VERSION # grammars
   end
 end

data/relaton_un.gemspec

@@ -32,12 +32,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "faraday", "~> 2.7.0"
   spec.add_dependency "http-cookie", "~> 1.0.5"
-  spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-bib", "~> 1.16.0"
   spec.add_dependency "unf_ext", ">= 0.0.7.7"
 end
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-un
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.16.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +58,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: unf_ext
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +106,7 @@ files:
 - grammars/relaton-un-compile.rng
 - grammars/relaton-un.rng
 - lib/relaton_un.rb
+- lib/relaton_un/config.rb
 - lib/relaton_un/editorialgroup.rb
 - lib/relaton_un/hash_converter.rb
 - lib/relaton_un/hit.rb
@@ -128,6 +115,7 @@ files:
 - lib/relaton_un/session.rb
 - lib/relaton_un/un_bibliographic_item.rb
 - lib/relaton_un/un_bibliography.rb
+- lib/relaton_un/util.rb
 - lib/relaton_un/version.rb
 - lib/relaton_un/xml_parser.rb
 - relaton_un.gemspec