update to apply identifier=>doi where the doi is present and the type responds, for all CreativeWork types, not just DataFile

Author: stuzart

lib/seek/bio_schema/resource_decorators/creative_work.rb

@@ -16,7 +16,12 @@ class CreativeWork < Thing
                         content_type: :encodingFormat,
                         subject_of: :subjectOf,
                         part_of: :isPartOf,
-			 previous_version_url: :isBasedOn	
+                        doi: :identifier,
+			 previous_version_url: :isBasedOn
+
+        def doi
+          "https://doi.org/#{resource.doi}" if resource.try(:doi).present?
+        end
 
         def content_type
           return unless resource.respond_to?(:content_blob) && resource.content_blob

lib/seek/bio_schema/resource_decorators/data_file.rb

@@ -6,15 +6,10 @@ class DataFile < CreativeWork
         include ActionView::Helpers::NumberHelper
 
 
-        schema_mappings doi: :identifier,
-                        distribution: :distribution
+        schema_mappings distribution: :distribution
 
         DATASET_PROFILE = 'https://bioschemas.org/profiles/Dataset/0.3-RELEASE-2019_06_14/'.freeze
 
-        def doi
-          "https://doi.org/#{resource.doi}" if resource.doi
-        end
-
         def description
           description = resource.description&.truncate(4999)
           description = 'Description not specified' if description.blank?

test/unit/bio_schema/decorator_test.rb

@@ -19,7 +19,7 @@ class DecoratorTest < ActiveSupport::TestCase
 
   test 'CreativeWork' do
     event = FactoryBot.create(:event, policy: FactoryBot.create(:public_policy))
-    document = FactoryBot.create(:document, events: [event], license: 'CC-BY-4.0', creators: [FactoryBot.create(:person)])
+    document = FactoryBot.create(:document, events: [event], license: 'CC-BY-4.0', creators: [FactoryBot.create(:person)], doi: '10.10.10.10/test.1')
     document.add_annotations('yellow, lorry', 'tag', User.first)
     disable_authorization_checks { document.save! }
 
@@ -29,14 +29,15 @@ class DecoratorTest < ActiveSupport::TestCase
     assert_equal %w[lorry yellow], decorator.keywords.split(',').collect(&:strip).sort
     assert_equal 'https://spdx.org/licenses/CC-BY-4.0', decorator.license
     assert_equal 'application/pdf', decorator.content_type
+    assert_equal 'https://doi.org/10.10.10.10/test.1', decorator.doi
     project = document.projects.first
     person = document.creators.first
     assert_equal [{ :@type => 'Event', :@id => "http://localhost:3000/events/#{event.id}", :name => event.title }], decorator.subject_of
     assert_equal [{ :@type => ['Project','Organization'], :@id => "http://localhost:3000/projects/#{project.id}", :name => project.title }], decorator.producer
     assert_equal [{ :@type => 'Person', :@id => "http://localhost:3000/people/#{person.id}", :name => person.title }], decorator.all_creators
 
     properties = decorator.attributes.collect(&:property).collect(&:to_s).sort
-    assert_equal ['@id', 'creator', 'dateCreated', 'dateModified', 'description', 'encodingFormat', 'image', 'isBasedOn', 'isPartOf', 'keywords', 'license', 'name', 'producer', 'subjectOf', 'url', 'version'], properties
+    assert_equal %w[@id creator dateCreated dateModified description encodingFormat identifier image isBasedOn isPartOf keywords license name producer subjectOf url version], properties
   end
 
   test 'Dataset pads or truncates description' do

test/unit/bio_schema/schema_ld_generation_test.rb

@@ -411,7 +411,7 @@ def setup
 
   test 'document' do
     document = travel_to(@current_time) do
-      document = FactoryBot.create(:document, contributor: @person)
+      document = FactoryBot.create(:document, contributor: @person, doi: '10.10.10.10/test.1')
       document.add_annotations('wibble', 'tag', User.first)
       disable_authorization_checks { document.save! }
       document
@@ -433,6 +433,7 @@ def setup
         { '@type' => %w[Project Organization], '@id' => "http://localhost:3000/projects/#{document.projects.first.id}",
           'name' => document.projects.first.title }
       ],
+      'identifier' => 'https://doi.org/10.10.10.10/test.1',
       'isPartOf' => [],
       'subjectOf' => []
     }
@@ -482,7 +483,7 @@ def setup
                          title: 'This workflow',
                          description: 'This is a test workflow for bioschema generation',
                          contributor: @person,
-                         license: 'APSL-2.0')
+                         license: 'APSL-2.0', doi: '10.10.10.10/test.1')
 
       workflow.assets_creators.create!(creator: @person, pos: 1)
       workflow.assets_creators.create!(creator: creator2, pos: 2)
@@ -510,6 +511,7 @@ def setup
       'url' => "http://localhost:3000/workflows/#{workflow.id}",
       'keywords' => 'wibble',
       'license' => Seek::License.find('APSL-2.0')&.url,
+      'identifier' => 'https://doi.org/10.10.10.10/test.1',
       'creator' => [
         { '@type' => 'Person', '@id' => "http://localhost:3000/people/#{@person.id}", 'name' => @person.name },
         { '@type' => 'Person', '@id' => "http://localhost:3000/people/#{creator2.id}", 'name' => creator2.name },