relaton-cie 1.16.1 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 736da12c1c19f8a12b9dcf4b7ceed1fc8a2f30b25a43dc3ee745e6be4cb42f44
-  data.tar.gz: fb84d6dbeea2788218efe2f7f6ed003be5b077bf507a756d73367b16218219d9
+  metadata.gz: 11878869c776cb0e77ce456b8f774fd549d45a1681ab05a1b18d0178d6ec9dc9
+  data.tar.gz: d6a0c2395217422c2c16de2313eba99818aae4792a280bb27e5abdd6d62ebdc8
 SHA512:
-  metadata.gz: 17c841542d8ee4922923d7e741ed7b1e8abacf52be55234c24ad859190c81155402f1cf561901f603210a0f5f5aaaf2998c8926a5e04db6b2d71496be5d1164f
-  data.tar.gz: cb10e7ede2db4f1dccc38e6ff13cfed5fa6876adae21e3e7602892c4a75c54aaf434d21f4f649d77dafc500c9eeb8921107c3be229321864c23ebfe05ea91475
+  metadata.gz: f3884f990e810108ef61152b8b7b178d5208f310d640aeec04bbd573327ec9cf28370e96842f427155e4d0e917d987074bfeeb5348cdfe43cce71965fbe8d7e6
+  data.tar.gz: 914aac83049568ca9ba66fbf496d8ea4688a263cc8e47418ea828bc2e822d08a03fac95c5aa80daae24460db6cc283ebf3f9b6faa9a0c9f67817a9f715f656a4

data/README.adoc

@@ -29,23 +29,34 @@ Or install it yourself as:
 
 == Usage
 
-=== Search document
+=== Configuration
+
+Configuration is optional. The available option is `logger` which is a `Logger` instance. By default, the logger is `Logger.new($stderr)` with `Logger::WARN` level. To change the logger level, use `RelatonCie.configure` block.
 
 [source,ruby]
 ----
 require 'relaton_cie'
 => true
 
+RelatonCie.configure do |config|
+  config.logger.level = Logger::DEBUG
+end
+----
+
+=== Search document
+
+[source,ruby]
+----
 item = RelatonCie::CieBibliography.get 'CIE 001-1980'
-[relaton-cie] ("CIE 001-1980") fetching...
-[relaton-cie] ("CIE 001-1980") found CIE 001-1980
+[relaton-cie] (CIE 001-1980) Fetching from Realton repository ...
+[relaton-cie] (CIE 001-1980) Found: `CIE 001-1980`
 => #<RelatonBib::BibliographicItem:0x007fb3f6098920
 ...
 
 # Return nil if a document doesn't exist.
 RelatonCie::CieBibliography.get '1111'
-[relaton-cie] ("1111") fetching...
-[relaton-cie] WARNING no match found online for 1111. The code must be exactly like it is on the standards website.
+[relaton-cie] (1111) Fetching from Realton repository ...
+[relaton-cie] (1111) Not found.
 => nil
 ----
 

data/grammars/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/grammars/biblio.rng

@@ -942,6 +942,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/relaton_cie/cie_bibliography.rb

@@ -15,13 +15,12 @@ module RelatonCie
       # @param opts [Hash] not used
       # @return [RelatonCie::BibliographicItem] Relaton of reference
       def get(code, _year = nil, _opts = {})
-        Util.warn "(#{code}) fetching..."
+        Util.warn "(#{code}) Fetching from Relaton repository ..."
         result = search code
         if result
-          Util.warn "(#{code}) found `#{result.docidentifier.first.id}`"
+          Util.warn "(#{code}) Found: `#{result.docidentifier.first.id}`"
         else
-          Util.warn "(#{code}) WARNING no match found online for `#{code}`. " \
-                    "The code must be exactly like it is on the standards website."
+          Util.warn "(#{code}) Not found."
         end
         result
       end

data/lib/relaton_cie/data_fetcher.rb

@@ -160,6 +160,10 @@ module RelatonCie
       contribs << { entity: org, role: [{ type: "publisher" }] }
     end
 
+    def fetch_doctype
+      RelatonBib::DocumentType.new(type: "document")
+    end
+
     # @param bib [RelatonCie::BibliographicItem]
     def write_file(bib) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       id = bib.docidentifier[0].id.gsub(%r{[/\s\-:.]}, "_")
@@ -191,7 +195,7 @@ module RelatonCie
         abstract: fetch_abstract(doc), date: fetch_date(doc),
         edition: fetch_edition(doc), contributor: fetch_contributor(doc),
         relation: fetch_relation(doc), language: ["en"], script: ["Latn"],
-        doctype: "document"
+        doctype: fetch_doctype
       )
       write_file item
     rescue StandardError => e

data/lib/relaton_cie/hash_converter.rb

@@ -1,11 +1,11 @@
 module RelatonCie
-  class HashConverter < RelatonBib::HashConverter
-    class << self
-      # @param item_hash [Hash]
-      # @return [RelatonCie::BibliographicItem]
-      def bib_item(item_hash)
-        BibliographicItem.new(**item_hash)
-      end
+  module HashConverter
+    include RelatonBib::HashConverter
+    extend self
+    # @param item_hash [Hash]
+    # @return [RelatonCie::BibliographicItem]
+    def bib_item(item_hash)
+      BibliographicItem.new(**item_hash)
     end
   end
 end

data/lib/relaton_cie/name_parser.rb

@@ -0,0 +1,6 @@
+module RelatonCie
+  class NameParser < Parslet::Parser
+    root(:name)
+    rule(:name) { name_part.as(:name_part) >> (comma >> name_part).repeat }
+  end
+end

data/lib/relaton_cie/version.rb

@@ -1,3 +1,3 @@
 module RelatonCie
-  VERSION = "1.16.1".freeze
+  VERSION = "1.17.0".freeze
 end

data/relaton_cie.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mechanize", "~> 2.8.0"
   spec.add_dependency "parslet", "~> 2.0.0"
-  spec.add_dependency "relaton-bib", "~> 1.16.0"
+  spec.add_dependency "relaton-bib", "~> 1.17.0"
   spec.add_dependency "relaton-index", "~> 0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cie
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.17.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +98,7 @@ files:
 - lib/relaton_cie/config.rb
 - lib/relaton_cie/data_fetcher.rb
 - lib/relaton_cie/hash_converter.rb
+- lib/relaton_cie/name_parser.rb
 - lib/relaton_cie/processor.rb
 - lib/relaton_cie/scrapper.rb
 - lib/relaton_cie/util.rb