commonmeta-ruby 3.3 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dde90e2b65c0eabd771cda34b2b5054fbe6bf80b573444fe0bcdde14c8392429
-  data.tar.gz: 487ffa495c4ffae32184c0a6e11ef68a5f9e82ea18bfe4183d851cb4558d5f81
+  metadata.gz: 1ece0c59f3993f3ca9e94df678c97093e785135f431592850dd5505d3f910f72
+  data.tar.gz: 948128ccbdb265d677531b68f7dd939e8e7723b5bb0b5bf8f751e606d4d58232
 SHA512:
-  metadata.gz: 468b8f5ffc67f878cf97a39b0733e01ee9a56c1a2fd82874feba18fb9de6876b2d835ab11b2dd40021139dff988152d66fe25af0adde1e5884884017435dc711
-  data.tar.gz: 1126af3e7ae9b0cbb25d9d2f4497e894ae33e2a34bb9cc975924233fcf48f8cd0527b67f7983aeee375d4e98f7d58005a913e5301a848aca2da92ce051b93732
+  metadata.gz: ca2bf7e8edca004aa35c3009cda657a544db8f420546e067d86a7c4bfe5e8819373e341efc0f4b7490a74867e8e4b38e96423f8257100cf720513d1d49e92655
+  data.tar.gz: 5c68deb59478f2b1c108bf42eaf24bd70b3218fecf4e76da731a6d4717997c75a037af55a36c6d0c4d4c1f270c0fed5efc24bd9dab5e7e25bc7c8855fc1b4c11

data/Gemfile.lock

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

data/lib/commonmeta/cli.rb

@@ -59,6 +59,7 @@ module Commonmeta
     desc "", "encode"
 
     def encode(prefix)
+      return nil unless validate_prefix(prefix).present?
       puts encode_doi(prefix)
     end
 
@@ -72,6 +73,7 @@ module Commonmeta
 
     def encode_by_blog(blog_id)
       prefix = get_doi_prefix_by_blog_id(blog_id)
+      return nil unless prefix.present?
       puts encode_doi(prefix)
     end
 
@@ -79,6 +81,7 @@ module Commonmeta
 
     def encode_by_uuid(uuid)
       prefix = get_doi_prefix_by_json_feed_item_uuid(uuid)
+      return nil unless prefix.present?
       puts encode_doi(prefix)
     end
 

data/lib/commonmeta/readers/json_feed_reader.rb

@@ -132,10 +132,10 @@ module Commonmeta
 
         url = json_feed_by_blog_url(blog_id)
         response = HTTP.get(url)
-        return { "string" => nil, "state" => "not_found" } unless response.status.success?
+        return nil unless response.status.success?
 
         post = JSON.parse(response.body.to_s)
-        post.dig('prefix')
+        post.to_h.dig('prefix')
       end
 
       def get_doi_prefix_by_json_feed_item_uuid(uuid)
@@ -143,10 +143,10 @@ module Commonmeta
 
         url = json_feed_item_by_uuid_url(uuid)
         response = HTTP.get(url)
-        return { "string" => nil, "state" => "not_found" } unless response.status.success?
+        return nil unless response.status.success?
 
         post = JSON.parse(response.body.to_s)
-        post.dig('blog', 'prefix')
+        post.to_h.dig('blog', 'prefix')
       end
     end
   end

data/lib/commonmeta/utils.rb

@@ -1384,11 +1384,14 @@ module Commonmeta
     end
 
     def encode_doi(prefix, options = {})
+      return nil unless prefix.present?
+      
       # 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
       if options[:uuid]
         str = Base32::URL.encode_uuid(options[:uuid], split: 7, checksum: true)
+        return nil unless str.present?
       else
         random_int = SecureRandom.random_number(32 ** 7..(32 ** 8) - 1)
         suffix = Base32::URL.encode(random_int, checksum: true)

data/lib/commonmeta/version.rb

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

data/spec/cli_spec.rb

@@ -312,20 +312,35 @@ describe Commonmeta::CLI do
   end
 
   describe "encode", vcr: true do
