uc3-dmp-id 0.1.54 → 0.1.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a25055e5e62c689e02f190fe828bbe553ef380bcf6bcd2b2e2bb6299f80ea439
-  data.tar.gz: c51528de686f3786175ef6bfe2dcde9f1c86897d0fc6d5748667167021d55b54
+  metadata.gz: 1081d13ad36b5435984d6fbb610511f4e99a7f6fb677d4c7aa4bd502776f1166
+  data.tar.gz: 86e564c45241e14a6bcf23e7fb5015b4adf2e2c4ae8a939a0d9c38f22ae58a51
 SHA512:
-  metadata.gz: c3a6afb5c512125d29ff1fc6a2da94de5aa98277f08e9fb46d7e120cd64d24238f8eb915f141a4df115feb89951f7e5753daf7c49358241fc7d718277e4d3aed
-  data.tar.gz: 7421c51628509d0e0c904625916fd56b43c6fecca16a131169568371f6b39acc274f730ca7d8942d4634daf30b89a7ddfa9f6acb63b634b3ad3fe2a3b8e1472b
+  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,17 +148,18 @@ 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)
-        resp = client.scan(args:)
-
         client = Uc3DmpDynamo::Client.new if client.nil?
-        _process_search_response(response: client.query(args:, logger:))
+        _process_search_response(response: client.scan(args:))
       end
 
       # Fetch the DMP IDs for the specified organization/institution
@@ -177,10 +178,8 @@ module Uc3DmpId
           }
         }
         logger&.debug(message: 'Fetch relevant DMPs _by_org - scan args', details: args)
-        resp = client.scan(args:)
-
         client = Uc3DmpDynamo::Client.new if client.nil?
-        _process_search_response(response: client.query(args:, logger:))
+        _process_search_response(response: client.scan(args:))
       end
 
       # Fetch the DMP IDs for the specified funder
@@ -199,10 +198,8 @@ module Uc3DmpId
           }
         }
         logger&.debug(message: 'Fetch relevant DMPs _by_funder - scan args', details: args)
-        resp = client.scan(args:)
-
         client = Uc3DmpDynamo::Client.new if client.nil?
-        _process_search_response(response: client.query(args:, logger:))
+        _process_search_response(response: client.scan(args:))
       end
 
       # Fetch the DMP IDs that are marked as featured
@@ -212,10 +209,8 @@ module Uc3DmpId
           expression_attribute_values: { ':sk': 'METADATA', ':featured': 1 }
         }
         logger&.debug(message: 'Fetch relevant DMPs _by_featured - scan args', details: args)
-        resp = client.scan(args:)
-
         client = Uc3DmpDynamo::Client.new if client.nil?
-        _process_search_response(response: client.query(args:, logger:))
+        _process_search_response(response: client.scan(args:))
       end
 
       # Return all of the publicly visible DMPs
@@ -225,10 +220,8 @@ module Uc3DmpId
           expression_attribute_values: { ':sk': 'METADATA', ':visibility': 'public' }
         }
         logger&.debug(message: 'Fetch relevant DMPs _publicly_visible - scan args', details: args)
-        resp = client.scan(args:)
-
         client = Uc3DmpDynamo::Client.new if client.nil?
-        _process_search_response(response: client.query(args:, logger:))
+        _process_search_response(response: client.scan(args:))
       end
 
       # Transform the search results so that we do not include any of the DMPHub specific metadata

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

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