diff --git a/hyrax/app/models/concerns/complex_relation.rb b/hyrax/app/models/concerns/complex_relation.rb index 336680e1f32fe7c69ed99bbe667c00e1f712b797..f2d0eae68bea0b280a94821522278a3e36884b78 100644 --- a/hyrax/app/models/concerns/complex_relation.rb +++ b/hyrax/app/models/concerns/complex_relation.rb @@ -4,10 +4,6 @@ class ComplexRelation < ActiveTriples::Resource configure type: ::RDF::Vocab::PROV.Association property :title, predicate: ::RDF::Vocab::DC.title property :url, predicate: ::RDF::Vocab::MODS.locationUrl - property :complex_identifier, predicate: ::RDF::Vocab::MODS.identifierGroup, - class_name:"ComplexIdentifier" - accepts_nested_attributes_for :complex_identifier - #property :relationship, predicate: ::RDF::Vocab::EBUCore.roleDefinition property :relationship, predicate: ::RDF::Vocab::EBUCore.roleType ## Necessary to get AT to create hash URIs. diff --git a/hyrax/spec/models/concerns/complex_relation_spec.rb b/hyrax/spec/models/concerns/complex_relation_spec.rb index 3144fd6d7b8c9d0dfec94da554d4ee66bd30cd38..2c0adf269f50738e881cbf73834d77b57438d396 100644 --- a/hyrax/spec/models/concerns/complex_relation_spec.rb +++ b/hyrax/spec/models/concerns/complex_relation_spec.rb @@ -49,10 +49,6 @@ RSpec.describe ComplexRelation do { title: 'My first publication', url: 'http://example.com/relation', - complex_identifier_attributes: [{ - identifier: ['123456'], - label: ['local'] - }], relationship: 'IsPartOf' } ] @@ -60,9 +56,6 @@ RSpec.describe ComplexRelation do expect(@obj.complex_relation.first).to be_kind_of ActiveTriples::Resource expect(@obj.complex_relation.first.title).to eq ['My first publication'] expect(@obj.complex_relation.first.url).to eq ['http://example.com/relation'] - expect(@obj.complex_relation.first.complex_identifier.first).to be_kind_of ActiveTriples::Resource - expect(@obj.complex_relation.first.complex_identifier.first.identifier).to eq ['123456'] - expect(@obj.complex_relation.first.complex_identifier.first.label).to eq ['local'] expect(@obj.complex_relation.first.relationship).to eq ['IsPartOf'] end @@ -90,7 +83,6 @@ RSpec.describe ComplexRelation do expect(@obj.complex_relation.first).to be_kind_of ActiveTriples::Resource expect(@obj.complex_relation.first.title).to eq ['A relation title'] expect(@obj.complex_relation.first.url).to be_empty - expect(@obj.complex_relation.first.complex_identifier).to be_empty expect(@obj.complex_relation.first.relationship).to eq ['IsPartOf'] end @@ -104,34 +96,13 @@ RSpec.describe ComplexRelation do } ] } + expect(@obj.complex_relation.first).to be_kind_of ActiveTriples::Resource expect(@obj.complex_relation.first.title).to be_empty expect(@obj.complex_relation.first.url).to eq ['http://example.com/relation'] - expect(@obj.complex_relation.first.complex_identifier).to be_empty expect(@obj.complex_relation.first.relationship).to eq ['isPreviousVersionOf'] end - it 'creates a relation active triple resource with identifier and relationship' do - @obj = ExampleWork2.new - @obj.attributes = { - complex_relation_attributes: [ - { - complex_identifier_attributes: [{ - identifier: ['123456'] - }], - relationship: 'isSupplementTo' - } - ] - } - expect(@obj.complex_relation.first).to be_kind_of ActiveTriples::Resource - expect(@obj.complex_relation.first.title).to be_empty - expect(@obj.complex_relation.first.url).to be_empty - expect(@obj.complex_relation.first.complex_identifier.first).to be_kind_of ActiveTriples::Resource - expect(@obj.complex_relation.first.complex_identifier.first.identifier).to eq ['123456'] - expect(@obj.complex_relation.first.complex_identifier.first.label).to be_empty - expect(@obj.complex_relation.first.relationship).to eq ['isSupplementTo'] - end - it 'creates a relation active triple resource with title, url and relationship' do @obj = ExampleWork2.new @obj.attributes = { @@ -146,19 +117,15 @@ RSpec.describe ComplexRelation do expect(@obj.complex_relation.first).to be_kind_of ActiveTriples::Resource expect(@obj.complex_relation.first.title).to eq ['A relation title'] expect(@obj.complex_relation.first.url).to eq ['http://example.com/relation'] - expect(@obj.complex_relation.first.complex_identifier).to be_empty expect(@obj.complex_relation.first.relationship).to eq ['isContinuedBy'] end - it 'creates a relation active triple resource with title, identifier and relationship' do + it 'creates a relation active triple resource with title and relationship' do @obj = ExampleWork2.new @obj.attributes = { complex_relation_attributes: [ { title: 'A relation title', - complex_identifier_attributes: [{ - identifier: ['123456'] - }], relationship: 'isContinuedBy' } ] @@ -166,23 +133,16 @@ RSpec.describe ComplexRelation do expect(@obj.complex_relation.first).to be_kind_of ActiveTriples::Resource expect(@obj.complex_relation.first.title).to eq ['A relation title'] expect(@obj.complex_relation.first.url).to be_empty - expect(@obj.complex_relation.first.complex_identifier.first).to be_kind_of ActiveTriples::Resource - expect(@obj.complex_relation.first.complex_identifier.first.identifier).to eq ['123456'] - expect(@obj.complex_relation.first.complex_identifier.first.label).to be_empty expect(@obj.complex_relation.first.relationship).to eq ['isContinuedBy'] end - it 'creates a relation active triple resource with title, url, identifier and relationship' do + it 'creates a relation active triple resource with title, url and relationship' do @obj = ExampleWork2.new @obj.attributes = { complex_relation_attributes: [ { title: 'A relation title', url: 'http://example.com/relation', - complex_identifier_attributes: [{ - identifier: ['123456'], - label: 'Local' - }], relationship: 'isDocumentedBy' } ] @@ -190,31 +150,21 @@ RSpec.describe ComplexRelation do expect(@obj.complex_relation.first).to be_kind_of ActiveTriples::Resource expect(@obj.complex_relation.first.title).to eq ['A relation title'] expect(@obj.complex_relation.first.url).to eq ['http://example.com/relation'] - expect(@obj.complex_relation.first.complex_identifier.first).to be_kind_of ActiveTriples::Resource - expect(@obj.complex_relation.first.complex_identifier.first.identifier).to eq ['123456'] - expect(@obj.complex_relation.first.complex_identifier.first.label).to eq ['Local'] expect(@obj.complex_relation.first.relationship).to eq ['isDocumentedBy'] end - it 'creates a relation active triple resource with url, identifier and relationship' do + it 'creates a relation active triple resource with url and relationship' do @obj = ExampleWork2.new @obj.attributes = { complex_relation_attributes: [ { url: 'http://example.com/relation', - complex_identifier_attributes: [{ - identifier: ['123456'], - label: 'Local' - }], relationship: 'isDerivedFrom' } ] } expect(@obj.complex_relation.first).to be_kind_of ActiveTriples::Resource expect(@obj.complex_relation.first.url).to eq ['http://example.com/relation'] - expect(@obj.complex_relation.first.complex_identifier.first).to be_kind_of ActiveTriples::Resource - expect(@obj.complex_relation.first.complex_identifier.first.identifier).to eq ['123456'] - expect(@obj.complex_relation.first.complex_identifier.first.label).to eq ['Local'] expect(@obj.complex_relation.first.relationship).to eq ['isDerivedFrom'] end @@ -242,22 +192,7 @@ RSpec.describe ComplexRelation do expect(@obj.complex_relation).to be_empty end - it 'rejects relation active triple with just identifier and no relationship' do - @obj = ExampleWork2.new - @obj.attributes = { - complex_relation_attributes: [ - { - complex_identifier_attributes: [{ - identifier: ['123456'], - label: 'Local' - }], - } - ] - } - expect(@obj.complex_relation).to be_empty - end - - it 'rejects relation active triple with just reltionship and no identifying information' do + it 'rejects relation active triple with just relationship and no identifying information' do @obj = ExampleWork2.new @obj.attributes = { complex_relation_attributes: [ @@ -269,17 +204,13 @@ RSpec.describe ComplexRelation do expect(@obj.complex_relation).to be_empty end - it 'rejects relation active triple with no reltionship' do + it 'rejects relation active triple with no relationship' do @obj = ExampleWork2.new @obj.attributes = { complex_relation_attributes: [ { title: 'test relation', - url: 'http://example.com/relation', - complex_identifier_attributes: [{ - identifier: ['123456'], - label: 'Local' - }] + url: 'http://example.com/relation' } ] }