commonmeta-ruby 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4f7fe678426a805430b1b984753c49ba0f7203925cc88c7791fa2f49355b52e
-  data.tar.gz: 4dfd5a78831a19c59cebae1bcf96ad2460d3b937f0e48b01980ce92812887f10
+  metadata.gz: d39024b030308bfeb8bddbc31a34396f630967c375c5ee15e38ce76fefd97e5b
+  data.tar.gz: 93e0dcceac66451bbcd81745ef829f2d489a83bad5bd9abd32f74c77efbcb200
 SHA512:
-  metadata.gz: ac4861caf56b5f07e0137e240cb15e5f3f752ada0ee48dafd0ab09f9635b10152bd7815a2aa52b05d1cbac094d6e0c73ed997b9e62f77d7cb526950da64cbbdf
-  data.tar.gz: 99120b5d7aaf9bd26a464e81b6eec2afadf545456d4065b9c06a4c278948631e94b87650c56cb84b1b5c1ba2159f692aaeca50011ab85208afa4fb46f49afd1e
+  metadata.gz: d5fc95306870e50f0db71d994fa41b2d776523535ec2e81f0d5ecac721cff5c0a0b4ead67a0910e7633e9bab66fc65cabc7362a411469c9d31a4fd1cb25d1af8
+  data.tar.gz: 233a74b81551bd4951a3852b400c0fb07baf9bd0c8d557348a1f6c1d17483bc56c158f95a68063490929ff8e9078f67fe9f1094b8ce1b32ddccea6ed2406c1a4

data/Gemfile.lock

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

data/lib/commonmeta/author_utils.rb

@@ -49,6 +49,8 @@ module Commonmeta
 
       if type.blank? && id.is_a?(String) && URI.parse(id).host == 'ror.org'
         type = 'Organization'
+      elsif type.blank? && author['type'] == 'Organization'
+        type = 'Organization'
       elsif type.blank? && id.is_a?(String) && URI.parse(id).host == 'orcid.org'
         type = 'Person'
       elsif type.blank? && (given_name.present? || family_name.present?)
@@ -108,6 +110,15 @@ module Commonmeta
     def is_personal_name?(name: nil)
       return true if name_exists?(name.to_s.split.first) || name_exists?(name.to_s.split(', ').last)
 
+      # check if a name has only one word, e.g. "FamousOrganization"
+      return false if name.to_s.split(' ').size == 1
+
+      # check of name can be parsed into given/family name
+      Namae.options[:include_particle_in_family] = true
+      names = Namae.parse(name)
+      parsed_name = names.first
+      return true if parsed_name && parsed_name.given
+
       false
     end
 

data/lib/commonmeta/cli.rb

@@ -83,7 +83,11 @@ module Commonmeta
     desc '', 'feed'
 
     def json_feed(id)
-      puts get_json_feed(id)
+      if id.present?
+        puts get_json_feed(id)
+      else
+        puts get_json_feed
+      end
     end
 
     default_task :convert

data/lib/commonmeta/readers/json_feed_reader.rb

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

data/lib/commonmeta/utils.rb

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

data/lib/commonmeta/version.rb

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

data/spec/author_utils_spec.rb

@@ -8,12 +8,6 @@ describe Commonmeta::Metadata, vcr: true do
   end
 
   context 'is_personal_name?' do
-    it 'has type organization' do
-      author = { 'email' => 'info@ucop.edu', 'name' => 'University of California, Santa Barbara',
-                 'role' => { 'namespace' => 'http://www.ngdc.noaa.gov/metadata/published/xsd/schema/resources/Codelist/gmxCodelists.xml#CI_RoleCode', 'roleCode' => 'copyrightHolder' }, 'type' => 'Organization' }
-      expect(subject.is_personal_name?(name: author['name'])).to be false
-    end
-
     it 'has id' do
       author = { 'id' => 'http://orcid.org/0000-0003-1419-2405', 'givenName' => 'Martin', 'familyName' => 'Fenner', 'name' => 'Martin Fenner' }
       expect(subject.is_personal_name?(name: author['name'])).to be true
@@ -42,7 +36,7 @@ describe Commonmeta::Metadata, vcr: true do
 
     it 'has unknown given name' do
       author = { 'name' => 'Rintze Zelle' }
-      expect(subject.is_personal_name?(name: author['name'])).to be false
+      expect(subject.is_personal_name?(name: author['name'])).to be true
     end
 
     it 'has middle initial' do
@@ -52,11 +46,18 @@ describe Commonmeta::Metadata, vcr: true do
 
     it 'has no info' do
       author = { 'name' => 'M Fenner' }
-      expect(subject.is_personal_name?(name: author['name'])).to be false
+      expect(subject.is_personal_name?(name: author['name'])).to be true
     end
   end
 
   context 'get_one_author' do
+    it 'has type organization' do
+      author = { 'email' => 'info@ucop.edu', 'name' => 'University of California, Santa Barbara',
+                 'role' => { 'namespace' => 'http://www.ngdc.noaa.gov/metadata/published/xsd/schema/resources/Codelist/gmxCodelists.xml#CI_RoleCode', 'roleCode' => 'copyrightHolder' }, 'type' => 'Organization' }
+      response = subject.get_one_author(author)
+      expect(response).to eq('name' => 'University of California, Santa Barbara', 'type' => 'Organization')
+    end
+
     it 'has familyName' do
       input = 'https://doi.org/10.5438/4K3M-NYVG'
       subject = described_class.new(input: input)

data/spec/cli_spec.rb

@@ -345,7 +345,7 @@ describe Commonmeta::CLI do
     let(:input) { "prmb582" }
 
     it "blog post" do
-      expect { subject.json_feed input }.to output(/1jdkoe52\n/).to_stdout
+      expect { subject.json_feed input }.to output(/89a326c6-f5d1-443a-99b8-ea75e705ce11\n/).to_stdout
     end
   end
 end

data/spec/fixtures/vcr_cassettes/Commonmeta_CLI/json_feed/blog_post.yml

@@ -23,13 +23,13 @@ http_interactions:
       Cache-Control:
       - public, max-age=0, must-revalidate
       Content-Length:
-      - '29830'
+      - '30046'
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Sun, 04 Jun 2023 14:05:32 GMT
+      - Mon, 05 Jun 2023 08:27:03 GMT
       Etag:
-      - '"pp488uitdomy8"'
+      - '"3osxmn59l4n48"'
       Server:
       - Vercel
       Strict-Transport-Security:
@@ -39,7 +39,7 @@ http_interactions:
       X-Vercel-Cache:
       - MISS
       X-Vercel-Id:
-      - fra1::iad1::wc5sv-1685887531972-fdcad9a39325
+      - fra1::iad1::djztz-1685953622736-2b55f4de8668
       Connection:
       - close
     body:
@@ -47,7 +47,7 @@ http_interactions:
       string: '{"id":"prmb582","title":"Citation Style Language","description":"CitationStyles.org,
         home of the Citation Style Language (CSL), a popular open XML-based language
         to describe the formatting of citations and bibliographies.","language":"en","icon":null,"favicon":null,"feed_url":"https://citationstyles.org/feed.xml","feed_format":"application/atom+xml","home_page_url":"https://citationstyles.org/","indexed_at":"2023-04-25","license":"https://creativecommons.org/licenses/by/4.0/legalcode","generator":"Jekyll","category":"Engineering
-        and Technology","items":[{"id":"https://citationstyles.org/2014/01/29/mendeley-donates-to-the-csl-project/","short_id":"1jdkoe52","url":"https://citationstyles.org/2014/01/29/mendeley-donates-to-the-csl-project/","title":"Mendeley
+        and Technology","items":[{"id":"https://citationstyles.org/2014/01/29/mendeley-donates-to-the-csl-project/","uuid":"89a326c6-f5d1-443a-99b8-ea75e705ce11","url":"https://citationstyles.org/2014/01/29/mendeley-donates-to-the-csl-project/","title":"Mendeley
         Donates to the CSL Project","summary":"CSL has seen a lot of growth in recent
         years: more than 20 software products use CSL (see the citationstyles.org
         frontpage), and we offer over 6750 free citation styles, covering thousands
@@ -82,7 +82,7 @@ http_interactions:
         citing items in multiple languages.\nWe’ll of course continue to maintain
         the project website and documentation, and handle style submissions to the
         repository.\nFinally, we’ll keep reaching out to publishers to further increase
-        the number of journals covered by CSL styles.</p>","tags":[],"language":"en"},{"id":"https://citationstyles.org/2010/03/22/citation-style-language-1-0/","short_id":"4qe9ypg1","url":"https://citationstyles.org/2010/03/22/citation-style-language-1-0/","title":"Citation
+        the number of journals covered by CSL styles.</p>","tags":[],"language":"en"},{"id":"https://citationstyles.org/2010/03/22/citation-style-language-1-0/","uuid":"6cb26c61-ef77-4b7f-9d60-9925298ed738","url":"https://citationstyles.org/2010/03/22/citation-style-language-1-0/","title":"Citation
         Style Language 1.0","summary":"The Citation Style Language (CSL) team is proud
         to announce CSL 1.0, a free and open XML language for the formatting of citations
         and bibliographies. A New Home CitationStyles.org is the new home of the CSL...","date_published":"2010-03-22T00:00:00Z","date_modified":"2010-03-22T00:00:00Z","authors":[{"url":null,"name":"Rintze
@@ -125,7 +125,7 @@ http_interactions:
         upgrade the more than thousand CSL 0.8 styles hosted in the <a href=\"http://zotero.org/styles\">Zotero
         Style Repository</a>.\nTo upgrade a CSL 0.8 style yourself, follow the <a
         href=\"http://citationstyles.org/downloads/upgrade-notes.html#updating-csl-0-8-styles\">upgrade
-        procedure</a>.</p>","tags":[],"language":"en"},{"id":"https://citationstyles.org/2020/07/11/seeking-public-comment-on-CSL-1-0-2/","short_id":"1jdkwod5","url":"https://citationstyles.org/2020/07/11/seeking-public-comment-on-CSL-1-0-2/","title":"Seeking
+        procedure</a>.</p>","tags":[],"language":"en"},{"id":"https://citationstyles.org/2020/07/11/seeking-public-comment-on-CSL-1-0-2/","uuid":"efdacb04-bcec-49d7-b689-ab3eab0634bf","url":"https://citationstyles.org/2020/07/11/seeking-public-comment-on-CSL-1-0-2/","title":"Seeking
         Public Comment on CSL 1.0.2 Release","summary":"Over the past few months,
         Citation Style Language developers have worked to address a backlog of feature
         requests. This work will be reflected in two upcoming releases. The first
@@ -161,7 +161,7 @@ http_interactions:
         approximate qualifiers, and decades and centuries.</li>\n      <li>A new “custom”
         property to add extension metadata.</li>\n      <li>New related modelling
         to match the new style attribute (as above, still in discussion).</li>\n      <li>An
-        official YAML representation, which can be validated with the same JSON schemas.</li>\n    </ul>\n  </li>\n</ul>","tags":[],"language":"en"},{"id":"https://citationstyles.org/2015/05/20/papers-and-springer-donation/","short_id":"56glp9d9","url":"https://citationstyles.org/2015/05/20/papers-and-springer-donation/","title":"Papers
+        official YAML representation, which can be validated with the same JSON schemas.</li>\n    </ul>\n  </li>\n</ul>","tags":[],"language":"en"},{"id":"https://citationstyles.org/2015/05/20/papers-and-springer-donation/","uuid":"e185bf99-5d57-49ef-ae77-f30dd838f53a","url":"https://citationstyles.org/2015/05/20/papers-and-springer-donation/","title":"Papers
         and Springer Donation","summary":"Today, with 30 software products using the
         Citation Style Language (CSL), and a style repository with over 7700 styles,
         we are excited to announce that Papers and Springer have made a $5000 donation
@@ -194,7 +194,7 @@ http_interactions:
         these automated reports into easy-to-understand feedback, and provide contributors
         with detailed instructions on how to correct their submissions.\nAnd last
         but not least, we also hope to pick up the pace again on creating the next
-        version of CSL.</p>","tags":[],"language":"en"},{"id":"https://citationstyles.org/2010/05/30/csl-1-0-specification-update-2010-05-30/","short_id":"1xdnk0d0","url":"https://citationstyles.org/2010/05/30/csl-1-0-specification-update-2010-05-30/","title":"CSL
+        version of CSL.</p>","tags":[],"language":"en"},{"id":"https://citationstyles.org/2010/05/30/csl-1-0-specification-update-2010-05-30/","uuid":"3f903896-a7bc-4342-ab5a-6f9ce57c9683","url":"https://citationstyles.org/2010/05/30/csl-1-0-specification-update-2010-05-30/","title":"CSL
         1.0 Specification Update 2010-05-30","summary":"Changelog The CSL 1.0 specification
         update of 2010-05-30 includes the following changes:  clarified behavior of
         the line-spacing and entry-spacing attributes [diff]  clarified behavior of
@@ -223,7 +223,7 @@ http_interactions:
         to the CSL schema will be accompanied by an updated CSL specification.\nIn
         addition, minor date-versioned updates to the CSL specification can be released
         without accompanying changes to the CSL schema (as is the case for the current
-        specification update).</p>","tags":[],"language":null},{"id":"https://citationstyles.org/2015/07/21/mendeley-and-elsevier-donation-for-2015/","short_id":"56glmmd9","url":"https://citationstyles.org/2015/07/21/mendeley-and-elsevier-donation-for-2015/","title":"Mendeley
+        specification update).</p>","tags":[],"language":null},{"id":"https://citationstyles.org/2015/07/21/mendeley-and-elsevier-donation-for-2015/","uuid":"f520b59c-db35-4b19-9085-8f7ac35e0532","url":"https://citationstyles.org/2015/07/21/mendeley-and-elsevier-donation-for-2015/","title":"Mendeley
         and Elsevier Donation for 2015","summary":"For a second year, Mendeley and
         Elsevier have generously supported the CSL project with a $5,000 donation.
         Donations like these allow us to dedicate time to the project, cover expenses,
