relaton-bipm 1.13.9 → 1.13.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25ba380a0a3c8be3a780f9ab4e5d9c07c73ba3b6e394718a46528ba731a05f8f
-  data.tar.gz: 1d42cf0d52fac70d663ee102935dc369e38e56c2cba1a95a6246c62297cc5de1
+  metadata.gz: fc2075169e1f56321c3f81448e13c637de70a298c966d8fa9bebc8d084d275f6
+  data.tar.gz: aa2b8648ee7782726be9e1f35b7c84c7048178296bda8ef2b7771109bfec71d0
 SHA512:
-  metadata.gz: de73958097527e957388c3fe0c1f2d4e22be73cd2be0bd1489e4ed327b575b20ff8bfab86ec2d412af5a0e34dc820e71b1d13f08b2a4bc25b5e10d4f207abb47
-  data.tar.gz: a10dbfb2077646c9e35c3a910f16e94c1c3e0320e5dc321ffae055ccdf06fc798145df74f16c0b48b9a11fa382b3add39cae26ef676b36e33573f3884b1cf8b4
+  metadata.gz: cc3e9b8268d4a7f20fd3d8ca3e1f2cef8ca51f16a76fd0997a0c3edd957cda9f201af3e5c2e4de4f2beaf2a740b2cbbf6bf7fb0dd29138a7d3487c5dfc032de8
+  data.tar.gz: 2bc5c3a0df947808564955c755472aadccf38f525ddc9cce0eceeb9079ee8f5b048baf860050b4e1e33a08b180d6af3ed21706c162bf5b81508598a673857b1a

data/grammars/biblio.rng

@@ -854,6 +854,12 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -882,6 +888,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">

data/lib/relaton_bipm/data_fetcher.rb

@@ -180,7 +180,10 @@ module RelatonBipm
       gh_src = "https://raw.githubusercontent.com/metanorma/bipm-data-outcomes/"
       src_en = gh_src + en_file.split("/")[-3..].unshift("main").join("/")
       src_fr = gh_src + fr_file.split("/")[-3..].unshift("main").join("/")
-      src = [{ type: "src", content: src_en }, { type: "src", content: src_fr }]
+      src = [
+        { type: "src", content: src_en, language: "en", script: "Latn" },
+        { type: "src", content: src_fr, language: "fr", script: "Latn" },
+      ]
 
       /^(?<num>\d+)(?:-_(?<part>\d+))?-\d{4}$/ =~ en_md["url"].split("/").last
       id = "#{body} #{type.capitalize} #{num}"
@@ -275,30 +278,21 @@ module RelatonBipm
       end
     end
 
+    #
+    # Create contributors
+    #
+    # @param [Strign] date date of publication
+    # @param [Strign] body organization abbreviation (CCTF, CIPM, CGPM)
+    #
+    # @return [Array<Hash>] contributors
+    #
     def contributors(date, body) # rubocop:disable Metrics/MethodLength
-      if body == "CCTF" && Date.parse(date).year < 1999
-        authors = [{
-          name: [
-            { content: "Consultative Committee for the Definition of the Second",
-              language: "en", script: "Latn" },
-            { content: "Comité Consultatif pour la Définition de la Seconde",
-              language: "fr", script: "Latn" },
-          ],
-          abbreviation: { content: "CCDS", language: ["en", "fr"], script: "Latn" },
-        }]
-      elsif body == "CCTF"
-        authors = [{
-          name: [
-            { content: "Consultative Committee for Time and Frequency",
-              language: "en", script: "Latn" },
-            { content: "Comité consultatif du temps et des fréquences",
-              language: "fr", script: "Latn" },
-          ],
-          abbreviation: { content: body, language: ["en", "fr"], script: "Latn" },
-        }]
-      else authors = []
-      end
-      authors.reduce(
+      case body
+      when "CCTF" then cctf_org date
+      when "CGPM" then cgpm_org
+      when "CIPM" then cipm_org
+      else []
+      end.reduce(
         [{ entity: {
              url: "www.bipm.org",
              name: "Bureau International des Poids et Mesures",
@@ -308,6 +302,76 @@ module RelatonBipm
       ) { |a, e| a << { entity: e, role: [{ type: "author" }] } }
     end
 
+    #
+    # Create CCTF organization
+    #
+    # @param [String] date date of meeting
+    #
+    # @return [Array<Hash>] CCTF organization
+    #
+    def cctf_org(date) # rubocop:disable Metrics/MethodLength
+      if Date.parse(date).year < 1999
+        nms = [
+          { content: "Consultative Committee for the Definition of the Second", language: "en" },
+          { content: "Comité Consultatif pour la Définition de la Seconde", language: "fr" },
+        ]
+        organization nms, "CCDS"
+      else
+        nms = [
+          { content: "Consultative Committee for Time and Frequency", language: "en" },
+          { content: "Comité consultatif du temps et des fréquences", language: "fr" },
+        ]
+        organization nms, "CCTF"
+      end
+    end
+
+    #
+    # Create organization
+    #
+    # @param [Array<Hash>] names organization names in different languages
+    # @param [String] abbr abbreviation
+    #
+    # @return [Array<Hash>] organization
+    #
+    def organization(names, abbr)
+      names.each { |ctrb| ctrb[:script] = "Latn" }
+      [{ name: names, abbreviation: { content: abbr, language: ["en", "fr"], script: "Latn" } }]
+    end
+
+    #
+    # Create CGPM organization
+    #
+    # @return [Array<Hash>] CGPM organization
+    #
+    def cgpm_org
+      nms = [
+        { content: "General Conference on Weights and Measures", language: "en" },
+        { content: "Conférence Générale des Poids et Mesures", language: "fr" },
+      ]
+      organization nms, "CGPM"
+    end
+
+    #
+    # Create CIPM organization
+    #
+    # @return [Array<Hash>] CIPM organization
+    #
+    def cipm_org
+      names = [
+        { content: "International Committee for Weights and Measures", language: "en" },
+        { content: "Comité International des Poids et Mesures", language: "fr" },
+      ]
+      organization names, "CIPM"
+    end
+
+    #
+    # Create a title
+    #
+    # @param [String] content title content
+    # @param [String] language language code (en, fr)
+    #
+    # @return [Hash] title
+    #
     def title(content, language)
       { content: content, language: language, script: "Latn" }
     end

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.13.9".freeze
+  VERSION = "1.13.10".freeze
 end

data/relaton_bipm.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
 
   spec.add_dependency "faraday", "~> 1.0"
   spec.add_dependency "mechanize", "~> 2.8.0"
-  spec.add_dependency "relaton-bib", "~> 1.13.0"
+  spec.add_dependency "relaton-bib", "~> 1.13.9"
   spec.add_dependency "rubyzip", "~> 2.3.0"
   spec.add_dependency "serrano", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.13.9
+  version: 1.13.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.13.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.13.9
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement