Merge branch 'main' into mccalluc-diff-module

pulibrary · Dec 20, 2022 · 9caad7a · 9caad7a
2 parents 033274f + a5cbc72
commit 9caad7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/app/models/pdc_metadata/resource.rb b/app/models/pdc_metadata/resource.rb
@@ -57,11 +57,11 @@ def to_xml
 
     class << self
       # Creates a PDCMetadata::Resource from a JSON string
-      def new_from_json(json_data)
+      # TODO: When folks are back in the office, there is an agenda item to discuss
+      # what "json" means to everyone. There may be some renaming after that.
+      def new_from_json(hash)
         resource = PDCMetadata::Resource.new
-        return resource if json_data.blank?
-
-        hash = json_data
+        return resource if hash.blank?
 
         set_basics(resource, hash)
         set_curator_controlled_metadata(resource, hash)

diff --git a/spec/models/pdc_serialization/datacite_spec.rb b/spec/models/pdc_serialization/datacite_spec.rb
@@ -252,8 +252,7 @@
     fixtures_dir = "spec/fixtures/resource-to-datacite"
     Dir.glob("#{fixtures_dir}/*.resource.yaml").each do |resource_path|
       it "handles #{resource_path}" do
-        resource_json = YAML.load_file(resource_path).to_json
-        resource = PDCMetadata::Resource.new_from_json(resource_json)
+        resource = PDCMetadata::Resource.new_from_json(YAML.load_file(resource_path))
         datacite_xml = resource.to_xml
 
         datacite_path = resource_path.gsub(".resource.yaml", ".datacite.xml")