relaton-bipm 1.16.5 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d91960ac9f8357a2ced7209b3dcb7c3ff4637b899639c09a622c2715fe7d36
-  data.tar.gz: 56536641e820e1d14336f8d40efce9a1be829c9356d362761740fc09a39d5b6f
+  metadata.gz: 4d6ca7c2babd9a223b0ed3493818df34cee58241d4589edb19c640d28d2d473d
+  data.tar.gz: 42a2f2b7c16a9e06be43c0ddcfea027220a9bbcd4d9fe7aeed67b1fc579135c2
 SHA512:
-  metadata.gz: 57a28e5cc70fd280b02caa1d267fa79d8aff4e7b120847bae458e283977e631190d622b727c1830fa442c0507a46227548cee50666bf0010fe50fa242b62edc6
-  data.tar.gz: cf74e9ff7b2ad3d2db08b17f8c4139b42d43cfe8bba98d7bd81bf154ea51341ecd821e596780b9415e839f47b664adf6d085b8e678fa3497f773211beb64d015
+  metadata.gz: 4375e47c892a72b1f9c7a246d303fc2deb3334b42ca505121133246bdd59584338e12d4c8a6afcd791787267cd1c4574a145f72ede538cffcf87dab20b1d8d1b
+  data.tar.gz: b384da3f7d91958f0c1c8c8f4ef41e1f74cd2faa2a4e631684c93fdf2d9af8dd180cde2213d4a7e7a37bd99fce66c6f5e4a06e7e2fb30b2b4d6e33af8bcaf1c2

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_bipm/bipm_bibliographic_item.rb

@@ -2,10 +2,6 @@ module RelatonBipm
   class BipmBibliographicItem < RelatonBib::BibliographicItem
     include RelatonBib
 
-    DOCTYPES = %w[brochure mise-en-pratique rapport monographie guide
-                  meeting-report technical-report working-party-note strategy
-                  cipm-mra resolutions].freeze
-
     STATUSES = %w[draft-proposal draft-development in-force retired].freeze
 
     SI_ASPECTS = %w[
@@ -69,7 +65,7 @@ module RelatonBipm
                               si_aspect || comment_period ||
                               structuredidentifier)
           ext = b.ext do
-            b.doctype doctype if doctype
+            doctype&.to_xml b
             editorialgroup&.to_xml b
             comment_period&.to_xml b
             b.send :"si-aspect", si_aspect if si_aspect

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -62,7 +62,7 @@ module RelatonBipm
 
       def index
         Relaton::Index.find_or_create(
-          :bipm, url: "#{GH_ENDPOINT}index2.zip", file: INDEX_FILE, id_keys: %i[group type number year]
+          :bipm, url: "#{GH_ENDPOINT}index2.zip", file: INDEX_FILE, id_keys: %i[group type number year corr]
         )
       end
 

data/lib/relaton_bipm/data_outcomes_parser.rb

@@ -159,7 +159,7 @@ module RelatonBipm
       args[:en]["resolutions"].each.with_index do |r, i| # rubocop:disable Metrics/BlockLength
         hash = {
           type: "proceedings", title: [],
-          doctype: r["type"], place: [RelatonBib::Place.new(city: "Paris")]
+          doctype: DocumentType.new(type: r["type"]), place: [RelatonBib::Place.new(city: "Paris")]
         }
         fr_r = args[:fr]["resolutions"].fetch(i, nil)
         hash[:title] = resolution_title r, fr_r
@@ -385,7 +385,7 @@ module RelatonBipm
     #
     def meeting_bibitem(**args) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
       docnum = create_meeting_docnum args[:body], args[:type], args[:num], args[:en]["date"]
-      hash = { title: [], type: "proceedings", doctype: args[:type],
+      hash = { title: [], type: "proceedings", doctype: DocumentType.new(type: args[:type]),
                place: [RelatonBib::Place.new(city: "Paris")] }
       hash[:title] = create_titles args.slice(:en, :fr)
       hash[:date] = [{ type: "published", on: args[:en]["date"] }]

data/lib/relaton_bipm/document_type.rb

@@ -0,0 +1,29 @@
+module RelatonBipm
+  class DocumentType < RelatonBib::DocumentType
+    DOCTYPES = %w[brochure mise-en-pratique rapport monographie guide
+                  meeting-report technical-report working-party-note strategy
+                  cipm-mra resolutions].freeze
+
+    #
+    # Initialize a document type object.
+    #
+    # @param [String] type document type
+    # @param [String, nil] abbreviation abbreviation
+    #
+    def initialize(type:, abbreviation: nil)
+      check_type type
+      super
+    end
+
+    #
+    # Check if document type is valid.
+    #
+    # @param [String] type document type
+    #
+    def check_type(type)
+      # unless DOCTYPES.include? type
+      #   Util.warn "WARNING: invalid doctype: `#{type}`"
+      # end
+    end
+  end
+end

data/lib/relaton_bipm/hash_converter.rb

@@ -1,105 +1,110 @@
 require "yaml"
 
 module RelatonBipm
-  class HashConverter < RelatonBib::HashConverter
+  module HashConverter
+    include RelatonBib::HashConverter
+    extend self
+
     @@acronyms = nil
 
-    class << self
-      # @override RelatonIsoBib::HashConverter.hash_to_bib
-      # @param args [Hash]
-      # @param nested [TrueClass, FalseClass]
-      # @return [Hash]
-      def hash_to_bib(args)
-        ret = super
-        return if ret.nil?
-
-        # project_group_hash_to_bib ret
-        commentperiod_hash_to_bib ret
-        ret
-      end
+    # @override RelatonIsoBib::HashConverter.hash_to_bib
+    # @param args [Hash]
+    # @param nested [TrueClass, FalseClass]
+    # @return [Hash]
+    def hash_to_bib(args)
+      ret = super
+      return if ret.nil?
 
-      private
+      # project_group_hash_to_bib ret
+      commentperiod_hash_to_bib ret
+      ret
+    end
 
-      # @param item_hash [Hash]
-      # @return [RelatonBib::BibliographicItem]
-      def bib_item(item_hash)
-        BipmBibliographicItem.new(**item_hash)
-      end
+    private
 
-      # @param ret [Hash]
-      def title_hash_to_bib(ret)
-        ret[:title] &&= RelatonBib.array(ret[:title])
-          .reduce(RelatonBib::TypedTitleStringCollection.new) do |m, t|
-          m << if t.is_a? Hash
-                 RelatonBib::TypedTitleString.new(**t)
-               else
-                 RelatonBib::TypedTitleString.new(content: t)
-               end
-        end
-      end
+    # @param item_hash [Hash]
+    # @return [RelatonBib::BibliographicItem]
+    def bib_item(item_hash)
+      BipmBibliographicItem.new(**item_hash)
+    end
 
-      # @param ret [Hash]
-      def commentperiod_hash_to_bib(ret)
-        ret[:comment_period] &&= CommentPeriond.new(**ret[:comment_period])
+    # @param ret [Hash]
+    def title_hash_to_bib(ret)
+      ret[:title] &&= RelatonBib.array(ret[:title])
+        .reduce(RelatonBib::TypedTitleStringCollection.new) do |m, t|
+        m << if t.is_a? Hash
+                RelatonBib::TypedTitleString.new(**t)
+              else
+                RelatonBib::TypedTitleString.new(content: t)
+              end
       end
+    end
 
-      # @param ret [Hash]
-      # def project_group_hash_to_bib(ret)
-      #   ret[:project_group] &&= RelatonBib.array(ret[:project_group]).map do |pg|
-      #     wg = RelatonBib::FormattedString.new pg[:workgroup]
-      #     ProjectTeam.new(committee: pg[:committee], workgroup: wg)
-      #   end
-      # end
-
-      # @param ret [Hash]
-      def dates_hash_to_bib(ret)
-        super
-        ret[:date] &&= ret[:date].map { |d| BibliographicDate.new(**d) }
-      end
+    # @param ret [Hash]
+    def commentperiod_hash_to_bib(ret)
+      ret[:comment_period] &&= CommentPeriond.new(**ret[:comment_period])
+    end
 
-      # @param ret [Hash]
-      def relations_hash_to_bib(ret)
-        super
-        ret[:relation] &&= ret[:relation].map do |r|
-          RelatonBipm::DocumentRelation.new(**r)
-        end
-      end
+    # @param ret [Hash]
+    # def project_group_hash_to_bib(ret)
+    #   ret[:project_group] &&= RelatonBib.array(ret[:project_group]).map do |pg|
+    #     wg = RelatonBib::FormattedString.new pg[:workgroup]
+    #     ProjectTeam.new(committee: pg[:committee], workgroup: wg)
+    #   end
+    # end
 
-      # @param ret [Hash]
-      def editorialgroup_hash_to_bib(ret) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        return unless ret[:editorialgroup]
-
-        cmt = ret[:editorialgroup][:committee].map do |c|
-          if (vars = committee_variants c).any?
-            content = RelatonBib::LocalizedString.new vars
-            Committee.new acronym: c[:acronym], content: content
-          else
-            Committee.new(**c)
-          end
-        end
-        wg = RelatonBib.array(ret[:editorialgroup][:workgroup]).map do |w|
-          w.is_a?(Hash) ? WorkGroup.new(**w) : WorkGroup.new(content: w)
-        end
-        ret[:editorialgroup] = EditorialGroup.new committee: cmt, workgroup: wg
+    # @param ret [Hash]
+    def dates_hash_to_bib(ret)
+      super
+      ret[:date] &&= ret[:date].map { |d| BibliographicDate.new(**d) }
+    end
+
+    # @param ret [Hash]
+    def relations_hash_to_bib(ret)
+      super
+      ret[:relation] &&= ret[:relation].map do |r|
+        RelatonBipm::DocumentRelation.new(**r)
       end
+    end
 
-      def committee_variants(cmt)
-        RelatonBib.array(cmt[:variants]).each_with_object([]) do |v, a|
-          c = v[:content] || (ac = acronyms[cmt[:acronym]]) && ac[v[:language]]
-          a << RelatonBib::LocalizedString.new(c, v[:language], v[:script]) if c
+    # @param ret [Hash]
+    def editorialgroup_hash_to_bib(ret) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      return unless ret[:editorialgroup]
+
+      cmt = ret[:editorialgroup][:committee].map do |c|
+        if (vars = committee_variants c).any?
+          content = RelatonBib::LocalizedString.new vars
+          Committee.new acronym: c[:acronym], content: content
+        else
+          Committee.new(**c)
         end
       end
-
-      def acronyms
-        @@acronyms ||= YAML.load_file File.join __dir__, "acronyms.yaml"
+      wg = RelatonBib.array(ret[:editorialgroup][:workgroup]).map do |w|
+        w.is_a?(Hash) ? WorkGroup.new(**w) : WorkGroup.new(content: w)
       end
+      ret[:editorialgroup] = EditorialGroup.new committee: cmt, workgroup: wg
+    end
 
-      # @param ret [Hash]
-      def structuredidentifier_hash_to_bib(ret)
-        ret[:structuredidentifier] &&= StructuredIdentifier.new(
-          **ret[:structuredidentifier],
-        )
+    def committee_variants(cmt)
+      RelatonBib.array(cmt[:variants]).each_with_object([]) do |v, a|
+        c = v[:content] || (ac = acronyms[cmt[:acronym]]) && ac[v[:language]]
+        a << RelatonBib::LocalizedString.new(c, v[:language], v[:script]) if c
       end
     end
+
+    def acronyms
+      @@acronyms ||= YAML.load_file File.join __dir__, "acronyms.yaml"
+    end
+
+    # @param ret [Hash]
+    def structuredidentifier_hash_to_bib(ret)
+      ret[:structuredidentifier] &&= StructuredIdentifier.new(
+        **ret[:structuredidentifier],
+      )
+    end
+
+    def create_doctype(**args)
+      DocumentType.new(**args)
+    end
   end
 end

data/lib/relaton_bipm/id_parser.rb

@@ -14,7 +14,7 @@ module RelatonBipm
       rule(:lang) { comma >> space? >> match["A-Z"].repeat(1, 2).as(:lang) }
       rule(:lang?) { lang.maybe }
 
-      rule(:numdash) { match["0-9-"].repeat(1).as(:number) }
+      rule(:numdash) { match["A-Z0-9-"].repeat(1).as(:number) }
       rule(:number) { numdash >> space? }
       rule(:number?) { number.maybe }
       rule(:num_suff) { numdash >> match["a-z"].repeat(1, 2) >> space }
@@ -47,7 +47,11 @@ module RelatonBipm
 
       rule(:metrologia) { str("Metrologia").as(:group) >> (space >> match["a-zA-Z0-9\s"].repeat(1).as(:number)).maybe }
 
-      rule(:result) { outcome | brochure | metrologia }
+      rule(:corr) { space >> str("Corrigendum").as(:corr) }
+      rule(:corr?) { corr.maybe }
+      rule(:jcgm) { group >> space >> numdash >> (str(":") >> year).maybe >> corr? }
+
+      rule(:result) { outcome | brochure | metrologia | jcgm }
 
       root :result
     end
@@ -93,7 +97,7 @@ module RelatonBipm
       hash = to_hash
       hash.delete(:number) if other_hash[:number].nil? && hash[:number] == "1" and hash[:year]
       other_hash.delete(:number) if hash[:number].nil? && other_hash[:number] == "1"
-      hash.delete(:year) unless other_hash[:year]
+      # hash.delete(:year) unless other_hash[:year]
       other_hash.delete(:year) unless hash[:year]
       hash.delete(:lang) unless other_hash[:lang]
       other_hash.delete(:lang) unless hash[:lang]
@@ -124,6 +128,7 @@ module RelatonBipm
       norm_num = normalized_number(src)
       hash[:number] = norm_num unless norm_num.nil? || norm_num.empty?
       hash[:year] = src[:year].to_s if src[:year]
+      hash[:corr] = true if src[:corr]
       hash[:lang] = src[:lang].to_s if src[:lang]
       hash
     end

data/lib/relaton_bipm/rawdata_bipm_metrologia/article_parser.rb

@@ -316,7 +316,9 @@ module RelatonBipm
         "article"
       end
 
-      alias_method :parse_doctype, :parse_type
+      def parse_doctype
+        DocumentType.new type: "article"
+      end
     end
   end
 end

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.16.5".freeze
+  VERSION = "1.17.0".freeze
 end

data/lib/relaton_bipm.rb

@@ -7,6 +7,7 @@ require "relaton_bipm/config"
 require "relaton_bipm/util"
 require "relaton_bipm/id_parser"
 require "relaton_bipm/version"
+require "relaton_bipm/document_type"
 require "relaton_bipm/editorial_group"
 require "relaton_bipm/committee"
 require "relaton_bipm/workgroup"

data/relaton_bipm.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.add_dependency "faraday", "~> 2.7.0"
   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.2"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.16.5
+  version: 1.17.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -58,14 +58,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
@@ -131,6 +131,7 @@ files:
 - lib/relaton_bipm/data_fetcher.rb
 - lib/relaton_bipm/data_outcomes_parser.rb
 - lib/relaton_bipm/document_relation.rb
+- lib/relaton_bipm/document_type.rb
 - lib/relaton_bipm/editorial_group.rb
 - lib/relaton_bipm/hash_converter.rb
 - lib/relaton_bipm/id_parser.rb