relaton-3gpp 1.14.6 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bc9709c0a74837fe4f663e26f3fe6a0533f47ac02a265f7fadb18326470e41d
-  data.tar.gz: d373bd1f8b947342ff35f022ac4a0228b9b404364d4302cda1ddf8f8ccb9d852
+  metadata.gz: 7044b7a40312d4be81499ffec99b78ca23a1ce244b1b40cb813c446e1b77bdcf
+  data.tar.gz: 32c1aac44fb279a09e91db52e930f4543620eeb9d937abb7edb1ccb5aae1c6e0
 SHA512:
-  metadata.gz: fe21a29110a3a313d1277d85e5ac6d7dac52ce6637f1bbc31c23b29f167c53bd9b364385e10737ff3eca707736e108d758a2b92fc28b7709502f431ffa285070
-  data.tar.gz: 61cac4569e32c91448d550ab3814610164cf34edb948ab818fa8d0e53b76be7377102a27f1d6173e835b54546df2b20e14d27d9ca32c4cc65f09c7776ab5ad20
+  metadata.gz: 784095e42a3a215f41d252b8640251ebde283775acf822d2f37b9169c4f7d22584645944fc72ae4f85d01440e820a3593a1ef9ee1f6dee0763f9a4c0bdba812c
+  data.tar.gz: 11b8f3e63592d6caf64542cfe4918f447ded9eb603b371941d9d37d1918d68a36052c1a58c35db4ba80f86c2ba1c56c58e51a39c56de6b4516cc3f83f858dd1b

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_3gpp/bibliographic_item.rb

@@ -14,19 +14,19 @@ module Relaton3gpp
     def initialize(**args) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       @radiotechnology = args.delete(:radiotechnology)
       if @radiotechnology && !RADIOTECHNOLOGIES.include?(@radiotechnology)
-        warn "[relaton-3gpp] Unknown radiotechnology type: #{@radiotechnology}"
-        warn "[relaton-3gpp] Possible radiotechnology types: #{RADIOTECHNOLOGIES.join ' '}"
+        Util.warn "Unknown radiotechnology type: `#{@radiotechnology}`"
+        Util.warn "Possible radiotechnology types: `#{RADIOTECHNOLOGIES.join '`, `'}`"
       end
       @common_ims_spec = args.delete(:common_ims_spec)
       @release = args.delete(:release)
-      if args[:doctype].nil? then warn "[relaton-3gpp] doctype is missing"
+      if args[:doctype].nil? then Util.warn "doctype is missing"
       elsif !DOCTYPES.include?(args[:doctype])
-        warn "[relaton-3gpp] Unknown doctype: #{args[:doctype]}"
-        warn "[relaton-3gpp] Possible doctypes: #{DOCTYPES.join ' '}"
+        Util.warn "Unknown doctype: `#{args[:doctype]}`"
+        Util.warn "Possible doctypes: `#{DOCTYPES.join '`, `'}`"
       end
       if args[:docsubtype] && !DOCSUBTYPES.include?(args[:docsubtype])
-        warn "[relaton-3gpp] Unknown docsubtype: #{args[:docsubtype]}"
-        warn "[relaton-3gpp] Possible docsubtypes: #{DOCSUBTYPES.join ' '}"
+        Util.warn "Unknown docsubtype: `#{args[:docsubtype]}`"
+        Util.warn "Possible docsubtypes: `#{DOCSUBTYPES.join '`, `'}`"
       end
       super(**args)
     end

data/lib/relaton_3gpp/bibliography.rb

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

data/lib/relaton_3gpp/config.rb

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

data/lib/relaton_3gpp/util.rb

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

data/lib/relaton_3gpp/version.rb

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

data/lib/relaton_3gpp.rb

@@ -4,6 +4,8 @@ require "net/http"
 require "relaton/index"
 require "relaton_bib"
 require_relative "relaton_3gpp/version"
+require_relative "relaton_3gpp/config"
+require_relative "relaton_3gpp/util"
 require_relative "relaton_3gpp/release"
 require_relative "relaton_3gpp/bibliographic_item"
 require_relative "relaton_3gpp/hash_converter"
@@ -18,9 +20,9 @@ module Relaton3gpp
   # 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 Relaton3gpp::VERSION + RelatonBib::VERSION # grammars
   end
 end

data/relaton_3gpp.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mdb", "~> 0.5.0"
   spec.add_dependency "net-ftp", "~> 0.1.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"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 1.14.6
+  version: 1.16.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mdb
@@ -44,14 +44,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
@@ -107,11 +107,13 @@ files:
 - lib/relaton_3gpp.rb
 - lib/relaton_3gpp/bibliographic_item.rb
 - lib/relaton_3gpp/bibliography.rb
+- lib/relaton_3gpp/config.rb
 - lib/relaton_3gpp/data_fetcher.rb
 - lib/relaton_3gpp/hash_converter.rb
 - lib/relaton_3gpp/parser.rb
 - lib/relaton_3gpp/processor.rb
 - lib/relaton_3gpp/release.rb
+- lib/relaton_3gpp/util.rb
 - lib/relaton_3gpp/version.rb
 - lib/relaton_3gpp/xml_parser.rb
 - relaton_3gpp.gemspec