commonmeta-ruby 3.2.7 → 3.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a50ad8ff25b9ff753b60cc9a34f578ae064cedc2417a5db146898e8202f8dc3
-  data.tar.gz: cc7f32e49a6d0621a30884a8226a9dda04cd5b13ed6545aefc28fd8f19386acb
+  metadata.gz: e05b0fedfc5074f16bf6b04dd73150dcae6f75d3392dd3abe82bd52eafea1531
+  data.tar.gz: 12700c970a507ae36013334f0e942413f0092d6bf4735aa27b6709a12bc7d84e
 SHA512:
-  metadata.gz: 16d052d4e0dda3aed49235f43914f3d88e46627741500edb987cbf6dad00091234aa2304541f8ba6d713b05c9b158717d2c5632aa024e60dc694f7126752dda1
-  data.tar.gz: d6a7044f3b3722dc71f22f8c98e12d3f5c5e79b82bdf1aff745ccb74ecbd4febd2d53926924b635b97334c30df233dd793802dabfe0ea038f387488acf0ae4ef
+  metadata.gz: 74c86b93355c0337df66c15d519f51f5336f2f883924f1c6b2edad8b6460d509d2e3443653d8545b201004e6407afffe79a505044f8cae88bbeede9f25e16171
+  data.tar.gz: 903e7a8af1ec1025f8e7125ed96eea07f0994ed71f1473c5111947e5d7c8c1e42c5dcbe2b0562e261f60515c374c5f23e1d593cf448b9a87962cd4f3c831e2a3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    commonmeta-ruby (3.2.7)
+    commonmeta-ruby (3.2.9)
       activesupport (>= 4.2.5, < 8.0)
       addressable (~> 2.8.1, < 2.8.2)
       base32-url (>= 0.5.0, < 1)
@@ -103,7 +103,7 @@ GEM
     json-ld-preloaded (3.2.2)
       json-ld (~> 3.2)
       rdf (~> 3.2)
-    json_schemer (1.0.2)
+    json_schemer (1.0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
@@ -138,8 +138,8 @@ GEM
     props (1.2.0)
       iniparser (>= 0.1.0)
     public_suffix (4.0.7)
-    racc (1.7.0)
-    rack (3.0.7)
+    racc (1.7.1)
+    rack (3.0.8)
     rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
@@ -169,7 +169,7 @@ GEM
     rdf-xsd (3.2.1)
       rdf (~> 3.2)
       rexml (~> 3.2)
-    regexp_parser (2.8.0)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -187,10 +187,10 @@ GEM
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
-    rubocop (1.52.0)
+    rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)

data/lib/commonmeta/crossref_utils.rb

@@ -3,12 +3,12 @@
 module Commonmeta
   module CrossrefUtils
     def write_crossref_xml
-      @crossref_xml ||= Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
+      @crossref_xml ||= Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
         xml.doi_batch(crossref_root_attributes) do
           xml.head do
             # we use a uuid as batch_id
             xml.doi_batch_id(SecureRandom.uuid)
-            xml.timestamp(Time.now.utc.strftime('%Y%m%d%H%M%S'))
+            xml.timestamp(Time.now.utc.strftime("%Y%m%d%H%M%S"))
             xml.depositor do
               xml.depositor_name(depositor)
               xml.email_address(email)
@@ -23,12 +23,12 @@ module Commonmeta
     end
 
     def crossref_errors(xml: nil)
-      filepath = File.expand_path('../../resources/crossref/crossref5.3.1.xsd', __dir__)
-      File.open(filepath, 'r') do |f|
+      filepath = File.expand_path("../../resources/crossref/crossref5.3.1.xsd", __dir__)
+      File.open(filepath, "r") do |f|
         schema = Nokogiri::XML::Schema(f)
       end
 
-      schema.validate(Nokogiri::XML(xml, nil, 'UTF-8')).map(&:to_s).unwrap
+      schema.validate(Nokogiri::XML(xml, nil, "UTF-8")).map(&:to_s).unwrap
     rescue Nokogiri::XML::SyntaxError => e
       e.message
     end
@@ -37,9 +37,9 @@ module Commonmeta
       return xml if doi_from_url(id).blank?
 
       case type
-      when 'JournalArticle'
+      when "JournalArticle"
         insert_journal(xml)
-      when 'Article'
+      when "Article"
         insert_posted_content(xml)
       end
     end
@@ -47,20 +47,21 @@ module Commonmeta
     def insert_journal(xml)
       xml.journal do
         if language.present?
-          xml.journal_metadata('language' => language[0..1]) do
-            xml.full_title(container['title'])
+          xml.journal_metadata("language" => language[0..1]) do
+            xml.full_title(container["title"])
           end
         else
           xml.journal_metadata do
-            xml.full_title(container['title'])
+            xml.full_title(container["title"])
           end
         end
-        xml.journal_article('publication_type' => 'full_text') do
+        xml.journal_article("publication_type" => "full_text") do
           insert_crossref_titles(xml)
           insert_crossref_creators(xml)
           insert_crossref_publication_date(xml)
           insert_crossref_abstract(xml)
           insert_crossref_issn(xml)
+          insert_item_number(xml)
           insert_crossref_access_indicators(xml)
           insert_doi_data(xml)
           insert_citation_list(xml)
@@ -69,7 +70,7 @@ module Commonmeta
     end
 
     def insert_posted_content(xml)
-      posted_content = { 'type' => 'other', 'language' => language ? language[0..1] : nil }.compact
+      posted_content = { "type" => "other", "language" => language ? language[0..1] : nil }.compact
 
       xml.posted_content(posted_content) do
         insert_group_title(xml)
@@ -77,7 +78,7 @@ module Commonmeta
         insert_crossref_titles(xml)
         insert_posted_date(xml)
         insert_institution(xml)
-        insert_publisher_item(xml)
+        insert_item_number(xml)
         insert_crossref_abstract(xml)
         insert_crossref_access_indicators(xml)
         insert_doi_data(xml)
@@ -88,14 +89,14 @@ module Commonmeta
     def insert_group_title(xml)
       return xml if subjects.blank?
 
-      xml.group_title(subjects.first['subject'].titleize)
+      xml.group_title(subjects.first["subject"].titleize)
     end
 
     def insert_crossref_creators(xml)
       xml.contributors do
         Array.wrap(creators).each_with_index do |person, index|
-          xml.person_name('contributor_role' => 'author',
-                          'sequence' => index.zero? ? 'first' : 'additional') do
+          xml.person_name("contributor_role" => "author",
+                          "sequence" => index.zero? ? "first" : "additional") do
             insert_crossref_person(xml, person)
           end
         end
@@ -103,15 +104,15 @@ module Commonmeta
     end
 
     def insert_crossref_person(xml, person)
-      xml.given_name(person['givenName']) if person['givenName'].present?
-      xml.surname(person['familyName']) if person['familyName'].present?
-      if person.dig('id') && URI.parse(person.dig('id')).host == 'orcid.org'
-        xml.ORCID(person.dig('id'))
+      xml.given_name(person["givenName"]) if person["givenName"].present?
+      xml.surname(person["familyName"]) if person["familyName"].present?
+      if person.dig("id") && URI.parse(person.dig("id")).host == "orcid.org"
+        xml.ORCID(person.dig("id"))
       end
-      Array.wrap(person['affiliation']).each do |affiliation|
-        attributes = { 'affiliationIdentifier' => affiliation['affiliationIdentifier'],
-                       'affiliationIdentifierScheme' => affiliation['affiliationIdentifierScheme'], 'schemeURI' => affiliation['schemeUri'] }.compact
-        xml.affiliation(affiliation['name'], attributes)
+      Array.wrap(person["affiliation"]).each do |affiliation|
+        attributes = { "affiliationIdentifier" => affiliation["affiliationIdentifier"],
+                       "affiliationIdentifierScheme" => affiliation["affiliationIdentifierScheme"], "schemeURI" => affiliation["schemeUri"] }.compact
+        xml.affiliation(affiliation["name"], attributes)
       end
     end
 
@@ -119,7 +120,7 @@ module Commonmeta
       xml.titles do
         Array.wrap(titles).each do |title|
           if title.is_a?(Hash)
-            xml.title(title['title'])
+            xml.title(title["title"])
           else
             xml.title(title)
           end
@@ -130,15 +131,15 @@ module Commonmeta
     def insert_citation_list(xml)
       xml.citation_list do
         Array.wrap(references).each do |ref|
-          xml.citation('key' => ref['key']) do
-            xml.journal_article(ref['journal_title']) if ref['journal_title'].present?
-            xml.author(ref['author']) if ref['author'].present?
-            xml.volume(ref['volume']) if ref['volume'].present?
-            xml.first_page(ref['first_page']) if ref['first_page'].present?
-            xml.cYear(ref['cYear']) if ref['cYear'].present?
-            xml.article_title(ref['article_title']) if ref['article_title'].present?
-            xml.doi(ref['doi']) if ref['doi'].present?
-            xml.unstructured_citation(ref['url']) if ref['url'].present?
+          xml.citation("key" => ref["key"]) do
+            xml.journal_article(ref["journal_title"]) if ref["journal_title"].present?
+            xml.author(ref["author"]) if ref["author"].present?
+            xml.volume(ref["volume"]) if ref["volume"].present?
+            xml.first_page(ref["first_page"]) if ref["first_page"].present?
+            xml.cYear(ref["cYear"]) if ref["cYear"].present?
+            xml.article_title(ref["article_title"]) if ref["article_title"].present?
+            xml.doi(doi_from_url(ref["doi"])) if ref["doi"].present?
+            xml.unstructured_citation(ref["url"]) if ref["url"].present?
           end
         end
       end
@@ -162,12 +163,12 @@ module Commonmeta
     def insert_crossref_access_indicators(xml)
       return xml if license.blank?
 
-      rights_uri = license['url']
+      rights_uri = license["url"]
 
-      xml.program('xmlns' => 'http://www.crossref.org/AccessIndicators.xsd',
-                  'name' => 'AccessIndicators') do
-        xml.license_ref(rights_uri, 'applies_to' => 'vor')
-        xml.license_ref(rights_uri, 'applies_to' => 'tdm')
+      xml.program("xmlns" => "http://www.crossref.org/AccessIndicators.xsd",
+                  "name" => "AccessIndicators") do
+        xml.license_ref(rights_uri, "applies_to" => "vor")
+        xml.license_ref(rights_uri, "applies_to" => "tdm")
       end
     end
 
@@ -203,7 +204,7 @@ module Commonmeta
       xml.subjects do
         subjects.each do |subject|
           if subject.is_a?(Hash)
-            xml.subject(subject['subject'])
+            xml.subject(subject["subject"])
           else
             xml.subject(subject)
           end
@@ -224,11 +225,11 @@ module Commonmeta
     end
 
     def insert_crossref_publication_date(xml)
-      return xml if date['registered'].blank?
+      return xml if date["registered"].blank?
 
-      date_ = get_datetime_from_iso8601(date['registered'])
+      date_ = get_datetime_from_iso8601(date["registered"])
 
-      xml.publication_date('media_type' => 'online') do
+      xml.publication_date("media_type" => "online") do
         xml.month(date_.month) if date_.month.present?
         xml.day(date_.day) if date_.day.present?
         xml.year(date_.year) if date_.year.present?
@@ -236,9 +237,9 @@ module Commonmeta
     end
 
     def insert_posted_date(xml)
-      return xml if date['published'].blank?
+      return xml if date["published"].blank?
 
-      date_ = get_datetime_from_iso8601(date['published'])
+      date_ = get_datetime_from_iso8601(date["published"])
 
       xml.posted_date do
         xml.month(date_.month) if date_.month.present?
@@ -251,21 +252,22 @@ module Commonmeta
       return xml if publisher.blank?
 
       xml.institution do
-        xml.institution_name(publisher['name'])
+        xml.institution_name(publisher["name"])
       end
     end
 
-    def insert_publisher_item(xml)
+    def insert_item_number(xml)
       return xml if alternate_identifiers.blank?
 
-      xml.publisher_item do
-        alternate_identifiers.each do |alternate_identifier|
-          attributes = {
-            'item_number_type' => alternate_identifier['alternateIdentifierType'] ? alternate_identifier['alternateIdentifierType'].downcase : nil
-          }.compact
+      alternate_identifiers.each do |alternate_identifier|
+        attributes = {
+          "item_number_type" => alternate_identifier["alternateIdentifierType"] ? alternate_identifier["alternateIdentifierType"].downcase : nil,
+        }.compact
 
-          xml.item_number(alternate_identifier['alternateIdentifier'], attributes)
-        end
+        # remove dashes from UUIDs, as item_number can only be 32 characters long
+        alternate_identifier["alternateIdentifier"].gsub!("-", "") if alternate_identifier["alternateIdentifierType"] == "UUID"
+
+        xml.item_number(alternate_identifier["alternateIdentifier"], attributes)
       end
     end
 
