relaton-bipm 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3713af26bfc8755bed28d78022cee0542649400e3767a3f9892c5744a60e85db
-  data.tar.gz: fde22355a20e15e6d8a146b62957628bc694ae181b23169fa6f09b11c2d4f974
+  metadata.gz: 42080c1c3ebb7eab76de1fc1b18bb91da064ac175581633c34b0c8daa2361282
+  data.tar.gz: 340d032da2900d7873da399c2711587b38ccd99307a0a401b1a4b3ba8201db5a
 SHA512:
-  metadata.gz: 1253a0d2392e246f5e7c85cd5f36ef84e0f960f5f97ffba01650a7ec324399c14be7edbb7e6470464564ca1ecf481d21a5eacc2d5175b20c2cc0b4dec4627f15
-  data.tar.gz: 7ab0323f511ef6c20243cbfb81b75077d7adb2c6e236a8e6f6118d6719ac545b8438a5eed6d403d0506502455f096c82cbf51f02efb91aef2b0dcc5be13635c5
+  metadata.gz: 9292924b806016e99034be78d609420b96be057745499ef4f7c006682325fdb4ef38a80369398bc6c882379b703fd7debeb4ad4b26a6daad12a1be5893d70aec
+  data.tar.gz: 5c7908cdb8d6943da712d3a1a43c91310efed866530504434b7377f18e50f6f871798e95efb16b04a5c88bd2f6ada1c8aab3c30836c546d1a6b3ed5e4d4206be

data/.github/workflows/rake.yml

@@ -4,7 +4,7 @@ name: rake
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [ master, main, lutaml-integration ]
     tags: [ v* ]
   pull_request:
 

data/CLAUDE.md

@@ -39,6 +39,7 @@ The gem fetches from three external datasets:
 
 ### Testing
 
+- **Index fixture:** `spec/fixtures/index-v1.zip` is pre-loaded into `Relaton::Index` pool in `before(:suite)` (configured in `spec/support/webmock.rb`). Run `rake spec:update_index` to refresh from relaton-data-bipm.
 Tests use RSpec with VCR cassettes (`spec/vcr_cassettes/`) to record/replay HTTP interactions. WebMock is used to prevent real HTTP requests during tests. Test fixtures are in `spec/fixtures/`.
 
 ### Dependencies

data/README.adoc

@@ -364,6 +364,8 @@ RelatonBipm uses the relaton-logger gem for logging. By default, it logs to STDO
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
+To update the index test fixture (used by tests), run `rake spec:update_index`. This downloads the latest `index-v1.zip` from the https://github.com/relaton/relaton-data-bipm[relaton-data-bipm] repository.
+
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 == Contributing

data/Rakefile

@@ -4,3 +4,25 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+namespace :spec do
+  desc "Download latest BIPM index fixture from relaton-data-bipm"
+  task :update_index do
+    require "net/http"
+    require "uri"
+
+    url = "https://raw.githubusercontent.com/relaton/relaton-data-bipm/data-v2/index-v1.zip"
+    dest = File.join(__dir__, "spec", "fixtures", "index-v1.zip")
+
+    puts "Downloading \#{url} ..."
+    uri = URI.parse(url)
+    response = Net::HTTP.get_response(uri)
+
+    if response.is_a?(Net::HTTPSuccess)
+      File.binwrite(dest, response.body)
+      puts "Updated \#{dest} (\#{response.body.bytesize} bytes)"
+    else
+      abort "Failed to download: HTTP \#{response.code}"
+    end
+  end
+end

data/grammars/biblio.rng

@@ -2015,15 +2015,11 @@ provided that it is not the entire bibliographic item that is so related</a:docu
     <a:documentation>A version of the bibliographic item (within an edition). Can be used for drafts</a:documentation>
     <element name="version">
       <optional>
-        <ref name="revision-date">
-          <a:documentation>The date at which the current version of the bibliographic item was produced</a:documentation>
-        </ref>
-      </optional>
-      <optional>
-        <ref name="draft">
-          <a:documentation>The identifier for the current draft of the bibliographic item</a:documentation>
-        </ref>
+        <attribute name="type">
+          <a:documentation>Versioning scheme, in case of multiple versioning schemes</a:documentation>
+        </attribute>
       </optional>
+      <text/>
     </element>
   </define>
   <define name="vedition">

data/lib/relaton/bipm/data_outcomes_parser.rb

@@ -437,7 +437,7 @@ module Relaton::Bipm
         did.content.sub!(regex) { "#{$1}-#{part}" }
         # did.instance_variable_set(:@id, id)
       end
-      hash[:ext].structuredidentifier.instance_variable_set :@part, part
+      hash[:ext].structuredidentifier.part = part
     end
 
     #

data/lib/relaton/bipm/model/ext.rb

@@ -10,7 +10,6 @@ module Relaton
         kg_h_c_deltanu kg_h m_c_deltanu m_c mol_NA s_deltanu
       ]
 
-      attribute :schema_version, method: :get_schema_version
       attribute :doctype, Doctype
       attribute :comment_period, CommentPeriod
       attribute :si_aspect, :string, values: SI_ASPECTS
@@ -24,6 +23,12 @@ module Relaton
         map_element "structuredidentifier", to: :structuredidentifier
       end
 
+      key_value do
+        map_element "comment_period", to: :comment_period
+        map_element "si_aspect", to: :si_aspect
+        map_element "meeting_note", to: :meeting_note
+      end
+
       def get_schema_version
        Relaton.schema_versions["relaton-model-bipm"]
       end

data/lib/relaton/bipm/rawdata_bipm_metrologia/article_parser.rb

@@ -50,7 +50,6 @@ module Relaton::Bipm
       # @return [Array<Relaton::Bib::DocumentIdentifier>] array of document identifiers
       #
       def parse_docidentifier
-        pubid = "#{journal_title} #{volume_issue_article}"
         primary_id = create_docidentifier pubid, "BIPM", true
         result = @meta.xpath("./article-id[@pub-id-type='doi']").each_with_object([primary_id]) do |id, m|
           m << create_docidentifier(id.text, id["pub-id-type"])
@@ -59,6 +58,15 @@ module Relaton::Bipm
         result
       end
 
+      #
+      # Build primary publication identifier string (e.g. "Metrologia 55 1 125")
+      #
+      # @return [String] pubid
+      #
+      def pubid
+        @pubid ||= "#{journal_title} #{volume_issue_article}"
+      end
+
       #
       # Parse volume, issue and page
       #
@@ -291,7 +299,7 @@ module Relaton::Bipm
           next unless from
 
           owner = l.at("./copyright-statement").text.split(" & ").map do |c|
-            /(?<name>[A-z]+(?:\s[A-z]+)*)/ =~ c
+            /(?<name>\p{L}+(?:\s\p{L}+)*)/ =~ c
             org_name = Relaton::Bib::TypedLocalizedString.new(content: name, language: "en", script: "Latn")
             org = Relaton::Bib::Organization.new name: [org_name]
             Relaton::Bib::ContributionInfo.new(organization: org)
@@ -326,7 +334,7 @@ module Relaton::Bipm
         rels = dates do |d, t|
           Relaton::Bib::Relation.new(type: "hasManifestation", bibitem: bibitem(d, t))
         end
-        @errors[:article_relation] &&= refs.empty?
+        @errors[:article_relation] &&= rels.empty?
         rels + parse_references
       end
 
@@ -392,7 +400,9 @@ module Relaton::Bipm
         dt = Relaton::Bib::Date.new(type: type, at: date)
         carrier = type == "epub" ? "online" : "print"
         medium = Relaton::Bib::Medium.new carrier: carrier
-        ItemData.new title: parse_title, date: [dt], medium: medium
+        fref = Relaton::Bib::Formattedref.new(content: pubid)
+        docid = [create_docidentifier(pubid, "BIPM", true)]
+        ItemData.new(formattedref: fref, docidentifier: docid, date: [dt], medium: medium)
       end
 
       #

data/lib/relaton/bipm/si_brochure_parser.rb

@@ -35,6 +35,14 @@ module Relaton::Bipm
         xml = File.read(f, encoding: "UTF-8")
         xml = xml.force_encoding("UTF-8") if xml.encoding != Encoding::UTF_8
         item1 = Bibdata.from_xml(xml)
+        # Workaround for relaton-bib Version#content bug: whitespace between
+        # legacy <revision-date>/<draft> children gets captured as @content,
+        # blocking the legacy-fold path. Clear it so the getter recomputes.
+        item1.version.each do |v|
+          c = v.instance_variable_get(:@content)
+          next unless c.is_a?(Array) || (c.is_a?(String) && c.strip.empty?)
+          v.instance_variable_set(:@content, nil)
+        end
         @data_fetcher.errors[:si_brochure_title] &&= item1.title.empty?
         @data_fetcher.errors[:si_brochure_docidentifier] &&= item1.docidentifier.empty?
         unless has_committee_contributor?(item1)

data/lib/relaton/bipm/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Bipm
-    VERSION = "2.0.0".freeze
+    VERSION = "2.1.1".freeze
   end
 end

data/{relaton_bipm.gemspec → relaton-bipm.gemspec}

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.add_dependency "faraday", "~> 2.7.0"
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "parslet", "~> 2.0.0"
-  spec.add_dependency "relaton-bib", "~> 2.0.0"
+  spec.add_dependency "relaton-bib", "~> 2.1.0"
   spec.add_dependency "relaton-index", "~> 0.2.2"
   spec.add_dependency "relaton-core", "~> 0.0.12"
   spec.add_dependency "rubyzip", "~> 2.3.0"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -57,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -154,13 +155,14 @@ files:
 - lib/relaton/bipm/si_brochure_parser.rb
 - lib/relaton/bipm/util.rb
 - lib/relaton/bipm/version.rb
-- relaton_bipm.gemspec
+- relaton-bipm.gemspec
 homepage: https://github.com/relaton/relaton-bipm
 licenses:
 - BSD-2-Clause
 metadata:
   homepage_uri: https://github.com/relaton/relaton-bipm
   source_code_uri: https://github.com/relaton/relaton-bipm
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,7 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: 'Relaton::Bipm: retrieve BIPM Standards for bibliographic use using the BibliographicItem
   model'