puree 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8bc93ad5800cd2505cfb1e29dd1297e24f1314e
-  data.tar.gz: 69057fe1977ca9ba0918ec9df90a0ad0459730df
+  metadata.gz: e16d74fee89f71aae7593434a3bb8041e6ae9451
+  data.tar.gz: 2180947af2af6b771305ac16712f447721f23f63
 SHA512:
-  metadata.gz: e8419dade2d8cfa512fcb0afabe4c9c5db592d13c70e634272f39f945eb8a1ee66796dd1cf663294fd7b85454cb754fd5a2faf3113c2219a36542587fa4457f6
-  data.tar.gz: 5466e882728576e0a1ae1ab2267a9b4fa1ff9771badab46b33ed9cc63d242f5cb6524ef9e21dbdce7b8ab40164704fb2bed1c09fbc973ea06c671f495e7d5bd3
+  metadata.gz: f56565ef90e7d266adf52c7f6a346e7e7d885e25f42064353f8b2840d6c31654d044e98d0a48f8cb677fb94f35ad47cfb26488b7db0b562cdbfe530bc93a3a6f
+  data.tar.gz: 360d2d041c5bb2c71739a245c4cfea4059c41c274cee2cae1289e3775bb9ab98c55297e59702e32137300e47da696d6cc17b5dd89fc4dcec261e766de46b2e47

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/).
 
+## 0.9.0 - 2016-05-16
+### Added
+- Dataset metadata (production).
+- Organisation metadata (name).
+- Person metadata (image, keyword, name).
+
 ## 0.8.0 - 2016-05-11
 ### Added
 - Publication metadata (description, doi, file, subtitle, title).

data/README.md

@@ -40,17 +40,18 @@ d.get uuid:     'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx',
       password: password
 
 # Filter metadata into simple data structures
-d.title
+d.access
+d.available
 d.description
+d.doi
+d.file
+d.geographical
 d.keyword
 d.person
-d.temporal
-d.geographical
-d.file
+d.production
 d.publication
-d.available
-d.access
-d.doi
+d.temporal
+d.title
 
 # Combine metadata into one simple data structure
 d.metadata
@@ -221,6 +222,7 @@ Resource metadata
 
 ```ruby
 :dataset
+:organisation
 :person
 :publication
 ```
@@ -229,10 +231,7 @@ Resource metadata (single hash only)
 
 ```ruby
 :journal
-:organisation
-:person
 :project
-:publication
 :publisher
 ```
 

data/lib/puree/dataset.rb

@@ -135,6 +135,14 @@ module Puree
       end
     end
 
+    # Date of data production
+    #
+    # @return [Hash]
+    def production
+      data = node('dateOfDataProduction')
+      Puree::Date.normalise(data)
+    end
+
     # Temporal coverage
     #
     # @return [Hash]
@@ -224,20 +232,23 @@ module Puree
     # @return [Hash]
     def metadata
       o = {}
-      o['title'] = title
+      o['access'] = access
+      o['available'] = available
       o['description'] = description
+      o['doi'] = doi
+      o['file'] = file
+      o['geographical'] = geographical
       o['keyword'] = keyword
       o['person'] = person
-      o['temporal'] = temporal
-      o['geographical'] = geographical
-      o['file'] = file
+      o['production'] = production
       o['publication'] = publication
-      o['available'] = available
-      o['access'] = access
-      o['doi'] = doi
+      o['temporal'] = temporal
+      o['title'] = title
       o
     end
 
+
+
     private
 
     # Assembles basic information about a person

data/lib/puree/map.rb

@@ -16,8 +16,7 @@ module Puree
         resource_type: {
           dataset: {
             service: 'datasets',
-            response: 'GetDataSetsResponse',
-            xpath: nil
+            response: 'GetDataSetsResponse'
           }
         }
       }
@@ -40,7 +39,6 @@ module Puree
         resource_type = {}
         resource_type[:service] = c
         resource_type[:response] = 'Get' + c.capitalize + 'Response'
-        resource_type[:xpath] = nil
         @api_map[:resource_type][c.to_sym] = resource_type
       end
     end

data/lib/puree/organisation.rb

@@ -8,6 +8,23 @@ module Puree
       super(:organisation)
     end
 
+    # Name
+    #
+    # @return [String]
+    def name
+      data = node 'name'
+      !data.nil? && !data.empty? ? data['localizedString']['__content__'] : ''
+    end
+
+    # All metadata
+    #
+    # @return [Hash]
+    def metadata
+      o = {}
+      o['name'] = name
+      o
+    end
+
   end
 
 end

data/lib/puree/person.rb

@@ -19,16 +19,47 @@ module Puree
       return affiliations.uniq
     end
 
+    # Image
+    #
+    # @return [Array<String>]
+    def image
+      path = '//photos/file/url'
+      xpath_result =  xpath_query path
+      data = []
+      xpath_result.each { |i| data << i.text }
+      data.uniq
+    end
+
+    # Keyword
+    #
+    # @return [Array<String>]
+    def keyword
+      path = '//keywordGroup/keyword/userDefinedKeyword/freeKeyword'
+      xpath_result =  xpath_query path
+      data = []
+      xpath_result.each { |i| data << i.text }
+      return data.uniq
+    end
+
+    # Name
+    #
+    # @return [Hash]
+    def name
+      data = node 'name'
+      o = {}
+      if !data.nil? && !data.empty?
+        o['first'] = data['firstName']
+        o['last'] = data['lastName']
+      end
+      o
+    end
+
     # ORCID
     #
     # @return [String]
     def orcid
       data = node 'orcid'
-      if !data.nil? && !data.empty?
-        !data.nil? && !data.empty? ? data : ''
-      else
-        ''
-      end
+      !data.nil? && !data.empty? ? data : ''
     end
 
     # All metadata
@@ -37,6 +68,9 @@ module Puree
     def metadata
       o = {}
       o['affiliation'] = affiliation
+      o['image'] = image
+      o['keyword'] = keyword
+      o['name'] = name
       o['orcid'] = orcid
       o
     end

data/lib/puree/version.rb

@@ -1,3 +1,3 @@
 module Puree
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A client for the Pure Research Information System API.