-    it "blog prefix" do
+    it "valid doi prefix" do
       input = "10.53731"
       expect { subject.encode input }.to output(/https:\/\/doi.org\/10.53731/).to_stdout
     end
 
+    it "invalid doi prefix" do
+      input = "11.1234"
+      expect { subject.encode input }.to output("").to_stdout
+    end
+
     it "by_blog" do
       input = "tyfqw20"
       expect { subject.encode_by_blog input }.to output(/https:\/\/doi.org\/10.59350/).to_stdout
     end
 
+    it "by_blog unknown blog_id" do
+      input = "tyfqw"
+      expect { subject.encode_by_blog input }.to output("").to_stdout
+    end
+
     it "by_uuid" do
       input = "2b22bbba-bcba-4072-94cc-3f88442fff88"
       expect { subject.encode_by_uuid input }.to output(/https:\/\/doi.org\/10.54900/).to_stdout
     end
+
+    it "by_uuid unknown uuid" do
+      input = "2b22bbba-bcba-4072-94cc-3f88442"
+      expect { subject.encode_by_uuid input }.to output("").to_stdout
+    end
   end
 
   describe "decode" do

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

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://rogue-scholar.org/api/blogs/tyfqw
+    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:
+      - '4'
+      Content-Type:
+      - application/json; charset=utf-8
+      Date:
+      - Sun, 18 Jun 2023 07:50:43 GMT
+      Etag:
+      - '"wm6yxsynvh4"'
+      Server:
+      - Vercel
+      Strict-Transport-Security:
+      - max-age=63072000
+      X-Matched-Path:
+      - "/api/blogs/[slug]"
+      X-Vercel-Cache:
+      - MISS
+      X-Vercel-Id:
+      - fra1::iad1::98kz8-1687074643292-5d2c6967ccd1
+      Connection:
+      - close
+    body:
+      encoding: UTF-8
+      string: 'null'
+  recorded_at: Sun, 18 Jun 2023 07:50:44 GMT
+recorded_with: VCR 6.1.0

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

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://rogue-scholar.org/api/posts/2b22bbba-bcba-4072-94cc-3f88442
+    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:
+      - '4'
+      Content-Type:
+      - application/json; charset=utf-8
+      Date:
+      - Sun, 18 Jun 2023 07:50:45 GMT
+      Etag:
+      - '"wm6yxsynvh4"'
+      Server:
+      - Vercel
+      Strict-Transport-Security:
+      - max-age=63072000
+      X-Matched-Path:
+      - "/api/posts/[slug]"
+      X-Vercel-Cache:
+      - MISS
+      X-Vercel-Id:
+      - fra1::iad1::vcxmh-1687074645282-662f2f07ee79
+      Connection:
+      - close
+    body:
+      encoding: UTF-8
+      string: 'null'
+  recorded_at: Sun, 18 Jun 2023 07:50:45 GMT
+recorded_with: VCR 6.1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmeta-ruby
 version: !ruby/object:Gem::Version
-  version: '3.3'
+  version: 3.3.2
 platform: ruby
 authors:
 - Martin Fenner
@@ -1074,7 +1074,9 @@ files:
 - spec/fixtures/vcr_cassettes/Commonmeta_CLI/doi_prefix/doi_prefix_by_blog.yml
 - spec/fixtures/vcr_cassettes/Commonmeta_CLI/doi_prefix/doi_prefix_by_uuid.yml
 - spec/fixtures/vcr_cassettes/Commonmeta_CLI/encode/by_blog.yml
+- spec/fixtures/vcr_cassettes/Commonmeta_CLI/encode/by_blog_unknown_blog_id.yml
 - spec/fixtures/vcr_cassettes/Commonmeta_CLI/encode/by_uuid.yml
+- spec/fixtures/vcr_cassettes/Commonmeta_CLI/encode/by_uuid_unknown_uuid.yml
 - spec/fixtures/vcr_cassettes/Commonmeta_CLI/find_from_format_by_id/crossref.yml
 - spec/fixtures/vcr_cassettes/Commonmeta_CLI/find_from_format_by_id/datacite.yml
 - spec/fixtures/vcr_cassettes/Commonmeta_CLI/find_from_format_by_id/jalc.yml