relaton-iso-bib 1.16.0 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9178932b5f1aeda46f0f96953c3af24f9a0f972b2a814a944fac874b1750aa18
-  data.tar.gz: bc4581d1396b7da73f085dbfb2dc24563a7f5ff3e9d304364a68950e856f3841
+  metadata.gz: 4da0e98206115f1448b10d16ba8c6521a38bc25762f9b1ecabf07e11b415c293
+  data.tar.gz: f09b435e8ec48229bd3fbe516d476cda07f0ade028a5f141174fc97d7f3b07cc
 SHA512:
-  metadata.gz: e2323ef8d43d2c64d4638f1c0ef7da3e7cce6cf9e0c660a4256c81062f60d26c293cc58165215f7472174936cd5fa3a746b5423183ad0ddeee8ebf40c5125ebd
-  data.tar.gz: f5713dd3d4ec1e6b37e8623bec3ac3bd1b524f4bdf0a58cdcbde60f18303e6e05c05671c91daf69b0070413e8b7d60ea550d1375611e3da934fd4beb7ffc2252
+  metadata.gz: bd267c0503570dc5e86586a574cb0da0f032680019d68eea433ab5d97ac11551f41c2a646653aef17b7ed70dea3879cc0f9eb8cfcd7b73f4751bf33d58c40a6d
+  data.tar.gz: 1761fbed48d7aa9d0d200fb0061aa2ca17fc0e3c8264e3a75349ac3a797457f996c1557d23c16d43af6e4ddff6310f2ec6af57d0e5076150814805e4bc7b5937

data/README.adoc

@@ -1,9 +1,7 @@
 = RelatonIsoBib
 
 image:https://img.shields.io/gem/v/relaton-iso-bib.svg["Gem Version", link="https://rubygems.org/gems/relaton-iso-bib"]
-image:https://github.com/relaton/relaton-iso-bib/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/relaton/relaton-iso-bib/actions?workflow=macos"]
-image:https://github.com/relaton/relaton-iso-bib/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/relaton/relaton-iso-bib/actions?workflow=windows"]
-image:https://github.com/relaton/relaton-iso-bib/workflows/ubuntu/badge.svg["Build Status (Ubuntu)", link="https://github.com/relaton/relaton-iso-bib/actions?workflow=ubuntu"]
+image:https://github.com/relaton/relaton-iso-bib/workflows/rake/badge.svg["Build Status (macOS)", link="https://github.com/relaton/relaton-iso-bib/actions?workflow=rake"]
 image:https://codeclimate.com/github/relaton/relaton-iso-bib/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/relaton/relaton-iso-bib"]
 image:https://img.shields.io/github/issues-pr-raw/relaton/relaton-iso-bib.svg["Pull Requests", link="https://github.com/relaton/relaton-iso-bib/pulls"]
 image:https://img.shields.io/github/commits-since/relaton/relaton-iso-bib/latest.svg["Commits since latest",link="https://github.com/relaton/relaton-iso-bib/releases"]
@@ -29,13 +27,24 @@ Or install it yourself as:
 
 == Usage
 
-=== Create ISO bibliographic item
+=== 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 `RelatonIsoBib.configure` block.
 
 [source,ruby]
 ----
 require 'relaton_iso_bib'
 => true
 
+RelatonIsoBib.configure do |config|
+  config.logger.level = Logger::DEBUG
+end
+----
+
+=== Create ISO bibliographic item
+
+[source,ruby]
+----
 hash = YAML.load_file "spec/examples/iso_bib_item.yml"
 => {
     "schema-version"=>"v1.0.0",

data/grammars/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/grammars/biblio.rng

@@ -942,6 +942,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/relaton_iso_bib/config.rb

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

data/lib/relaton_iso_bib/iso_bibliographic_item.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: false
 
-require "nokogiri"
-require "isoics"
-require "relaton_bib"
 require "relaton_iso_bib/editorial_group"
 require "relaton_iso_bib/xml_parser"
 require "relaton_iso_bib/structured_identifier"
@@ -151,7 +148,7 @@ module RelatonIsoBib
       end
 
       if args[:subdoctype] && !self.class::SUBDOCTYPES.include?(args[:subdoctype])
-        warn "Invald subdoctype '#{args[:subdoctype]}'. Allowed values are: #{self.class::SUBDOCTYPES.join(', ')}"
+        Util.warn "Invald subdoctype `#{args[:subdoctype]}`. Allowed values are: #{self.class::SUBDOCTYPES.join(', ')}"
       end
       @subdoctype = args[:subdoctype]
       @structuredidentifier = args[:structuredidentifier]
@@ -231,8 +228,8 @@ module RelatonIsoBib
     # @raise ArgumentError
     def check_doctype(doctype)
       if doctype && !self.class::DOCTYPES.include?(doctype)
-        warn "[relaton-iso-bib] WARNING: invalid doctype: #{doctype}"
-        warn "[relaton-iso-bib] Allowed doctypes are: #{self.class::DOCTYPES.join(', ')}"
+        Util.warn "WARNING: invalid doctype: #{doctype}"
+        Util.warn "Allowed doctypes are: #{self.class::DOCTYPES.join(', ')}"
       end
     end
 

data/lib/relaton_iso_bib/util.rb

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

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "1.16.0".freeze
+  VERSION = "1.16.2".freeze
 end

data/lib/relaton_iso_bib.rb

@@ -1,4 +1,9 @@
+require "nokogiri"
+require "isoics"
+require "relaton_bib"
 require "relaton_iso_bib/version"
+require "relaton_iso_bib/config"
+require "relaton_iso_bib/util"
 require "relaton_iso_bib/iso_bibliographic_item"
 require "digest/md5"
 
@@ -8,9 +13,9 @@ module RelatonIsoBib
   # 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, encoding: "UTF-8" }.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, encoding: "UTF-8" }.join
+    Digest::MD5.hexdigest RelatonIsoBib::VERSION + RelatonBib::VERSION # grammars
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.2
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isoics
@@ -63,12 +63,14 @@ files:
 - grammars/relaton-iso-compile.rng
 - grammars/relaton-iso.rng
 - lib/relaton_iso_bib.rb
+- lib/relaton_iso_bib/config.rb
 - lib/relaton_iso_bib/editorial_group.rb
 - lib/relaton_iso_bib/hash_converter.rb
 - lib/relaton_iso_bib/ics.rb
 - lib/relaton_iso_bib/iso_bibliographic_item.rb
 - lib/relaton_iso_bib/iso_document_relation.rb
 - lib/relaton_iso_bib/structured_identifier.rb
+- lib/relaton_iso_bib/util.rb
 - lib/relaton_iso_bib/version.rb
 - lib/relaton_iso_bib/xml_parser.rb
 - relaton_iso_bib.gemspec
@@ -76,7 +78,7 @@ homepage: https://github.com/relaton/relaton-iso-bib
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -91,8 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.9
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 test_files: []