uc3-dmp-id 0.1.56 → 0.1.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1081d13ad36b5435984d6fbb610511f4e99a7f6fb677d4c7aa4bd502776f1166
-  data.tar.gz: 86e564c45241e14a6bcf23e7fb5015b4adf2e2c4ae8a939a0d9c38f22ae58a51
+  metadata.gz: '0987f59845998c2a2e3409986fe93f8b176f0f3ad175f2b25384fd1c558dd943'
+  data.tar.gz: 7ee6181e791f32a788c96e4f5c4a174cb510f7b89a99d2bd0dc4e575e457efe8
 SHA512:
-  metadata.gz: f8ae4658ca506e73ae049c901ad1bbdb23817369be5571514bc8cc3bc75c7947d9a62863e565b9bc2085e36f016ba93469d2c5c502bfa65ee70c38625aca159a
-  data.tar.gz: 25e3cfff2baea5a4f20ddf23a6dcd075f959300fa4b973887f6a99c60b77aefd798b522766b99a13d598ac19a1b626d377ee463906a82752a7f2a2cfd8d9330d
+  metadata.gz: a66993ced9e0c61fac91fb754f90f637c7eaf630c8751b3dd2ee7b4b396f3741e71ec48fd64e387c508cc68b2bcad4f9cf89dda747a56b2d0eb2fb42720a6c30
+  data.tar.gz: 42ca4b60f5e094acd492257dd97da3fc1191912c9f1dbad4fbbe614c7ad34ea02db617ea1e9501e02ede5a5a4e4493d5e7041d365bceff6bbc7f6d604cf34ad9

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.trim.gsub('%40', '@') =~ email_regex).nil?
+        email = owner.strip unless (owner.to_s.strip.gsub('%40', '@') =~ email_regex).nil?
 
-        if !(owner.to_s.trim =~ orcid_regex).nil?
+        if !(owner.to_s.strip =~ orcid_regex).nil?
           args = {
             filter_expression: 'contains(:people_ids, people) AND :sk = sk',
             expression_attribute_values: {
@@ -151,7 +151,7 @@ module Uc3DmpId
         elsif !email.nil?
           args = {
             filter_expression: 'contains(:people, people) AND :sk = sk',
-            expression_attribute_values: { ':sk': 'METADATA', ':people': [email] }
+            expression_attribute_values: { ':sk': 'METADATA', ':people': [email.gsub('%40', '@')] }
           }
         else
           # It wasn't an email or ORCID, so return an empty array
@@ -165,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',
@@ -185,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.56'
+  VERSION = '0.1.58'
 end

metadata

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