commonmeta-ruby 3.2.4 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d39024b030308bfeb8bddbc31a34396f630967c375c5ee15e38ce76fefd97e5b
-  data.tar.gz: 93e0dcceac66451bbcd81745ef829f2d489a83bad5bd9abd32f74c77efbcb200
+  metadata.gz: 575100d8bef2d51a19423453d3a5c3d7129903d5d7d23da7e7ac3c6c24ceb52b
+  data.tar.gz: 9146bae365bf7f79c1f3ce05e781942749b29257433ed1d37196b3d0d1d2bf21
 SHA512:
-  metadata.gz: d5fc95306870e50f0db71d994fa41b2d776523535ec2e81f0d5ecac721cff5c0a0b4ead67a0910e7633e9bab66fc65cabc7362a411469c9d31a4fd1cb25d1af8
-  data.tar.gz: 233a74b81551bd4951a3852b400c0fb07baf9bd0c8d557348a1f6c1d17483bc56c158f95a68063490929ff8e9078f67fe9f1094b8ce1b32ddccea6ed2406c1a4
+  metadata.gz: 82f95b057c1b28d1dd344f31207fc43d43f6db65705bbdc3609b02c90b9a4ed8ffd2d6a3538f090589c615e9207ad78046625344b99a1e592e9a4a624f414e4e
+  data.tar.gz: a6ff2bbe08b29b2641f35520e8fc46c8827f502e747b03b53f100235e7c0d639b8de4729ecfb6c7e41d1eee69e23fd9a6c0479e86471824797fe7bda1c78cc85

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    commonmeta-ruby (3.2.4)
+    commonmeta-ruby (3.2.6)
       activesupport (>= 4.2.5, < 8.0)
       addressable (~> 2.8.1, < 2.8.2)
       base32-url (>= 0.5.0, < 1)
@@ -98,7 +98,7 @@ GEM
     json-ld-preloaded (3.2.2)
       json-ld (~> 3.2)
       rdf (~> 3.2)
-    json_schemer (1.0.1)
+    json_schemer (1.0.2)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
@@ -122,20 +122,21 @@ GEM
     oj (3.15.0)
     optimist (3.0.1)
     parallel (1.23.0)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     postrank-uri (1.1)
       addressable (>= 2.4.0)
       nokogiri (>= 1.8.0)
       public_suffix (>= 4.0.0, < 5)
     public_suffix (4.0.7)
-    racc (1.6.2)
+    racc (1.7.0)
     rack (3.0.7)
     rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
     rake (13.0.6)
-    rdf (3.2.10)
+    rdf (3.2.11)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (3.2.1)
       rdf (~> 3.2)
@@ -218,7 +219,7 @@ GEM
       rdf (~> 3.2)
     temple (0.10.2)
     thor (1.2.2)
-    tilt (2.1.0)
+    tilt (2.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)

data/lib/commonmeta/cli.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'thor'
+require "thor"
 
-require_relative 'doi_utils'
-require_relative 'utils'
+require_relative "doi_utils"
+require_relative "utils"
 
 module Commonmeta
   class CLI < Thor
@@ -18,18 +18,18 @@ module Commonmeta
     # from http://stackoverflow.com/questions/22809972/adding-a-version-option-to-a-ruby-thor-cli
     map %w[--version -v] => :__print_version
 
-    desc '--version, -v', 'print the version'
+    desc "--version, -v", "print the version"
 
     def __print_version
       puts Commonmeta::VERSION
     end
 
-    desc '', 'convert metadata'
-    method_option :from, aliases: '-f'
-    method_option :to, aliases: '-t', default: 'schema_org'
+    desc "", "convert metadata"
+    method_option :from, aliases: "-f"
+    method_option :to, aliases: "-t", default: "schema_org"
     method_option :regenerate, type: :boolean, force: false
-    method_option :style, aliases: '-s', default: 'apa'
-    method_option :locale, aliases: '-l', default: 'en-US'
+    method_option :style, aliases: "-s", default: "apa"
+    method_option :locale, aliases: "-l", default: "en-US"
     method_option :show_errors, type: :boolean, force: false
     method_option :doi
     method_option :depositor
@@ -47,7 +47,7 @@ module Commonmeta
                               depositor: options[:depositor],
                               email: options[:email],
                               registrant: options[:registrant])
-      to = options[:to] || 'schema_org'
+      to = options[:to] || "schema_org"
 
       if options[:show_errors] && !metadata.valid?
         warn metadata.errors
@@ -56,38 +56,34 @@ module Commonmeta
       end
     end
 
-    desc '', 'encode'
+    desc "", "encode"
 
     def encode(prefix)
       puts encode_doi(prefix)
     end
 
-    desc '', 'encode_id'
+    desc "", "encode_id"
 
     def encode_id
       puts encode_container_id
     end
 
-    desc '', 'decode'
+    desc "", "decode"
 
     def decode(doi)
       puts decode_doi(doi)
     end
 
-    desc '', 'decode_id'
+    desc "", "decode_id"
 
     def decode_id(id)
       puts decode_container_id(id)
     end
 
-    desc '', 'feed'
+    desc "", "json_feed"
 
-    def json_feed(id)
-      if id.present?
-        puts get_json_feed(id)
-      else
-        puts get_json_feed
-      end
+    def json_feed
+      puts get_json_feed
     end
 
     default_task :convert

data/lib/commonmeta/readers/json_feed_reader.rb

@@ -9,7 +9,7 @@ module Commonmeta
         url = normalize_id(id)
         response = HTTP.get(url)
         return { "string" => nil, "state" => "not_found" } unless response.status.success?
-  
+
         { "string" => response.body.to_s }
       end
 
@@ -74,20 +74,15 @@ module Commonmeta
           "state" => state }.compact.merge(read_options)
       end
 
-      def get_json_feed(id = nil)
+      def get_json_feed
         # get JSON Feed items not registered as DOIs
-       
-        url = json_feed_url(id)
+
+        url = json_feed_url
         response = HTTP.get(url)
         return { "string" => nil, "state" => "not_found" } unless response.status.success?
 
-        if id.present?
-          blog = JSON.parse(response.body.to_s)
-          blog["items"].select { |item| !validate_doi(item["id"]) }.map { |item| item["uuid"] }.first
-        else
-          posts = JSON.parse(response.body.to_s)
-          posts.select { |post| !validate_doi(post["id"]) }.map { |post| post["uuid"] }.first
-        end
+        posts = JSON.parse(response.body.to_s)
+        posts.map { |post| post["uuid"] }.first
       end
     end
   end

data/lib/commonmeta/utils.rb

@@ -1381,10 +1381,8 @@ module Commonmeta
       Base32::URL.decode(id)
     end
 
-    def json_feed_url(id = nil)
-      return "https://rogue-scholar.org/api/blogs/#{id}" if id.present?
-
-      "https://rogue-scholar.org/api/posts"
+    def json_feed_url
+      "https://rogue-scholar.org/api/posts/unregistered"
     end
   end
 end

data/lib/commonmeta/version.rb

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

data/spec/cli_spec.rb

@@ -342,10 +342,8 @@ describe Commonmeta::CLI do
   end
 
   describe "json_feed", vcr: true do
-    let(:input) { "prmb582" }
-
-    it "blog post" do
-      expect { subject.json_feed input }.to output(/89a326c6-f5d1-443a-99b8-ea75e705ce11\n/).to_stdout
+    it "blog post uuid" do
+      expect { subject.json_feed }.to output(/e4872b3e-cd15-407d-8406-33642c1a98b0\n/).to_stdout
     end
   end
 end