commonmeta-ruby 3.3.14 → 3.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee69e57863623e144f88a33b390d82e7091e164251e18126dc91506aa1dbb46
-  data.tar.gz: 18a2dbf7ca68ab099441811fae3535164f9ecd32257a75b06327c2978adb2d86
+  metadata.gz: 1959fba18a127e97c92b94c7e0e78d42c4538e3bccf6b9e6019035931e19d2f4
+  data.tar.gz: 190a4ddc0e6789c56f6f9a5a97355c8684e103abf121d2dfefdd5c1d816bd2d2
 SHA512:
-  metadata.gz: ece7f1c165c734f8654329f809b2163013d6e837fc29a4b50e17f449e0754b6fa0ef3a6afd22c1601c0cd27c7659f068d1d59a9f166a7bc44b67e6d227a75366
-  data.tar.gz: 3eada0a28b0ccc7ea570b7ca45ee07c2a614725b0d55ca8fd6964c67579d27e9c538a51bc1e76e30c6faccff871e93959063702062df9f8a1cc25d9ae4468ba4
+  metadata.gz: d5994587ca3efda69c8f1e4efca204a89db31d9e4b48a4b683e0312e32209c720f3a24506026152dd69d6ee49895919d72ee4d3aea6557da2b972a1fdb94092a
+  data.tar.gz: 56b4e03114cff5155c502f08f953afb3f2ba13c82bdefecfed73b752131b6b718cd21460eaa8d6506b7b50ded9655330e7c040c833a81c5feeb105c489306ab9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    commonmeta-ruby (3.3.14)
+    commonmeta-ruby (3.3.16)
       activesupport (>= 4.2.5, < 8.0)
       addressable (~> 2.8.1, < 2.8.2)
       base32-url (>= 0.7.0, < 1)
@@ -127,7 +127,7 @@ GEM
     minitest (5.18.1)
     multi_json (1.15.0)
     namae (1.1.1)
-    nokogiri (1.15.2-arm64-darwin)
+    nokogiri (1.15.3-arm64-darwin)
       racc (~> 1.4)
     oj (3.15.0)
     optimist (3.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 encode_by_blog encode_by_uuid json_feed_not_indexed json_feed_unregistered json_feed_by_blog update_ghost_post)).empty?
+if (ARGV & %w(--version -v help --help encode decode encode_id decode_id encode_by_blog encode_by_id json_feed_not_indexed json_feed_unregistered json_feed_by_blog update_ghost_post)).empty?
   Commonmeta::CLI.start(ARGV.dup.unshift("convert"))
 else
   Commonmeta::CLI.start

data/lib/commonmeta/cli.rb

@@ -77,10 +77,10 @@ module Commonmeta
       puts encode_doi(prefix)
     end
 
-    desc "", "encode_by_uuid"
+    desc "", "encode_by_id"
 
-    def encode_by_uuid(uuid)
-      prefix = get_doi_prefix_by_json_feed_item_uuid(uuid)
+    def encode_by_id(id)
+      prefix = get_doi_prefix_by_json_feed_item_id(id)
       return nil unless prefix.present?
       puts encode_doi(prefix)
     end
@@ -117,8 +117,8 @@ module Commonmeta
 
     desc "", "update_ghost_post"
 
-    def update_ghost_post(uuid)
-      puts update_ghost_post_via_api(uuid)
+    def update_ghost_post(id)
+      puts update_ghost_post_via_api(id)
     end
 
     default_task :convert

data/lib/commonmeta/readers/json_feed_reader.rb

@@ -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,8 @@ 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
+        puts posts.inspect
+        posts.map { |post| post["id"] }.first
       end
 
       def get_json_feed_by_blog(blog_id)
@@ -133,7 +134,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)
@@ -147,10 +148,10 @@ module Commonmeta
         post.to_h.dig("prefix")
       end
 
-      def get_doi_prefix_by_json_feed_item_uuid(uuid)
+      def get_doi_prefix_by_json_feed_item_id(id)
         # for generating a random DOI. Prefix is based on the blog id.
 
-        url = json_feed_item_by_uuid_url(uuid)
+        url = json_feed_item_by_id_url(id)
         response = HTTP.get(url)
         return nil unless response.status.success?
 

data/lib/commonmeta/utils.rb

@@ -1400,10 +1400,10 @@ module Commonmeta
       "https://doi.org/#{prefix}/#{str}"
     end
 
-    def encode_doi_for_uuid(uuid, options = {})
-      # look up prefix for rogue scholar blog associated with uuid
-      # returns nil if unknown uuid or doi registration is not enabled for blog
-      json_feed_by_uuid(uuid)
+    def encode_doi_for_id(id, options = {})
+      # look up prefix for rogue scholar blog associated with id
+      # returns nil if unknown id or doi registration is not enabled for blog
+      json_feed_by_id(id)
       # 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
