puree 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68e9bc6b3031be78761029cf76f9a2d0ca19dc83
-  data.tar.gz: c25c6ba1167ee3b477c58bf1e1f1b0774fb9b410
+  metadata.gz: 36bf126598ca6a267612c243bf8140c594c875ea
+  data.tar.gz: b09a23a98dda52719e3e1767f3d7ef08b52ba5da
 SHA512:
-  metadata.gz: e09b12ccea6749fe4904031d366c38eb677f4a4b653f7a5d8f1ac2139cdb56db97cacd183db9b4beb3cfb2c4a49a05a1bd27d337f5f3dd98301a44e9aa6617e9
-  data.tar.gz: 23b257d617b8f47802ec213b592b75b15fc9132058c5299761c30291e1739353e149db0e1bf5580beee55a51f5d3bad255e1376d48318480c565c6dd4932ec57
+  metadata.gz: d625c5527a02c5748e980640cfb7c56d851c661e9292aaea6732f0fecdca075cfeb50f163f622b7656455f022bbdc7f6797da9f429889731c81701623b73a9cd
+  data.tar.gz: fd3788695ac2118a2f9f20cf0d03a6b16bdfc53fe6080ad10c67e90cde7ee2ae1b256099a86efaeaee8e6a371a1e380c461d137f99fda1f6d23f35d28c6a85e2

data/CHANGELOG.md

@@ -2,12 +2,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.1.0 - 2018-03-12
+### Added
+- Research output - scopus_id, projects
+
 ## 2.0.0 - 2017-12-19
 ### Changed
 - For Pure API 59.
 
 ### Added
-- Independent modules: REST, Extractor, XMLExtractor
+- Independent modules: REST, Extractor, XMLExtractor.
 - Testing against known live data.
 
 ## 1.7.0 - 2017-11-03

data/lib/puree/model/research_output.rb

@@ -50,6 +50,9 @@ module Puree
       # @return [Array<Puree::Model::EndeavourPerson>]
       attr_accessor :persons_other
 
+      # @return [Array<Puree::Model::RelatedContentHeader>]
+      attr_accessor :projects
+
       # @return [Array<Puree::Model::PublicationStatus>]
       attr_accessor :publication_statuses
 
@@ -60,6 +63,9 @@ module Puree
       # @return [Fixnum, nil]
       attr_accessor :scopus_citations_count
 
+      # @return [String, nil]
+      attr_accessor :scopus_id
+
       # @return [Array<Puree::Model::ResearchOutputScopusMetric>]
       attr_accessor :scopus_metrics
 

data/lib/puree/version.rb

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

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

@@ -0,0 +1,28 @@
+module Puree
+
+  module XMLExtractor
+
+    # Project extractor mixin.
+    #
+    module ProjectMixin
+
+      # Projects
+      # @return [Array<Puree::Model::RelatedContentHeader>]
+      def projects
+        xpath_result = xpath_query '/relatedProjects/relatedProject'
+
+        data_arr = []
+        xpath_result.each { |i|
+          related = Puree::Model::RelatedContentHeader.new
+          related.type = i.xpath('type').text.strip
+          related.title = i.xpath('name').text.strip
+          related.uuid = i.attr('uuid').strip
+          data_arr << related
+        }
+        data_arr.uniq { |d| d.uuid }
+      end
+
+    end
+
+  end
+end

data/lib/puree/xml_extractor/research_output.rb

@@ -10,6 +10,7 @@ module Puree
       include Puree::XMLExtractor::OrganisationalUnitMixin
       include Puree::XMLExtractor::OwnerMixin
       include Puree::XMLExtractor::PersonMixin
+      include Puree::XMLExtractor::ProjectMixin
       include Puree::XMLExtractor::ResearchOutputMixin
       include Puree::XMLExtractor::WorkflowMixin
       include Puree::XMLExtractor::TitleMixin
@@ -119,6 +120,16 @@ module Puree
         xpath_result ? xpath_result.to_i : nil
       end
 
+      # @return [String, nil]
+      def scopus_id
+        xpath_result = xpath_query '/externalableInfo/secondarySources/secondarySource'
+        return if xpath_result.empty?
+        source = xpath_result.xpath('source')
+        if source && source.text.strip.downcase === 'scopus'
+          return xpath_result.xpath('sourceId').text.strip
+        end
+      end
+
       # @return [Array<Puree::Model::ResearchOutputScopusMetric>]
       def scopus_metrics
         xpath_result = xpath_query '/scopusMetrics/scopusMetric'
