puree 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4e5029fa4e6560d831820e7a7852891d3d5aba9ab46fdc0b96d2db151ba0b07
-  data.tar.gz: 53c2ccd0e77dc22cc61b9e2813e6c97f8bc7c070074de26dde67dfe2b28c8575
+  metadata.gz: 823c32f826a65eb4b0721134ab79bcadcd62f748c6ed78d4d471466e503c1312
+  data.tar.gz: '0860c55ae39eaece7f7e23a756d0b02d665f5d0e8c437340e1200d416edf93aa'
 SHA512:
-  metadata.gz: 9764da69c66d18d6ff3f4ae53e35154f2ca509df28d157be2f751a576cbec4421b47ee722635de65850758493ec2d74148f9b70f081b791d7ca9bc1146d18184
-  data.tar.gz: 350872633c7a925cf81ef4c67a527b1205a720882860abf71ae81236c93c9adaccaa6f4f7e921efd4e92d06f9c52a51627fc3f1f032eeb7015a2533ced37f92e
+  metadata.gz: 622f8407995641df0034b05d141440aa489a4d3b424b6fd5bd6062a9aac5ee0e519afb6fc4a96ebb87021f44f2edb75454f0f66194d075e7ac9f7ccc0d9d9c66
+  data.tar.gz: d506dee62955ebdce2076f2b74a6f347d5beb1ad22093a64ed5b248d2520377477fd0e77d8459836971ff51c737082d77c8c09d21683ebdd0e8c72da309fd0fe

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.5.1 2019-01-11
+### Fixed
+- Research output - file URL, scopus metric data types.
+- Conference paper - event title.
+- Organisational unit - address post code.
+
 ## 2.5.0 2019-01-04
 ### Added
 - REST timeouts.

data/lib/puree/model/research_output_scopus_metric.rb

@@ -6,20 +6,10 @@ module Puree
     class ResearchOutputScopusMetric < Puree::Model::Structure
 
       # @return [Integer, nil]
-      attr_reader :value
+      attr_accessor :value
 
       # @return [Integer, nil]
-      attr_reader :year
-
-      # @param v [Integer]
-      def value=(v)
-        @value = v if v && !v.empty?
-      end
-
-      # @param v [Integer]
-      def year=(v)
-        @year = v if v && !v.empty?
-      end
+      attr_accessor :year
 
     end
   end

data/lib/puree/version.rb

@@ -1,5 +1,5 @@
 module Puree
   # Semantic version number
   #
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

data/lib/puree/xml_extractor/mixins/event_mixin.rb

@@ -12,7 +12,7 @@ module Puree
         if !xpath_result.empty?
           header = Puree::Model::EventHeader.new
           header.uuid = xpath_result.xpath('@uuid').text.strip
-          header.title = xpath_result.xpath('title/localizedString').text.strip
+          header.title = xpath_result.xpath('name').text.strip
           return header if header.data?
         end
         nil

data/lib/puree/xml_extractor/organisational_unit.rb

@@ -21,7 +21,7 @@ module Puree
           a.street = street unless street.empty?
           building = xpath_result.xpath('building').text.strip
           a.building = building unless building.empty?
-          postcode = xpath_result.xpath('postalCode').text.strip
+          postcode = xpath_result.xpath('postalcode').text.strip
           a.postcode = postcode unless building.empty?
           city = xpath_result.xpath('city').text.strip
           a.city = city unless city.empty?

data/lib/puree/xml_extractor/research_output.rb

@@ -53,7 +53,7 @@ module Puree
           model.name = d.xpath('file/fileName').text.strip
           model.mime = d.xpath('file/mimeType').text.strip
           model.size = d.xpath('file/size').text.strip.to_i
-          model.url = d.xpath('file/URL').text.strip
+          model.url = d.xpath('file/fileURL').text.strip
           # document_license = d.xpath('licenseType')
           # if !document_license.empty?
           #   license = Puree::Model::CopyrightLicense.new
@@ -142,8 +142,8 @@ module Puree
         data = []
         xpath_result.each do |i|
           s = Puree::Model::ResearchOutputScopusMetric.new
-          s.value = i.xpath('value').text.strip
-          s.year = i.xpath('year').text.strip
+          s.value = i.xpath('value').text.strip.to_i
+          s.year = i.xpath('year').text.strip.to_i
           data << s
         end
         data

data/test/common/address.rb

@@ -0,0 +1,14 @@
+def assert_address(data)
+  assert_instance_of Puree::Model::Address, data
+  assert data.data?
+  assert_instance_of String, data.street
+  refute_empty data.street
+  assert_instance_of String, data.building
+  refute_empty data.building
+  assert_instance_of String, data.postcode
+  refute_empty data.postcode
+  assert_instance_of String, data.city
+  refute_empty data.city
+  assert_instance_of String, data.country
+  refute_empty data.country
+end

data/test/common/endeavour_person.rb

@@ -0,0 +1,11 @@
+require_relative 'person_name'
+
+def assert_endeavour_person(data)
+  assert_instance_of Puree::Model::EndeavourPerson, data
+  assert data.data?
+  assert_instance_of String, data.uuid
+  refute_empty data.uuid
+  assert_instance_of String, data.role
+  refute_empty data.role
+  assert_person_name data.name
+end

data/test/common/name_header.rb

@@ -0,0 +1,9 @@
+def assert_name_header(data)
+  assert data.data?
+  assert_instance_of String, data.uuid
+  refute_empty data.uuid
+  assert_instance_of String, data.name
+  refute_empty data.name
+  assert_instance_of String, data.type
+  refute_empty data.type
+end

data/test/common/person_name.rb

@@ -0,0 +1,8 @@
+def assert_person_name(data)
+  assert_instance_of Puree::Model::PersonName, data
+  assert data.data?
+  assert_instance_of String, data.first
+  refute_empty data.first
+  assert_instance_of String, data.last
+  refute_empty data.last
+end

data/test/common/related_content_header.rb

@@ -0,0 +1,10 @@
+def assert_related_content_header(data)
+  assert_instance_of Puree::Model::RelatedContentHeader, data
+  assert data.data?
+  assert_instance_of String, data.uuid
+  refute_empty data.uuid
+  assert_instance_of String, data.title
+  refute_empty data.title
+  assert_instance_of String, data.type
+  refute_empty data.type
+end

data/test/common/temporal_range.rb

@@ -0,0 +1,5 @@
+def assert_temporal_range(data)
+  assert data.data?
+  assert_instance_of Time, data.start
+  assert_instance_of Time, data.end
+end

data/test/common/title_header.rb

@@ -0,0 +1,9 @@
+def assert_title_header(data)
+  assert data.data?
+  assert_instance_of String, data.uuid
+  refute_empty data.uuid
+  assert_instance_of String, data.title
+  refute_empty data.title
+  assert_instance_of String, data.type
+  refute_empty data.type
+end

data/test/extractor/resource_find_test.rb

@@ -76,7 +76,11 @@ class TestResourceFind < Minitest::Test
 
   def test_project
     # The Channel Scheme - Preston
-    id = '2af1fb5c-ac04-40f3-9cb4-073fb92fcf96'
+    # id = '2af1fb5c-ac04-40f3-9cb4-073fb92fcf96'
+    # FINISHED
+    # uuid changed to
+    id = '6acfd7ae-4012-4c82-bb71-2976dbbafbd6'
+    # pure_id = '236466684'
     extractor = Puree::Extractor::Project.new config
     model = extractor.find id
 

data/test/model/person_name_test.rb

@@ -0,0 +1,37 @@
+require 'test_model_helper'
+
+class TestPersonName < Minitest::Test
+
+  def person_name_new
+    Puree::Model::PersonName.new
+  end
+
+  def test_new
+    assert_instance_of Puree::Model::PersonName, person_name_new
+  end
+
+  def person_name
+    name = person_name_new
+    name.first = 'Foo'
+    name.last = 'Bar'
+    name
+  end
+
+  def test_first_last
+    assert_equal person_name.first_last, 'Foo Bar'
+  end
+
+  def test_last_first
+    assert_equal person_name.last_first, 'Bar, Foo'
+  end
+
+  def test_initial_last
+    assert_equal person_name.initial_last, 'F. Bar'
+  end
+
+  def test_last_initial
+    assert_equal person_name.last_initial, 'Bar, F.'
+  end
+
+end
+

data/test/test_model_helper.rb

@@ -0,0 +1 @@
+require 'test_helper'

data/test/xml_extractor/xml_extractor_conference_paper_test.rb

@@ -22,8 +22,15 @@ class TestXMLExtractorPaper < Minitest::Test
 
     asserts_resource x
 
-    assert_instance_of Puree::Model::EventHeader, x.event
-    assert_equal true, x.event.data?
+    event = x.event
+    assert_instance_of Puree::Model::EventHeader, event
+    assert event.data?
+
+    assert_instance_of String, event.title
+    refute_empty event.title
+
+    assert_instance_of String, event.uuid
+    refute_empty event.uuid
 
     assert_instance_of Integer, x.pages
   end
@@ -42,7 +49,7 @@ class TestXMLExtractorPaper < Minitest::Test
     id = 'db2193b7-5cc7-496d-9bd5-35192c6d7ece'
     x = xml_extractor_from_id id
 
-    assert_equal true, x.peer_reviewed
+    assert x.peer_reviewed
   end
 
   def test_absence

data/test/xml_extractor/xml_extractor_dataset_test.rb

@@ -1,4 +1,8 @@
 require 'test_xml_extractor_helper'
+require_relative '../common/endeavour_person'
+require_relative '../common/name_header'
+require_relative '../common/related_content_header'
+require_relative '../common/temporal_range'
 
 class TestXMLExtractorDataset < Minitest::Test
 
@@ -28,11 +32,25 @@ class TestXMLExtractorDataset < Minitest::Test
     refute_empty x.description
 
     assert_instance_of String, x.doi
-    refute_empty x.doi.to_s
+    refute_empty x.doi
 
     assert_instance_of Array, x.files
     assert_instance_of Puree::Model::File, x.files.first
-    assert_equal true, x.files.first.data?
+    assert x.files.first.data?
+
+    data = x.files.first
+    assert_instance_of Puree::Model::File, data
+    assert data.data?
+    assert_instance_of String, data.name
+    refute_empty data.name
+    # assert_instance_of String, data.mime
+    # refute_empty data.mime
+    # assert_instance_of Integer, data.size
+    assert_instance_of String, data.url
+    refute_empty data.url
+    assert_instance_of Puree::Model::CopyrightLicense, data.license
+    assert_instance_of String, data.license.name
+    refute_empty data.license.name
 
     assert_instance_of Array, x.keywords
     assert_instance_of String, x.keywords.first
@@ -40,35 +58,34 @@ class TestXMLExtractorDataset < Minitest::Test
 
     assert_instance_of Array, x.organisational_units
     assert_instance_of Puree::Model::OrganisationalUnitHeader, x.organisational_units.first
-    assert_equal true, x.organisational_units.first.data?
+    assert_name_header x.organisational_units.first
 
     assert_instance_of Puree::Model::OrganisationalUnitHeader, x.owner
-    assert_equal true, x.owner.data?
+    assert_name_header x.owner
 
     assert_instance_of Array, x.persons_internal
     assert_instance_of Puree::Model::EndeavourPerson, x.persons_internal.first
-    assert_equal true, x.persons_internal.first.data?
+    assert_endeavour_person x.persons_internal.first
 
     assert_instance_of Array, x.persons_external
     assert_instance_of Puree::Model::EndeavourPerson, x.persons_external.first
-    assert_equal true, x.persons_external.first.data?
+    assert_endeavour_person x.persons_external.first
 
     assert_instance_of Puree::Model::TemporalRange, x.production
-    assert_equal true, x.production.data?
+    assert_temporal_range x.production
 
     assert_instance_of Array, x.research_outputs
-    assert_instance_of Puree::Model::RelatedContentHeader, x.research_outputs.first
-    assert_equal true, x.research_outputs.first.data?
+    assert_related_content_header x.research_outputs.first
 
     assert_instance_of Puree::Model::PublisherHeader, x.publisher
-    assert_equal true, x.publisher.data?
+    assert_name_header x.publisher
 
     assert_instance_of Array, x.spatial_places
     assert_instance_of String, x.spatial_places.first
     refute_empty x.spatial_places.first
 
     assert_instance_of Puree::Model::TemporalRange, x.temporal
-    assert_equal true, x.temporal.data?
+    assert_temporal_range x.temporal
 
     assert_instance_of String, x.title
     refute_empty x.title
@@ -83,8 +100,12 @@ class TestXMLExtractorDataset < Minitest::Test
     x = xml_extractor_from_id id
 
     assert_instance_of Array, x.persons_other
-    assert_instance_of Puree::Model::EndeavourPerson, x.persons_other.first
-    assert_equal true, x.persons_other.first.data?
+    data = x.persons_other.first
+    assert_instance_of Puree::Model::EndeavourPerson, data
+    assert data.data?
+    assert_instance_of String, data.role
+    refute_empty data.role
+    assert_person_name data.name
   end
 
   def test_spatial_point
@@ -93,7 +114,9 @@ class TestXMLExtractorDataset < Minitest::Test
     x = xml_extractor_from_id id
 
     assert_instance_of Puree::Model::SpatialPoint, x.spatial_point
-    assert_equal true, x.spatial_point.data?
+    assert x.spatial_point.data?
+    assert_instance_of Float, x.spatial_point.latitude
+    assert_instance_of Float, x.spatial_point.longitude
   end
 
   def test_absence

data/test/xml_extractor/xml_extractor_event_test.rb

@@ -26,7 +26,7 @@ class TestXMLEventJournal < Minitest::Test
     refute_empty x.city
 
     assert_instance_of Puree::Model::TemporalRange, x.date
-    assert_equal true, x.date.data?
+    assert x.date.data?
 
     assert_instance_of String, x.title
     refute_empty x.title

data/test/xml_extractor/xml_extractor_external_organisation_test.rb

@@ -1,4 +1,5 @@
 require 'test_xml_extractor_helper'
+require_relative '../common/name_header'
 
 class TestXMLExtractorExternalOrganisation < Minitest::Test
 

data/test/xml_extractor/xml_extractor_journal_article_test.rb

@@ -1,4 +1,5 @@
 require 'test_xml_extractor_helper'
+require_relative '../common/title_header'
 
 class TestXMLExtractorJournalArticle < Minitest::Test
 
@@ -25,14 +26,14 @@ class TestXMLExtractorJournalArticle < Minitest::Test
     assert_instance_of Integer, x.issue
 
     assert_instance_of Puree::Model::JournalHeader, x.journal
-    assert_equal true, x.journal.data?
+    assert_title_header x.journal
 
     assert_instance_of String, x.page_range
     refute_empty x.page_range
 
     assert_instance_of Integer, x.pages
 
-    assert_includes [true, false], x.peer_reviewed
+    assert [true, false].include? x.peer_reviewed
 
     assert_instance_of Integer, x.volume
   end

data/test/xml_extractor/xml_extractor_journal_test.rb

@@ -1,4 +1,5 @@
 require 'test_xml_extractor_helper'
+require_relative '../common/name_header'
 
 class TestXMLExtractorJournal < Minitest::Test
 
@@ -26,7 +27,8 @@ class TestXMLExtractorJournal < Minitest::Test
     refute_empty x.issn
 
     assert_instance_of Puree::Model::PublisherHeader, x.publisher
-    assert_equal true, x.publisher.data?
+    assert x.publisher.data?
+    assert_name_header x.publisher
 
     assert_instance_of String, x.title
     refute_empty x.title

data/test/xml_extractor/xml_extractor_organisation_test.rb

@@ -1,4 +1,6 @@
 require 'test_xml_extractor_helper'
+require_relative '../common/name_header'
+require_relative '../common/address'
 
 class TestXMLExtractorOrganisation < Minitest::Test
 
@@ -23,7 +25,7 @@ class TestXMLExtractorOrganisation < Minitest::Test
     asserts_resource x
 
     assert_instance_of Puree::Model::Address, x.address
-    assert_equal true, x.address.data?
+    assert_address x.address
 
     assert_instance_of Array, x.email_addresses
     assert_instance_of String, x.email_addresses.first
@@ -33,11 +35,13 @@ class TestXMLExtractorOrganisation < Minitest::Test
     refute_empty x.name
 
     assert_instance_of Puree::Model::OrganisationalUnitHeader, x.parent
-    assert_equal true, x.parent.data?
+    assert x.parent.data?
+    assert_name_header x.parent
 
     assert_instance_of Array, x.parents
     assert_instance_of Puree::Model::OrganisationalUnitHeader, x.parents.first
-    assert_equal true, x.parents.first.data?
+    assert x.parents.first.data?
+    assert_name_header x.parents.first
 
     assert_instance_of Array, x.phone_numbers
     assert_instance_of String, x.phone_numbers.first

data/test/xml_extractor/xml_extractor_person_test.rb

@@ -1,4 +1,6 @@
 require 'test_xml_extractor_helper'
+require_relative '../common/name_header'
+require_relative '../common/person_name'
 
 class TestXMLExtractorPerson < Minitest::Test
 
@@ -24,7 +26,8 @@ class TestXMLExtractorPerson < Minitest::Test
 
     assert_instance_of Array, x.affiliations
     assert_instance_of Puree::Model::OrganisationalUnitHeader, x.affiliations.first
-    assert_equal true, x.affiliations.first.data?
+    assert x.affiliations.first.data?
+    assert_name_header x.affiliations.first
 
     assert_instance_of Array, x.email_addresses
     assert_instance_of String, x.email_addresses.first
@@ -36,14 +39,15 @@ class TestXMLExtractorPerson < Minitest::Test
 
     assert_instance_of Array, x.identifiers
     assert_instance_of Puree::Model::Identifier, x.identifiers.first
-    assert_equal true, x.identifiers.first.data?
+    assert x.identifiers.first.data?
 
     assert_instance_of Array, x.keywords
     assert_instance_of String, x.keywords.first
     refute_empty x.keywords.first
 
     assert_instance_of Puree::Model::PersonName, x.name
-    assert_equal true, x.name.data?
+    assert x.name.data?
+    assert_person_name x.name
 
     assert_instance_of String, x.orcid
     refute_empty x.orcid

data/test/xml_extractor/xml_extractor_project_test.rb

@@ -1,4 +1,7 @@
 require 'test_xml_extractor_helper'
+require_relative '../common/endeavour_person'
+require_relative '../common/name_header'
+require_relative '../common/temporal_range'
 
 class TestXMLExtractorProject < Minitest::Test
 
@@ -17,7 +20,11 @@ class TestXMLExtractorProject < Minitest::Test
 
   def test_core
     # The Channel Scheme - Preston
-    id = '2af1fb5c-ac04-40f3-9cb4-073fb92fcf96'
+    # id = '2af1fb5c-ac04-40f3-9cb4-073fb92fcf96'
+    # FINISHED
+    # uuid changed to
+    id = '6acfd7ae-4012-4c82-bb71-2976dbbafbd6'
+    # pure_id = '236466684'
     x = xml_extractor_from_id id
 
     assert_instance_of String, x.acronym
@@ -25,11 +32,13 @@ class TestXMLExtractorProject < Minitest::Test
 
     assert_instance_of Array, x.external_organisations
     assert_instance_of Puree::Model::ExternalOrganisationHeader, x.external_organisations.first
-    assert_equal true, x.external_organisations.first.data?
+    assert x.external_organisations.first.data?
+    assert_name_header x.external_organisations.first
 
     assert_instance_of Array, x.organisational_units
     assert_instance_of Puree::Model::OrganisationalUnitHeader, x.organisational_units.first
-    assert_equal true, x.organisational_units.first.data?
+    assert x.organisational_units.first.data?
+    assert_name_header x.organisational_units.first
 
     assert_instance_of String, x.status
     refute_empty x.status
@@ -42,17 +51,22 @@ class TestXMLExtractorProject < Minitest::Test
 
     assert_instance_of Array, x.persons_internal
     assert_instance_of Puree::Model::EndeavourPerson, x.persons_internal.first
-    assert_equal true, x.persons_internal.first.data?
+    assert x.persons_internal.first.data?
+    assert_endeavour_person x.persons_internal.first
 
     # persons_other, see Dataset test
 
     assert_instance_of Puree::Model::TemporalRange, x.temporal
-    assert_equal true, x.temporal.data?
+    assert_temporal_range x.temporal
   end
 
   def test_description
     # Designing an inclusive curriculum in higher education
-    id = '926f34e9-e461-406a-a2b8-3f831456ada0'
+    # id = '926f34e9-e461-406a-a2b8-3f831456ada0'
+    # FINISHED
+    # uuid changed to
+    id = '2bf4b724-7c3a-49c7-8a5a-4060a2fc975f'
+    # pure_id = '236382102'
     x = xml_extractor_from_id id
 
     assert_instance_of String, x.description
@@ -61,17 +75,25 @@ class TestXMLExtractorProject < Minitest::Test
 
   def test_identifiers
     # Blackburn Parenting and Intensive Family Support Project
-    id = '1b15fa94-39f0-4809-976a-a04b53592004'
+    # id = '1b15fa94-39f0-4809-976a-a04b53592004'
+    # FINISHED
+    # uuid changed to
+    id = 'fc3baafd-f147-4c07-9acc-c98b269fcc4c'
+    # pure_id = '236466374'
     x = xml_extractor_from_id id
 
     assert_instance_of Array, x.identifiers
     assert_instance_of Puree::Model::Identifier, x.identifiers.first
-    assert_equal true, x.identifiers.first.data?
+    assert x.identifiers.first.data?
   end
 
   def test_url
     # Designing an inclusive curriculum in higher education
-    id = '926f34e9-e461-406a-a2b8-3f831456ada0'
+    # id = '926f34e9-e461-406a-a2b8-3f831456ada0'
+    # FINISHED
+    # uuid changed to
+    id = '2bf4b724-7c3a-49c7-8a5a-4060a2fc975f'
+    # pure_id = '236382102'
     x = xml_extractor_from_id id
 
     assert_instance_of String, x.url
@@ -80,12 +102,17 @@ class TestXMLExtractorProject < Minitest::Test
 
   def test_persons_external
     # Children, flood and urban resilience
-    id = 'a4d07102-8bbb-4110-8969-580a8fd019c0'
+    # id = 'a4d07102-8bbb-4110-8969-580a8fd019c0'
+    # FINISHED
+    # uuid changed to
+    id = '31834af4-2b68-49c4-9caf-6875d1ba78eb'
+    # pure_id = '236476404'
     x = xml_extractor_from_id id
 
     assert_instance_of Array, x.persons_external
     assert_instance_of Puree::Model::EndeavourPerson, x.persons_external.first
-    assert_equal true, x.persons_external.first.data?
+    assert x.persons_external.first.data?
+    assert_endeavour_person x.persons_external.first
   end
 
   def test_absence
@@ -127,7 +154,11 @@ class TestXMLExtractorProject < Minitest::Test
 
   def test_model
     # The Channel Scheme - Preston
-    id = '2af1fb5c-ac04-40f3-9cb4-073fb92fcf96'
+    # id = '2af1fb5c-ac04-40f3-9cb4-073fb92fcf96'
+    # FINISHED
+    # uuid changed to
+    id = '6acfd7ae-4012-4c82-bb71-2976dbbafbd6'
+    # pure_id = '236466684'
     x = xml_extractor_from_id id
 
     assert_instance_of Puree::Model::Project, x.model

data/test/xml_extractor/xml_extractor_research_output_test.rb

@@ -1,4 +1,7 @@
 require 'test_xml_extractor_helper'
+require_relative '../common/endeavour_person'
+require_relative '../common/name_header'
+require_relative '../common/related_content_header'
 
 # Tests Resource methods, via a JournalArticle
 # Unless otherwise stated, tests ResearchOutput methods via a JournalArticle
@@ -34,8 +37,16 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     refute_empty x.doi.to_s
 
     assert_instance_of Array, x.files
-    assert_instance_of Puree::Model::File, x.files.first
-    assert_equal true, x.files.first.data?
+    data = x.files.first
+    assert_instance_of Puree::Model::File, data
+    assert data.data?
+    assert_instance_of String, data.name
+    refute_empty data.name
+    assert_instance_of String, data.mime
+    refute_empty data.mime
+    assert_instance_of Integer, data.size
+    assert_instance_of String, data.url
+    refute_empty data.url
 
     assert_instance_of String, x.language
     refute_empty x.language
@@ -48,29 +59,28 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     refute_empty x.open_access_permission
 
     assert_instance_of Array, x.organisational_units
-    assert_instance_of Puree::Model::OrganisationalUnitHeader, x.organisational_units.first
-    assert_equal true, x.organisational_units.first.data?
+    assert_name_header x.organisational_units.first
 
-    assert_instance_of Puree::Model::OrganisationalUnitHeader, x.owner
-    assert_equal true, x.owner.data?
+    assert_name_header x.owner
 
     assert_instance_of Array, x.persons_internal
-    assert_instance_of Puree::Model::EndeavourPerson, x.persons_internal.first
-    assert_equal true, x.persons_internal.first.data?
+    assert_endeavour_person x.persons_internal.first
 
     assert_instance_of Array, x.persons_external
-    assert_instance_of Puree::Model::EndeavourPerson, x.persons_external.first
-    assert_equal true, x.persons_external.first.data?
+    assert_endeavour_person x.persons_external.first
 
     assert_instance_of Array, x.publication_statuses
-    assert_instance_of Puree::Model::PublicationStatus, x.publication_statuses.first
-    assert_equal true, x.publication_statuses.first.data?
+    data = x.publication_statuses.first
+    assert_instance_of Puree::Model::PublicationStatus, data
+    assert data.data?
+    assert_instance_of String, data.stage
+    refute_empty data.stage
+    assert_instance_of Time, data.date
 
     # persons_other, see Dataset test
 
     assert_instance_of Array, x.research_outputs
-    assert_instance_of Puree::Model::RelatedContentHeader, x.research_outputs.first
-    assert_equal true, x.research_outputs.first.data?
+    assert_related_content_header x.research_outputs.first
 
     assert_instance_of String, x.type
     refute_empty x.type
@@ -94,6 +104,7 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     x = xml_extractor_from_id id
 
     assert_instance_of Array, x.dois
+    assert_instance_of String, x.dois.first
     refute_empty x.dois
   end
 
@@ -107,14 +118,31 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     refute_empty x.keywords.first
   end
 
-  def test_projects
-    # Measurements of the Higgs boson production and decay rates and coupling strengths using pp collision data at s√=7s=7 and 8 TeV in the ATLAS experiment
-    id = '24ec62e9-a3cc-4402-9ec9-396067949031'
+  # def test_projects
+  #   # Measurements of the Higgs boson production and decay rates and coupling strengths using pp collision data at s√=7s=7 and 8 TeV in the ATLAS experiment
+  #   id = '24ec62e9-a3cc-4402-9ec9-396067949031'
+  #   x = xml_extractor_from_id id
+  #
+  #   assert_instance_of Array, x.projects
+  #
+  #   assert_instance_of Puree::Model::RelatedContentHeader, x.projects.first
+  #   assert_related_content_header x.projects.first
+  #   Project ATLAS: ATLAS listed as relation in Pure app but no longer available in API response
+  # end
+
+  def test_projects_2
+    # Plant diversity and root traits benefit physical properties key to soil function in grasslands
+    id = '458ad0e7-6950-4e30-9374-125fbf628548'
     x = xml_extractor_from_id id
 
     assert_instance_of Array, x.projects
+
+    # Lancaster Environment Centre Project
+    # Active on 2019-01-11
+    # pure_id = '236382106'
     assert_instance_of Puree::Model::RelatedContentHeader, x.projects.first
-    assert_equal true, x.projects.first.data?
+    assert_related_content_header x.projects.first
+    assert x.projects.first.uuid === 'a2bf957f-d54b-495a-97ac-cf360eeda67f'
   end
 
   def test_scopus_citations_count
@@ -138,8 +166,11 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     x = xml_extractor_from_id id
 
     assert_instance_of Array, x.scopus_metrics
-    assert_instance_of Puree::Model::ResearchOutputScopusMetric, x.scopus_metrics.first
-    assert_equal true, x.scopus_metrics.first.data?
+    data = x.scopus_metrics.first
+    assert_instance_of Puree::Model::ResearchOutputScopusMetric, data
+    assert data.data?
+    assert_instance_of Integer, data.value
+    assert_instance_of Integer, data.year
   end
 
   def test_subtitle
@@ -260,6 +291,6 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     x = Puree::XMLExtractor::JournalArticle.new xml
     assert_instance_of Array, x.projects
     assert_instance_of Puree::Model::RelatedContentHeader, x.projects.first
-    assert_equal true, x.projects.first.data?
+    assert_related_content_header x.projects.first
   end
 end

data/test/xml_extractor/xml_extractor_thesis_test.rb

@@ -1,4 +1,5 @@
 require 'test_xml_extractor_helper'
+require_relative '../common/name_header'
 
 class TestXMLExtractorThesis < Minitest::Test
 
@@ -24,11 +25,10 @@ class TestXMLExtractorThesis < Minitest::Test
 
     assert_instance_of Time, x.award_date
 
-    assert_instance_of Puree::Model::ExternalOrganisationHeader, x.awarding_institution
-    assert_equal true,  x.awarding_institution.data?
+    assert_name_header x.awarding_institution
 
     assert_instance_of Puree::Model::PublisherHeader, x.publisher
-    assert_equal true, x.publisher.data?
+    assert_name_header x.publisher
 
     assert_instance_of String, x.type
     refute_empty x.type
@@ -41,7 +41,7 @@ class TestXMLExtractorThesis < Minitest::Test
 
     assert_instance_of Array, x.sponsors
     assert_instance_of Puree::Model::ExternalOrganisationHeader, x.sponsors.first
-    assert_equal true,  x.sponsors.first.data?
+    assert_name_header x.sponsors.first
   end
 
   def test_qualification

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -199,14 +199,23 @@ files:
 - lib/puree/xml_extractor/thesis.rb
 - lib/puree/xml_extractor/xml_extractor.rb
 - puree.gemspec
+- test/common/address.rb
+- test/common/endeavour_person.rb
+- test/common/name_header.rb
+- test/common/person_name.rb
+- test/common/related_content_header.rb
+- test/common/temporal_range.rb
+- test/common/title_header.rb
 - test/extractor/resource_count_test.rb
 - test/extractor/resource_find_test.rb
 - test/extractor/resource_random_test.rb
 - test/integration/research_output_types_test.rb
+- test/model/person_name_test.rb
 - test/rest/base_test.rb
 - test/rest/common_test.rb
 - test/test_extractor_helper.rb
 - test/test_helper.rb
+- test/test_model_helper.rb
 - test/test_rest_helper.rb
 - test/test_xml_extractor_helper.rb
 - test/xml_extractor/xml_extractor_collection_test.rb
@@ -248,14 +257,23 @@ signing_key:
 specification_version: 4
 summary: Metadata extraction from the Pure Research Information System.
 test_files:
+- test/common/address.rb
+- test/common/endeavour_person.rb
+- test/common/name_header.rb
+- test/common/person_name.rb
+- test/common/related_content_header.rb
+- test/common/temporal_range.rb
+- test/common/title_header.rb
 - test/extractor/resource_count_test.rb
 - test/extractor/resource_find_test.rb
 - test/extractor/resource_random_test.rb
 - test/integration/research_output_types_test.rb
+- test/model/person_name_test.rb
 - test/rest/base_test.rb
 - test/rest/common_test.rb
 - test/test_extractor_helper.rb
 - test/test_helper.rb
+- test/test_model_helper.rb
 - test/test_rest_helper.rb
 - test/test_xml_extractor_helper.rb
 - test/xml_extractor/xml_extractor_collection_test.rb