relaton-omg 1.14.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16901d647bffb0b9f3e61729c1c43f43ce961e0f09e132e678b248f2289b338e
-  data.tar.gz: 550eb3e6edc11281ae1ee3e794d1c973a8c0cc7920a44918f881ad8dcdd1a8b3
+  metadata.gz: 68a04e76b6f9b7e0262d94edad9b9f419940e78e6dd983cfa6707f8142cfec90
+  data.tar.gz: 6e8d87f0e245b545f55dc2c329cbc8801e29555317630134446f49f0532a4fc1
 SHA512:
-  metadata.gz: 33eb37bdb3abe8d6eae1179e1c8b647f9b9d0efbcf661c5adf9079ae8971ff87acc387022027b5ffce313e70fdc28410b791be0bc5d2511892a5efb0c16c5d55
-  data.tar.gz: 31a2bdeb94d1327376785daea0f033af744403c03a7eea07098953aca29bc88b25adfffdbabed71cc08b28e5efe9eabe03c41f7ee38530e6701cdc93a26a2df0
+  metadata.gz: 73fe10dc67e851fb68219c56c8254a82b56b080e1b1608bb9ad4e396a6dcbfc2cf31ba4db40247fd80f4a3d5a6a13bd4ec6fa4cc3f7a270b7a93fbd61783eee4
+  data.tar.gz: c5d8eada8199773bd6711094e11a70ea8fb42c13f0531c6b75064a80f5f6f106f02b0446d8eb1f42213664962891ec2f10e045d35158afa9eff293e2e19adb2d

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

@@ -5,3 +5,11 @@ gemspec
 
 gem "rake"
 gem "rspec", "~> 3.0"
+
+gem "byebug"
+gem "equivalent-xml", "~> 0.6"
+gem "pry-byebug"
+gem "ruby-jing"
+gem "simplecov"
+gem "vcr"
+gem "webmock"

data/README.adoc

@@ -58,7 +58,7 @@ RelatonOmg::OmgBibliography.get 'OMG 1111'
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="AMI4CCM1.0" schema-version="v1.2.1">
+=> "<bibitem id="AMI4CCM1.0" schema-version="v1.2.4">
       <fetched>2022-12-05</fetched>
       <title type="main" format="text/plain" language="en" script="Latn">Asynchronous Method Invocation for CCM</title>
       <uri type="src">https://www.omg.org/spec/AMI4CCM/1.0/About-AMI4CCM</uri>
@@ -92,7 +92,7 @@ item = RelatonOmg::OmgBibliographicItem.from_xml 'spec/fixtures/omg_ami4ccm_1_0.
 [source,ruby]
 ----
 hash = YAML.load_file 'spec/fixtures/omg_ami4ccm_1_0.yaml'
-=> {"schema-version"=>"v1.2.1",
+=> {"schema-version"=>"v1.2.4",
  "id"=>"AMI4CCM1.0",
 ...
 

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

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

data/lib/relaton_omg/omg_bibliography.rb

@@ -15,7 +15,14 @@ module RelatonOmg
       # @param opts [Hash] options
       # @return [RelatonOmg::OmgBibliographicItem]
       def get(code, _year = nil, _opts = {})
-        search code
+        Util.warn "(#{code}) fetching from OMG website..."
+        result = search code
+        if result
+          Util.warn "(#{code}) found `#{result.docidentifier.first.id}`"
+        else
+          Util.warn "(#{code}) no document found"
+        end
+        result
       end
     end
   end

data/lib/relaton_omg/processor.rb

@@ -13,19 +13,19 @@ module RelatonOmg
     # @param code [String]
     # @param date [String, NilClass] year
     # @param opts [Hash]
-    # @return [RelatonIetf::IetfBibliographicItem]
+    # @return [RelatonOmg::OmgBibliographicItem]
     def get(code, date, opts)
       ::RelatonOmg::OmgBibliography.get(code, date, opts)
     end
 
     # @param xml [String]
-    # @return [RelatonIetf::IetfBibliographicItem]
+    # @return [RelatonOmg::OmgBibliographicItem]
     def from_xml(xml)
       ::RelatonOmg::XMLParser.from_xml xml
     end
 
     # @param hash [Hash]
-    # @return [RelatonIetf::IetfBibliographicItem]
+    # @return [RelatonOmg::OmgBibliographicItem]
     def hash_to_bib(hash)
       # item_hash = ::RelatonOmg::HashConverter.hash_to_bib(hash)
       ::RelatonOmg::OmgBibliographicItem.from_hash hash

data/lib/relaton_omg/scrapper.rb

@@ -14,12 +14,9 @@ module RelatonOmg
         doc = Nokogiri::HTML OpenURI.open_uri(url, open_timeout: 10)
         OmgBibliographicItem.new(**item(doc, acronym))
       rescue OpenURI::HTTPError, URI::InvalidURIError, Net::OpenTimeout => e
-        if e.is_a?(URI::InvalidURIError) || e.io.status[0] == "404"
-          warn %{[relaton-omg] no document found for "#{ref}" reference.}
-          return
-        end
+        return if e.is_a?(URI::InvalidURIError) || e.io.status[0] == "404"
 
-        raise RelatonBib::RequestError, "Unable acces #{url} (#{e.io.status.join(" ")}"
+        raise RelatonBib::RequestError, "Unable acces #{url} (#{e.io.status.join(' ')}"
       end
 
       private
@@ -121,4 +118,4 @@ module RelatonOmg
       end
     end
   end
-end
+end

data/lib/relaton_omg/util.rb

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

data/lib/relaton_omg/version.rb

@@ -1,3 +1,3 @@
 module RelatonOmg
-  VERSION = "1.14.0".freeze
+  VERSION = "1.16.1".freeze
 end

data/lib/relaton_omg.rb

@@ -1,6 +1,8 @@
 require "nokogiri"
 require "relaton_bib"
 require "relaton_omg/version"
+require "relaton_omg/config"
+require "relaton_omg/util"
 require "relaton_omg/scrapper"
 require "relaton_omg/omg_bibliography"
 require "relaton_omg/omg_bibliographic_item"
@@ -11,9 +13,9 @@ module RelatonOmg
   # 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 RelatonOmg::VERSION + RelatonBib::VERSION # grammars
   end
-end
+end

data/relaton_omg.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
                        "using the IsoBibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-ogn"
   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"] = "https://github.com/relaton/relaton-ogn"
@@ -26,13 +26,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "byebug"
-  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"
-  spec.add_development_dependency "webmock"
-
-  spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-bib", "~> 1.16.0"
 end

metadata

@@ -1,127 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: relaton-omg
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: 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: 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: '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: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     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: 'RelatonOmg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem
   model'
 email:
@@ -149,11 +51,13 @@ files:
 - grammars/relaton-omg-compile.rng
 - grammars/relaton-omg.rng
 - lib/relaton_omg.rb
+- lib/relaton_omg/config.rb
 - lib/relaton_omg/hash_converter.rb
 - lib/relaton_omg/omg_bibliographic_item.rb
 - lib/relaton_omg/omg_bibliography.rb
 - lib/relaton_omg/processor.rb
 - lib/relaton_omg/scrapper.rb
+- lib/relaton_omg/util.rb
 - lib/relaton_omg/version.rb
 - lib/relaton_omg/xml_parser.rb
 - relaton_omg.gemspec
@@ -171,14 +75,14 @@ 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.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: 'RelatonOmg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem