commonmeta-ruby 3.2.13 → 3.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bac0bef429dfb0d6b215f3e9224dea78c3bae41ecc96dc9aa8c74fb45f14adc9
-  data.tar.gz: fe9f8e4628fb8ea120f858d24fc803e8183693104be98ffc96c3b608c76ef2ea
+  metadata.gz: 43a78bfc4b2f9b77c966597e4593cdfef5f6b3fffc493857b99e224ff94fb70b
+  data.tar.gz: 7b95a16aa8de6c5f7ce04352966e0855be5a174175514f77fe9ac82efc85d605
 SHA512:
-  metadata.gz: 14422b80a42b7c9093f9ca564486005248f9b2cfcde00a3d7a8f880844e50a62501bf0a516a83fff0a05ee123fe5aa7a990d3f2bc7c1f2d6b1fe25742b0c6dd4
-  data.tar.gz: 2ed255c095195200bbf1ca9c9c5d9207541a3196df57c3e951c11610ce3e56d19ca2d1f19f446481f66beda29bc7cf5b1a25f6ac611f0102b16f0f02e29c3cbd
+  metadata.gz: cf12683197ddff178718725b72976b1b2fecef23c2bafff50f9c81b9c29b2da67554937830d60b9860d59d9294d5cd7ccd0e86d15633948758896abf3a8827c5
+  data.tar.gz: e357c0d3871e0fd53e2371e792c487f2ba8895bb789982bddef496830d5aea08f0c571f209d8bcaf0f99365ec245eaf38621d7ad4230a548ab3e6f6ca1a7d7fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    commonmeta-ruby (3.2.13)
+    commonmeta-ruby (3.2.15)
       activesupport (>= 4.2.5, < 8.0)
       addressable (~> 2.8.1, < 2.8.2)
       base32-url (>= 0.7.0, < 1)
@@ -121,7 +121,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     matrix (0.4.2)
-    minitest (5.18.0)
+    minitest (5.18.1)
     multi_json (1.15.0)
     namae (1.1.1)
     nokogiri (1.15.2-arm64-darwin)

data/lib/commonmeta/crossref_utils.rb

@@ -89,7 +89,7 @@ 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"])
     end
 
     def insert_crossref_creators(xml)
@@ -264,8 +264,8 @@ module Commonmeta
           "item_number_type" => alternate_identifier["alternateIdentifierType"] ? alternate_identifier["alternateIdentifierType"].downcase : nil,
         }.compact
 
-        # 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"
+        # strip hyphen from UUIDs, as item_number can only be 32 characters long (UUIDv4 is 36 characters long)
+        alternate_identifier["alternateIdentifier"] = alternate_identifier["alternateIdentifier"].gsub('-','') if alternate_identifier["alternateIdentifierType"] == "UUID"
 
         xml.item_number(alternate_identifier["alternateIdentifier"], attributes)
       end

data/lib/commonmeta/readers/json_feed_reader.rb

@@ -54,7 +54,7 @@ module Commonmeta
           end
         language = meta.fetch("language", nil) || meta.dig("blog", "language")
         state = id.present? || read_options.present? ? "findable" : "not_found"
-        subjects = Array.wrap(meta.fetch("tags", nil)).reduce([]) do |sum, subject|
+        subjects = Array.wrap(meta.dig("blog", "category")).reduce([]) do |sum, subject|
           sum += name_to_fos(subject)
 
           sum
@@ -82,7 +82,11 @@ module Commonmeta
       def get_references(meta)
         # check that references resolve
         Array.wrap(meta["references"]).reduce([]) do |sum, reference|
-          sum << reference if [200, 301, 302].include? HTTP.head(reference["doi"] || reference["url"]).status
+          if reference["doi"] && validate_doi(reference["doi"])
+            sum << reference if [200, 301, 302].include? HTTP.head(reference["doi"]).status
+          elsif reference["url"] && validate_url(reference["url"]) == "URL"
+            sum << reference if [200, 301, 302].include? HTTP.head(reference["url"]).status
+          end
 
           sum
         end

data/lib/commonmeta/readers/schema_org_reader.rb

@@ -208,7 +208,7 @@ module Commonmeta
 
         # handle keywords as array and as comma-separated string
         subjects = meta.fetch('keywords', nil)
-        subjects = subjects.to_s.downcase.split(', ') if subjects.is_a?(String)
+        subjects = subjects.to_s.split(', ') if subjects.is_a?(String)
         subjects = Array.wrap(subjects).reduce([]) do |sum, subject|
           sum += name_to_fos(subject)
           sum

data/lib/commonmeta/utils.rb

@@ -1253,6 +1253,9 @@ module Commonmeta
     end
 
     def name_to_fos(name)
+      # make sure name is capitalized
+      name = name.capitalize
+
       # first find subject in Fields of Science (OECD)
       fos = JSON.load(File.read(File.expand_path("../../resources/oecd/fos-mappings.json",
                                                  __dir__))).fetch("fosFields")
@@ -1261,7 +1264,7 @@ module Commonmeta
 
       if subject
         return [{
-                 "subject" => sanitize(name).downcase,
+                 "subject" => sanitize(name),
                },
                 {
                  "subject" => "FOS: " + subject["fosLabel"],
@@ -1282,7 +1285,7 @@ module Commonmeta
 
       if subject
         [{
-          "subject" => sanitize(name).downcase,
+          "subject" => sanitize(name),
         },
          {
           "subject" => "FOS: " + subject["fosLabel"],
@@ -1290,7 +1293,7 @@ module Commonmeta
           "schemeUri" => "http://www.oecd.org/science/inno/38235147.pdf",
         }]
       else
-        [{ "subject" => sanitize(name).downcase }]
+        [{ "subject" => sanitize(name) }]
       end
     end
 

data/lib/commonmeta/version.rb

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

data/lib/commonmeta/writers/bibtex_writer.rb

@@ -17,7 +17,7 @@ module Commonmeta
           keywords: if subjects.present?
                       Array.wrap(subjects).map do |k|
                         parse_attributes(k, content: 'subject', first: true)
-                      end.join(', ')
+                      end.join(', ').capitalize
                     end,
           language: language,
           title: parse_attributes(titles, content: 'title', first: true),

data/lib/commonmeta/writers/ris_writer.rb

@@ -15,7 +15,7 @@ module Commonmeta
           'UR' => url,
           'AB' => parse_attributes(descriptions, content: 'description', first: true),
           'KW' => Array.wrap(subjects).map do |k|
-            parse_attributes(k, content: 'subject', first: true)
+            parse_attributes(k, content: 'subject', first: true).capitalize
           end.presence,
           'PY' => date['published'] && date['published'].split('-').first,
           'PB' => publisher['name'],

data/lib/commonmeta/writers/schema_org_writer.rb

@@ -19,7 +19,7 @@ module Commonmeta
           'keywords' => if subjects.present?
                           Array.wrap(subjects).map do |k|
                             parse_attributes(k, content: 'subject', first: true)
-                          end.join(', ')
+                          end.join(', ').capitalize
                         end,
           'inLanguage' => language,
           'contentSize' => Array.wrap(sizes).unwrap,