relaton-bsi 1.14.6 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664ac75d413b97705481a3d457f61e511f5e34a7261ea7b257ace3e37e28a0f2
-  data.tar.gz: 4d288a818b8fb20e5c469ef79bbe0ea6e0a1e8a2ea4692c9f60e7f56931f5ca7
+  metadata.gz: 021f994bae1987a1d8dadd5b1c9425bdcb1aad9c69d62d3e4cb3d388d55bd6d7
+  data.tar.gz: c96491e47dcd93b9281bd1deed2c5e0d1f72984c0aea401966e919dc4634b7a9
 SHA512:
-  metadata.gz: fd95f20ee76e03e06823024f4a45ae7f7a1ae9c0954fd6fd6e7aa97e0cb02550de2b6810cec29fe024bafb8966a6096f06f3b06b92b12292f69f1a0ea12f661f
-  data.tar.gz: '08644bdc1500ae711d927a9db30a912f406d4a7fd36aeb0f7c6539ce12cebe70bc7a489fd607538965ec0d9dfaef82c6c6c755c6a7e5e38170e25c7abc8e898f'
+  metadata.gz: e6b400c1153a40ede7766a6fce3be936114806d600d620eeaceb90ef521c439cb125ae3b53ca27df1dd536ed94366a33fce85e5aedfe0374ab0ebc7231a744e1
+  data.tar.gz: 51bc43147ec74f564d0e37aa97c29622b46554e4d4adba720ef46f1271827e16efd4bd7c23a4c239151d9ff42c97cceee009d35c9a67c9358f967002549e960f

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

@@ -6,5 +6,11 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
-
 gem "rspec", "~> 3.0"
+
+gem "equivalent-xml", "~> 0.6"
+gem "pry-byebug"
+gem "ruby-jing"
+gem "simplecov"
+gem "vcr"
+gem "webmock"

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_bsi/bsi_bibliographic_item.rb

@@ -11,8 +11,8 @@ module RelatonBsi
 
     def initialize(**args) # rubocop:disable Metrics/AbcSize
       if args[:subdoctype] && !SUBDOCTYPES.include?(args[:subdoctype])
-        warn "[relaton-bsi] WARNING: invalid subdoctype: #{args[:subdoctype]}"
-        warn "[relaton-bsi] Allowed subdoctypes are: #{SUBDOCTYPES.join(', ')}"
+        Util.warn "WARNING: invalid subdoctype: `#{args[:subdoctype]}`"
+        Util.warn "Allowed subdoctypes are: `#{SUBDOCTYPES.join('`, `')}`"
       end
       super
     end

data/lib/relaton_bsi/bsi_bibliography.rb

@@ -1,14 +1,5 @@
 # frozen_string_literal: true
 
-# require "mechanize"
-require "relaton_iso_bib"
-require "relaton_bsi/bsi_bibliographic_item"
-require "relaton_bsi/scrapper"
-require "relaton_bsi/hit_collection"
-require "relaton_bsi/hit"
-require "relaton_bsi/xml_parser"
-require "relaton_bsi/hash_converter"
-
 module RelatonBsi
   # Class methods for search ISO standards.
   class BsiBibliography
@@ -64,11 +55,11 @@ module RelatonBsi
       def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         y = code_parts(code)[:year]
         id = year && !y ? "#{code}:#{year}" : code
-        warn "[relaton-bsi] WARNING: no match found online for #{id}. "\
-             "The code must be exactly like it is on the standards website."
+        Util.warn "WARNING: no match found online for `#{id}`. " \
+                  "The code must be exactly like it is on the standards website."
         unless missed_years.empty?
-          warn "[relaton-bsi] (There was no match for #{year}, though there "\
-               "were matches found for #{missed_years.join(', ')}.)"
+          Util.warn "(There was no match for `#{year}`, though there " \
+                    "were matches found for `#{missed_years.join('`, `')}`.)"
         end
         # if /\d-\d/.match? code
         #   warn "[relaton-bsi] The provided document part may not exist, or "\
@@ -91,7 +82,7 @@ module RelatonBsi
       #
       def search_filter(code)
         cp = code_parts code
-        warn "[relaton-bsi] (\"#{code}\") fetching..."
+        Util.warn "(#{code}) fetching..."
         return [] unless cp
 
         search(code).filter_hits!(cp)
@@ -121,7 +112,7 @@ module RelatonBsi
         result = search_filter(code) || return
         ret = results_filter(result, year)
         if ret[:ret]
-          warn "[relaton-bsi] (\"#{code}\") found #{ret[:ret].docidentifier.first&.id}"
+          Util.warn "(#{code}) found `#{ret[:ret].docidentifier.first&.id}`"
           ret[:ret]
         else
           fetch_ref_err(code, year, ret[:years])

data/lib/relaton_bsi/config.rb

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

data/lib/relaton_bsi/util.rb

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

data/lib/relaton_bsi/version.rb

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

data/lib/relaton_bsi.rb

@@ -1,15 +1,24 @@
 # frozen_string_literal: true
 
+require "relaton_iso_bib"
 require_relative "relaton_bsi/version"
+require "relaton_bsi/config"
+require "relaton_bsi/util"
 require "relaton_bsi/bsi_bibliography"
+require "relaton_bsi/bsi_bibliographic_item"
+require "relaton_bsi/scrapper"
+require "relaton_bsi/hit_collection"
+require "relaton_bsi/hit"
+require "relaton_bsi/xml_parser"
+require "relaton_bsi/hash_converter"
 
 module RelatonBsi
   # Returns hash of XML greammar
   # @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 RelatonBsi::VERSION + RelatonIsoBib::VERSION + RelatonBib::VERSION # grammars
   end
 end

data/relaton_bsi.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = "RelatonBsi: retrieve BSI Standards for bibliographic use "\
-                       "using the BibliographicItem model"
-  spec.description   = "RelatonBsi: retrieve BSI Standards for bibliographic use "\
-                       "using the BibliographicItem model"
+  spec.summary       = "RelatonBsi: retrieve BSI Standards for bibliographic " \
+                       "use using the BibliographicItem model"
+  spec.description   = "RelatonBsi: retrieve BSI Standards for bibliographic " \
+                       "use using the BibliographicItem model"
   spec.homepage      = "https://github.com/metanorma/relaton-bsi"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -29,16 +29,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "ruby-jing"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr", "~> 5.0.0"
-  spec.add_development_dependency "webmock"
-
   spec.add_dependency "algolia", "~> 2.3.0"
   spec.add_dependency "graphql", "1.13.6"
   spec.add_dependency "graphql-client", "~> 0.16.0"
-  # spec.add_dependency "mechanize", "~> 2.8.0"
-  spec.add_dependency "relaton-iso-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.16.0"
 end

metadata

@@ -1,99 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bsi
 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-05-15 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: 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: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  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: algolia
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +58,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: 'RelatonBsi: retrieve BSI Standards for bibliographic use using the BibliographicItem
   model'
 email:
@@ -178,12 +94,14 @@ files:
 - lib/relaton_bsi.rb
 - lib/relaton_bsi/bsi_bibliographic_item.rb
 - lib/relaton_bsi/bsi_bibliography.rb
+- lib/relaton_bsi/config.rb
 - lib/relaton_bsi/hash_converter.rb
 - lib/relaton_bsi/hit.rb
 - lib/relaton_bsi/hit_collection.rb
 - lib/relaton_bsi/processor.rb
 - lib/relaton_bsi/schema.json
 - lib/relaton_bsi/scrapper.rb
+- lib/relaton_bsi/util.rb
 - lib/relaton_bsi/version.rb
 - lib/relaton_bsi/xml_parser.rb
 - relaton_bsi.gemspec
@@ -201,7 +119,7 @@ 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:
   - - ">="