commonmeta-ruby 3.2.9 → 3.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e05b0fedfc5074f16bf6b04dd73150dcae6f75d3392dd3abe82bd52eafea1531
-  data.tar.gz: 12700c970a507ae36013334f0e942413f0092d6bf4735aa27b6709a12bc7d84e
+  metadata.gz: 7def7640d11d8d88a8a9fb8b18394cd88d5de57e44832c9b05d7c23213857970
+  data.tar.gz: 9adc93a35e9c9060ddd3bda1bb859e88f45a00d31454af13c54b54d4c96209b8
 SHA512:
-  metadata.gz: 74c86b93355c0337df66c15d519f51f5336f2f883924f1c6b2edad8b6460d509d2e3443653d8545b201004e6407afffe79a505044f8cae88bbeede9f25e16171
-  data.tar.gz: 903e7a8af1ec1025f8e7125ed96eea07f0994ed71f1473c5111947e5d7c8c1e42c5dcbe2b0562e261f60515c374c5f23e1d593cf448b9a87962cd4f3c831e2a3
+  metadata.gz: 61ab2849532d1967e78111a68eec7c4ece6c1cbb968ae705fde933e11dab50079a4f441a4ab4c3acfe2e6d5e9d76dd1496d7b2092244cde2e5a0d588c8747b0d
+  data.tar.gz: cd470bf78ce018a78d89133ec5e17ab5dc6f3f35f982cc0e26736b24661bb316b6b9491e93ff897d98773ab027264b4532d367da2c03e546331ee20600c12a24

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    commonmeta-ruby (3.2.9)
+    commonmeta-ruby (3.2.10)
       activesupport (>= 4.2.5, < 8.0)
       addressable (~> 2.8.1, < 2.8.2)
-      base32-url (>= 0.5.0, < 1)
+      base32-url (>= 0.7.0, < 1)
       bibtex-ruby (~> 6.0)
       builder (~> 3.2, >= 3.2.4)
       citeproc-ruby (~> 2.0)
@@ -34,7 +34,8 @@ GEM
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    base32-url (0.6.0)
+    base32-url (0.7.0)
+      uuidtools (~> 2.1, >= 2.1.5)
     bibtex-ruby (6.0.0)
       latex-decode (~> 0.0)
     builder (3.2.4)
@@ -241,6 +242,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
     unicode-types (1.8.0)
+    uuidtools (2.2.0)
     vcr (6.1.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)

data/commonmeta.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   # Declare dependencies here, rather than in the Gemfile
   s.add_dependency 'activesupport', '>= 4.2.5', '< 8.0'
   s.add_dependency 'addressable', '~> 2.8.1', '< 2.8.2'
-  s.add_dependency 'base32-url', '>= 0.5.0', '< 1'
+  s.add_dependency 'base32-url', '>= 0.7.0', '< 1'
   s.add_dependency 'bibtex-ruby', '~> 6.0'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.4'
   s.add_dependency 'citeproc-ruby', '~> 2.0'

data/lib/commonmeta/crossref_utils.rb

@@ -264,8 +264,8 @@ module Commonmeta
           "item_number_type" => alternate_identifier["alternateIdentifierType"] ? alternate_identifier["alternateIdentifierType"].downcase : nil,
         }.compact
 
-        # remove dashes from UUIDs, as item_number can only be 32 characters long
-        alternate_identifier["alternateIdentifier"].gsub!("-", "") if alternate_identifier["alternateIdentifierType"] == "UUID"
+        # convert UUIDs into base32 encoded strings, as item_number can only be 32 characters long (UUIDv4 is 36 characters long)
+        alternate_identifier["alternateIdentifier"] = Base32::URL.encode_uuid(alternate_identifier["alternateIdentifier"], split: 7, checksum: true) if alternate_identifier["alternateIdentifierType"] == "UUID"
 
         xml.item_number(alternate_identifier["alternateIdentifier"], attributes)
       end

data/lib/commonmeta/utils.rb

@@ -1367,19 +1367,27 @@ module Commonmeta
       end
     end
 
-    def encode_doi(prefix)
+    def encode_doi(prefix, options = {})
       # DOI suffix is a generated from a random number, encoded in base32
       # suffix has 8 digits plus two checksum digits. With base32 there are
       # 32 possible digits, so 8 digits gives 32^8 possible combinations
-      random_int = SecureRandom.random_number(32 ** 7..(32 ** 8) - 1)
-      suffix = Base32::URL.encode(random_int, checksum: true)
-      str = "#{suffix[0, 5]}-#{suffix[5, 10]}"
+      if options[:uuid]
+        str = Base32::URL.encode_uuid(options[:uuid], split: 7, checksum: true)
+      else
+        random_int = SecureRandom.random_number(32 ** 7..(32 ** 8) - 1)
+        suffix = Base32::URL.encode(random_int, checksum: true)
+        str = "#{suffix[0, 5]}-#{suffix[5, 10]}"
+      end
       "https://doi.org/#{prefix}/#{str}"
     end
 
-    def decode_doi(doi)
+    def decode_doi(doi, options = {})
       suffix = doi.split("/", 5).last
-      Base32::URL.decode(suffix)
+      if options[:uuid]
+        Base32::URL.decode_uuid(suffix)
+      else
+        Base32::URL.decode(suffix)
+      end
     end
 
     def encode_container_id

data/lib/commonmeta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Commonmeta
-  VERSION = '3.2.9'
+  VERSION = '3.2.10'
 end

data/spec/utils_spec.rb

@@ -650,6 +650,15 @@ describe Commonmeta::Metadata, vcr: true do
       expect(response.length).to eq(36)
     end
 
+    it "encode doi from uuid" do
+      prefix = "10.53731"
+      uuid = "c3095752-2af0-40a4-a229-3ceb7424bce2"
+      response = subject.encode_doi(prefix, uuid: uuid)
+      puts response
+      expect(response).to match(%r{#{prefix}/[a-z0-9]+})
+      expect(response.length).to eq(56)
+    end
+
     it "decode doi" do
       doi = "https://doi.org/10.53731/revzwnv-rpd913d-8drwz"
       response = subject.decode_doi(doi)
@@ -661,6 +670,12 @@ describe Commonmeta::Metadata, vcr: true do
       response = subject.decode_doi(doi)
       expect(response).to eq(30_198_793_950_250_854_133_601_922_433)
     end
+
+    it "decode doi to uuid" do
+      doi = "https://doi.org/10.53731/6315bn4-aqg82ja-4a9wxdt-29f7279"
+      response = subject.decode_doi(doi, uuid: true)
+      expect(response).to eq('255d48ab-c102-9288-a4f3-add092f388e9')
+    end
   end
 
   context "random id" do

data/spec/writers/crossref_xml_writer_spec.rb

@@ -191,6 +191,7 @@ describe Commonmeta::Metadata, vcr: true do
                                          "person_name")).first).to eq("ORCID" => "https://orcid.org/0000-0001-9165-2757", "contributor_role" => "author", "given_name" => "Esha", "sequence" => "first", "surname" => "Datta")
       expect(crossref_xml.dig("titles",
                               "title")).to eq("Attempts at automating journal subject classification")
+      expect(crossref_xml.dig('item_number')).to eq("__content__"=>"2x2kzts-edc9rgb-vg6s4j6-z9t0d56", "item_number_type"=>"uuid")
     end
 
     it "json_feed_item with references" do
@@ -218,7 +219,7 @@ describe Commonmeta::Metadata, vcr: true do
                               "title")).to eq("The Research Software Alliance (ReSA)")
       expect(crossref_xml.dig("citation_list", "citation").length).to eq(11)
       expect(crossref_xml.dig("citation_list", "citation").last).to eq("doi"=>"10.5281/zenodo.3699950", "key"=>"ref11")
-      expect(crossref_xml.dig('item_number')).to eq("__content__"=>"954f81380ecd409087c5cef1297f1470", "item_number_type"=>"uuid")
+      expect(crossref_xml.dig('item_number')).to eq("__content__"=>"4n9y0kg-3pd8288-fheey4m-qy53g93", "item_number_type"=>"uuid")
     end
 
     it "json_feed_item from rogue scholar with doi" do
@@ -242,6 +243,7 @@ describe Commonmeta::Metadata, vcr: true do
                                          "person_name")).first).to eq("ORCID"=>"https://orcid.org/0000-0003-3334-2771", "contributor_role"=>"author", "given_name"=>"Heinz", "sequence"=>"first", "surname"=>"Pampel")
       expect(crossref_xml.dig("titles",
                               "title")).to eq("EU-Mitgliedstaaten betonen die Rolle von wissenschaftsgeleiteten Open-Access-Modellen jenseits von APCs")
+      expect(crossref_xml.dig('item_number')).to eq("__content__"=>"way2ng-4s48j9v-hbw4rjf-aqh9f33", "item_number_type"=>"uuid")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmeta-ruby
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.2.10
 platform: ruby
 authors:
 - Martin Fenner
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'