uc3-dmp-id 0.0.111 → 0.0.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0c720136c3acb7e0eb21577bd728380d7762d17106db062c35175844cfe52a9
-  data.tar.gz: 0db5c1b66e2feec39866f57452d9aa4f8b6c1f8e99ecec2d4f90377a7da226e2
+  metadata.gz: f658015291259fab110eaf6e7cd0b370dcffa4eac8b7bea13bcfbfa64a722f6d
+  data.tar.gz: 04d33d78deb7de85d59f3a27ca8f6d1cae6a5e70202f37b674e195504faac04b
 SHA512:
-  metadata.gz: 6ff78637b08069dc203c9fbfc4ee87e5b4c810175f3193b02b9506f65eef270307270bcf45e2c77777a2b3aa3a6b8e775c1781fad77b9357d7235e2d5e1e8ad5
-  data.tar.gz: 5a784f33c4db64d19e88cd2e94b7bc81e231cd660e23e64f3688c79e9ab56eca2c2f52af0e300c52150801f803be7b90e6f256a1536c530e17165a3f00476646
+  metadata.gz: 4f66d927a44aba2a07057c354d3afd75eb124cb11be52716ee59afd2cbc027097e4f13f370614862e37a75f34ddbc572b597bc3532ff7cb551ad53b2d6b18317
+  data.tar.gz: ee1ee172ba3725d432b627412de0519d35405be9399375b21bc31355fdedc7577de9d7cb2d3474dd61154137dd28b8c60b0164d0ba9a4c41e13d0b883cdac3c0

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

@@ -147,13 +147,10 @@ module Uc3DmpId
 
         args = {
           index_name: 'dmphub_owner_org_gsi',
-          query_filter: {
+          key_conditions: {
             dmphub_owner_org: {
-              attribute_value_list: [
-                "http://ror.org/#{owner_org.to_s.downcase}",
-                "https://ror.org/#{owner_org.to_s.downcase}"
-              ],
-              comparison_operator: 'IN'
+              attribute_value_list: ["https://ror.org/#{owner_org.to_s.downcase}"],
+              comparison_operator: 'EQ'
             }
           },
           filter_expression: 'SK = :version',

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

@@ -48,13 +48,19 @@ module Uc3DmpId
 
       # Return the base URL for a DMP ID
       def dmp_id_base_url
-        url = ENV.fetch('DMP_ID_BASE_URL', 'https://dmptool-dev.cdlib.org/dmps/')
+        url = ENV.fetch('DMP_ID_BASE_URL', 'https://dmphub.uc3dev.cdlib.net/dmps/')
+        url&.end_with?('/') ? url : "#{url}/"
+      end
+
+      # The landing page URL (NOT the DOI URL)
+      def landing_page_url
+        url = api_base_url.gsub('api.', '')
         url&.end_with?('/') ? url : "#{url}/"
       end
 
       # Return the base URL for the API
       def api_base_url
-        url = ENV.fetch('DMP_ID_BASE_URL', 'https://api.dmptool-dev.cdlib.org/dmps/')
+        url = ENV.fetch('DMP_ID_BASE_URL', 'https://api.dmphub.uc3dev.cdlib.net/dmps/')
         url&.end_with?('/') ? url : "#{url}/"
       end
 

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

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

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

@@ -76,7 +76,7 @@ module Uc3DmpId
           next if ver['modified'].nil?
           {
             timestamp: ver['modified'],
-            url: "#{Helper.api_base_url}dmps/#{Helper.remove_pk_prefix(p_key: p_key)}?version=#{ver['modified']}"
+            url: "#{Helper.landing_page_url}#{Helper.remove_pk_prefix(p_key: p_key)}?version=#{ver['modified']}"
           }
         end
         json['dmp']['dmphub_versions'] = JSON.parse(versions.to_json)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.111
+  version: 0.0.113
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json