relaton-ecma 1.14.6 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 489543e098342587dcd53b5488ab3704ab432761a553c28da88d20a76f110d15
-  data.tar.gz: 7f246f2b5751621a791fa3d452754f7a46c50e958e737b6a9a8130f59cef1302
+  metadata.gz: 79a0e5c939fec089e35a4f10ea7c62bdbc9ca1cea332dbbdb61cee01fc255b30
+  data.tar.gz: 5c9c499101971798f03ff2953bf5d4a7693a9edbac031bf7793ce568df97582c
 SHA512:
-  metadata.gz: 7f75631aa0d342ab952534ad8829b0ce64682c16f49962228495da1dd5b0b286787d9d790c85d00e49cae7d4304c77a218d3236f9b383673c8c53fb8667a165a
-  data.tar.gz: bec4dcaf4aa873f13e7eba1846212ee1df248b478ef0949e81782ae975c3ce517ed8bf909fa118bbf6c90d8eb5b17369b75cd490b93b7afe2ee700a1fdea2a99
+  metadata.gz: 40bca3bd29a6fbd8c668ba2dca1ed9fedfeb03bc248162b5f5b702d1fd80bd32fc56c33e83e3c0a35e82eb9e4699dd84396c6f24e9bfa8cc9203639c6cee2ca4
+  data.tar.gz: 7eccd989b4bf12be08f519b8f7564aab8bdd823929e0c3206a903f5f0679460458e54ea89eb2ca7b2d75dd20b4845268b821d8fc4c5766ed1e27496e41c247b8

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

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

data/lib/relaton_ecma/data_parser.rb

@@ -147,7 +147,7 @@ module RelatonEcma
     # @return [Array<RelatonBib::FormattedString>]
     def fetch_abstract
       content = @doc.xpath('//div[@class="ecma-item-content"]/p').map do |a|
-        a.text.strip.squeeze(" ").gsub(/\r\n/, "")
+        a.text.strip.squeeze(" ").gsub("\r\n", "")
       end.join "\n"
       return [] if content.empty?
 
@@ -164,7 +164,7 @@ module RelatonEcma
 
     # @return [Array<Hash>]
     def fetch_relation # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
-      @doc.xpath("//ul[@class='ecma-item-archives']/li").map do |rel|
+      @doc.xpath("//ul[@class='ecma-item-archives']/li").filter_map do |rel|
         ref, ed, date, vol = edition_id_parts rel.at("span").text
         next if ed.nil? || ed.empty?
 
@@ -178,7 +178,7 @@ module RelatonEcma
           link: link, extent: extent
         )
         { type: "updates", bibitem: bibitem }
-      end.compact
+      end
     end
 
     #

data/lib/relaton_ecma/ecma_bibliography.rb

@@ -40,14 +40,14 @@ module RelatonEcma
       # @param opts [Hash] not used
       # @return [RelatonEcma::BibliographicItem] Relaton of reference
       def get(code, _year = nil, _opts = {})
-        warn "[relaton-ecma] (\"#{code}\") fetching..."
+        Util.warn "(#{code}) fetching..."
         result = fetch_doc(code)
         if result
-          warn "[relaton-ecma] (\"#{code}\") found #{result.docidentifier.first.id}"
+          Util.warn "(#{code}) found `#{result.docidentifier.first.id}`"
           # item
         else
-          warn "[relaton-ecma] WARNING no match found online for #{code}. " \
-               "The code must be exactly like it is on the standards website."
+          Util.warn "(#{code}) WARNING no match found online for `#{code}`. " \
+                    "The code must be exactly like it is on the standards website."
         end
         result
       end

data/lib/relaton_ecma/util.rb

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

data/lib/relaton_ecma/version.rb

@@ -1,3 +1,3 @@
 module RelatonEcma
-  VERSION = "1.14.6".freeze
+  VERSION = "1.16.1".freeze
 end

data/lib/relaton_ecma.rb

@@ -4,6 +4,8 @@ require "yaml"
 require "relaton/index"
 require "relaton_bib"
 require "relaton_ecma/version"
+require "relaton_ecma/config"
+require "relaton_ecma/util"
 require "relaton_ecma/bibliographic_item"
 require "relaton_ecma/xml_parser"
 require "relaton_ecma/hash_converter"
@@ -15,9 +17,9 @@ module RelatonEcma
   # 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 RelatonEcma::VERSION + RelatonBib::VERSION # grammars
   end
 end

data/relaton_ecma.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mechanize", "~> 2.8.0"
-  spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-bib", "~> 1.16.0"
   spec.add_dependency "relaton-index", "~> 0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ecma
 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-14 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -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
@@ -79,11 +79,13 @@ files:
 - grammars/relaton-ecma.rng
 - lib/relaton_ecma.rb
 - lib/relaton_ecma/bibliographic_item.rb
+- lib/relaton_ecma/config.rb
 - lib/relaton_ecma/data_fetcher.rb
 - lib/relaton_ecma/data_parser.rb
 - lib/relaton_ecma/ecma_bibliography.rb
 - lib/relaton_ecma/hash_converter.rb
 - lib/relaton_ecma/processor.rb
+- lib/relaton_ecma/util.rb
 - lib/relaton_ecma/version.rb
 - lib/relaton_ecma/xml_parser.rb
 - relaton_ecma.gemspec