puree 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd7631adf7f39b6d041f3ae46b0b6648b6220a37d74313c86293df1a6b2b938f
-  data.tar.gz: b19e093582fb9e14d2c0bad8898c6c63a9cc3afc501282566194e23b1d12e0a7
+  metadata.gz: 951d9defbfc0c08a02ce5a113e567fe2483bb0273fdaf6357b8b69b1af8f82d5
+  data.tar.gz: 644f09fe6de39e789ef0b186ece794a044bacc49aed60912d3c6ccf8cb6f958b
 SHA512:
-  metadata.gz: '09784067f174ca5f1e310d35c6bbe7132148bc64b13623c12ed94920a5f8c934b7de19992ef117efbfbdea00803f3b19786675c7784ee1bb521d02a00ed9d50c'
-  data.tar.gz: 9a2a672ae92da3c02ccba9dd92010b7d865d8792f2e2bb2218dd85ebe3b2cfda7215e4207fc530921b4035bb169e828550d690d9a8a1f2270f7aa78360e4ad14
+  metadata.gz: 0c5ae5ad398b0f593d0a89535bddf7ac9b42335457305d60657176b933d42d56ece5ed3d45b8366e46002bfdc9c225682506898a7b6ad24e6d75198256f7b973
+  data.tar.gz: ce2ad05d7fe37585fa768988b506be9de69c927e8156fb1c51d8e48197bb416c3e6c58b2b87fad242f0a7da8dd347c587d0d97af77273612a3e346f79d779915

data/CHANGELOG.md

@@ -2,7 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-### 2.3.0 2018-10-09
+## 2.4.0 2018-10-17
+### Added
+- Research output - dois.
+
+### Fixed
+- Research output - doi combining multiple dois. 
+
+## 2.3.0 2018-10-09
 ### Added
 - POST for REST module.
 - Count and random in extractor extended with GET and POST parameters.

data/lib/puree/model/research_output.rb

@@ -17,6 +17,9 @@ module Puree
       # @return [String, nil]
       attr_accessor :doi
 
+      # @return [Array<String>]
+      attr_accessor :dois
+
       # @return [Array<Puree::Model::ExternalOrganisationHeader>]
       attr_accessor :external_organisations
 

data/lib/puree/version.rb

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

data/lib/puree/xml_extractor/research_output.rb

@@ -31,10 +31,17 @@ module Puree
         xpath_query_for_single_value '/category'
       end
 
-      # Digital Object Identifier
+      # Digital Object Identifier (first one, if many)
       # @return [String, nil]
       def doi
-        xpath_query_for_single_value '/electronicVersions/electronicVersion[@type="wsElectronicVersionDoiAssociation"]/doi'
+        multiple_dois = dois
+        multiple_dois.empty? ? nil : multiple_dois.first
+      end
+
+      # Digital Object Identifiers
+      # @return [Array<String>]
+      def dois
+        xpath_query_for_multi_value '/electronicVersions/electronicVersion[@type="wsElectronicVersionDoiAssociation"]/doi'
       end
 
       # @return [Array<Puree::Model::File>]
@@ -170,6 +177,7 @@ module Puree
         @model.category = category
         @model.description = description
         @model.doi = doi
+        @model.dois = dois
         @model.files = files
         @model.keywords = keywords
         @model.language = language

data/puree.gemspec

@@ -9,7 +9,9 @@ Gem::Specification.new do |spec|
   spec.authors       = 'Adrian Albin-Clark'
   spec.email         = 'a.albin-clark@lancaster.ac.uk'
   spec.summary       = %q{Metadata extraction from the Pure Research Information System.}
-  spec.homepage      = 'https://github.com/lulibrary/puree'
+  spec.metadata = {
+    'source_code_uri' => 'https://github.com/lulibrary/puree'
+  }
   spec.license       = 'MIT'
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/test/xml_extractor/xml_extractor_research_output_test.rb

@@ -88,6 +88,15 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     refute_empty x.bibliographical_note
   end
 
+  def test_dois
+    # The spatial-temporal characteristics and health impacts of ambient fine particulate matter in China
+    id = 'a06ce5cd-a9e8-4e87-aa55-7a8616d1d69d'
+    x = xml_extractor_from_id id
+
+    assert_instance_of Array, x.dois
+    refute_empty x.dois
+  end
+
   def test_keywords
     # The effect of humic substances on barite precipitation-dissolution behaviour in natural and synthetic lake waters
     id = 'ce76dbda-8b22-422b-9bb6-8143820171b8'
@@ -170,6 +179,8 @@ class TestXMLExtractorResearchOutput < Minitest::Test
 
     assert_nil x.doi
 
+    assert_empty x.dois
+
     assert_instance_of Array, x.files
     assert_empty x.files
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -222,10 +222,11 @@ 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: https://github.com/lulibrary/puree
+homepage: 
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/lulibrary/puree
 post_install_message: 
 rdoc_options: []
 require_paths: