From 519054822f4e8043de0a5a1b9694c192058eb164 Mon Sep 17 00:00:00 2001 From: Suzanne Vogt Date: Fri, 25 Jul 2025 16:52:04 -0400 Subject: [PATCH 1/3] Allow hsh_to_spdx to accept rightsUri as well as rightsURI. Note: it was already doing that around line 1309 --- lib/bolognese/utils.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bolognese/utils.rb b/lib/bolognese/utils.rb index 07b0aa9c..50b53943 100644 --- a/lib/bolognese/utils.rb +++ b/lib/bolognese/utils.rb @@ -1293,7 +1293,7 @@ def name_to_spdx(name) def hsh_to_spdx(hsh) spdx = resource_json(:spdx).fetch("licenses") - license = spdx.find { |l| l["licenseId"].casecmp?(hsh["rightsIdentifier"]) || l["seeAlso"].first == normalize_cc_url(hsh["rightsURI"]) || l["name"] == hsh["rights"] || l["seeAlso"].first == normalize_cc_url(hsh["rights"]) } + license = spdx.find { |l| l["licenseId"].casecmp?(hsh["rightsIdentifier"]) || l["seeAlso"].first == normalize_cc_url(hsh["rightsUri"]) || l["seeAlso"].first == normalize_cc_url(hsh["rightsURI"]) || l["name"] == hsh["rights"] || l["seeAlso"].first == normalize_cc_url(hsh["rights"]) } if license { From b8016b8d5ed993b2961534330fbfe236e216d78c Mon Sep 17 00:00:00 2001 From: Suzanne Vogt Date: Fri, 25 Jul 2025 18:14:57 -0400 Subject: [PATCH 2/3] Update version. --- Gemfile.lock | 217 ++++++++++++++++++++++----------------- lib/bolognese/version.rb | 2 +- 2 files changed, 126 insertions(+), 93 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5c30a7ff..8ddf0d20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - bolognese (2.3.5) + bolognese (2.3.6) activesupport (>= 4.2.5) benchmark_methods (~> 0.7) bibtex-ruby (>= 5.1.0) @@ -29,27 +29,46 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (6.1.7.3) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (7.2.2.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.3.0) + bcp47_spec (0.2.1) + benchmark (0.4.1) benchmark_methods (0.7) - bibtex-ruby (6.0.0) + bibtex-ruby (6.2.0) latex-decode (~> 0.0) - builder (3.2.4) - byebug (11.1.3) - citeproc (1.0.10) + logger (~> 1.7) + racc (~> 1.7) + bigdecimal (3.2.2) + builder (3.3.0) + byebug (12.0.0) + citeproc (1.1.0) + date + forwardable + json namae (~> 1.0) + observer (< 1.0) + open-uri (< 1.0) citeproc-ruby (1.1.14) citeproc (~> 1.0, >= 1.0.9) csl (~> 1.6) colorize (0.8.1) - concurrent-ruby (1.2.2) - crack (0.4.5) + concurrent-ruby (1.3.5) + connection_pool (2.5.3) + crack (1.0.0) + bigdecimal rexml crass (1.0.6) csl (1.6.0) @@ -57,21 +76,25 @@ GEM rexml csl-styles (1.0.1.11) csl (~> 1.0) - diff-lcs (1.5.0) - docile (1.4.0) - ebnf (2.3.3) + date (3.4.1) + diff-lcs (1.6.2) + docile (1.4.1) + drb (2.2.3) + ebnf (2.6.0) + base64 (~> 0.2) htmlentities (~> 4.3) - rdf (~> 3.2) + rdf (~> 3.3) scanf (~> 1.0) - sxp (~> 1.2) + sxp (~> 2.0) unicode-types (~> 1.8) - edtf (3.1.1) - activesupport (>= 3.0, < 8.0) + edtf (3.2.0) + activesupport (>= 3.0, < 9.0) excon (0.71.1) - faraday (2.7.6) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-encoding (0.0.5) + faraday (2.13.4) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-encoding (0.0.6) faraday faraday-excon (2.1.0) excon (>= 0.27.4) @@ -83,18 +106,18 @@ GEM zlib (~> 2.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (3.0.2) + faraday-net_http (3.4.1) + net-http (>= 0.5.0) + forwardable (1.3.3) gender_detector (0.1.2) unicode_utils (>= 1.3.0) - haml (5.2.2) - temple (>= 0.8.0) - tilt - hashdiff (1.0.1) + hashdiff (1.2.0) htmlentities (4.3.4) - i18n (1.14.1) + i18n (1.14.7) concurrent-ruby (~> 1.0) + io-console (0.8.1) iso8601 (0.9.1) - json (2.6.2) + json (2.13.1) json-canonicalization (0.3.1) json-ld (3.2.4) htmlentities (~> 4.3) @@ -111,7 +134,8 @@ GEM optimist (~> 3) latex-decode (0.4.0) link_header (0.0.8) - loofah (2.21.3) + logger (1.7.0) + loofah (2.24.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) maremma (5.0.0) @@ -128,97 +152,106 @@ GEM nokogiri (~> 1.16, >= 1.16.2) oj (>= 2.8.3) oj_mimic_json (~> 1.0, >= 1.0.1) - matrix (0.4.2) - mini_portile2 (2.8.5) - minitest (5.18.0) - multi_json (1.15.0) - multipart-post (2.3.0) - namae (1.1.1) - nokogiri (1.16.2) - mini_portile2 (~> 2.8.2) + matrix (0.4.3) + minitest (5.25.5) + multi_json (1.17.0) + multipart-post (2.4.1) + namae (1.2.0) + racc (~> 1.7) + net-http (0.6.0) + uri + nokogiri (1.18.9-x86_64-linux-gnu) racc (~> 1.4) - oj (3.14.2) + observer (0.1.2) + oj (3.16.11) + bigdecimal (>= 3.0) + ostruct (>= 0.2) oj_mimic_json (1.0.1) - optimist (3.0.1) - postrank-uri (1.0.24) + open-uri (0.5.0) + stringio + time + uri + optimist (3.2.1) + ostruct (0.6.3) + postrank-uri (1.1) addressable (>= 2.4.0) nokogiri (>= 1.8.0) - public_suffix (>= 2.0.0, < 2.1) - public_suffix (2.0.5) - racc (1.6.0) - rack (2.2.4) + public_suffix (>= 4.0.0, < 5) + public_suffix (4.0.7) + racc (1.8.1) + rack (2.2.17) rack-test (0.8.3) rack (>= 1.0, < 3) rake (12.3.3) - rdf (3.2.11) + rdf (3.3.4) + bcp47_spec (~> 0.2) + bigdecimal (~> 3.1, >= 3.1.5) link_header (~> 0.0, >= 0.0.8) - rdf-aggregate-repo (3.2.1) - rdf (~> 3.2) - rdf-rdfa (3.2.2) - haml (>= 5.2, < 7) - htmlentities (~> 4.3) - rdf (~> 3.2) - rdf-aggregate-repo (~> 3.2) - rdf-vocab (~> 3.2) - rdf-xsd (~> 3.2) - rdf-rdfxml (3.2.1) - haml (~> 5.2) + logger (~> 1.5) + ostruct (~> 0.6) + readline (~> 0.0) + rdf-rdfxml (3.3.0) + builder (~> 3.2, >= 3.2.4) htmlentities (~> 4.3) - rdf (~> 3.2) - rdf-rdfa (~> 3.2) - rdf-xsd (~> 3.2) - rdf-turtle (3.2.1) - ebnf (~> 2.3) - rdf (~> 3.2) - rdf-vocab (3.2.6) - rdf (~> 3.2, >= 3.2.4) - rdf-xsd (3.2.1) - rdf (~> 3.2) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + rdf-turtle (3.3.1) + base64 (~> 0.2) + bigdecimal (~> 3.1, >= 3.1.5) + ebnf (~> 2.5) + rdf (~> 3.3) + rdf-xsd (3.3.0) + rdf (~> 3.3) rexml (~> 3.2) - rexml (3.2.5) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.1) + readline (0.0.4) + reline + reline (0.6.2) + io-console (~> 0.5) + rexml (3.4.1) + rspec (3.13.1) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.5) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.4) rspec-xsd (0.1.0) nokogiri (~> 1.6) rspec (~> 3) - ruby2_keywords (0.0.5) scanf (1.0.0) + securerandom (0.4.1) simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sxp (1.2.4) + stringio (3.1.7) + sxp (2.0.0) matrix (~> 0.4) - rdf (~> 3.2) - temple (0.10.2) - thor (1.2.2) - tilt (2.2.0) + rdf (~> 3.3) + thor (1.4.0) + time (0.4.1) + date tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-types (1.8.0) + unicode-types (1.10.0) unicode_utils (1.4.0) + uri (1.0.3) vcr (3.0.3) - webmock (3.18.1) + webmock (3.25.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - zeitwerk (2.6.8) zlib (2.1.1) PLATFORMS - ruby + x86_64-linux DEPENDENCIES bolognese! @@ -235,4 +268,4 @@ DEPENDENCIES webmock (~> 3.0, >= 3.0.1) BUNDLED WITH - 2.5.5 + 2.3.27 diff --git a/lib/bolognese/version.rb b/lib/bolognese/version.rb index 4d40d5f0..682dc5a4 100644 --- a/lib/bolognese/version.rb +++ b/lib/bolognese/version.rb @@ -1,3 +1,3 @@ module Bolognese - VERSION = "2.3.5" + VERSION = "2.3.6" end From 89765f1c753e00cc62627b55d9759cb99ce65f23 Mon Sep 17 00:00:00 2001 From: Suzanne Vogt Date: Fri, 25 Jul 2025 18:26:18 -0400 Subject: [PATCH 3/3] Make sure the correct version is reflected. --- Gemfile.lock | 215 ++++++++++++++++++++++----------------------------- 1 file changed, 91 insertions(+), 124 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8ddf0d20..87faf48d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,46 +29,27 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (7.2.2.1) - base64 - benchmark (>= 0.3) - bigdecimal - concurrent-ruby (~> 1.0, >= 1.3.1) - connection_pool (>= 2.2.5) - drb + activesupport (6.1.7.3) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) - logger (>= 1.4.2) minitest (>= 5.1) - securerandom (>= 0.3) - tzinfo (~> 2.0, >= 2.0.5) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - base64 (0.3.0) - bcp47_spec (0.2.1) - benchmark (0.4.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) benchmark_methods (0.7) - bibtex-ruby (6.2.0) + bibtex-ruby (6.0.0) latex-decode (~> 0.0) - logger (~> 1.7) - racc (~> 1.7) - bigdecimal (3.2.2) - builder (3.3.0) - byebug (12.0.0) - citeproc (1.1.0) - date - forwardable - json + builder (3.2.4) + byebug (11.1.3) + citeproc (1.0.10) namae (~> 1.0) - observer (< 1.0) - open-uri (< 1.0) citeproc-ruby (1.1.14) citeproc (~> 1.0, >= 1.0.9) csl (~> 1.6) colorize (0.8.1) - concurrent-ruby (1.3.5) - connection_pool (2.5.3) - crack (1.0.0) - bigdecimal + concurrent-ruby (1.2.2) + crack (0.4.5) rexml crass (1.0.6) csl (1.6.0) @@ -76,25 +57,21 @@ GEM rexml csl-styles (1.0.1.11) csl (~> 1.0) - date (3.4.1) - diff-lcs (1.6.2) - docile (1.4.1) - drb (2.2.3) - ebnf (2.6.0) - base64 (~> 0.2) + diff-lcs (1.5.0) + docile (1.4.0) + ebnf (2.3.3) htmlentities (~> 4.3) - rdf (~> 3.3) + rdf (~> 3.2) scanf (~> 1.0) - sxp (~> 2.0) + sxp (~> 1.2) unicode-types (~> 1.8) - edtf (3.2.0) - activesupport (>= 3.0, < 9.0) + edtf (3.1.1) + activesupport (>= 3.0, < 8.0) excon (0.71.1) - faraday (2.13.4) - faraday-net_http (>= 2.0, < 3.5) - json - logger - faraday-encoding (0.0.6) + faraday (2.7.6) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-encoding (0.0.5) faraday faraday-excon (2.1.0) excon (>= 0.27.4) @@ -106,18 +83,18 @@ GEM zlib (~> 2.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (3.4.1) - net-http (>= 0.5.0) - forwardable (1.3.3) + faraday-net_http (3.0.2) gender_detector (0.1.2) unicode_utils (>= 1.3.0) - hashdiff (1.2.0) + haml (5.2.2) + temple (>= 0.8.0) + tilt + hashdiff (1.0.1) htmlentities (4.3.4) - i18n (1.14.7) + i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.8.1) iso8601 (0.9.1) - json (2.13.1) + json (2.6.2) json-canonicalization (0.3.1) json-ld (3.2.4) htmlentities (~> 4.3) @@ -134,8 +111,7 @@ GEM optimist (~> 3) latex-decode (0.4.0) link_header (0.0.8) - logger (1.7.0) - loofah (2.24.1) + loofah (2.21.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) maremma (5.0.0) @@ -152,106 +128,97 @@ GEM nokogiri (~> 1.16, >= 1.16.2) oj (>= 2.8.3) oj_mimic_json (~> 1.0, >= 1.0.1) - matrix (0.4.3) - minitest (5.25.5) - multi_json (1.17.0) - multipart-post (2.4.1) - namae (1.2.0) - racc (~> 1.7) - net-http (0.6.0) - uri - nokogiri (1.18.9-x86_64-linux-gnu) + matrix (0.4.2) + mini_portile2 (2.8.5) + minitest (5.18.0) + multi_json (1.15.0) + multipart-post (2.3.0) + namae (1.1.1) + nokogiri (1.16.2) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - observer (0.1.2) - oj (3.16.11) - bigdecimal (>= 3.0) - ostruct (>= 0.2) + oj (3.14.2) oj_mimic_json (1.0.1) - open-uri (0.5.0) - stringio - time - uri - optimist (3.2.1) - ostruct (0.6.3) - postrank-uri (1.1) + optimist (3.0.1) + postrank-uri (1.0.24) addressable (>= 2.4.0) nokogiri (>= 1.8.0) - public_suffix (>= 4.0.0, < 5) - public_suffix (4.0.7) - racc (1.8.1) - rack (2.2.17) + public_suffix (>= 2.0.0, < 2.1) + public_suffix (2.0.5) + racc (1.6.0) + rack (2.2.4) rack-test (0.8.3) rack (>= 1.0, < 3) rake (12.3.3) - rdf (3.3.4) - bcp47_spec (~> 0.2) - bigdecimal (~> 3.1, >= 3.1.5) + rdf (3.2.11) link_header (~> 0.0, >= 0.0.8) - logger (~> 1.5) - ostruct (~> 0.6) - readline (~> 0.0) - rdf-rdfxml (3.3.0) - builder (~> 3.2, >= 3.2.4) + rdf-aggregate-repo (3.2.1) + rdf (~> 3.2) + rdf-rdfa (3.2.2) + haml (>= 5.2, < 7) + htmlentities (~> 4.3) + rdf (~> 3.2) + rdf-aggregate-repo (~> 3.2) + rdf-vocab (~> 3.2) + rdf-xsd (~> 3.2) + rdf-rdfxml (3.2.1) + haml (~> 5.2) htmlentities (~> 4.3) - rdf (~> 3.3) - rdf-xsd (~> 3.3) - rdf-turtle (3.3.1) - base64 (~> 0.2) - bigdecimal (~> 3.1, >= 3.1.5) - ebnf (~> 2.5) - rdf (~> 3.3) - rdf-xsd (3.3.0) - rdf (~> 3.3) + rdf (~> 3.2) + rdf-rdfa (~> 3.2) + rdf-xsd (~> 3.2) + rdf-turtle (3.2.1) + ebnf (~> 2.3) + rdf (~> 3.2) + rdf-vocab (3.2.6) + rdf (~> 3.2, >= 3.2.4) + rdf-xsd (3.2.1) + rdf (~> 3.2) rexml (~> 3.2) - readline (0.0.4) - reline - reline (0.6.2) - io-console (~> 0.5) - rexml (3.4.1) - rspec (3.13.1) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-core (3.13.5) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.5) + rexml (3.2.5) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.5) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.4) + rspec-support (~> 3.11.0) + rspec-support (3.11.1) rspec-xsd (0.1.0) nokogiri (~> 1.6) rspec (~> 3) + ruby2_keywords (0.0.5) scanf (1.0.0) - securerandom (0.4.1) simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - stringio (3.1.7) - sxp (2.0.0) + sxp (1.2.4) matrix (~> 0.4) - rdf (~> 3.3) - thor (1.4.0) - time (0.4.1) - date + rdf (~> 3.2) + temple (0.10.2) + thor (1.2.2) + tilt (2.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-types (1.10.0) + unicode-types (1.8.0) unicode_utils (1.4.0) - uri (1.0.3) vcr (3.0.3) - webmock (3.25.1) + webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + zeitwerk (2.6.8) zlib (2.1.1) PLATFORMS - x86_64-linux + ruby DEPENDENCIES bolognese! @@ -268,4 +235,4 @@ DEPENDENCIES webmock (~> 3.0, >= 3.0.1) BUNDLED WITH - 2.3.27 + 2.5.5