commonmeta-ruby 3.3.15 → 3.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7f58c5181ad8210359b3e6cb897e6a7c0b66d6065f2dda0836998e1a59939af
-  data.tar.gz: 780639668c9bc7b2fec43061818db60e3c05d4c6e430e6d03349d02ae781eacd
+  metadata.gz: 3d9089eaa55c76c89411f0b252418860d40c498b77ad5e07ff6937d26364fff4
+  data.tar.gz: b251346f6fd8fe1714632587ee46196b00c3c4bb8c4ba7bf0fe6decd54c5a9e3
 SHA512:
-  metadata.gz: 65ab7d09ed4a84c4ba153a94f142de3a4878899832135883d83123b6bfdfa48b7c21f47b87ae6f385a158d874316ebed4236d531bd8f9921ce2a4802561b2015
-  data.tar.gz: b3970a10d049bcce65a9ac9a2f357b5569422335b2cc317877821aa7dddb3a0aa29070c2ab196dcccdfbd02f670f827d9515083c480f94c2686c34b3ceb5b524
+  metadata.gz: 87733ee7cf23b71317df6c8ef7ad2eea099db43a6291a948f93b18220aeff5f3cf72e8ec9a9b0e36b3f243fe7b651d1b7d401341d0cf0524d0a6c3ea0db1bc7f
+  data.tar.gz: 131dbb14b63cca5c62acce085746f0dc13ef99252bd9243a84c0565a5e671e45c613cc12903df297e4c9df8bd0f5a6d69b645d18e622dd895c0d120e0d7b7f46

data/Gemfile.lock

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

data/lib/commonmeta/readers/json_feed_reader.rb

@@ -21,7 +21,7 @@ module Commonmeta
         meta = string.present? ? JSON.parse(string) : {}
 
         url = normalize_url(meta.fetch("url", nil))
-        id = options[:doi] ? normalize_doi(options[:doi]) : normalize_id(meta.fetch("id", nil))
+        id = options[:doi] ? normalize_doi(options[:doi]) : normalize_id(meta.fetch("doi", nil))
         id = url if id.blank? && url.present?
 
         type = "Article"
@@ -34,8 +34,8 @@ module Commonmeta
         publisher = { "name" => meta.dig("blog", "title") }
 
         date = {}
-        date["published"] = get_iso8601_date(meta.dig("date_published")) if meta.dig("date_published").present?
-        date["updated"] = get_iso8601_date(meta.dig("date_modified")) if meta.dig("date_modified").present?
+        date["published"] = get_date_from_unix_timestamp(meta.dig("published_at")) if meta.dig("published_at").present?
+        date["updated"] = get_date_from_unix_timestamp(meta.dig("updated_at")) if meta.dig("updated_at").present?
 
         license = if meta.dig("blog", "license").present?
             hsh_to_spdx("rightsURI" => meta.dig("blog", "license"))
@@ -62,7 +62,7 @@ module Commonmeta
           sum
         end
         references = get_references(meta)
-        alternate_identifiers = [{ "alternateIdentifier" => meta["uuid"], "alternateIdentifierType" => "UUID" }]
+        alternate_identifiers = [{ "alternateIdentifier" => meta["id"], "alternateIdentifierType" => "UUID" }]
 
         { "id" => id,
           "type" => type,
@@ -83,7 +83,7 @@ module Commonmeta
 
       def get_references(meta)
         # check that references resolve
-        Array.wrap(meta["references"]).reduce([]) do |sum, reference|
+        Array.wrap(meta["reference"]).reduce([]) do |sum, reference|
           begin
             if reference["doi"] && validate_doi(reference["doi"])
               response = HTTP.follow
@@ -111,7 +111,7 @@ module Commonmeta
         return { "string" => nil, "state" => "not_found" } unless response.status.success?
 
         posts = JSON.parse(response.body.to_s)
-        posts.map { |post| post["uuid"] }.first
+        posts.map { |post| post["id"] }.first
       end
 
       def get_json_feed_not_indexed
@@ -122,7 +122,7 @@ module Commonmeta
         return { "string" => nil, "state" => "not_found" } unless response.status.success?
 
         posts = JSON.parse(response.body.to_s)
-        posts.map { |post| post["uuid"] }.first
+        posts.map { |post| post["id"] }.first
       end
 
       def get_json_feed_by_blog(blog_id)
@@ -133,7 +133,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"] }.first
+        blog["items"].map { |item| item["id"] }.first
       end
 
       def get_doi_prefix_by_blog_id(blog_id)

data/lib/commonmeta/utils.rb

@@ -1094,6 +1094,20 @@ module Commonmeta
       nil
     end
 
+    # parsing of unix timestamps such as 1427846400
+    def get_datetime_from_unix_timestamp(unix_timestamp)
+      strip_milliseconds(DateTime.strptime(unix_timestamp.to_s, '%s').iso8601)
+    rescue StandardError
+      nil
+    end
+
+    # parsing of unix timestamps such as 1427846400
+    def get_date_from_unix_timestamp(unix_timestamp)
+      DateTime.strptime(unix_timestamp.to_s, '%s').strftime('%Y-%m-%d')
+    rescue StandardError
+      nil
+    end
+
     # strip milliseconds if there is a time, as it interferes with edtc parsing
     # keep dates unchanged
     def strip_milliseconds(iso8601_time)

data/lib/commonmeta/version.rb

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

data/spec/cli_spec.rb

@@ -367,7 +367,7 @@ describe Commonmeta::CLI do
 
   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
+      expect { subject.json_feed_unregistered }.to output(/3023e24a-817d-452e-bb6e-ddadecce94c6/).to_stdout
     end
     
     it "json_feed_not_indexed" do
@@ -376,7 +376,7 @@ describe Commonmeta::CLI do
 
     it "json_feed_by_blog" do
       input = "tyfqw20"
-      expect { subject.json_feed_by_blog input }.to output(/3e1278f6-e7c0-43e1-bb54-6829e1344c0d/).to_stdout
+      expect { subject.json_feed_by_blog input }.to output(/37538c38-66e6-4ac4-ab5c-679684622ade/).to_stdout
     end
   end
 end