uc3-dmp-id 0.0.75 → 0.0.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 445c7ef4554d72339624600ee7e43a0237564e4d45cb9393bd151719bfa5899d
-  data.tar.gz: 6f2c315e67f2cd63b570d7815f3bb7d04b9d134b523d17a4a05e293f1c46e7f6
+  metadata.gz: 2f769de6ae77fa371a710f13351629a90092a596131b31f82d7ad5161e792f12
+  data.tar.gz: a3da20ecdce90334053349c726f4d4ed78abe00d5b915366957963be82ccbd40
 SHA512:
-  metadata.gz: 5a3f4ef40605def448cc5128a595b6b2dbfc7a814a652744a63fc8ab386bc57effb4178fddcd78ae380119ed25607e9e2dd7066e89d95e4f5469a001e0e83f6b
-  data.tar.gz: '0917410c7c29936e689d192de8c8dff454fa7c15cf891370fa78446c2fb6effdbeb70465f626fb7c3835e2ee34a8a9b9bbdeda2c544ba83701f79eaa4e9cec2a'
+  metadata.gz: f4a350af34ae4eff82a0c24c2de1e309b62ece8b268d53b23014ed05505dbe646c0a40f126a5a346c88047a30e790e52375cfed3956b879ee2ba5f2b94cf5ccc
+  data.tar.gz: 9cda04030ef741a7f1f66eb62a7124755b572ae9791f8485a5081ac72c0efcd181b36e88f409b472078655bf7c2226f28b2956f16fb31e781ed362165ca4729d

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

@@ -19,10 +19,10 @@ module Uc3DmpId
 
     class << self
       # TODO: Replace this with ElasticSearch
-      def search_dmps(args:, debug: debug)
-        return _by_owner(owner_org: args['owner_orcid']) unless args['owner_orcid'].nil?
-        return _by_owner_org(owner_org: args['owner_org_ror']) unless args['owner_org_ror'].nil?
-        return _by_mod_day(day: args['modification_day']) unless args['modification_day'].nil?
+      def search_dmps(args:, debug: false)
+        return _by_owner(owner_org: args['owner_orcid'], debug: debug) unless args['owner_orcid'].nil?
+        return _by_owner_org(owner_org: args['owner_org_ror'], debug: debug) unless args['owner_org_ror'].nil?
+        return _by_mod_day(day: args['modification_day'], debug: debug) unless args['modification_day'].nil?
 
         []
       end
@@ -115,7 +115,7 @@ module Uc3DmpId
       private
 
       # Fetch the DMP IDs for the specified owner's ORCID (the owner is the :dmphub_owner_id on the DMP ID record)
-      def _by_owner(owner_id:)
+      def _by_owner(owner_id:, debug: false)
         regex = %r{^([0-9A-Z]{4}-){3}[0-9A-Z]{4}$}
         raise FinderError, MSG_INVALID_OWNER_ID if owner_id.nil? || (owner_id.to_s.downcase =~  regex).nil?
 
@@ -133,12 +133,13 @@ module Uc3DmpId
           filter_expression: 'SK = :version',
           expression_attribute_values: { ':version': Helper::DMP_LATEST_VERSION }
         }
+        puts "Querying _by_owner with #{args}" if debug
         client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         _process_search_response(response: client.query(args: args))
       end
 
       # Fetch the DMP IDs for the specified organization/institution (the org is the :dmphub_owner_org on the DMP ID record)
-      def _by_owner_org(owner_org:)
+      def _by_owner_org(owner_org:, debug: false)
         regex = %r{^[a-zA-Z0-9]+$}
         raise FinderError, MSG_INVALID_OWNER_ID if owner_org.nil? ||(owner_org.to_s.downcase =~ regex).nil?
 
@@ -156,12 +157,13 @@ module Uc3DmpId
           filter_expression: 'SK = :version',
           expression_attribute_values: { ':version': Helper::DMP_LATEST_VERSION }
         }
+        puts "Querying _by_owner_org with #{args}" if debug
         client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         _process_search_response(response: client.query(args: args))
       end
 
       # Fetch the DMP IDs modified on the specified date (the date is the :dmphub_modification_day on the DMP ID record)
-      def _by_mod_day(day:)
+      def _by_mod_day(day:, debug: false)
         regex = %r{^[0-9]{4}(-[0-9]{2}){2}}
         raise FinderError, MSG_INVALID_OWNER_ID if day.nil? || (day.to_s =~ regex).nil?
 
@@ -176,6 +178,7 @@ module Uc3DmpId
           filter_expression: 'SK = :version',
           expression_attribute_values: { ':version': Helper::DMP_LATEST_VERSION }
         }
+        puts "Querying _by_mod_day with #{args}" if debug
         client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         _process_search_response(response: client.query(args: args))
       end

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

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

metadata

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