@@ -1449,8 +1449,8 @@ module Commonmeta
       "https://rogue-scholar.org/api/blogs/#{blog_id}"
     end
 
-    def json_feed_item_by_uuid_url(uuid)
-      "https://rogue-scholar.org/api/posts/#{uuid}"
+    def json_feed_item_by_id_url(id)
+      "https://rogue-scholar.org/api/posts/#{id}"
     end
 
     def generate_ghost_token(admin_api_key)
@@ -1473,43 +1473,43 @@ module Commonmeta
       JWT.encode payload, [secret].pack("H*"), "HS256", header
     end
 
-    def update_ghost_post_via_api(uuid)
+    def update_ghost_post_via_api(id)
       api_key = ENV["API_KEY"]
       api_url = ENV["API_URL"]
 
-      return nil unless uuid.present? && api_key.present? && api_url.present?
+      return nil unless id.present? && api_key.present? && api_url.present?
 
       # generate short lived jwt for ghost admin api
       ghost_jwt = generate_ghost_token(api_key)
 
       # get post url and doi from Rogue Scholar API
-      url = json_feed_item_by_uuid_url(uuid)
+      url = json_feed_item_by_id_url(id)
       response = HTTP.get(url)
       return nil unless response.status.success?
 
       post = JSON.parse(response.body.to_s)
       url = post.to_h.dig("url")
-      doi = validate_doi(post.to_h.dig("id"))
+      doi = validate_doi(post.to_h.dig("doi"))
       doi = doi_as_url(doi)
 
       return nil unless url.present? && doi.present?
 
-      # get id and updated_at from ghost api
+      # get post_id and updated_at from ghost api
       slug = url.chomp("/").split("/").last
       ghost_url = "#{api_url}/ghost/api/admin/posts/slug/#{slug}/"
       response = HTTP.auth("Ghost #{ghost_jwt}").get(ghost_url)
       return nil unless response.status.success?
 
       ghost_post = JSON.parse(response.body.to_s).dig("posts").first
-      id = ghost_post.dig("id")
+      ghost_id = ghost_post.dig("id")
       updated_at = ghost_post.dig("updated_at")
 
-      return nil unless id.present? && updated_at.present?
+      return nil unless ghost_id.present? && updated_at.present?
 
       # update post canonical_url with new doi
-      ghost_url = "#{api_url}/ghost/api/admin/posts/#{id}/"
+      ghost_url = "#{api_url}/ghost/api/admin/posts/#{ghost_id}/"
       response = HTTP.auth("Ghost #{ghost_jwt}").headers('Content-Type' => "application/json", 'Accept-Version' => 'v5').put(ghost_url, :json => { 'posts' => [{ 'canonical_url' => doi, 'updated_at' => updated_at }] })
-      "#{response.status} DOI #{doi} added to post #{uuid}"
+      "#{response.status} DOI #{doi} added to post #{ghost_id}"
     end
   end
 end

data/lib/commonmeta/version.rb

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

data/spec/cli_spec.rb

@@ -332,14 +332,14 @@ describe Commonmeta::CLI do
       expect { subject.encode_by_blog input }.to output("").to_stdout
     end
 
-    it "by_uuid" do
+    it "by_id" do
       input = "2b22bbba-bcba-4072-94cc-3f88442fff88"
-      expect { subject.encode_by_uuid input }.to output(/https:\/\/doi.org\/10.54900/).to_stdout
+      expect { subject.encode_by_id input }.to output(/https:\/\/doi.org\/10.54900/).to_stdout
     end
 
-    it "by_uuid unknown uuid" do
+    it "by_id unknown uuid" do
       input = "2b22bbba-bcba-4072-94cc-3f88442"
-      expect { subject.encode_by_uuid input }.to output("").to_stdout
+      expect { subject.encode_by_id input }.to output("").to_stdout
     end
   end
 
@@ -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

data/spec/fixtures/vcr_cassettes/Commonmeta_CLI/encode/by_id.yml

@@ -0,0 +1,62 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://rogue-scholar.org/api/posts/2b22bbba-bcba-4072-94cc-3f88442fff88
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      Connection:
+      - close
+      Host:
+      - rogue-scholar.org
+      User-Agent:
+      - http.rb/5.1.1
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Age:
+      - '0'
+      Cache-Control:
+      - public, max-age=0, must-revalidate
+      Content-Length:
+      - '1894'
+      Content-Type:
+      - application/json; charset=utf-8
+      Date:
+      - Sun, 09 Jul 2023 11:52:35 GMT
+      Etag:
+      - '"15o6g3vltsa1gm"'
+      Server:
+      - Vercel
+      Strict-Transport-Security:
+      - max-age=63072000
+      X-Matched-Path:
+      - "/api/posts/[[...params]]"
+      X-Vercel-Cache:
+      - MISS
+      X-Vercel-Id:
+      - fra1::iad1::flst9-1688903555530-c16d7c4324cc
+      Connection:
+      - close
+    body:
+      encoding: UTF-8
+      string: '{"id":"2b22bbba-bcba-4072-94cc-3f88442fff88","doi":"https://doi.org/10.54900/6p6re-xyj61","url":"https://upstream.force11.org/an-initial-scholarly-ai-taxonomy","title":"An
+        Initial Scholarly AI Taxonomy","summary":"Although advances in artificial
+        intelligence (AI)1 have been unfolding for over decades, the progress in the
+        last six months has come faster than anyone expected. The public release of
+        ChatGPT in November 2022, in particular, has opened up new possibilities and
+        heightened awareness of AI''s potential role in various aspects of our work
+        and life.It follows that in the context of the publishing industry, AI also
+        holds the promise of transforming multiple facets of the publishing process2.
+        In this...","date_published":"2023-04-11T08:00:34+00:00","date_modified":"2023-04-11T15:29:38+00:00","date_indexed":"2023-06-27T10:51:38.566+00:00","authors":[{"url":null,"name":"Adam
+        Hyde"},{"url":"https://orcid.org/0000-0002-7378-2408","name":"John Chodacki"},{"url":null,"name":"Paul
+        Shannon"}],"image":"https://upstream.force11.org/content/images/2023/04/1-1.png","tags":["Thought
+        Pieces"],"language":"en","references":[],"blog_id":"pm0p222","blog":{"id":"pm0p222","title":"Upstream","description":"The
+        community blog for all things Open Research.","language":"en","favicon":"https://upstream.force11.org/favicon.png","feed_url":"https://upstream.force11.org/atom-complete/","home_page_url":"https://upstream.force11.org","user_id":"8498eaf6-8c58-4b58-bc15-27eda292b1aa","created_at":"2023-05-31T07:23:49+00:00","indexed_at":"2023-01-13","feed_format":"application/atom+xml","license":"https://creativecommons.org/licenses/by/4.0/legalcode","generator":"Ghost
+        5.25","category":"Humanities","prefix":"10.54900","modified_at":"2023-07-04T21:15:51+00:00","version":"https://jsonfeed.org/version/1.1","backlog":false,"current_feed_url":"https://upstream.force11.org/atom/","expired":null}}'
+  recorded_at: Sun, 09 Jul 2023 11:52:35 GMT
+recorded_with: VCR 6.2.0

data/spec/fixtures/vcr_cassettes/Commonmeta_CLI/{json_feed_unregistered/blog_post_uuid.yml → encode/by_id_unknown_uuid.yml}

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://rogue-scholar.org/api/posts/unregistered
+    uri: https://rogue-scholar.org/api/posts/2b22bbba-bcba-4072-94cc-3f88442
     body:
       encoding: UTF-8
       string: ''
@@ -15,35 +15,35 @@ http_interactions:
       - http.rb/5.1.1
   response:
     status:
-      code: 200
-      message: OK
+      code: 404
+      message: Not Found
     headers:
       Age:
       - '0'
       Cache-Control:
       - public, max-age=0, must-revalidate
       Content-Length:
-      - '2'
+      - '28'
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Sat, 10 Jun 2023 08:41:01 GMT
+      - Sun, 09 Jul 2023 11:52:35 GMT
       Etag:
-      - '"38jmpejbxv2"'
+      - '"jtxxi9yf69s"'
       Server:
       - Vercel
       Strict-Transport-Security:
       - max-age=63072000
       X-Matched-Path:
-      - "/api/posts/unregistered"
+      - "/api/posts/[[...params]]"
       X-Vercel-Cache:
       - MISS
       X-Vercel-Id:
-      - fra1::iad1::zmnzt-1686386457205-d9f9a0745c33
+      - fra1::iad1::r2jnr-1688903554372-bc572f9c2183
       Connection:
       - close
     body:
       encoding: UTF-8
-      string: "[]"
-  recorded_at: Sat, 10 Jun 2023 08:41:01 GMT
-recorded_with: VCR 6.1.0
+      string: '{"message":"Post not found"}'
+  recorded_at: Sun, 09 Jul 2023 11:52:35 GMT
+recorded_with: VCR 6.2.0