relaton-iso-bib 1.14.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf939bc514b2ad4c5bc4a3fb1bb6bc5a6d6b6e340e37de485bec38e21731bc44
-  data.tar.gz: 5b87d56812913f7e14f33ebcad42c79c62b7f48a687980342da1837a7b40d92d
+  metadata.gz: 9f7d51e059f163a137cbd3bf2a21c7ebff8e56c3521126d2641374900b90b203
+  data.tar.gz: 8fb275454cc41ca26aa90198b916298bcd7683b10a5e386cda5add9035a3c9aa
 SHA512:
-  metadata.gz: '08cde4d3367d7f90328aceed3272fb4ac0b0df3a8c16b79a000383de8d3c295f151310cd76d57b48096c023332b18cadaa7ce1ce424b88c9efb1e04e673d128f'
-  data.tar.gz: 816253a7cd80565e110eee2380bb74f4305acea6ec7437703cb0eed77aaa74aa22cb761601743ba2ced61dd63ac2ac24ee1938e9147a300ce6cb4c83f4cb76ff
+  metadata.gz: ac0d7d21d23201f5f2569d20ec0ff645642546c75a7f7faf5dec7aa4beb84af8f207997ca89d1124c62e3fe02db85692aafde76a16cab9546b7e0280532c3438
+  data.tar.gz: fe94a38bb8535645ffe2fc67ebbf5470003cad1374552b3150683e872806d603b76420c51977d5a7aa22a7e764dd93cc2c38d7dd183c6653674dd1423e72d642

data/.github/workflows/rake.yml

@@ -5,6 +5,7 @@ name: rake
 on:
   push:
     branches: [ master, main ]
+    tags: [ v* ]
   pull_request:
 
 jobs:

data/.github/workflows/release.yml

@@ -7,11 +7,13 @@ 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'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
+
 
 jobs:
   release:

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 .vscode/
+/vendor/
 .rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
 
 # rspec failure tracking

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 Rails:
   Enabled: false

data/Gemfile

@@ -2,3 +2,10 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in relaton_iso_bib.gemspec
 gemspec
+
+gem "equivalent-xml", "~> 0.6"
+gem "pry-byebug"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "ruby-jing"
+gem "simplecov"

data/grammars/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/grammars/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">
@@ -1273,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>
@@ -1316,7 +1326,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</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/editorial_group.rb

@@ -17,17 +17,17 @@ module RelatonIsoBib
     # @return [String, NilClass]
     attr_reader :secretariat
 
-    # @param technical_committee [Array<Hash, RelatonIsoBib::IsoSubgroup>]
+    # @param technical_committee [Array<Hash, RelatonBib::WorkGroup>]
     # @option technical_committee [String] :name
     # @option technical_committee [String] :type
     # @option technical_committee [Integer] :number
     #
-    # @param subcommittee [Array<Hash, RelatonIsoBib::IsoSubgroup>]
+    # @param subcommittee [Array<Hash, RelatonBib::WorkGroup>]
     # @option subcommittee [String] :name
     # @option subcommittee [String] :type
     # @option subcommittee [Integer] :number
     #
-    # @param workgroup [Array<Hash, RelatonIsoBib::IsoSubgroup>]
+    # @param workgroup [Array<Hash, RelatonBib::WorkGroup>]
     # @option workgroup [String] :name
     # @option workgroup [String] :type
     # @option workgroup [Integer] :number

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"
@@ -150,8 +147,8 @@ module RelatonIsoBib
                           end
       end
 
-      if args[:subdoctype] && !SUBDOCTYPES.include?(args[:subdoctype])
-        warn "Invald subdoctype '#{args[:subdoctype]}'. Allowed values are: #{SUBDOCTYPES.join(', ')}"
+      if args[:subdoctype] && !self.class::SUBDOCTYPES.include?(args[:subdoctype])
+        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.14.0".freeze
+  VERSION = "1.16.1".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

data/relaton_iso_bib.gemspec

@@ -24,17 +24,8 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
-
-  # spec.add_development_dependency "debase"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  # spec.add_development_dependency "ruby-debug-ide"
-  spec.add_development_dependency "ruby-jing"
-  spec.add_development_dependency "simplecov"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "isoics", "~> 0.1.6"
-  spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-bib", "~> 1.16.0"
 end

metadata

@@ -1,99 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-02 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: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: isoics
   requirement: !ruby/object:Gem::Requirement
@@ -114,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
 description: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 email:
 - open.source@ribose.com
@@ -147,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
@@ -160,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
@@ -168,15 +86,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 test_files: []