commonmeta-ruby 3.2.12 → 3.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb3a97138b6b57a503b29202613fd81d5124c66ef2523ba9ef7cccccb78d7ff8
-  data.tar.gz: 0b9f6d3b310604ff2bb567b0ae13ae025d9c954c77669d9adec2f3e1bd36f307
+  metadata.gz: b549fc46c70c5962ee3c971968771a6e5f13124eb89b03aab36228afc94c01fe
+  data.tar.gz: 1545d0de4e821265cc19bb744456d025f6bc14ea52c19cbae2585a1d501501a4
 SHA512:
-  metadata.gz: 8262107294fc3be73c4b39ed45a662f1cd0e6a98702deb5bbc65fe91b8e9a31e890d33e38246c5852232be35746ce40d3cc9c77a9314a979dbf7c659b8826b56
-  data.tar.gz: 5d68d6084d2a0257147346cc68837ed64955691141dcef7568fa7de3f5fffcd9b7573201ab9b4e26bbd0c6fcb7aee6cc4abadaf766c9344da5383e42dcbf2223
+  metadata.gz: 3d7a785d1fdbf3bd226a64f489ef12e37cb474fe0334c894e98c0a86b90fba23d02d937eed3bc4f4e710791209556ab2ece950e50491d48874e128e95f62c44e
+  data.tar.gz: cad955e4ba4066a42ff821f03437cfe09fb926c283785050d34682cc95e676d89d608f03ca63c18574d012e5fcad168c5f289cd7d465f525846c877e91368635

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    commonmeta-ruby (3.2.12)
+    commonmeta-ruby (3.2.14)
       activesupport (>= 4.2.5, < 8.0)
       addressable (~> 2.8.1, < 2.8.2)
       base32-url (>= 0.7.0, < 1)

data/bin/commonmeta

@@ -2,7 +2,7 @@
 
 require File.expand_path("../../lib/commonmeta", __FILE__)
 
-if (ARGV & %w(--version -v help --help encode decode encode_id decode_id json_feed_updated json_feed_unregistered json_feed_by_blog)).empty?
+if (ARGV & %w(--version -v help --help encode decode encode_id decode_id json_feed_not_indexed json_feed_unregistered json_feed_by_blog)).empty?
   Commonmeta::CLI.start(ARGV.dup.unshift("convert"))
 else
   Commonmeta::CLI.start

data/lib/commonmeta/cli.rb

@@ -86,10 +86,10 @@ module Commonmeta
       puts get_json_feed_unregistered
     end
 
-    desc "", "json_feed_updated"
+    desc "", "json_feed_not_indexed"
 
-    def json_feed_updated
-      puts get_json_feed_updated
+    def json_feed_not_indexed(date_indexed)
+      puts get_json_feed_not_indexed(date_indexed)
     end
 
     desc "", "json_feed_by_blog"

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
@@ -96,18 +96,18 @@ module Commonmeta
         return { "string" => nil, "state" => "not_found" } unless response.status.success?
 
         posts = JSON.parse(response.body.to_s)
-        posts.map { |post| post["uuid"] }.join('\n')
+        posts.map { |post| post["uuid"] }.first
       end
 
-      def get_json_feed_updated
-        # get JSON Feed items updated since last check
+      def get_json_feed_not_indexed(date_indexed)
+        # get JSON Feed items not indexed in Crossref since a particular date
 
-        url = json_feed_updated_url
+        url = json_feed_not_indexed_url(date_indexed)
         response = HTTP.get(url)
         return { "string" => nil, "state" => "not_found" } unless response.status.success?
 
         posts = JSON.parse(response.body.to_s)
-        posts.map { |post| post["uuid"] }.join('\n')
+        posts.map { |post| post["uuid"] }.first
       end
 
       def get_json_feed_by_blog(blog_id)
@@ -118,7 +118,7 @@ module Commonmeta
         return { "string" => nil, "state" => "not_found" } unless response.status.success?
 
         blog = JSON.parse(response.body.to_s)
-        blog["items"].map { |item| item["uuid"] }.join('\n')
+        blog["items"].map { |item| item["uuid"] }.first
       end
     end
   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
 
@@ -1401,8 +1404,8 @@ module Commonmeta
       Base32::URL.decode(id)
     end
 
-    def json_feed_updated_url
-      "https://rogue-scholar.org/api/posts/updated"
+    def json_feed_not_indexed_url(date_indexed)
+      "https://rogue-scholar.org/api/posts/not_indexed/#{date_indexed}"
     end
 
     def json_feed_unregistered_url

data/lib/commonmeta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Commonmeta
-  VERSION = '3.2.12'
+  VERSION = '3.2.14'
 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,

data/spec/cli_spec.rb

@@ -342,6 +342,15 @@ describe Commonmeta::CLI do
   end
 
   describe "json_feed", vcr: true do
+    it "json_feed_unregistered" do
+      expect { subject.json_feed_unregistered }.to output(/031faba3-3a6e-49d1-a540-26523be2fd09/).to_stdout
+    end
+    
+    it "json_feed_not_indexed" do
+      input = "2023-01-01"
+      expect { subject.json_feed_not_indexed input }.to output(/ab58e412-06eb-42b7-b81a-d340825b9d48/).to_stdout
+    end
+
     it "json_feed_by_blog" do
       input = "tyfqw20"
       expect { subject.json_feed_by_blog input }.to output(/3e1278f6-e7c0-43e1-bb54-6829e1344c0d/).to_stdout