puree 2.8.1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7042cad4f264724c8db5e78ee7e044517884965bb601095b8cd11ebd8883cef9
-  data.tar.gz: 50405daa56c748f5b4157a44035b9f009b59a05c889a2c3634e65ea3de9fda84
+  metadata.gz: a88708a008306a99ad43c36f4fb1692fd5b59159b70c839b2b1fee47527076fe
+  data.tar.gz: 1de184b1546eeb9712474426ef927c0f15d6c148c44e3614770bb26a0e093355
 SHA512:
-  metadata.gz: '09027f7e53686f27acd1ae068237931897502c6c6848d523a7a641a049b1fd4c411e5b25507c1ce693f62cb7a95e6bc439fefbdc8ba4bcfe8012896ffc17e65b'
-  data.tar.gz: 38a92a6b89047597c4dd207cfa4d4997297952342bd2628864d765d50a104fde1fa1597f99c407e8312c8f8a8d6d9fa5226e18ec53d3a9026e5d01dec2531560
+  metadata.gz: 5e18a7383b6547cd0929b8259eac4cbbfeec3e049b5574e36433b525f1dc4d2d939e3f3d81099df8d38943cb36758108cda032baac864499aa0c159c51dbc857
+  data.tar.gz: 780d8bc2d9703342529ea151d84e4a697ccf96345ff34606c267883ce8b6fdd82e9b72b13726877c5585e7b4e700bb8e3247ff74c1900c55818f0498b9088165

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.9.0 2020-02-14
+### Changed
+- For Pure API 515, 516.
+
 ## 2.8.1 2019-10-02
 ### Fixed
 - Research output - title.
@@ -17,7 +21,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## 2.7.0 2019-06-06
 ### Changed
 - For Pure API 513.
-    - Dataset, person, research output - keywords.
+- Dataset, person, research output - keywords.
 
 ### Added
 - Resource subclasses - id.

data/README.md

@@ -41,6 +41,7 @@ Purée version | Pure API version
 &gt;= 2.5, < 2.7 | 511, 512
 2.7 | 513
 2.8 | 514
+2.9 | 515, 516
 
 ## Extractor module
 ```ruby

data/lib/puree/version.rb

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

data/lib/puree/xml_extractor/collection.rb

@@ -86,7 +86,7 @@ module Puree
             other: []
         }
         xpath_result.each do |research_output|
-          xpath_result_type = research_output.xpath('types/type')
+          xpath_result_type = research_output.xpath('type/term/text')
           type = xpath_result_type.first.text.strip unless xpath_result_type.empty?
           if type
             case type

data/lib/puree/xml_extractor/dataset.rb

@@ -46,10 +46,10 @@ module Puree
           # doc['createdDate'] = d.xpath('createdDate').text.strip
           # doc['visibleOnPortalDate'] = d.xpath('visibleOnPortalDate').text.strip
           # doc['limitedVisibility'] = d.xpath('limitedVisibility').text.strip
-          document_license = d.xpath('documentLicenses/documentLicense').first
+          document_license = d.xpath('documentLicense').first
           if document_license
             license = Puree::Model::CopyrightLicense.new
-            license.name = document_license.text.strip
+            license.name = document_license.xpath('term/text').text.strip
             # license.name = document_license.xpath('term/localizedString').text.strip
             # license.url = document_license.xpath('description/localizedString').text.strip
             doc.license = license if license.data?
@@ -88,7 +88,7 @@ module Puree
       # @return [Array<String>]
       def spatial_places
         # Data from free-form text box
-        xpath_result = xpath_query '/geographicalCoverages/geographicalCoverage'
+        xpath_result = xpath_query '/geographicalCoverage'
         data = []
         xpath_result.each do |i|
           data << i.text.strip

data/lib/puree/xml_extractor/external_organisation.rb

@@ -14,7 +14,7 @@ module Puree
 
       # @return [String, nil]
       def name
-        xpath_query_for_single_value '/names/name'
+        xpath_query_for_single_value '/name/text'
       end
 
       private

data/lib/puree/xml_extractor/journal_article.rb

@@ -26,7 +26,7 @@ module Puree
           header = Puree::Model::JournalHeader.new
           header.title = xpath_result.xpath('title').text.strip
           journal = xpath_result.xpath('journal')
-          xpath_result_type = journal.xpath('types/type')
+          xpath_result_type = journal.xpath('type/term/text')
           header.type = xpath_result_type.first.text.strip unless xpath_result_type.empty?
           header.uuid = journal.attr('uuid').text.strip
           header

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

@@ -8,7 +8,7 @@ module Puree
 
       # @return [String, nil]
       def description
-        xpath_query_for_single_value '/abstracts/abstract'
+        xpath_query_for_single_value '/abstract/text'
       end
 
     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
-          xpath_result_name = xpath_result.xpath('names/name')
+          xpath_result_name = xpath_result.xpath('name/text')
           header.title = xpath_result_name.first.text.strip unless xpath_result_name.empty?
           return header if header.data?
         end

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

@@ -12,8 +12,8 @@ module Puree
         data = []
         xpath_result.each do |d|
           identifier = Puree::Model::Identifier.new
-          identifier.id = d.text.strip
-          identifier.type = d.attr('type').strip
+          identifier.id = d.xpath('value').text.strip
+          identifier.type = d.xpath('type/term/text').text.strip
           data << identifier
         end
         data.uniq { |d| d.id }

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

@@ -32,7 +32,7 @@ module Puree
             name.first = i.xpath('name/firstName').text.strip
             name.last = i.xpath('name/lastName').text.strip
             person.name = name if name.data?
-            xpath_result_role = i.xpath('personRoles/personRole')
+            xpath_result_role = i.xpath('personRole/term/text')
             person.role = xpath_result_role.first.text.strip unless xpath_result_role.empty?
             arr << person if person.data?
           end

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

@@ -14,9 +14,9 @@ module Puree
         xpath_result.each { |i|
           related = Puree::Model::RelatedContentHeader.new
           related.uuid = i.attr('uuid').strip
-          xpath_result_name = i.xpath('names/name')
+          xpath_result_name = i.xpath('name/text')
           related.title = xpath_result_name.first.text.strip unless xpath_result_name.empty?
-          xpath_result_type = i.xpath('types/type')
+          xpath_result_type = i.xpath('type/term/text')
           related.type = xpath_result_type.first.text.strip unless xpath_result_type.empty?
           data_arr << related
         }

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

@@ -11,9 +11,9 @@ module Puree
         xpath_result = xpath_query '/publisher'
         h = Puree::Model::PublisherHeader.new
         h.uuid = xpath_result.xpath('@uuid').text.strip
-        xpath_result_name = xpath_result.xpath('names/name')
+        xpath_result_name = xpath_result.xpath('name/text')
         h.name = xpath_result_name.first.text.strip unless xpath_result_name.empty?
-        xpath_result_type = xpath_result.xpath('types/type')
+        xpath_result_type = xpath_result.xpath('type/term/text')
         h.type = xpath_result_type.first.text.strip unless xpath_result_type.empty?
         h.data? ? h : nil
       end

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

@@ -14,9 +14,9 @@ module Puree
         xpath_result.each { |i|
           related = Puree::Model::RelatedContentHeader.new
           related.uuid = i.attr('uuid').strip
-          xpath_result_name = i.xpath('names/name')
+          xpath_result_name = i.xpath('name/text')
           related.title = xpath_result_name.first.text.strip unless xpath_result_name.empty?
-          xpath_result_type = i.xpath('types/type')
+          xpath_result_type = i.xpath('type/term/text')
           related.type = xpath_result_type.first.text.strip unless xpath_result_type.empty?
           data_arr << related
         }

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

@@ -8,7 +8,7 @@ module Puree
 
       # @return [String, nil]
       def title
-        xpath_query_for_single_value '/titles/title'
+        xpath_query_for_single_value '/title/text'
       end
 
     end

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

@@ -8,7 +8,7 @@ module Puree
 
       # @return [String, nil]
       def type
-        xpath_query_for_single_value '/types/type'
+        xpath_query_for_single_value '/type/term/text'
       end
 
     end

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

@@ -8,7 +8,7 @@ module Puree
 
       # @return [String, nil]
       def workflow
-        xpath_query_for_single_value '/workflows/workflow'
+        xpath_query_for_single_value '/workflow/value/text'
       end
 
     end

data/lib/puree/xml_extractor/organisational_unit.rb

@@ -25,8 +25,8 @@ module Puree
           a.postcode = postcode unless building.empty?
           city = xpath_result.xpath('city').text.strip
           a.city = city unless city.empty?
-          country = xpath_result.xpath('countries/country')
-          a.country = country.first.text.strip unless country.empty?
+          country = xpath_result.xpath('country/term/text')
+          a.country = country.text.strip unless country.empty?
           a
         end
       end
@@ -38,7 +38,7 @@ module Puree
 
       # @return [String, nil]
       def name
-        xpath_query_for_single_value '/names/name'
+        xpath_query_for_single_value '/name/text'
       end
 
       # First parent

data/lib/puree/xml_extractor/person.rb

@@ -29,7 +29,7 @@ module Puree
         xpath_result = xpath_query '/profilePhotos/profilePhoto'
         arr = []
         xpath_result.each do |i|
-          arr << i.attr('url').strip
+          arr << i.xpath('url').text.strip
         end
         arr.uniq
       end

data/lib/puree/xml_extractor/project.rb

@@ -50,7 +50,7 @@ module Puree
 
       # @return [String, nil]
       def status
-        xpath_query_for_single_value '/statuses/status'
+        xpath_query_for_single_value '/status/value/text'
       end
 
       # @return [Puree::Model::TemporalRange, nil]

data/lib/puree/xml_extractor/research_output.rb

@@ -22,12 +22,12 @@ module Puree
 
       # @return [String, nil]
       def bibliographical_note
-        xpath_query_for_single_value '/bibliographicalNotes/bibliographicalNote'
+        xpath_query_for_single_value '/bibliographicalNote/text'
       end
 
       # @return [String, nil]
       def category
-        xpath_query_for_single_value '/categories/category'
+        xpath_query_for_single_value '/category/term/text'
       end
 
       # Digital Object Identifier (first one, if many)
@@ -72,7 +72,7 @@ module Puree
 
       # @return [String, nil]
       def language
-        xpath_query_for_single_value '/languages/language'
+        xpath_query_for_single_value '/language/term/text'
       end
 
       # @return [Array<String>, nil]
@@ -82,7 +82,7 @@ module Puree
 
       # @return [String, nil]
       def open_access_permission
-        xpath_query_for_single_value '/openAccessPermissions/openAccessPermission'
+        xpath_query_for_single_value '/openAccessPermission/term/text'
       end
 
       # @return [Array<Puree::Model::EndeavourPerson>]
@@ -106,7 +106,7 @@ module Puree
         data = []
         xpath_result.each do |i|
           s = Puree::Model::PublicationStatus.new
-          s.stage = i.xpath('publicationStatuses/publicationStatus').text.strip
+          s.stage = i.xpath('publicationStatus/term/text').text.strip
 
           ymd = {}
           ymd['year'] = i.xpath('publicationDate/year').text.strip
@@ -160,12 +160,12 @@ module Puree
 
       # @return [String, nil]
       def translated_subtitle
-        xpath_query_for_single_value '/translatedSubTitles/translatedSubTitle'
+        xpath_query_for_single_value '/translatedSubTitle/text'
       end
 
       # @return [String, nil]
       def translated_title
-        xpath_query_for_single_value '/translatedTitles/translatedTitle'
+        xpath_query_for_single_value '/translatedTitle/text'
       end
 
       private

data/lib/puree/xml_extractor/shared.rb

@@ -10,9 +10,9 @@ module Puree
       def self.external_organisation_header(nokogiri_xml_element)
         h = Puree::Model::ExternalOrganisationHeader.new
         h.uuid = nokogiri_xml_element.xpath('@uuid').text.strip
-        xpath_result_name = nokogiri_xml_element.xpath('names/name')
+        xpath_result_name = nokogiri_xml_element.xpath('name/text')
         h.name = xpath_result_name.first.text.strip unless xpath_result_name.empty?
-        xpath_result_type = nokogiri_xml_element.xpath('types/type')
+        xpath_result_type = nokogiri_xml_element.xpath('type/term/text')
         h.type = xpath_result_type.first.text.strip unless xpath_result_type.empty?
         h.data? ? h : nil
       end
@@ -31,9 +31,9 @@ module Puree
       def self.organisation_header(nokogiri_xml_element)
         h = Puree::Model::OrganisationalUnitHeader.new
         h.uuid = nokogiri_xml_element.xpath('@uuid').text.strip
-        xpath_result_name = nokogiri_xml_element.xpath('names/name')
+        xpath_result_name = nokogiri_xml_element.xpath('name/text')
         h.name = xpath_result_name.first.text.strip unless xpath_result_name.empty?
-        xpath_result_type = nokogiri_xml_element.xpath('types/type')
+        xpath_result_type = nokogiri_xml_element.xpath('type/term/text')
         h.type = xpath_result_type.first.text.strip unless xpath_result_type.empty?
         h.data? ? h : nil
       end

data/lib/puree/xml_extractor/thesis.rb

@@ -27,7 +27,7 @@ module Puree
 
       # @return [String, nil]
       def qualification
-        xpath_query_for_single_value('/qualifications/qualification')
+        xpath_query_for_single_value('/qualification/term/text')
       end
 
       # @return [Array<Puree::Model::ExternalOrganisationHeader>]

data/puree.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.1'
 
-  spec.add_runtime_dependency 'http', '~> 2.0'
+  spec.add_runtime_dependency 'http', '~> 4.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
 
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'

data/test/xml_extractor/xml_extractor_person_test.rb

@@ -20,6 +20,7 @@ class TestXMLExtractorPerson < Minitest::Test
   def test_core
     # Peter Diggle
     id = '811d7fc3-047a-40d2-89e6-c85d14a97fb8'
+
     x = xml_extractor_from_id id
 
     asserts_resource x
@@ -92,6 +93,7 @@ class TestXMLExtractorPerson < Minitest::Test
   def test_model
     # Peter Diggle
     id = '811d7fc3-047a-40d2-89e6-c85d14a97fb8'
+
     x = xml_extractor_from_id id
 
     assert_instance_of Puree::Model::Person, x.model

data/test/xml_extractor/xml_extractor_research_output_test.rb

@@ -293,14 +293,17 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     xml =
     '<contributionToJournal>
       <relatedProjects>
-        <relatedProject uuid="fe8aebdf-a926-4e7b-adf1-082425e50330">
-          <names>
-            <name>The Language Bases of Reading Comprehension</name>
-          </names>
-          <types>
-            <type uri="/dk/atira/pure/upmproject/upmprojecttypes/upmproject/research">Research</type>
-          </types>
-	 	    </relatedProject>
+        <relatedProject uuid="f74685fd-f1a9-4de9-b9d7-288f690755c6">
+          <link ref="content" href="https://pure.lancs.ac.uk/ws/api/515/projects/f74685fd-f1a9-4de9-b9d7-288f690755c6"/>
+          <name formatted="false">
+            <text locale="en_GB">The Language Bases of Reading Comprehension</text>
+          </name>
+          <type pureId="236382102" uri="/dk/atira/pure/upmproject/upmprojecttypes/upmproject/research">
+            <term formatted="false">
+              <text locale="en_GB">Research</text>
+            </term>
+          </type>
+        </relatedProject>
 	    </relatedProjects>
     </contributionToJournal>'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.9.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +236,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/lulibrary/puree
-  documentation_uri: https://www.rubydoc.info/gems/puree/2.8.1
+  documentation_uri: https://www.rubydoc.info/gems/puree/2.9.0
 post_install_message: 
 rdoc_options: []
 require_paths: