relaton-bipm 1.11.2 → 1.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff32d2538d50008590df750214025152ebe40eef58b249eb940ca435ac33967f
-  data.tar.gz: abaaa5ff94b879d5d5c91a2f7dd4f2ce14116f361a5a21d379532a5db168cd2d
+  metadata.gz: 9822a21eb0d3947f49b05a86cf1df7052ea0ff0b5647b1deff72a8c1a0baa615
+  data.tar.gz: aaac7bd97c5b86e084badcb0e3428c3cb8f3b72570e80f0a26f5499e5f6be6c0
 SHA512:
-  metadata.gz: afa46e8f2ebf060da46d159f59155e4ae92d0d1a50fa73136be0c46a9065790606f83f9526e4365756e17d617e01770e1ecefa1d13d4b6305671368b0cf8a9e5
-  data.tar.gz: 4a804b81bec63e039320fa3e9deaf86d02542108def5c04528e30667d06b7855cf56793b6ea73c94d593098bc0d45364ecad0759063fa18d9692fdfa4f3ab22c
+  metadata.gz: '039efcd3fff34694d66b65ec2183fefa2bccd0e7730d1de17ff090c78c0819faf17a26942df134d9b31c2faf02f5bd17d102c5166168ea47c34ed3dbd45111d9'
+  data.tar.gz: aa6cf69ed87904d7775ad614c6392ca2b5d56f7b4db579fdec4d82d88752a015adbc509626b4db0967de360d5a172750b280e7f814d2800016302cadacef48a4

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

@@ -52,43 +52,56 @@ bib = RelatonBipm::BipmBibliography.get "BIPM Metrologia 29 6 373"
 => #<RelatonBipm::BipmBibliographicItem:0x007f8857f94d40
 ...
 
-# get CGPM resolutions
-RelatonBipm::BipmBibliography.get "CGPM Resolution 1"
-[relaton-bipm] ("CGPM Resolution 1") fetching...
-[relaton-bipm] ("CGPM Resolution 1") found CGPM Resolution 1
+# get CGPM meetings
+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 decision
-RelatonBipm::BipmBibliography.get "CIPM Decision 101-1"
-[relaton-bipm] ("CIPM Decision 101-1") fetching...
-[relaton-bipm] ("CIPM Decision 101-1") found CIPM Decision 101-1
-=> #<RelatonBipm::BipmBibliographicItem:0x00007fed16dfcfe0
+# 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 (1889)
+=> #<RelatonBipm::BipmBibliographicItem:0x00007ff0d1ffae50
 ...
 
-RelatonBipm::BipmBibliography.get "CIPM Decision 01 (2012)"
-[relaton-bipm] ("CIPM Decision 01 (2012)") fetching...
-[relaton-bipm] ("CIPM Decision 01 (2012)") found CIPM Decision 01 (2012)
-=> #<RelatonBipm::BipmBibliographicItem:0x00007fb6b9bbec08
+RelatonBipm::BipmBibliography.get "CGPM Resolution (1889)"
+[relaton-bipm] ("CGPM Resolution (1889)") fetching...
+[relaton-bipm] ("CGPM Resolution (1889)") found CGPM Resolution (1889)
+=> #<RelatonBipm::BipmBibliographicItem:0x00007ff0d1ffae50
+...
+
+RelatonBipm::BipmBibliography.get "CGPM Resolution 1889"
+[relaton-bipm] ("CGPM Resolution 1889") fetching...
+[relaton-bipm] ("CGPM Resolution 1889") found CGPM Resolution (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 01 (2012)
-=> #<RelatonBipm::BipmBibliographicItem:0x00007fb6d98ddd98
+[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 resolution
-RelatonBipm::BipmBibliography.get "CIPM Resolution (1948)"
-[relaton-bipm] ("CIPM Resolution (1948)") fetching...
-[relaton-bipm] ("CIPM Resolution (1948)") found CIPM Resolution (1948)
-=> #<RelatonBipm::BipmBibliographicItem:0x00007fb6bb1c4a98
+# 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 Resolution 1948"
-[relaton-bipm] ("CIPM Resolution 1948") fetching...
-[relaton-bipm] ("CIPM Resolution 1948") found CIPM Resolution (1948)
-=> #<RelatonBipm::BipmBibliographicItem:0x00007fb6b9be5510
+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/lib/relaton_bipm/bipm_bibliography.rb

@@ -4,6 +4,13 @@ module RelatonBipm
   class BipmBibliography
     GH_ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-bipm/master/data/".freeze
     IOP_DOMAIN = "https://iopscience.iop.org".freeze
+    TYPES = {
+      "Déclaration" => "Declaration",
+      "Réunions" => "Meetings",
+      "Recommandation" => "Recommandation",
+      "Résolution" => "Resolution",
+      "Décision" => "Decision",
+    }.freeze
 
     class << self
       # @param text [String]
@@ -40,8 +47,13 @@ module RelatonBipm
       # @param agent [Mechanize]
       # @return [RelatonBipm::BipmBibliographicItem]
       def get_bipm(ref, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        rf = ref.sub(/(\d{2})\s\((\d{4})\)/, "\\2-\\1").sub(/\((\d{4})\)/, "\\1")
-        url = "#{GH_ENDPOINT}#{rf.downcase.split.join '/'}.yaml"
+        rf = ref.sub(/(?:(\d{1,2})\s)?\(?(\d{4})(?!-)\)?/) do
+          "#{$2}-#{$1.to_s.rjust(2, '0')}"
+        end
+        TYPES.each { |fr, en| rf.sub! fr, en }
+        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/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.11.2".freeze
+  VERSION = "1.11.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-22 00:00:00.000000000 Z
+date: 2022-06-02 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