relaton-w3c 1.14.3 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a1a222450fe77ebead97e01ba3e660fb06992b2d13c6628a8089a27e5058307
-  data.tar.gz: a46a34fe7cf17baacbab2502b17bc0f3446e840a80e98b4f304c3ca5d3d255e5
+  metadata.gz: 0440b77d73c24a978935bfba1bd94b9ddc58c8ebcf90cc229c4a5339a901c18c
+  data.tar.gz: a4b299f58a4c4c4b79946ef56e075cbff224fb8f6a639e11958a4dba996eeb5d
 SHA512:
-  metadata.gz: cb3d82c9e735eae6f1029f473fa1c0fe63890861f13360259b7e6e3b189ba19e76ef1faa013735e6accd4887d69ad732fb6fe2c7b6cc2285e27bb8bc1982c55b
-  data.tar.gz: 0562d37dee60a531f1f23106de50df4f7e1a9e9bfd865ba0345108cbf246e0523dddb2f29763c00d2174adf62b04125a2587388b096148d516345b9bc58c49a4
+  metadata.gz: 81e2bd181d0a55948a36d831d39ebb13edfc7a0d28bcff8e035f5e6544305b67bd6a28db4d647c45417ff4504aa8dde2459bd7b848b274c53c286fcc08edc360
+  data.tar.gz: ff49763539341324fc1d0e612d90404b52b25d11e9b2141cc7801e050abfb81e03c8c94de29c4278af452415eaf92293467b7d9817a87fbb2122fd0177a5b038

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/README.adoc

@@ -23,16 +23,27 @@ Or install it yourself as:
 
 == Usage
 
-=== Search for a standard using keywords
+=== Configuration
+
+Configuration is optional. The available option is `logger` which is a `Logger` instance. By default, the logger is `Logger.new($stderr)` with `Logger::WARN` level. To change the logger level, use `RelatonW3c.configure` block.
 
 [source,ruby]
 ----
 require 'relaton_w3c'
 => true
 
+RelatonW3c.configure do |config|
+  config.logger.level = Logger::DEBUG
+end
+----
+
+=== Search for a standard using keywords
+
+[source,ruby]
+----
 item = RelatonW3c::W3cBibliography.get "W3C REC-json-ld11-20200716"
-[relaton-w3c] ("W3C REC-json-ld11-20200716") fetching...
-[relaton-w3c] ("W3C REC-json-ld11-20200716") found REC-json-ld11-20200716
+[relaton-w3c] (W3C REC-json-ld11-20200716) Fetching from Relaton repository ...
+[relaton-w3c] (W3C REC-json-ld11-20200716) Found: `REC-json-ld11-20200716`
 => #<RelatonW3c::W3cBibliographicItem:0x00007fc4ea03c6c0
 ...
 ----

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

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

data/lib/relaton_w3c/data_fetcher.rb

@@ -74,13 +74,13 @@ module RelatonW3c
       if File.exist? file
         item = send "read_#{@format}", file
         item.relation.each do |r1|
-          r1.type = "hasEdition" if r1.type == "instance"
+          r1.type = "hasEdition" if r1.type == "instanceOf"
           same_edition = bib.relation.detect { |r2| same_edition?(r1, r2) }
           bib.relation << r1 unless same_edition
         end
       end
       bib.relation.select { |r| r.type == "hasEdition" }
-        .max_by { |r| r.bibitem.id.match(/(?<=-)\d{8}$/).to_s }&.type = "instance"
+        .max_by { |r| r.bibitem.id.match(/(?<=-)\d{8}$/).to_s }&.type = "instanceOf"
     end
 
     #

data/lib/relaton_w3c/data_parser.rb

@@ -434,7 +434,7 @@ module RelatonW3c
           rwg = RelatonBib::WorkGroup.new name: wg["name"]
           obj << RelatonBib::TechnicalCommittee.new(rwg)
         else
-          warn "Working group name not found for #{edg.home_page}"
+          Util.warn "WARNING: Working group name not found for: `#{edg.home_page}`"
         end
       end
       RelatonBib::EditorialGroup.new tc

data/lib/relaton_w3c/util.rb

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

data/lib/relaton_w3c/version.rb

@@ -1,3 +1,3 @@
 module RelatonW3c
-  VERSION = "1.14.3".freeze
+  VERSION = "1.16.1".freeze
 end

data/lib/relaton_w3c/w3c_bibliographic_item.rb

@@ -8,7 +8,7 @@ module RelatonW3c
     # @param doctype [String]
     def initialize(**args)
       if args[:doctype] && !TYPES.include?(args[:doctype])
-        warn "[relaton-w3c] invalid document type: #{args[:doctype]}"
+        Util.warn "Invalid document type: `#{args[:doctype]}`"
       end
       super
     end

data/lib/relaton_w3c/w3c_bibliography.rb

@@ -39,15 +39,15 @@ module RelatonW3c
       # @param opts [Hash] options
       # @return [RelatonW3c::W3cBibliographicItem]
       def get(ref, _year = nil, _opts = {})
-        warn "[relaton-w3c] (\"#{ref}\") fetching..."
+        Util.warn "(#{ref}) Fetching from Relaton repository ..."
         result = search(ref)
         unless result
-          warn "[relaton-w3c] (\"#{ref}\") not found."
+          Util.warn "(#{ref}) Not found."
           return
         end
 
         found = result.docnumber
-        warn "[relaton-w3c] (\"#{ref}\") found #{found}"
+        Util.warn "(#{ref}) Found: `#{found}`"
         result
       end
     end

data/lib/relaton_w3c.rb

@@ -1,6 +1,8 @@
 require "relaton_bib"
 require "relaton/index"
 require "relaton_w3c/version"
+require "relaton_w3c/config"
+require "relaton_w3c/util"
 require "relaton_w3c/w3c_bibliography"
 require "relaton_w3c/w3c_bibliographic_item"
 require "relaton_w3c/xml_parser"
@@ -16,9 +18,9 @@ module RelatonW3c
   # 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 RelatonW3c::VERSION + RelatonBib::VERSION # grammars
   end
 end

data/relaton_w3c.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mechanize", "~> 2.8.0"
   spec.add_dependency "rdf", "~> 3.2.0"
   spec.add_dependency "rdf-normalize", "~> 0.5.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"
   spec.add_dependency "rubyzip", "~> 2.3.0"
   spec.add_dependency "shex", "~> 0.7.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-w3c
 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-06-14 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -72,14 +72,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
@@ -164,12 +164,14 @@ files:
 - grammars/relaton-w3c.rng
 - lib/relaton_w3c.rb
 - lib/relaton_w3c/bibxml_parser.rb
+- lib/relaton_w3c/config.rb
 - lib/relaton_w3c/data_fetcher.rb
 - lib/relaton_w3c/data_index.rb
 - lib/relaton_w3c/data_parser.rb
 - lib/relaton_w3c/hash_converter.rb
 - lib/relaton_w3c/processor.rb
 - lib/relaton_w3c/pubid.rb
+- lib/relaton_w3c/util.rb
 - lib/relaton_w3c/version.rb
 - lib/relaton_w3c/w3c_bibliographic_item.rb
 - lib/relaton_w3c/w3c_bibliography.rb