uc3-dmp-id 0.1.55 → 0.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 303302842851603259f0981187aa9e2df87db1214541f8716686ee0f68c3d565
-  data.tar.gz: de9174608180b81de434d1f5d87abfa1f339c14495d49f93f0c7446cdaaea608
+  metadata.gz: 141e0ecd0482b349f2b98f2d41029623f42c755324bb6ab0347c1703d224393f
+  data.tar.gz: 8872a059855cb558f884a2b8542c8dece13aaad36c7b73679d90f7e129e6667b
 SHA512:
-  metadata.gz: 654b37d44b2b871a385dd72f3104ba857e01b2fff58690708aea9beb3f2e2480eb6550bb18dc3b21cd67ea1362c805dd456bbea4da89598a50493499d934719a
-  data.tar.gz: bff8736d8b88b890497c13f4604dd67749bf6409045de1532debd4875f7edb7baedb4ca427d5d9a02c2baea452a603ebcc6c98652e9a33f7a9d8217a8190cb4d
+  metadata.gz: 26f0b387fcc3417459c6a0b2363f6a6aa1ab8bade5690679ce60e2ecb8a010ec5e2bcf34d442f4fe93f5e0206cacef679842feea67b76bb9d0cbd54a14a57bf1
+  data.tar.gz: 143a749ad8e6f425360b5b8f8aa55c58be4a046a1b858360bdb9f6154bf75b891956436a33ecc045324f1a4abd64ac9d450c7e7b1616f9a3dc7f32e314bbddf9

data/lib/uc3-dmp-id/finder.rb

@@ -135,9 +135,9 @@ module Uc3DmpId
       def _by_owner(owner:, client: nil, logger: nil)
         orcid_regex = /^([0-9A-Z]{4}-){3}[0-9A-Z]{4}$/
         email_regex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
-        email = owner.trim() unless (owner.to_s =~ email_regex).nil?
+        email = owner.strip unless (owner.to_s.strip.gsub('%40', '@') =~ email_regex).nil?
 
-        if email.nil?
+        if !(owner.to_s.strip =~ orcid_regex).nil?
           args = {
             filter_expression: 'contains(:people_ids, people) AND :sk = sk',
             expression_attribute_values: {
@@ -148,11 +148,14 @@ module Uc3DmpId
               ]
             }
           }
-        else
+        elsif !email.nil?
           args = {
             filter_expression: 'contains(:people, people) AND :sk = sk',
             expression_attribute_values: { ':sk': 'METADATA', ':people': [email] }
           }
+        else
+          # It wasn't an email or ORCID, so return an empty array
+          return []
         end
         logger&.debug(message: 'Fetch relevant DMPs _by_owner - scan args', details: args)
         client = Uc3DmpDynamo::Client.new if client.nil?
@@ -162,7 +165,7 @@ module Uc3DmpId
       # Fetch the DMP IDs for the specified organization/institution
       def _by_org(org:, client: nil, logger: nil)
         regex = /^[a-zA-Z0-9]+$/
-        ror = org.trim() unless (org.to_s =~ regex).nil?
+        ror = org.strip unless (org.to_s =~ regex).nil?
 
         args = {
           filter_expression: 'contains(:affiliation_ids, affiliation_ids) AND :sk = sk',
@@ -182,7 +185,7 @@ module Uc3DmpId
       # Fetch the DMP IDs for the specified funder
       def _by_funder(funder:, client: nil, logger: nil)
         regex = /^[a-zA-Z0-9]+$/
-        ror = funder.trim() unless (funder.to_s =~ regex).nil?
+        ror = funder.strip unless (funder.to_s =~ regex).nil?
 
         args = {
           filter_expression: 'contains(:funder_ids, funder_ids) AND :sk = sk',

data/lib/uc3-dmp-id/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpId
-  VERSION = '0.1.55'
+  VERSION = '0.1.57'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.1.55
+  version: 0.1.57
 platform: ruby
 authors:
 - Brian Riley