@@ -275,9 +277,9 @@ module Commonmeta
       xml.doi_data do
         xml.doi(doi_from_url(id).downcase)
         xml.resource(url)
-        xml.collection('property' => 'text-mining') do
+        xml.collection("property" => "text-mining") do
           xml.item do
-            xml.resource(url, 'mime_type' => 'text/html')
+            xml.resource(url, "mime_type" => "text/html")
           end
         end
       end
@@ -292,26 +294,26 @@ module Commonmeta
           r = rights
         else
           r = {}
-          r['rights'] = rights
-          r['rightsUri'] = normalize_id(rights)
+          r["rights"] = rights
+          r["rightsUri"] = normalize_id(rights)
         end
 
         attributes = {
-          'rightsURI' => r['rightsUri'],
-          'rightsIdentifier' => r['rightsIdentifier'],
-          'rightsIdentifierScheme' => r['rightsIdentifierScheme'],
-          'schemeURI' => r['schemeUri'],
-          'xml:lang' => r['lang']
+          "rightsURI" => r["rightsUri"],
+          "rightsIdentifier" => r["rightsIdentifier"],
+          "rightsIdentifierScheme" => r["rightsIdentifierScheme"],
+          "schemeURI" => r["schemeUri"],
+          "xml:lang" => r["lang"],
         }.compact
 
-        xml.rights(r['rights'], attributes)
+        xml.rights(r["rights"], attributes)
       end
     end
 
     def insert_crossref_issn(xml)
-      issn = if container.to_h.fetch('identifierType', nil) == 'ISSN'
-               container.to_h.fetch('identifier', nil)
-             end
+      issn = if container.to_h.fetch("identifierType", nil) == "ISSN"
+          container.to_h.fetch("identifier", nil)
+        end
 
       return xml if issn.blank?
 
@@ -325,22 +327,22 @@ module Commonmeta
         d = descriptions.first
       else
         d = {}
-        d['description'] = descriptions.first
+        d["description"] = descriptions.first
       end
 
-      xml.abstract('xmlns' => 'http://www.ncbi.nlm.nih.gov/JATS1') do
-        xml.p(d['description'])
+      xml.abstract("xmlns" => "http://www.ncbi.nlm.nih.gov/JATS1") do
+        xml.p(d["description"])
       end
     end
 
     def crossref_root_attributes
-      { 'xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
-        'xsi:schemaLocation': 'http://www.crossref.org/schema/5.3.1 https://www.crossref.org/schemas/crossref5.3.1.xsd',
-        xmlns: 'http://www.crossref.org/schema/5.3.1',
-        'xmlns:jats': 'http://www.ncbi.nlm.nih.gov/JATS1',
-        'xmlns:fr': 'http://www.crossref.org/fundref.xsd',
-        'xmlns:mml': 'http://www.w3.org/1998/Math/MathML',
-        version: '5.3.1' }
+      { 'xmlns:xsi': "http://www.w3.org/2001/XMLSchema-instance",
+        'xsi:schemaLocation': "http://www.crossref.org/schema/5.3.1 https://www.crossref.org/schemas/crossref5.3.1.xsd",
+        xmlns: "http://www.crossref.org/schema/5.3.1",
+        'xmlns:jats': "http://www.ncbi.nlm.nih.gov/JATS1",
+        'xmlns:fr': "http://www.crossref.org/fundref.xsd",
+        'xmlns:mml': "http://www.w3.org/1998/Math/MathML",
+        version: "5.3.1" }
     end
   end
 end

data/lib/commonmeta/version.rb

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

data/spec/writers/crossref_xml_writer_spec.rb

@@ -217,8 +217,8 @@ describe Commonmeta::Metadata, vcr: true do
       expect(crossref_xml.dig("titles",
                               "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"=>"https://doi.org/10.5281/zenodo.3699950", "key"=>"ref11")
-      expect(crossref_xml.dig('publisher_item', 'item_number')).to eq("__content__"=>"954f8138-0ecd-4090-87c5-cef1297f1470", "item_number_type"=>"uuid")
+      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")
     end
 
     it "json_feed_item from rogue scholar with doi" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmeta-ruby
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.9
 platform: ruby
 authors:
 - Martin Fenner
@@ -1419,7 +1419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: Ruby client library for conversion of scholarly metadata