commonmeta-ruby 3.3.4 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64e45cd8a5e13c62d97cf71bfa6806a85dc12548b221207eb7938f1285635a6c
-  data.tar.gz: 2890b683526f5013b6ffd4c95c6b6bbdf2d1b148150e0662ed2ff915260aaf49
+  metadata.gz: edf931672f4de5668583515c8d61aff5b4538cf86b929d961866691dc56c0850
+  data.tar.gz: fcd58d117198ee30dd0387bd96ff38ad4c82d1b67b538fcf997661ed3d2019e6
 SHA512:
-  metadata.gz: 5bf8c06824328fee1aa671735c52c52ae1f15506855febdcf63f8b4bd68e4282fe232501c437cbbf2fd60034773e47e763f056bcb0eb087c1218bac8c026e360
-  data.tar.gz: dd4bb2c23711c452d562036458664bf757c1e53bbdc013c8c6276e00806aa4fca7c29b6e43957605b9937b0b6cebcd1d0fdb3cd94b035ae3ba4e6a2237de33e3
+  metadata.gz: 466b00b27e4382baeccab8c5bc82adb516e9a68a2651ba4cb9bbeb6f3e5cc7d6665a25fcf07142dc19fa5ef1dabf4ab273c4c6a75d8377070ea5f54f96af3e5e
+  data.tar.gz: 07634a0d50aed5280e6536cafa0a68fbe267d5d4b1065039aa1d433b305cfd220379e8fb9eab66385b2aa15eea01afb02c974643eb98d6aeb12e399eb9d03b60

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    commonmeta-ruby (3.3.4)
+    commonmeta-ruby (3.3.6)
       activesupport (>= 4.2.5, < 8.0)
       addressable (~> 2.8.1, < 2.8.2)
       base32-url (>= 0.7.0, < 1)
@@ -22,7 +22,7 @@ PATH
       postrank-uri (~> 1.1)
       rdf-rdfxml (~> 3.2)
       rdf-turtle (~> 3.2)
-      thor (~> 1.1, >= 1.1.0)
+      thor (~> 1.2, >= 1.2.2)
 
 GEM
   remote: https://rubygems.org/

data/commonmeta.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'postrank-uri', '~> 1.1'
   s.add_dependency 'rdf-rdfxml', '~> 3.2'
   s.add_dependency 'rdf-turtle', '~> 3.2'
-  s.add_dependency 'thor', '~> 1.1', '>= 1.1.0'
+  s.add_dependency 'thor', '~> 1.2', '>= 1.2.2'
   s.add_development_dependency 'bundler', '~> 2.3', '>= 2.3.1'
   s.add_development_dependency 'code-scanning-rubocop', '~> 0.6.1'
   s.add_development_dependency 'hashdiff', '~> 1.0.1'

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.4'
+  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.4
+  version: 3.3.6
 platform: ruby
 authors:
 - Martin Fenner
@@ -344,20 +344,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement