relaton-bipm 1.12.1 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452c7efc10863231dddcf973d6bba23c40756b5e2bb4eae6a6fe05f1454a8fcc
-  data.tar.gz: 559200bd9b5700cfa2f11f69bfa379ae4fe2da10a12a1a0395e1eeb2710cd88e
+  metadata.gz: 60cc8b3979fffe05b9bc5d554e7bc6b486867a5a32f332b30c8fb30601b49b18
+  data.tar.gz: 3e20d99bb7d1055b6bedc2ab42a8c9eb074738ee8ebd8d26aba67f824a4935d0
 SHA512:
-  metadata.gz: 07ec7af51e53a3ecd5fae8fcd4870d8debcbcd4630ad5d8936b9e884e2ed127cfe3a26a6930af742a08067d3f129a7135c1374b3f684d795f00d2b5c6fa56ced
-  data.tar.gz: c04e0cee65e8e3ea11dff07868c7f633e8d82cd61d6962eb4788e871275e0f08639ae1947d3b4e2b29f00884e82e77ad9589ae0b2b9c672c8ee9b1289b874e5d
+  metadata.gz: 5a59447492ae98160a67ed7a5f2843f211edbca658a452e685f521a5a940d102ee47d2b7d39265077407ff5a0cf9892f9d9c19e0719ad7c46e304b9f797e4709
+  data.tar.gz: d0c55fe5d12003e400cc660c6561bcf5878741b955785951089405ee64b4e94bc3067b8181f72b88ec7bb04a27dd93163cf19b289bdd3c3c1ccfff68b85579a1

data/README.adoc

@@ -263,7 +263,7 @@ RelatonBipm::BipmBibliographicItem.from_hash hash
 
 This gem uses following datasets as data sources:
 - `bipm-data-outcomes` - looking for local directory with the repository https://github.com/metanorma/bipm-data-outcomes
-- `si-brochute` - looking for local directory with the repository https://github.com/metanorma/bipm-si-brochure
+- `bipm-si-brochute` - looking for local directory with the repository https://github.com/metanorma/bipm-si-brochure
 
 The method `RelatonBipm::DataFetcher.fetch(sourece, output: "data", format: "yaml")` fetches all the documents from the datast and save them to the `./data` folder in YAML format.
 Arguments:
@@ -280,7 +280,7 @@ Stopped at: 2022-06-23 09:36:58 +0200
 Done in: 2 sec.
 => nil
 
-RelatonBipm::DataFetcher.fetch "si-brochure"
+RelatonBipm::DataFetcher.fetch "bipm-si-brochure"
 Started at: 2022-06-23 09:37:12 +0200
 Stopped at: 2022-06-23 09:37:12 +0200
 Done in: 0 sec.

data/grammars/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/grammars/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -1274,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -2493,6 +2509,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/lib/relaton_bipm/data_fetcher.rb

@@ -25,7 +25,7 @@ module RelatonBipm
     def self.fetch(source, output: "data", format: "yaml")
       t1 = Time.now
       puts "Started at: #{t1}"
-      FileUtils.mkdir_p output unless Dir.exist? output
+      FileUtils.mkdir_p output
       new(output, format).fetch(source)
       t2 = Time.now
       puts "Stopped at: #{t2}"
@@ -40,7 +40,7 @@ module RelatonBipm
     def fetch(source)
       case source
       when "bipm-data-outcomes" then parse_bipm_data_outcomes
-      when "si-brochure" then parse_si_brochure
+      when "bipm-si-brochure" then parse_si_brochure
       end
       File.write @index_path, @index.to_yaml, encoding: "UTF-8"
     end
@@ -57,7 +57,13 @@ module RelatonBipm
     # Parse SI brochure and write them to YAML files
     #
     def parse_si_brochure # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # puts "Parsing SI brochure..."
+      # puts "Ls #{Dir['*']}"
+      # puts "Ls #{Dir['bipm-si-brochure/*']}"
+      # puts "Ls #{Dir['bipm-si-brochure/site/*']}"
+      # puts "Ls #{Dir['bipm-si-brochure/site/documents/*']}"
       Dir["bipm-si-brochure/site/documents/*.rxl"].each do |f|
+        puts "Parsing #{f}"
         docstd = Nokogiri::XML File.read f
         doc = docstd.at "/bibdata"
         hash1 = RelatonBipm::XMLParser.from_xml(doc.to_xml).to_hash
@@ -75,6 +81,7 @@ module RelatonBipm
                end
         item = RelatonBipm::BipmBibliographicItem.from_hash(**hash)
         write_file outfile, item, warn_duplicate: warn_duplicate
+        puts "Saved to #{outfile}"
       end
     end
 
@@ -117,9 +124,9 @@ module RelatonBipm
     def fetch_type(dir, body) # rubocop:disable Metrics/AbcSize
       type = dir.split("/").last.split("-").first.sub(/s$/, "")
       body_dir = File.join @output, body.downcase
-      Dir.mkdir body_dir unless Dir.exist? body_dir
+      FileUtils.mkdir_p body_dir
       outdir = File.join body_dir, type.downcase
-      Dir.mkdir outdir unless Dir.exist? outdir
+      FileUtils.mkdir_p outdir
       Dir[File.join(dir, "*.{yml,yaml}")].each { |en_file| fetch_meeting en_file, body, type, outdir }
     end
 
@@ -228,7 +235,7 @@ module RelatonBipm
         file += "-#{num_justed}" if num.size < 4
         file += ".yaml"
         out_dir = File.join args[:dir], r["type"].downcase
-        Dir.mkdir out_dir unless Dir.exist? out_dir
+        FileUtils.mkdir_p out_dir
         path = File.join out_dir, file
         write_file path, item
         @index[["#{args[:body]} #{type} #{year}-#{num_justed}", "#{args[:body]} #{type} #{args[:num]}-#{num_justed}"]] = path

data/lib/relaton_bipm/processor.rb

@@ -9,7 +9,7 @@ module RelatonBipm
       @prefix = "BIPM"
       @defaultprefix = %r{^(?:BIPM|CCTF|CCDS|CGPM|CIPM)(?!\w)}
       @idtype = "BIPM"
-      @datasets = %w[bipm-data-outcomes si-brochure]
+      @datasets = %w[bipm-data-outcomes bipm-si-brochure]
     end
 
     # @param code [String]

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.12.1".freeze
+  VERSION = "1.13.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.12.0"
+  spec.add_dependency "relaton-bib", "~> 1.13.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.12.1
+  version: 1.13.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement