relaton-gb 1.14.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbeb1dfc83ab0140069905c65ebf8692f6df81dfe22671fedb6625ba4a53f829
-  data.tar.gz: 9af4552cec23b9a17f070a189eac9b408f50c721592bd193497cf45889a5dc99
+  metadata.gz: 9abe3c75ca613bc38c155fd5f116ecd967b06eecd7abc78610b498f107d6ec8f
+  data.tar.gz: a01b3c0b36e744d4518a54c2e41576a3c87a996468ff17b19a7981c5ed1a058d
 SHA512:
-  metadata.gz: '069cc2fdab709c560c5bfed46df413dfe32910c016c4ef20c5eac1b749251d26a70094bccab42bb8e78a317b57acefad71d5ab9a67f613547661a738e7656328'
-  data.tar.gz: c5a0af50cb523b5dfa6237beb831cad933b1202bbf295830572d4a4841ecba875e4b8002932365aa83fd9296adb183cab401f48122333f209b56ef807caabadf
+  metadata.gz: f10cfd40d9314992bae8b704118d53b519ce1c5f2145139e61f816559f28adbc17703a34e02556af92694e99f5b78371d6fbcea2732d3d3556d181dc7876d811
+  data.tar.gz: f6373a69761f186b254ef5dfacbee6f195143b6cf522dc2da06a9667a4bfd4df90be3ac001de734034655b48072ab7dbca632f73f77ebf2fe196f19ff8a081d2

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/
 
 # rspec failure tracking
 .rspec_status

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

@@ -3,7 +3,16 @@ Encoding.default_internal = Encoding::UTF_8
 
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in gdbib.gemspec
 gemspec
+
+gem "equivalent-xml", "~> 0.6"
+gem "pry-byebug"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "ruby-jing"
+gem "simplecov"
+gem "vcr"
+gem "webmock"

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

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

data/lib/relaton_gb/gb_bibliographic_item.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "relaton_iso_bib"
-require "cnccs"
 require "relaton_gb/gb_technical_committee"
 require "relaton_gb/gb_standard_type"
 require "relaton_gb/xml_parser"

data/lib/relaton_gb/gb_bibliography.rb

@@ -15,24 +15,25 @@ module RelatonGb
       # @return [RelatonGb::HitCollection]
       def search(text)
         case text
-        when /^(GB|GJ|GS)/
+        # when /^(GB|GJ|GS)/
           # Scrape national standards.
-          require "relaton_gb/gb_scrapper"
-          GbScrapper.scrape_page text
-        when /^ZB/
+          # require "relaton_gb/gb_scrapper"
+          # GbScrapper.scrape_page text
+        # when /^ZB/
           # Scrape proffesional.
-        when /^DB/
+        # when /^DB/
           # Scrape local standard.
-        when %r{^Q/}
+        # when %r{^Q/}
           # Enterprise standard
-        when %r{^T/[^\s]{3,6}\s}
+        when %r{^T/[^\s]{2,6}\s}
           # Scrape social standard.
           require "relaton_gb/t_scrapper"
           TScrapper.scrape_page text
         else
           # Scrape sector standard.
-          require "relaton_gb/sec_scrapper"
-          SecScrapper.scrape_page text
+          # require "relaton_gb/sec_scrapper"
+          # SecScrapper.scrape_page text
+          []
         end
       end
       # rubocop:enable Metrics/MethodLength
@@ -41,7 +42,7 @@ module RelatonGb
       # @param year [String] the year the standard was published (optional)
       # @param opts [Hash] options; restricted to :all_parts if all-parts reference is required
       # @return [String] Relaton XML serialisation of reference
-      def get(code, year = nil, opts = {})
+      def get(code, year = nil, opts = {}) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
         if year.nil?
           /^(?<code1>[^-]+)-(?<year1>[^-]+)$/ =~ code
           unless code1.nil?
@@ -51,7 +52,7 @@ module RelatonGb
         end
 
         code += ".1" if opts[:all_parts]
-        code, year = code.split(/-/, 2) if /-/ =~ code
+        code, year = code.split("-", 2) if code.include?("-")
         ret = get1(code, year, opts)
         return nil if ret.nil?
 
@@ -62,22 +63,22 @@ module RelatonGb
 
       private
 
-      def fetch_ref_err(code, year, missed_years)
+      def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         id = year ? "#{code}:#{year}" : code
-        warn "[relaton-gb] WARNING: no match found on the GB website "\
-          "for #{id}. The code must be exactly like it is on the website."
+        Util.warn "WARNING: no match found on the GB website for `#{id}`. " \
+                  "The code must be exactly like it is on the website."
         unless missed_years.empty?
-          warn "[relaton-gb] (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-gb] The provided document part may not exist, or the "\
-            "document may no longer be published in parts."
+          Util.warn "The provided document part may not exist, or " \
+                    "the document may no longer be published in parts."
         else
-          warn "[relaton-gb] If you wanted to cite all document parts for the "\
-            "reference, use \"#{code} (all parts)\".\nIf the document is not "\
-            "a standard, use its document type abbreviation (TS, TR, PAS, "\
-            "Guide)."
+          Util.warn "If you wanted to cite all document parts for the " \
+                    "reference, use `#{code} (all parts)`.\nIf the document " \
+                    "is not a standard, use its document type abbreviation " \
+                    "(TS, TR, PAS, Guide)."
         end
         nil
       end
@@ -88,7 +89,7 @@ module RelatonGb
         result = search_filter(searchcode) || return
         ret = results_filter(result, year)
         if ret[:ret]
-          warn "[relaton-gb] (\"#{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])
@@ -98,7 +99,7 @@ module RelatonGb
       def search_filter(code)
         # search filter needs to incorporate year
         docidrx = %r{^[^\s]+\s[\d.-]+}
-        warn "[relaton-gb] (\"#{code}\") fetching..."
+        Util.warn "(#{code}) fetching..."
         result = search(code)
         result.select do |hit|
           hit.docref && hit.docref.match(docidrx).to_s.include?(code)

data/lib/relaton_gb/util.rb

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

data/lib/relaton_gb/version.rb

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

data/lib/relaton_gb.rb

@@ -1,6 +1,10 @@
+require "digest/md5"
+require "relaton_iso_bib"
+require "cnccs"
 require "relaton_gb/version"
+require "relaton_gb/config"
+require "relaton_gb/util"
 require "relaton_gb/gb_bibliography"
-require "digest/md5"
 
 # if defined? Relaton
 #   require "relaton_gb/processor"
@@ -14,9 +18,9 @@ module RelatonGb
   # 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 RelatonGb::VERSION + RelatonIsoBib::VERSION + RelatonBib::VERSION # grammars
   end
 end

data/relaton_gb.gemspec

@@ -22,18 +22,9 @@ 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 "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-jing"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "cnccs", "~> 0.1.1"
   spec.add_dependency "gb-agencies", "~> 0.0.1"
-  spec.add_dependency "relaton-iso-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.16.0"
 end

metadata

@@ -1,127 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 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-03 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: vcr
-  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: 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: cnccs
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +44,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: 'RelatonGb: retrieve Chinese GB Standards for bibliographic use using
   the BibliographicItem model.'
 email:
@@ -192,6 +80,7 @@ files:
 - grammars/relaton-gb.rng
 - lib/relaton_gb.rb
 - lib/relaton_gb/ccs.rb
+- lib/relaton_gb/config.rb
 - lib/relaton_gb/gb_bibliographic_item.rb
 - lib/relaton_gb/gb_bibliography.rb
 - lib/relaton_gb/gb_scrapper.rb
@@ -204,6 +93,7 @@ files:
 - lib/relaton_gb/scrapper.rb
 - lib/relaton_gb/sec_scrapper.rb
 - lib/relaton_gb/t_scrapper.rb
+- lib/relaton_gb/util.rb
 - lib/relaton_gb/version.rb
 - lib/relaton_gb/xml_parser.rb
 - lib/relaton_gb/yaml/prefixes.yaml
@@ -212,7 +102,7 @@ homepage: https://github.com/metanorma/relaton_gb
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -220,15 +110,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: 'RelatonGb: retrieve Chinese GB Standards for bibliographic use using the
   BibliographicItem model.'