relaton-bipm 1.13.12 → 1.14.0

data/grammars/biblio.rng

@@ -33,9 +33,10 @@
       <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
     </data>
   </define>
-  <start>
-    <ref name="bibitem"/>
-  </start>
+  <!-- start = bibitem -->
+  <define name="BibData">
+    <ref name="BibliographicItem"/>
+  </define>
   <define name="status">
     <element name="status">
       <ref name="stage"/>
@@ -73,8 +74,14 @@
       <text/>
     </element>
   </define>
-  <define name="script">
+  <define name="locale">
     <a:documentation>ISO-639</a:documentation>
+    <element name="locale">
+      <text/>
+    </element>
+  </define>
+  <define name="script">
+    <a:documentation>ISO-3166</a:documentation>
     <element name="script">
       <text/>
     </element>
@@ -93,6 +100,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -136,6 +146,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -158,27 +171,30 @@
   </define>
   <define name="contributor">
     <element name="contributor">
-      <zeroOrMore>
+      <oneOrMore>
         <ref name="role"/>
-      </zeroOrMore>
+      </oneOrMore>
       <ref name="ContributorInfo"/>
     </element>
   </define>
   <define name="role">
     <element name="role">
-      <optional>
-        <attribute name="type">
-          <choice>
-            <value>author</value>
-            <value>performer</value>
-            <value>publisher</value>
-            <value>editor</value>
-            <value>adapter</value>
-            <value>translator</value>
-            <value>distributor</value>
-          </choice>
-        </attribute>
-      </optional>
+      <attribute name="type">
+        <choice>
+          <value>author</value>
+          <value>performer</value>
+          <value>publisher</value>
+          <value>editor</value>
+          <value>adapter</value>
+          <value>translator</value>
+          <value>distributor</value>
+          <value>realizer</value>
+          <value>owner</value>
+          <value>authorizer</value>
+          <value>enabler</value>
+          <value>subject</value>
+        </choice>
+      </attribute>
       <zeroOrMore>
         <ref name="roledescription"/>
       </zeroOrMore>
@@ -500,6 +516,17 @@
   </define>
   <define name="localityStack">
     <element name="localityStack">
+      <optional>
+        <attribute name="connective">
+          <choice>
+            <value>and</value>
+            <value>or</value>
+            <value>from</value>
+            <value>to</value>
+            <value/>
+          </choice>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="locality"/>
       </zeroOrMore>
@@ -512,6 +539,17 @@
   </define>
   <define name="sourceLocalityStack">
     <element name="sourceLocalityStack">
+      <optional>
+        <attribute name="connective">
+          <choice>
+            <value>and</value>
+            <value>or</value>
+            <value>from</value>
+            <value>to</value>
+            <value/>
+          </choice>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="sourceLocality"/>
       </zeroOrMore>
@@ -614,6 +652,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>
@@ -650,6 +691,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -705,6 +749,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>
@@ -741,6 +788,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -857,6 +907,9 @@
     <optional>
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -937,6 +990,9 @@
       <optional>
         <attribute name="language"/>
       </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
       <optional>
         <attribute name="script"/>
       </optional>

data/grammars/relaton-bipm-compile.rng

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <include href="basicdoc.rng"/>
+  <include href="relaton-bipm.rng"/>
+  <start>
+    <choice>
+      <ref name="bibitem"/>
+      <ref name="bibdata"/>
+    </choice>
+  </start>
+</grammar>