@@ -254,7 +254,7 @@ http_interactions:
         for a new maintainer/developer of the <a href=\"http://editor.citationstyles.org/about/\">Visual
         CSL Editor</a>.\nThanks to the donations made to the CSL project, we are able
         to offer (limited) funding to anybody willing to take over this work from
-        Steve Ridout, the editor’s original developer.</p>","tags":[],"language":null},{"id":"https://citationstyles.org/2016/10/06/mendeley-and-elsevier-donation-for-2016/","short_id":"1xdnoje0","url":"https://citationstyles.org/2016/10/06/mendeley-and-elsevier-donation-for-2016/","title":"Mendeley
+        Steve Ridout, the editor’s original developer.</p>","tags":[],"language":null},{"id":"https://citationstyles.org/2016/10/06/mendeley-and-elsevier-donation-for-2016/","uuid":"a30f5f1d-0b27-44f8-ad16-d41ed1cbd0ed","url":"https://citationstyles.org/2016/10/06/mendeley-and-elsevier-donation-for-2016/","title":"Mendeley
         and Elsevier Donation for 2016","summary":"For their third straight year,
         Mendeley and Elsevier have kindly supported the open source Citation Style
         Language project with a $5000 donation. Donations allow us to hire developers
@@ -289,7 +289,7 @@ http_interactions:
         multiple citation formats are used across your collection, an indication of
         which journal uses which citation format.\nWe’ll gladly (and without charge)
         use this metadata to generate CSL styles for all your journals.\nYou can also
-        help us by standardizing citation formats across your journals.</p>","tags":[],"language":null},{"id":"https://citationstyles.org/2012/09/03/citation-style-language-1-0-1-update/","short_id":"31epl0dn","url":"https://citationstyles.org/2012/09/03/citation-style-language-1-0-1-update/","title":"Citation
+        help us by standardizing citation formats across your journals.</p>","tags":[],"language":null},{"id":"https://citationstyles.org/2012/09/03/citation-style-language-1-0-1-update/","uuid":"7555e981-a931-4df1-adc0-1cdc4a1b417a","url":"https://citationstyles.org/2012/09/03/citation-style-language-1-0-1-update/","title":"Citation
         Style Language 1.0.1 Update","summary":"The Citation Style Language (CSL)
         team is happy to announce CSL 1.0.1. CSL 1.0.1 is an (almost completely) backwards
         compatible release, and CSL 1.0 styles and locale files don’t have to be updated
@@ -330,7 +330,7 @@ http_interactions:
         quite the challenge).\nAnother exciting development is the work of Frank Bennett
         on his forks of Zotero and CSL to revolutionize the field of multilingual
         and legal citation management, the progress of which can be followed on his
-        website <a href=\"http://citationstylist.org/\">citationstylist.org</a>.</p>","tags":[],"language":"en"},{"id":"https://citationstyles.org/2011/03/18/csl-1-0-first-anniversary/","short_id":"q0dqm6go","url":"https://citationstyles.org/2011/03/18/csl-1-0-first-anniversary/","title":"CSL
+        website <a href=\"http://citationstylist.org/\">citationstylist.org</a>.</p>","tags":[],"language":"en"},{"id":"https://citationstyles.org/2011/03/18/csl-1-0-first-anniversary/","uuid":"031faba3-3a6e-49d1-a540-26523be2fd09","url":"https://citationstyles.org/2011/03/18/csl-1-0-first-anniversary/","title":"CSL
         1.0 First Anniversary","summary":"It’s been a year since version 1.0 of the
         Citation Style Language was released, but now is as an exciting time as ever.
         Zotero 2.1, Mendeley 0.9.8 and Papers2 now all use CSL 1.0 for citation formatting...","date_published":"2011-03-18T00:00:00Z","date_modified":"2011-03-18T00:00:00Z","authors":[{"url":null,"name":"Rintze
@@ -356,5 +356,5 @@ http_interactions:
         preview and install styles.\nInterested parties are strongly invited to participate
         in the <a href=\"http://sourceforge.net/mail/?group_id=117435\">xbiblio mailing
         list</a> to discuss and help out with these future improvements.</p>","tags":[],"language":"en"}]}'
-  recorded_at: Sun, 04 Jun 2023 14:05:32 GMT
+  recorded_at: Mon, 05 Jun 2023 08:27:03 GMT
 recorded_with: VCR 6.1.0