commonmeta-ruby 3.3.5 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cce77aa997b52aa12e81e987f14ea774684fb51dd90fe059202f4beb3c83a2bf
-  data.tar.gz: 6902fadfdae00f8f60b074a954067a5068f4bc4dcfccd03aa43e721d1ccc2840
+  metadata.gz: edf931672f4de5668583515c8d61aff5b4538cf86b929d961866691dc56c0850
+  data.tar.gz: fcd58d117198ee30dd0387bd96ff38ad4c82d1b67b538fcf997661ed3d2019e6
 SHA512:
-  metadata.gz: c672bdf54f0b78306eb3022f9a9e6cbbff066349bd38c8b09d45508eeecb36eae7a9d4cf0d69f724ddcf2fac7654fcd00844dc5cd480a4ad6c09c61c01f85b57
-  data.tar.gz: d8a729f63506c8bd3a6ae66bffd4561ebd7d958583b8d95d954bf46c3097171b028c1356f25a0f7f2937acae61dc43069a280e42923c675265369bc5e4e17b87
+  metadata.gz: 466b00b27e4382baeccab8c5bc82adb516e9a68a2651ba4cb9bbeb6f3e5cc7d6665a25fcf07142dc19fa5ef1dabf4ab273c4c6a75d8377070ea5f54f96af3e5e
+  data.tar.gz: 07634a0d50aed5280e6536cafa0a68fbe267d5d4b1065039aa1d433b305cfd220379e8fb9eab66385b2aa15eea01afb02c974643eb98d6aeb12e399eb9d03b60

data/Gemfile.lock

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

data/bin/commonmeta

@@ -5,5 +5,5 @@ 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?
   Commonmeta::CLI.start(ARGV.dup.unshift("convert"))
 else
-  Commonmeta::CLI.start(ARGV)
+  Commonmeta::CLI.start
 end

data/lib/commonmeta/cli.rb

@@ -117,12 +117,8 @@ module Commonmeta
 
     desc "", "update_ghost_post"
 
-    method_option :api_key, required: true
-    method_option :api_url, required: true
-    method_option :doi, required: true
-
     def update_ghost_post(uuid)
-      puts update_ghost_post(uuid: uuid, api_key: options[:api_key], api_url: options[:api_url], doi: options[:doi])
+      puts update_ghost_post(uuid)
     end
 
     default_task :convert

data/lib/commonmeta/utils.rb

@@ -1473,25 +1473,30 @@ module Commonmeta
       JWT.encode payload, [secret].pack("H*"), "HS256", header
     end
 
-    def update_ghost_post(uuid: nil, **options)
-      return nil unless uuid.present? && options[:api_key].present? && options[:api_url].present? && options[:doi].present?
+    def update_ghost_post(uuid)
+      api_key = ENV["API_KEY"]
+      api_url = ENV["API_URL"]
+
+      return nil unless uuid.present? && api_key.present? && api_url.present?
 
       # generate short lived jwt for ghost admin api
-      ghost_jwt = generate_ghost_token(options[:api_key])
+      ghost_jwt = generate_ghost_token(api_key)
 
-      # get post url from Rogue Scholar API
+      # get post url and doi from Rogue Scholar API
       url = json_feed_item_by_uuid_url(uuid)
       response = HTTP.get(url)
       return nil unless response.status.success?
 
       post = JSON.parse(response.body.to_s)
       url = post.to_h.dig("url")
-
-      return nil unless url.present?
+      doi = validate_doi(post.to_h.dig("id"))
+      doi = doi_as_url(doi)
+      
+      return nil unless url.present? && doi.present?
 
       # get id and updated_at from ghost api
       slug = url.chomp("/").split("/").last
-      ghost_url = "#{options[:api_url]}/ghost/api/admin/posts/slug/#{slug}/"
+      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?
 
@@ -1502,9 +1507,9 @@ module Commonmeta
       return nil unless id.present? && updated_at.present?
 
       # update post canonical_url with new doi
-      ghost_url = "#{options[:api_url]}/ghost/api/admin/posts/#{id}/"
-      response = HTTP.auth("Ghost #{ghost_jwt}").headers('Content-Type' => "application/json", 'Accept-Version' => 'v5').put(ghost_url, :json => { 'posts' => [{ 'canonical_url' => options[:doi], 'updated_at' => updated_at }] })
-      "#{response.status} DOI #{options[:doi]} updated for post #{uuid}"
+      ghost_url = "#{api_url}/ghost/api/admin/posts/#{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}"
     end
   end
 end

data/lib/commonmeta/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmeta-ruby
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
 platform: ruby
 authors:
 - Martin Fenner