uc3-dmp-id 0.0.47 → 0.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c55916e9c3c7e5dffebe207a69de110ff182000a72ae3ea915036653199be0
-  data.tar.gz: 7eb32abc118b66d38084716f34dd0994043c62421c7cba00ff85353f9442d3a9
+  metadata.gz: 07f8f7d24b3a076d6f6f04a4e797fb4d054eacabb744c4899451664fcf453cb1
+  data.tar.gz: a50778c06dc79cfb3a0893ae3848c72270223d97a3306a8a645e72591c143b07
 SHA512:
-  metadata.gz: 0f758910ef012627c05710e6dda80e3c72abdf77f0e7cff64ea46cb93a7697bacf8802ed73e3d455cb98dc245640a45d43f2f3b8ed2945d9b3043d31ec83e203
-  data.tar.gz: 45737a59db0d8e2a5e9a59ddadbccb7a36af9513a91ba04ba04f1919bef867060ba6139c8abdb55c4c1bb1452a599a35bce23cad8a59aab1037c522486c72dde
+  metadata.gz: 7641129e679125b75d11af27adb29b50e7d7496b0a27032d2cff147cd8b389bbfafdcecc99e8b9b6e69eadde9f7b7b27fcdd9f58b3b594362f3080101c115f06
+  data.tar.gz: 3586977e6d06503b1a81440174eec61afb0fea2c0faa29a9090de9f894b34927802359d45fd184aa036072e259971c79d3b1a26d861718f94500dbe9bc2aeb46

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

@@ -34,7 +34,7 @@ module Uc3DmpId
         raise CreatorError, Uc3DmpId::MSG_DMP_EXISTS unless json['PK'].nil?
 
         client = Uc3DmpDynamo::Client.new(debug: debug)
-        p_key = _preregister_dmp_id(client: client, json: json, debug: debug)
+        p_key = _preregister_dmp_id(client: client, provenance: provenance, json: json, debug: debug)
         raise CreatorError, MSG_UNABLE_TO_MINT if p_key.nil?
 
         # Add the DMPHub specific attributes and then save
@@ -52,12 +52,21 @@ module Uc3DmpId
 
       private
 
-      def _preregister_dmp_id(client:, json:, debug: false)
+      def _preregister_dmp_id(client:, provenance:, json:, debug: false)
         # Use the specified DMP ID if the provenance has permission
         existing = json.fetch('dmp_id', {})
         id = existing['identifier'].gsub(%r{https?://}, Helper::PK_DMP_PREFIX) if existing.is_a?(Hash) &&
                                                                                   !existing['identifier'].nil?
-        return id if !id.nil? && existing['type'].downcase == 'doi' && !Finder.exists?(client: client, p_key: id)
+
+puts "_preregister_dmp_id:"
+puts provenance
+puts id
+
+
+        return id if !id.nil? &&
+                     existing['type'].downcase == 'doi' &&
+                     provenance['seedingWithLiveDmpIds'].downcase == 'true' &&
+                     !Finder.exists?(client: client, p_key: id)
 
         dmp_id = ''
         counter = 0

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

@@ -213,6 +213,35 @@ module Uc3DmpId
         end
       end
       # rubocop:enable Metrics/AbcSize
+
+      # Appends the Provenance system's identifier to the value
+      #   For a DOI, it will return the DOI as-is
+      #
+      #   For a :provenance whose PK is 'PROVENANCE#example' and homepage is 'https://example.com' and
+      #   callbackUri is 'https://example.com/callback':
+      #     when the :value is '12345', it will return 'example#12345'
+      #     when the :value is 'https://example.com/dmps/12345', it will return 'example#dmp/12345'
+      #     when the :value is 'https://example.com/callback/12345' it will return 'example#12345'
+      #
+      # rubocop:disable Metrics/AbcSize
+      def format_provenance_id(provenance:, value:)
+        # return it as-is if there is no provenance or it's already a URL
+        return value if provenance.nil?
+
+        # return it as-is if it's a DOI
+        doi = value.match(DOI_REGEX).to_s
+        return value unless doi.nil? || doi == '' || !value.start_with?('http')
+
+        # Remove the homepage or callbackUri because we will add this when needed. we just want the id
+        val = value.downcase
+                  .gsub(provenance.fetch('callbackUri', '').downcase, '')
+                  .gsub(provenance.fetch('homepage', '').downcase, '')
+        val = val.gsub(%r{https?://}, '')
+        val = val[1..val.length] if val.start_with?('/')
+        id = provenance['PK']&.gsub('PROVENANCE#', '')
+        "#{id}##{val}"
+      end
+      # rubocop:enable Metrics/AbcSize
     end
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.47
+  version: 0.0.49
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json