relaton-bipm 1.11.0 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a82c0e9b55d960a68829f47fe01690401a924a1b61df376e6834a107159b488
-  data.tar.gz: 007aee78882b5e154ff6219d1b1429b727110600f254be691e8dced237e1120d
+  metadata.gz: 90b15ba099e66ff04bb59b8e79fb61a97a6ee82b93cdc4025f64e0489590b9bb
+  data.tar.gz: '09d38f02f831f995b5cc1e3fd99291480ddf7b06272374569954915a21d4d0e4'
 SHA512:
-  metadata.gz: 81058113d2ba56ea79734d19f9c1bb45e4cbcb71df6d7fc8fb14b5ab09d8c55924dda3118db4d6588a15d0790e55b5cc393a41e67539c4f9b5d78c31d9663a69
-  data.tar.gz: 1fc0397bb7b6b693fe8233d9577214684a72af2ec3c2a8fef5b130a3a4d10413c6980aefe4c7c638b9dfe0ba6726d1aa612577e63a853ec232827e8b16f673c0
+  metadata.gz: 300fb81135a9fc290b07b3bacdd43c1a126c131a0f52da8ddb249be79d87ced921b772b2b0623552e9d7d3f3ded76f107457c2d5f8864c91e1751d6d0876509f
+  data.tar.gz: 23a157ad9db09dd266d0eaae6c29b6198483530d80e04beb2b7bd88a05d45115a4f5d4d995752b2ab7a71b0e1e593a3204ba9be6d1e698b651b1fdd264efb852

data/.github/workflows/rake.yml

@@ -10,27 +10,4 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
-      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
-        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
+    uses: relaton/support/.github/workflows/rake.yml@master

data/README.adoc

@@ -53,17 +53,43 @@ bib = RelatonBipm::BipmBibliography.get "BIPM Metrologia 29 6 373"
 ...
 
 # get CGPM resolutions
-RelatonBipm::BipmBibliography.get "BIPM CR 01"
-[relaton-bipm] ("BIPM CR 01") fetching...
-[relaton-bipm] ("BIPM CR 01") found BIPM CR 01
+RelatonBipm::BipmBibliography.get "CGPM Meetings 1"
+[relaton-bipm] ("CGPM Meetings 1") fetching...
+[relaton-bipm] ("CGPM Meetings 1") found CGPM Meetings 1
 => #<RelatonBipm::BipmBibliographicItem:0x00007fd4f7cba038
 ...
 
-# get CIPM resolutions
-RelatonBipm::BipmBibliography.get "BIPM PV 101(I)"
-[relaton-bipm] ("BIPM PV 101(I)") fetching...
-[relaton-bipm] ("BIPM PV 101(I)") found BIPM PV 101(I)
-=> #<RelatonBipm::BipmBibliographicItem:0x00007fd5072301c0
+# get CGPM resolutions
+RelatonBipm::BipmBibliography.get "CGPM Resolution 1889-00"
+[relaton-bipm] ("CGPM Resolution 1889-00") fetching...
+[relaton-bipm] ("CGPM Resolution 1889-00") found CGPM Resolution 0 (1889)
+=> #<RelatonBipm::BipmBibliographicItem:0x00007ff0d1ffae50
+...
+
+# get CIPM decision
+RelatonBipm::BipmBibliography.get "CIPM Decision 2012-01"
+[relaton-bipm] ("CIPM Decision 2012-01") fetching...
+[relaton-bipm] ("CIPM Decision 2012-01") found CIPM Decision 1 (2012)
+=> #<RelatonBipm::BipmBibliographicItem:0x00007ff0f10dc548
+...
+
+RelatonBipm::BipmBibliography.get "CIPM Decision 1 (2012)"
+[relaton-bipm] ("CIPM Decision 1 (2012)") fetching...
+[relaton-bipm] ("CIPM Decision 1 (2012)") found CIPM Decision 1 (2012)
+=> #<RelatonBipm::BipmBibliographicItem:0x00007fb6b9bbec08
+...
+
+# get CIPM recommendation
+RelatonBipm::BipmBibliography.get "CIPM Recommendation (1948)"
+[relaton-bipm] ("CIPM Recommendation (1948)") fetching...
+[relaton-bipm] ("CIPM Recommendation (1948)") found CIPM Recommendation (1948)
+=> #<RelatonBipm::BipmBibliographicItem:0x00007ff0a18a6aa8
+...
+
+RelatonBipm::BipmBibliography.get "CIPM Recommendation 1948"
+[relaton-bipm] ("CIPM Recommendation 1948") fetching...
+[relaton-bipm] ("CIPM Recommendation 1948") found CIPM Recommendation (1948)
+=> #<RelatonBipm::BipmBibliographicItem:0x00007ff0f1164150
 ...
 ----
 

data/grammars/biblio.rng

@@ -527,7 +527,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -851,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -40,7 +40,10 @@ module RelatonBipm
       # @param agent [Mechanize]
       # @return [RelatonBipm::BipmBibliographicItem]
       def get_bipm(ref, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        url = "#{GH_ENDPOINT}#{ref.gsub(/[()]/, "").upcase.split.join '-'}.yaml"
+        rf = ref.sub(/(\d{1,2})\s\((\d{4})\)/) { "#{$2}-#{$1.rjust(2, '0')}" }.sub(/\((\d{4})\)/, "\\1")
+        path_parts = rf.split.map &:downcase
+        path_parts.insert(1, "meetings") unless path_parts[1] == "meetings"
+        url = "#{GH_ENDPOINT}#{path_parts.join '/'}.yaml"
         resp = agent.get url
         check_response resp
         return unless resp.code == "200"

data/lib/relaton_bipm/data_fetcher.rb

@@ -0,0 +1,9 @@
+module RelatonBipm
+  class DataFetcher
+    def initialize(output, format)
+      @output = output
+      @format = format
+      @ext = format.sub(/^bib/, "")
+    end
+  end
+end

data/lib/relaton_bipm/processor.rb

@@ -7,7 +7,7 @@ module RelatonBipm
     def initialize
       @short = :relaton_bipm
       @prefix = "BIPM"
-      @defaultprefix = %r{^BIPM\s}
+      @defaultprefix = %r{^(?:BIPM|CCTF|CGPM|CIPM)\s}
       @idtype = "BIPM"
     end
 

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.11.0".freeze
+  VERSION = "1.11.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -181,6 +181,7 @@ files:
 - lib/relaton_bipm/bipm_bibliography.rb
 - lib/relaton_bipm/comment_periond.rb
 - lib/relaton_bipm/committee.rb
+- lib/relaton_bipm/data_fetcher.rb
 - lib/relaton_bipm/document_relation.rb
 - lib/relaton_bipm/editorial_group.rb
 - lib/relaton_bipm/hash_converter.rb