data/grammars/relaton-bipm.rng

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <include href="biblio-standoc.rng">
+    <define name="DocumentType">
+      <choice>
+        <value>brochure</value>
+        <value>mise-en-pratique</value>
+        <value>rapport</value>
+        <value>monographie</value>
+        <value>guide</value>
+        <value>meeting-report</value>
+        <value>technical-report</value>
+        <value>working-party-note</value>
+        <value>strategy</value>
+        <value>cipm-mra</value>
+        <value>resolution</value>
+      </choice>
+    </define>
+    <define name="editorialgroup">
+      <element name="editorialgroup">
+        <oneOrMore>
+          <ref name="committee"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="workgroup"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="structuredidentifier">
+      <element name="structuredidentifier">
+        <element name="docnumber">
+          <text/>
+        </element>
+        <optional>
+          <element name="part">
+            <text/>
+          </element>
+        </optional>
+        <optional>
+          <element name="appendix">
+            <text/>
+          </element>
+        </optional>
+      </element>
+    </define>
+    <define name="BibDataExtensionType">
+      <optional>
+        <attribute name="schema-version"/>
+      </optional>
+      <optional>
+        <ref name="doctype"/>
+      </optional>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
+      <ref name="editorialgroup"/>
+      <optional>
+        <ref name="comment-period"/>
+      </optional>
+      <optional>
+        <ref name="si-aspect"/>
+      </optional>
+      <optional>
+        <ref name="meeting-note"/>
+      </optional>
+      <ref name="structuredidentifier"/>
+    </define>
+  </include>
+  <define name="comment-period">
+    <element name="comment-period">
+      <element name="from">
+        <ref name="ISO8601Date"/>
+      </element>
+      <element name="to">
+        <ref name="ISO8601Date"/>
+      </element>
+    </element>
+  </define>
+  <define name="si-aspect">
+    <element name="si-aspect">
+      <choice>
+        <value>A_e_deltanu</value>
+        <value>A_e</value>
+        <value>cd_Kcd_h_deltanu</value>
+        <value>cd_Kcd</value>
+        <value>full</value>
+        <value>K_k_deltanu</value>
+        <value>K_k</value>
+        <value>kg_h_c_deltanu</value>
+        <value>kg_h</value>
+        <value>m_c_deltanu</value>
+        <value>m_c</value>
+        <value>mol_NA</value>
+        <value>s_deltanu</value>
+      </choice>
+    </element>
+  </define>
+  <define name="committee">
+    <element name="committee">
+      <attribute name="acronym">
+        <choice>
+          <value>CGPM</value>
+          <value>CIPM</value>
+          <value>BIPM</value>
+          <value>CCAUV</value>
+          <value>CCEM</value>
+          <value>CCL</value>
+          <value>CCM</value>
+          <value>CCPR</value>
+          <value>CCQM</value>
+          <value>CCRI</value>
+          <value>CCT</value>
+          <value>CCTF</value>
+          <value>CCU</value>
+          <value>CCL-CCTF-WGFS</value>
+          <value>JCGM</value>
+          <value>JCRB</value>
+          <value>JCTLM</value>
+          <value>INetQI</value>
+        </choice>
+      </attribute>
+      <ref name="LocalizedString"/>
+    </element>
+  </define>
+  <define name="workgroup">
+    <element name="workgroup">
+      <optional>
+        <attribute name="acronym"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
+  <define name="meeting-note">
+    <element name="meeting-note">
+      <text/>
+    </element>
+  </define>
+</grammar>

data/lib/relaton_bipm/bipm_bibliographic_item.rb

@@ -42,6 +42,15 @@ module RelatonBipm
       super
     end
 
+    #
+    # Fetch flavour schema version
+    #
+    # @return [String] flavour schema versio
+    #
+    def ext_schema
+      @ext_schema ||= schema_versions["relaton-model-bipm"]
+    end
+
     # @param hash [Hash]
     # @return [RelatonBipm::BipmBibliographicItem]
     def self.from_hash(hash)
@@ -59,7 +68,7 @@ module RelatonBipm
         if opts[:bibdata] && (doctype || editorialgroup&.presence? ||
                               si_aspect || comment_period ||
                               structuredidentifier)
-          b.ext do
+          ext = b.ext do
             b.doctype doctype if doctype
             editorialgroup&.to_xml b
             comment_period&.to_xml b
@@ -67,12 +76,19 @@ module RelatonBipm
             b.send :"meeting-note", meeting_note if meeting_note
             structuredidentifier&.to_xml b
           end
+          ext["schema-version"] = ext_schema unless opts[:embedded]
         end
       end
     end
 
-    # @return [Hash]
-    def to_hash
+    #
+    # Rnder document as Hash
+    #
+    # @param embedded [Boolean] treu if embedded in another document
+    #
+    # @return [Hash] document as Hash
+    #
+    def to_hash(embedded: false)
       hash = super
       hash["comment_period"] = comment_period.to_hash if comment_period
       hash["si_aspect"] = si_aspect if si_aspect

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -66,7 +66,7 @@ module RelatonBipm
         return unless resp.code == "200"
 
         yaml = RelatonBib.parse_yaml resp.body, [Date]
-        yaml["fetched"] = Date.today.to_s
+        # yaml["fetched"] = Date.today.to_s
         bib_hash = HashConverter.hash_to_bib yaml
         BipmBibliographicItem.new(**bib_hash)
       end
@@ -264,7 +264,7 @@ module RelatonBipm
       # @return [RelatonBipm::BipmBibliographicItem]
       def bibitem(**args)
         BipmBibliographicItem.new(
-          fetched: Date.today.to_s, type: "article", language: ["en"], script: ["Latn"], **args,
+          type: "article", language: ["en"], script: ["Latn"], **args,
         )
       end
 

data/lib/relaton_bipm/committee.rb

@@ -11,8 +11,8 @@ module RelatonBipm
     def initialize(acronym:, content: nil)
       acronyms = YAML.load_file File.join(__dir__, "acronyms.yaml")
       unless acronyms[acronym]
-        warn "[relaton-bipm] WARNING: invalid acronym: #{acronym}. Allowed "\
-        "values: #{acronyms.map { |k, _v| k }.join ', '}"
+        warn "[relaton-bipm] WARNING: invalid acronym: #{acronym}. Allowed " \
+             "values: #{acronyms.map { |k, _v| k }.join ', '}"
       end
 
       @acronym = acronym

data/lib/relaton_bipm/data_outcomes_parser.rb

@@ -127,15 +127,9 @@ module RelatonBipm
           type: "proceedings", title: [],
           doctype: r["type"], place: [RelatonBib::Place.new(city: "Paris")]
         }
-        hash[:title] << title(r["title"], "en") if r["title"]
         fr_r = args[:fr]["resolutions"].fetch(i, nil)
-        hash[:link] = [{ type: "citation", content: r["url"], language: "en", script: "Latn" }]
-        if fr_r
-          hash[:title] << title(fr_r["title"], "fr") if fr_r["title"]
-          hash[:link] << { type: "citation", content: fr_r["url"], language: "fr", script: "Latn" }
-        end
-        hash[:link] += args[:src]
-        hash[:link] << { type: "pdf", content: r["reference"] } if r["reference"]
+        hash[:title] = resolution_title r, fr_r
+        hash[:link] = resolution_link r, fr_r, args[:src]
         date = r["dates"].first.to_s
         hash[:date] = [{ type: "published", on: date }]
         num = r["identifier"].to_s # .split("-").last
@@ -163,6 +157,40 @@ module RelatonBipm
       end
     end
 
+    #
+    # Parse resolution titles
+    #
+    # @param [Hash] en_r english resolution
+    # @param [Hash] fr_r french resolution
+    #
+    # @return [Array<Hash>] titles
+    #
+    def resolution_title(en_r, fr_r)
+      title = []
+      title << create_title(en_r["title"], "en") if en_r["title"] && !en_r["title"].empty?
+      title << create_title(fr_r["title"], "fr") if fr_r && fr_r["title"] && !fr_r["title"].empty?
+      title
+    end
+
+    #
+    # Parse resolution links
+    #
+    # @param [Hash] en_r english resolution
+    # @param [Hash] fr_r french resolution
+    # @param [Array<Hash>] src data source links
+    #
+    # @return [Array<Hash>] links
+    #
+    def resolution_link(en_r, fr_r, src)
+      link = [{ type: "citation", content: en_r["url"], language: "en", script: "Latn" }]
+      if fr_r
+        link << { type: "citation", content: fr_r["url"], language: "fr", script: "Latn" }
+      end
+      link += src
+      link << { type: "pdf", content: en_r["reference"] } if en_r["reference"]
+      link
+    end
+
     #
     # Add item to index
     #
@@ -276,7 +304,7 @@ module RelatonBipm
     #
     # @return [Hash] title
     #
-    def title(content, language)
+    def create_title(content, language)
       { content: content, language: language, script: "Latn" }
     end
 
@@ -315,8 +343,8 @@ module RelatonBipm
       docnum = create_docnum args[:body], args[:type], args[:num], args[:en]["date"]
       hash = { title: [], type: "proceedings", doctype: args[:type],
                place: [RelatonBib::Place.new(city: "Paris")] }
-      hash[:title] << title(args[:en]["title"], "en") if args[:en]["title"]
-      hash[:title] << title(args[:fr]["title"], "fr") if args[:fr]["title"]
+      hash[:title] << create_title(args[:en]["title"], "en") if args[:en]["title"]
+      hash[:title] << create_title(args[:fr]["title"], "fr") if args[:fr]["title"]
       hash[:date] = [{ type: "published", on: args[:en]["date"] }]
       hash[:docid] = create_docids docnum
       hash[:docnumber] = docnum # .sub(" --", "").sub(/\s\(\d{4}\)/, "")

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.13.12".freeze
+  VERSION = "1.14.0".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.13"
+  spec.add_dependency "relaton-bib", "~> 1.14.0"
   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.12
+  version: 1.14.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-13 00:00:00.000000000 Z
+date: 2022-12-03 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.13
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.13
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -199,10 +199,10 @@ files:
 - bin/rspec
 - bin/setup
 - grammars/basicdoc.rng
+- grammars/biblio-standoc.rng
 - grammars/biblio.rng
-- grammars/bipm.rng
-- grammars/isodoc.rng
-- grammars/reqt.rng
+- grammars/relaton-bipm-compile.rng
+- grammars/relaton-bipm.rng
 - lib/relaton_bipm.rb
 - lib/relaton_bipm/acronyms.yaml
 - lib/relaton_bipm/bibliographic_date.rb