relaton-ogc 1.18.1 → 1.20.0

data/grammars/basicdoc.rng

@@ -244,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>

data/lib/relaton_ogc/data_fetcher.rb

@@ -72,7 +72,7 @@ module RelatonOgc
       get_data do |etag, json|
         no_errors = true
         json.each { |_, hit| fetch_doc(hit) || no_errors = false }
-        warn "WARNING Duplicated documents: #{@dupids.to_a.join(', ')}" if @dupids.any?
+        Util.warn "Duplicated documents: #{@dupids.to_a.join(', ')}" if @dupids.any?
         self.etag = etag if no_errors
         index.save
       end
@@ -85,9 +85,8 @@ module RelatonOgc
       write_document bib
       true
     rescue StandardError => e
-      warn "Fetching document: #{hit['identifier']}"
-      warn "#{e.class} #{e.message}"
-      warn e.backtrace
+      Util.error "Fetching document: #{hit['identifier']}\n" \
+      "#{e.class} #{e.message}\n#{e.backtrace}"
       false
     end
 

data/lib/relaton_ogc/document_type.rb

@@ -15,7 +15,7 @@ module RelatonOgc
 
     def check_type(type)
       unless DOCTYPES.include? type
-        Util.warn "WARNING: invalid doctype: `#{type}`"
+        Util.warn "invalid doctype: `#{type}`"
       end
     end
   end

data/lib/relaton_ogc/hash_converter.rb

@@ -7,7 +7,7 @@ module RelatonOgc
 
     # @param ret [Hash]
     def editorialgroup_hash_to_bib(ret)
-      eg = ret[:editorialgroup]
+      eg = ret.dig(:ext, :editorialgroup) || ret[:editorialgroup] #@TODO: remove ret[:editorialgroup] after all gem will be updated
       return unless eg
 
       ret[:editorialgroup] = EditorialGroup.new(

data/lib/relaton_ogc/ogc_bibliographic_item.rb

@@ -8,7 +8,7 @@ module RelatonOgc
 
     def initialize(**args)
       if args[:subdoctype] && !SUBTYPES.include?(args[:subdoctype])
-        Util.warn "WARNING: Invalid document subtype: `#{args[:subdoctype]}`"
+        Util.warn "Invalid document subtype: `#{args[:subdoctype]}`"
       end
 
       # @docsubtype = args.delete :docsubtype

data/lib/relaton_ogc/ogc_bibliography.rb

@@ -24,7 +24,7 @@ module RelatonOgc
         result = bib_search_filter(code, year, opts) || (return nil)
         ret = bib_results_filter(result, year)
         if ret[:ret]
-          Util.warn "(#{code}) Found: `#{ret[:ret].docidentifier.first.id}`"
+          Util.info "Found: `#{ret[:ret].docidentifier.first.id}`", key: code
           ret[:ret]
         else
           fetch_ref_err(code, year, ret[:years])
@@ -34,7 +34,7 @@ module RelatonOgc
       private
 
       def bib_search_filter(code, year, opts)
-        Util.warn "(#{code}) Fetching from Relaton repository ..."
+        Util.info "Fetching from Relaton repository ...", key: code
         search(code, year, opts)
       end
 
@@ -68,10 +68,10 @@ module RelatonOgc
       # @param year [String]
       # @param missed_years [Array<Strig>]
       def fetch_ref_err(code, year, missed_years)
-        Util.warn "(#{code}) Not found."
+        Util.info "Not found.", key: code
         unless missed_years.empty?
-          Util.warn "There was no match for `#{year}`, though there " \
-                    "were matches found for `#{missed_years.join('`, `')}`."
+          Util.info "There was no match for `#{year}`, though there " \
+                    "were matches found for `#{missed_years.join('`, `')}`.", key: code
         end
         nil
       end

data/lib/relaton_ogc/util.rb

@@ -1,9 +1,6 @@
 module RelatonOgc
   module Util
     extend RelatonBib::Util
-
-    def self.logger
-      RelatonOgc.configuration.logger
-    end
+    PROGNAME = "relaton-ogc".freeze
   end
 end

data/lib/relaton_ogc/version.rb

@@ -1,3 +1,3 @@
 module RelatonOgc
-  VERSION = "1.18.1".freeze
+  VERSION = "1.20.0".freeze
 end

data/lib/relaton_ogc/xml_parser.rb

@@ -38,9 +38,7 @@ module RelatonOgc
         committe = eg&.at("committee")&.text
         sc = iso_subgroup eg&.at("subcommittee")
         wg = iso_subgroup eg&.at("workgroup")
-        EditorialGroup.new(
-          committee: committe, subcommittee: sc, workgroup: wg,
-        )
+        EditorialGroup.new(committee: committe, subcommittee: sc, workgroup: wg)
       end
     end
   end

data/lib/relaton_ogc.rb

@@ -1,7 +1,6 @@
 require "relaton/index"
 require "relaton_iso_bib"
 require "relaton_ogc/version"
-require "relaton_ogc/config"
 require "relaton_ogc/util"
 require "relaton_ogc/document_type"
 require "relaton_ogc/ogc_bibliographic_item"

data/relaton_ogc.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday", "~> 2.7.0"
   spec.add_dependency "relaton-index", "~> 0.2.0"
-  spec.add_dependency "relaton-iso-bib", "~> 1.18.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.20.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ogc
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.20.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-07 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.20.0
 description: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem
   model'
 email:
@@ -72,14 +72,13 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
-- docs.json
+- docs1.json
 - grammars/basicdoc.rng
 - grammars/biblio-standoc.rng
 - grammars/biblio.rng
 - grammars/relaton-ogc-compile.rng
 - grammars/relaton-ogc.rng
 - lib/relaton_ogc.rb
-- lib/relaton_ogc/config.rb
 - lib/relaton_ogc/data_fetcher.rb
 - lib/relaton_ogc/document_type.rb
 - lib/relaton_ogc/editorial_group.rb
@@ -98,7 +97,7 @@ homepage: https://github.com/relaton/relaton-ogc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,8 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem
   model'

data/lib/relaton_ogc/config.rb

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