uc3-dmp-id 0.0.30 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f4ce38233177d1b1e22baed19433da77c8a25c0acee58101ba4e850addd687f
-  data.tar.gz: 3759570bcfa5ca95481b06e138f9c87019a26b16bc328b57ec47605ea23d1b35
+  metadata.gz: e9c5eb1e3af04a0d8ed5468b4f2357872e63e8a07e06ce071a6414daed420a27
+  data.tar.gz: fd042c4b9bb088a893010bcaf7e5d84fdb884a7c8ef513313159508bcbe79056
 SHA512:
-  metadata.gz: c28f028177f51d082e1a002038743f274ca7032e2fb5fca74fdea186641e2286b1219e71b2dbb3279e2023a7a1e3fa3e25513c5f3eda9d7527601e2c81b0e750
-  data.tar.gz: dbc4defdafb8221e41127d12e74fb7439761f1eea5e5a4fb5f1ced7de110584bd1b45cca9f11a0f769bf9663af155b6a238dd155e08392eb80f075f6c4344821
+  metadata.gz: ac616730bfdc04c41a01bda6bbcd795981a889df0a2fe0d5ec8087a1047380a1b8a020bc6b72274c57941004e5b7e198ed00f98df8b946a755f67379e0dc651f
+  data.tar.gz: 5fe3de09a45418038dbc64241938955bdd5273dceb4d3fa329f1f7d5bf6ba3841b9307461947fc3c5ac5bbfef1e701bbb4a41a9cd6d192a76fc24a5f5316db40

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

@@ -19,8 +19,8 @@ module Uc3DmpId
         raise DeleterError, MSG_DMP_FORBIDDEN unless provenance.is_a?(Hash) && !provenance['PK'].nil?
 
         # Validate the incoming JSON first
-        errs = Validator.validate(mode: 'author', json: Helper.parse_json(json: json))&.fetch('dmp', {})
-        raise CreatorError, errs.join(', ') if errs.is_a?(Array) && errs.any?
+        errs = Validator.validate(mode: 'author', json: Helper.parse_json(json: json))
+        raise CreatorError, errs.join(', ') if errs.is_a?(Array) && errs.any? && errs.first != Validator::MSG_VALID_JSON
 
         # Fail if the provenance or owner affiliation are not defined
         raise CreatorError, MSG_NO_PROVENANCE_OWNER if provenance.nil? || owner_org.nil?

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

@@ -47,7 +47,7 @@ module Uc3DmpId
     def _updateable?(provenance:, p_key:, json:)
       # Validate the incoming JSON first
       errs = Validator.validate(mode: 'author', json: json)&.fetch('dmp', {})
-      return errs.join(', ') if errs.is_a?(Array) && errs.any?
+      return errs.join(', ') if errs.is_a?(Array) && errs.any? && errs.first != Validator::MSG_VALID_JSON
 
       # Fail if the provenance is not defined
       return [MSG_DMP_FORBIDDEN] unless provenance.is_a?(Hash) && !provenance['PK'].nil?

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

@@ -44,12 +44,6 @@ module Uc3DmpId
       # Load the JSON schema that corresponds with the mode
       # ------------------------------------------------------------------------------------
       def _load_schema(mode:)
-
-puts "::Uc3DmpId::Schemas::Author defined? #{Object.const_defined?('::Uc3DmpId::Schemas::Author')}"
-puts "Uc3DmpId::Schemas::Author defined? #{Object.const_defined?('Uc3DmpId::Schemas::Author')}"
-puts "Schemas::Author defined? #{Object.const_defined?('Schemas::Author')}"
-puts "Author defined? #{Object.const_defined?('Author')}"
-
         # Instatiate the matching schema
         schema = "Uc3DmpId::Schemas::#{mode.to_s.downcase.capitalize}".split('::').inject(Object) { |o,c| p o; o.const_get c }
         schema.respond_to?(:load) ? schema.load : nil

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

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

metadata

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