@@ -169,9 +180,11 @@ module Puree
         @model.persons_internal = persons_internal
         @model.persons_external = persons_external
         @model.persons_other = persons_other
+        @model.projects = projects
         @model.publication_statuses = publication_statuses
         @model.research_outputs = research_outputs
         @model.scopus_citations_count = scopus_citations_count
+        @model.scopus_id = scopus_id
         @model.scopus_metrics = scopus_metrics
         @model.subtitle = subtitle
         @model.title = title

data/lib/puree/xml_extractor/xml_extractor.rb

@@ -13,6 +13,7 @@ require 'puree/xml_extractor/mixins/pages_mixin'
 require 'puree/xml_extractor/mixins/person_mixin'
 require 'puree/xml_extractor/mixins/page_range_mixin'
 require 'puree/xml_extractor/mixins/peer_reviewed_mixin'
+require 'puree/xml_extractor/mixins/project_mixin'
 require 'puree/xml_extractor/mixins/publisher_mixin'
 require 'puree/xml_extractor/mixins/research_output_mixin'
 require 'puree/xml_extractor/mixins/workflow_mixin'

data/test/xml_extractor/xml_extractor_research_output_test.rb

@@ -98,6 +98,16 @@ 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'
+    x = xml_extractor_from_id id
+
+    assert_instance_of Array, x.projects
+    assert_instance_of Puree::Model::RelatedContentHeader, x.projects.first
+    assert_equal true, x.projects.first.data?
+  end
+
   def test_scopus_citations_count
     # The effect of humic substances on barite precipitation-dissolution behaviour in natural and synthetic lake waters
     id = 'ce76dbda-8b22-422b-9bb6-8143820171b8'
@@ -106,6 +116,13 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     assert_instance_of Fixnum, x.scopus_citations_count
   end
 
+  def test_scopus_id
+    id = 'ce76dbda-8b22-422b-9bb6-8143820171b8'
+    x = xml_extractor_from_id id
+
+    assert_instance_of String, x.scopus_id
+  end
+
   def test_scopus_metrics
     # The effect of humic substances on barite precipitation-dissolution behaviour in natural and synthetic lake waters
     id = 'ce76dbda-8b22-422b-9bb6-8143820171b8'
@@ -180,6 +197,9 @@ class TestXMLExtractorResearchOutput < Minitest::Test
     assert_instance_of Array, x.persons_other
     assert_empty x.persons_other
 
+    assert_instance_of Array, x.projects
+    assert_empty x.projects
+
     assert_instance_of Array, x.publication_statuses
     assert_empty x.publication_statuses
 
@@ -211,4 +231,24 @@ class TestXMLExtractorResearchOutput < Minitest::Test
 
     assert_instance_of Puree::Model::ResearchOutput, x.model
   end
+
+  def test_projects_snippet
+    # Improving the language skills of Pre-Kindergarten students
+    # id = '54ac6efc-1739-4e42-b4c9-bcb1c6dfd664'
+
+    xml =
+    '<contributionToJournal>
+      <relatedProjects>
+        <relatedProject uuid="fe8aebdf-a926-4e7b-adf1-082425e50330">
+          <name>The Language Bases of Reading Comprehension</name>
+	   	    <type uri="/dk/atira/pure/upmproject/upmprojecttypes/upmproject/research">Research</type>
+	 	    </relatedProject>
+	    </relatedProjects>
+    </contributionToJournal>'
+
+    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?
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -182,6 +182,7 @@ files:
 - lib/puree/xml_extractor/mixins/pages_mixin.rb
 - lib/puree/xml_extractor/mixins/peer_reviewed_mixin.rb
 - lib/puree/xml_extractor/mixins/person_mixin.rb
+- lib/puree/xml_extractor/mixins/project_mixin.rb
 - lib/puree/xml_extractor/mixins/publisher_mixin.rb
 - lib/puree/xml_extractor/mixins/research_output_mixin.rb
 - lib/puree/xml_extractor/mixins/title_mixin.rb