relaton-iana 1.14.3 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbfa9e6bb7c8bdc2772554010aaedc00425f0f43d757ac6d0a4b22688a9e52d7
-  data.tar.gz: 67b12ec014b790910297134c3a8b5fccc6ad14c9f0f085038942a26afd8b3bbb
+  metadata.gz: b9e7fe65f2c63a9d011127f013f61f5bd85b1dc32043f80eb2eb2653755facd4
+  data.tar.gz: d0cc07f003041384cfe5c43bdff9f7bfa399ab37c752446746fe3d52b454107e
 SHA512:
-  metadata.gz: 5c5d6e87589523a0eda7d29f9cc99f70fb541f62b2be4e60ab286356fda69eaa1f7a3afc9de8359fbef33618a3d1573204632a845c305c802223cd6a6789733a
-  data.tar.gz: a0dab69a5515878c328fd837e048c6b9e47f44803d33ed3cf0e07bfea53f55223d7b8693bf1775b8f9fec7aa3651b13350fcdcf9dc2a07e4ed5a83f42f878c26
+  metadata.gz: ba25eadde028828f0a016fc4ee186166c5e012062ef8f46838d1ddb401768da7680321cd73469fe1cfe1032e1b6d37b26c8c121e26d98ae8065340101e2d8124
+  data.tar.gz: 269afa4728fb2bdd13722c8a3b91df76bef7dec287eb004d7c5ac1d240bc6e72a75860acd777ad46587119c11b95932f1314d43d9b996f5fe8755f371dd90748

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/Gemfile

@@ -9,6 +9,7 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
+gem "equivalent-xml", "~> 0.6"
 gem "rubocop", "~> 1.7"
 gem "rubocop-performance"
 gem "rubocop-rails"

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

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

data/lib/relaton_iana/iana_bibliography.rb

@@ -34,11 +34,14 @@ module RelatonIana
     # @param opts [Hash] options
     # @return [RelatonIana::IanaBibliographicItem]
     def get(ref, _year = nil, _opts = {})
-      warn "[relaton-iana] (\"#{ref}\") fetching..."
+      Util.warn "(#{ref}) fetching..."
       result = search(ref)
-      return unless result
+      unless result
+        Util.warn "(#{ref}) not found"
+        return
+      end
 
-      warn "[relaton-iana] (\"#{ref}\") found #{result.docidentifier[0].id}"
+      Util.warn "(#{ref}) found `#{result.docidentifier[0].id}`"
       result
     end
 

data/lib/relaton_iana/util.rb

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

data/lib/relaton_iana/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIana
-  VERSION = "1.14.3"
+  VERSION = "1.16.1"
 end

data/lib/relaton_iana.rb

@@ -4,6 +4,8 @@ require "faraday"
 require "relaton/index"
 require "relaton_bib"
 require_relative "relaton_iana/version"
+require_relative "relaton_iana/config"
+require_relative "relaton_iana/util"
 require_relative "relaton_iana/iana_bibliographic_item"
 require_relative "relaton_iana/xml_parser"
 require_relative "relaton_iana/hash_converter"
@@ -17,9 +19,9 @@ module RelatonIana
   # 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 RelatonIana::VERSION + RelatonBib::VERSION # grammars
   end
 end

data/relaton_iana.gemspec

@@ -30,10 +30,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-
   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"
 
   # Uncomment to register a new dependency of your gem

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iana
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.16.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-09-20 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: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -44,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
@@ -91,12 +77,14 @@ files:
 - grammars/relaton-iana-compile.rng
 - grammars/relaton-iana.rng
 - lib/relaton_iana.rb
+- lib/relaton_iana/config.rb
 - lib/relaton_iana/data_fetcher.rb
 - lib/relaton_iana/hash_converter.rb
 - lib/relaton_iana/iana_bibliographic_item.rb
 - lib/relaton_iana/iana_bibliography.rb
 - lib/relaton_iana/parser.rb
 - lib/relaton_iana/processor.rb
+- lib/relaton_iana/util.rb
 - lib/relaton_iana/version.rb
 - lib/relaton_iana/xml_parser.rb
 - relaton_iana.gemspec