relaton-bipm 1.16.6 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fed200c28077ec8e08f755b1185ec918797d15bf6937b884f207efd95837e230
-  data.tar.gz: e252b80a27cf21e0fd9c66af2bec464eea8cc578b6da66b4c51316b707aa4b39
+  metadata.gz: 4b1fb15e763da98895e7053e9fc0e9c8d171e479e4b89e6a0353dd1399955a0d
+  data.tar.gz: ac9db3bb0fc7bccebf5eb8e11cc392b98a8f16514e07aa5436b3817e4b54253d
 SHA512:
-  metadata.gz: 7d73f4d65055a47285532d0bcc0f812e58fa75a0790fc92a1e396d40b444732a84192e9f81467246552c61d0ae780a6449333186417f2a0154c756ae555e5097
-  data.tar.gz: 7415e3f9f5bb4cacaa3e28f79b25a08a22814a6de7c52e5effd21f53632c59bcce41a6d4ef52a84169ad996efdd8e82687c7404f32cd22b199ee50a6cfbd77f8
+  metadata.gz: d2b145a2a5facc0782ad9600c7240357e80367f191205fe5e2e40a0e2b1c36019cb638d77130b17183cca67b2f35ab1868a30aa097913dbcc1c83e2598cdf127
+  data.tar.gz: 2dd15163fcfb619fa3c5b63705cdce127d13d17799e120d5a4e506747042d52133929c92e8f2a5e40012bb8a2a052928ca2f51021b6d37a19adc28c3698e7d80

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>
@@ -898,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/grammars/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,21 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -752,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>
@@ -942,6 +963,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

@@ -50,7 +50,8 @@ module RelatonBipm
         rows = index.search { |r| ref_id == r[:id] }
         return unless rows.any?
 
-        url = "#{GH_ENDPOINT}#{rows.first[:file]}"
+        row = rows.sort_by { |r| r[:id][:year] }.last
+        url = "#{GH_ENDPOINT}#{row[:file]}"
         resp = Mechanize.new.get url
         return unless resp.code == "200"
 

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

@@ -94,9 +94,9 @@ module RelatonBipm
     #
     def ==(other) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize
       other_hash = other.is_a?(Id) ? other.to_hash : normalize_hash(other)
-      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 = to_hash.dup
+      hash.delete(:number) if other_hash[:number].nil? && hash[:number] == "1" && hash[:year]
+      other_hash.delete(:number) if hash[:number].nil? && other_hash[:number] == "1" && other_hash[:year]
       # hash.delete(:year) unless other_hash[:year]
       other_hash.delete(:year) unless hash[:year]
       hash.delete(:lang) unless other_hash[:lang]

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.6".freeze
+  VERSION = "1.17.1".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"
@@ -27,7 +28,7 @@ require "relaton_bipm/rawdata_bipm_metrologia/article_parser"
 module RelatonBipm
   class Error < StandardError; end
 
-  # Returns hash of XML reammar
+  # Returns hash of gems versions used to generate the data model.
   # @return [String]
   def grammar_hash
     # gem_path = File.expand_path "..", __dir__

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.6
+  version: 1.17.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-12 00:00:00.000000000 Z
+date: 2023-12-28 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