puree 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 064c99e856cac2e6ea9ccd3b2d45ec3e82007bfe8174728773e74f892dc0b141
-  data.tar.gz: 6e00afb038b34ee7c0b1fd1749951744f21c7362a7cf838708e992a43bd0ba16
+  metadata.gz: 6dd0b06031b0dce2cce517c85c91980f7ac6888e29f38777c467c1232429b0a3
+  data.tar.gz: '0397729310faef872d30dab6da50951908f70d8446d6409fa0d0269ed74fcb81'
 SHA512:
-  metadata.gz: ef7d50fcfcb865ef2c8970960c3a3415f1864dcf3941872f75a51b925b571fd87aaf748e0faa3511f67ebea797f113e56b4987ef956cbec8f38acca981f484c9
-  data.tar.gz: 0724f9c5996f59394c488781308f688dbc547b6fa3c408b4e30f07825bc96ec1d27604b485086d9a021073abd4036eeb9cd86e489267dfc82cb010fbf7c0c240
+  metadata.gz: 362173200782ba48932c1515de3a53d487f19f4c8a342ef2091c4633cb6a8118e644b4293efa0a492957d60cfe26a86b8a5beca3e10a34811dba3f39693a740e
+  data.tar.gz: e3d11f4e64a3507581c2229cf7c86242c7973b7f0c0a0e26764ea9483c723639e7d30f28a52d7026d35b6fed488dec4025824874cb06dcdb761f9929884c6cdb

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .idea
+.ruby-version

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.10.0 2025-10-14
+### Added
+Dataset, research output - portal_url.
+
+## 2.9.2 2023-08-31
+### Removed
+- Pessimistic operator for Ruby.
+
 ## 2.9.1 2020-03-31
 ### Fixed
 - Connection timeout keyword argument name for http library.

data/README.md

@@ -26,8 +26,6 @@ Or install it yourself as:
 # For Extractor and REST modules.
 config = {
   url:      'https://YOUR_HOST/ws/api/YOUR_API_VERSION',
-  username: 'YOUR_USERNAME',
-  password: 'YOUR_PASSWORD',
   api_key:  'YOUR_API_KEY'
 }
 ```
@@ -41,7 +39,8 @@ Purée version | Pure API version
 &gt;= 2.5, < 2.7 | 511, 512
 2.7 | 513
 2.8 | 514
-2.9 | 515, 516, 517
+2.9 | 515, 516, 517, 518, 519, 520, 521, 522, 523, 524
+2.10 | 524
 
 ## Extractor module
 ```ruby
@@ -213,4 +212,4 @@ response = client.persons.projects id: 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'
 # Extract metadata from XML
 Puree::XMLExtractor::Collection.projects response.to_s
 #=> [#<Puree::Model::Project:0x00c0ffee>, ...]
-```
+```

data/lib/puree/model/resource.rb

@@ -26,6 +26,9 @@ module Puree
       # @return [Time, nil]
       attr_reader :modified_at
 
+      # @return [String, nil]
+      attr_reader :portal_url      
+
       # @param v [String]
       def id=(v)
         @id = v if v && !v.empty?
@@ -61,6 +64,11 @@ module Puree
         @modified_at = v
       end
 
+      # @param v [String]
+      def portal_url=(v)
+        @portal_url = v
+      end      
+
     end
   end
 end

data/lib/puree/version.rb

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

data/lib/puree/xml_extractor/resource.rb

@@ -52,6 +52,11 @@ module Puree
         xpath_query_for_multi_value '/info/previousUuids/previousUuid'
       end
 
+      # @return [String, nil]
+      def portal_url
+        xpath_query_for_single_value('/info/portalUrl')
+      end      
+
       private
 
       def xpath_query(path)
@@ -70,6 +75,7 @@ module Puree
         @model.modified_by = modified_by
         @model.modified_at = modified_at
         @model.previous_uuids = previous_uuids
+        @model.portal_url = portal_url
       end
 
     end

data/puree.gemspec

@@ -19,9 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.1'
-
-  spec.add_runtime_dependency 'http', '~> 4.0'
+  spec.add_runtime_dependency 'http', '~> 5.1'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
 
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'

data/test/test_helper.rb

@@ -10,8 +10,8 @@ require 'puree'
 def config
   {
       url:      ENV['PURE_URL'],
-      username: ENV['PURE_USERNAME'],
-      password: ENV['PURE_PASSWORD'],
+      #username: ENV['PURE_USERNAME'],
+      #password: ENV['PURE_PASSWORD'],
       api_key:  ENV['PURE_API_KEY']
   }
 end

data/test/xml_extractor/xml_extractor_dataset_test.rb

@@ -34,24 +34,6 @@ class TestXMLExtractorDataset < Minitest::Test
     assert_instance_of String, x.doi
     refute_empty x.doi
 
-    assert_instance_of Array, x.files
-    assert_instance_of Puree::Model::File, x.files.first
-    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
     refute_empty x.keywords.first
@@ -69,7 +51,7 @@ class TestXMLExtractorDataset < Minitest::Test
 
     assert_instance_of Array, x.persons_external
     assert_instance_of Puree::Model::EndeavourPerson, x.persons_external.first
-    assert_endeavour_person x.persons_external.first
+    assert_endeavour_person x.persons_external.first    
 
     assert_instance_of Puree::Model::TemporalRange, x.production
     assert_temporal_range x.production
@@ -94,6 +76,14 @@ class TestXMLExtractorDataset < Minitest::Test
     refute_empty x.workflow
   end
 
+  def test_portal_url
+    # The 2014 Ebola virus disease outbreak in West Africa
+    id = 'b050f4b5-e272-4914-8cac-3bdc1e673c58'
+    x = xml_extractor_from_id id
+    
+    assert_instance_of String, x.portal_url
+  end
+
   def test_persons_other
     # Plant diversity and root traits influence soil physical properties
     id = '18cb8b7c-c3dd-43b8-ac65-bdf76910a6cc'
@@ -119,6 +109,30 @@ class TestXMLExtractorDataset < Minitest::Test
     assert_instance_of Float, x.spatial_point.longitude
   end
 
+  def test_files
+    # Influenza C in Lancaster, winter 2014-2015
+    id = 'a762a8a2-a9ed-4abb-ba91-a67752b1c54d'
+    x = xml_extractor_from_id id
+
+    assert_instance_of Array, x.files
+    assert_instance_of Puree::Model::File, x.files.first
+    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    
+  end
+
   def test_absence
     xml = '<foo/>'
     x = Puree::XMLExtractor::Dataset.new xml
@@ -149,6 +163,8 @@ class TestXMLExtractorDataset < Minitest::Test
     assert_instance_of Array, x.persons_other
     assert_empty x.persons_other
 
+    # assert_nil x.portal_url
+
     assert_nil x.production
 
     assert_instance_of Array, x.research_outputs

data/test/xml_extractor/xml_extractor_project_test.rb

@@ -27,9 +27,6 @@ class TestXMLExtractorProject < Minitest::Test
     # pure_id = '236466684'
     x = xml_extractor_from_id id
 
-    assert_instance_of String, x.acronym
-    refute_empty x.acronym
-
     assert_instance_of Array, x.external_organisations
     assert_instance_of Puree::Model::ExternalOrganisationHeader, x.external_organisations.first
     assert x.external_organisations.first.data?
@@ -119,6 +116,15 @@ class TestXMLExtractorProject < Minitest::Test
     assert_endeavour_person x.persons_external.first
   end
 
+  def test_acronym
+    # Children, flood and urban resilience
+    id = '31834af4-2b68-49c4-9caf-6875d1ba78eb'
+    x = xml_extractor_from_id id
+
+    assert_instance_of String, x.acronym
+    refute_empty x.acronym
+  end
+
   def test_absence
     xml = '<foo/>'
     x = Puree::XMLExtractor::Project.new xml

data/test/xml_extractor/xml_extractor_research_output_test.rb

@@ -69,6 +69,8 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     assert_instance_of Array, x.persons_external
     assert_endeavour_person x.persons_external.first
 
+    assert_instance_of String, x.portal_url    
+
     assert_instance_of Array, x.previous_uuids
     refute_empty x.previous_uuids
     assert_instance_of String, x.previous_uuids.first
@@ -246,6 +248,8 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     assert_instance_of Array, x.persons_other
     assert_empty x.persons_other
 
+    assert_nil x.portal_url    
+
     assert_instance_of Array, x.previous_uuids
     assert_empty x.previous_uuids
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2025-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-description: 
+description:
 email: a.albin-clark@lancaster.ac.uk
 executables: []
 extensions: []
@@ -231,29 +231,29 @@ files:
 - test/xml_extractor/xml_extractor_publisher_test.rb
 - test/xml_extractor/xml_extractor_research_output_test.rb
 - test/xml_extractor/xml_extractor_thesis_test.rb
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/lulibrary/puree
-  documentation_uri: https://www.rubydoc.info/gems/puree/2.9.1
-post_install_message: 
+  documentation_uri: https://www.rubydoc.info/gems/puree/2.10.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Metadata extraction from the Pure Research Information System.
 test_files: