uc3-dmp-id 0.1.55 → 0.1.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 303302842851603259f0981187aa9e2df87db1214541f8716686ee0f68c3d565
-  data.tar.gz: de9174608180b81de434d1f5d87abfa1f339c14495d49f93f0c7446cdaaea608
+  metadata.gz: 1081d13ad36b5435984d6fbb610511f4e99a7f6fb677d4c7aa4bd502776f1166
+  data.tar.gz: 86e564c45241e14a6bcf23e7fb5015b4adf2e2c4ae8a939a0d9c38f22ae58a51
 SHA512:
-  metadata.gz: 654b37d44b2b871a385dd72f3104ba857e01b2fff58690708aea9beb3f2e2480eb6550bb18dc3b21cd67ea1362c805dd456bbea4da89598a50493499d934719a
-  data.tar.gz: bff8736d8b88b890497c13f4604dd67749bf6409045de1532debd4875f7edb7baedb4ca427d5d9a02c2baea452a603ebcc6c98652e9a33f7a9d8217a8190cb4d
+  metadata.gz: f8ae4658ca506e73ae049c901ad1bbdb23817369be5571514bc8cc3bc75c7947d9a62863e565b9bc2085e36f016ba93469d2c5c502bfa65ee70c38625aca159a
+  data.tar.gz: 25e3cfff2baea5a4f20ddf23a6dcd075f959300fa4b973887f6a99c60b77aefd798b522766b99a13d598ac19a1b626d377ee463906a82752a7f2a2cfd8d9330d

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.trim unless (owner.to_s.trim.gsub('%40', '@') =~ email_regex).nil?
 
-        if email.nil?
+        if !(owner.to_s.trim =~ 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?

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpId
-  VERSION = '0.1.55'
+  VERSION = '0.1.56'
 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.56
 platform: ruby
 authors:
 - Brian Riley