uc3-dmp-id 0.0.46 → 0.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d478a33716920d1d91f8e933febebe7ec8e7a40a3d0bb50d4c50f1e764cf5aec
-  data.tar.gz: a073a32740da380be957b1af0061df437640e4126d79518d23b1a366e038f7dc
+  metadata.gz: f184f47843a41741118c64764999e2e63e66bf8092c8052d00f75bf7b5a04063
+  data.tar.gz: 44b5cafd4ef3f6043a4b1873d66fa3f9b9dde2f328203b8dd0c5537a042a245c
 SHA512:
-  metadata.gz: bb614d60d8ba75fd46e8316d39d27f27fc5f7ae3bdd8a91a632951b0abd947a29b075624f7ee211dc65975d6d162d873b949c5a247d2db78f1893e59cdaaaa7a
-  data.tar.gz: 6efc441c6c5f74c284d94a476b095eabe35f23b0995cecf8debf27d95a1f7e0f22d8307386a35c6322da045bfa099774f2536ea22010bf5e131420f2a009b275
+  metadata.gz: b6923c6148a6b347efbf00955d7aaafb810edbc42c38818191a9e440faaf648555753fc271a47f520d6ef489a135b5b9d65b468311c24da9feb22e7aa256660b
+  data.tar.gz: 0d54dc2c84c8a74dc0edf02a88971939fd307940837a0edd9ec1fae4144c3dcf5675e89dcb9b9cf08a2a6072eb44cae9bb14ad82e6343ea0b4676e0904f3970c

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

@@ -38,7 +38,7 @@ module Uc3DmpId
         raise CreatorError, MSG_UNABLE_TO_MINT if p_key.nil?
 
         # Add the DMPHub specific attributes and then save
-        annotated = Helper.annotate_dmp_json(provenance: provenance, owner_org: owner_org, p_key: p_key, json: json)
+        annotated = Helper.annotate_dmp_json(provenance: provenance, owner_org: owner_org, p_key: p_key, json: json['dmp'])
         puts "CREATING DMP ID:" if debug
         puts annotated if debug
 

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/updater.rb

@@ -17,7 +17,7 @@ module Uc3DmpId
       raise DeleterError, errs if errs.is_a?(Array) && errs.any?
 
       # Add the DMPHub specific attributes
-      annotated = Helper.annotate_dmp(provenance: provenance, json: dmp, p_key: p_key)
+      annotated = Helper.annotate_dmp(provenance: provenance, json: dmp['dmp'], p_key: p_key)
 
       # fetch the existing latest version of the DMP ID
       client = Uc3DmpDynamo::Client.new(debug: debug)

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

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

metadata

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