puree 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7129e92fd2ea35a0f0fde2fbf9a205b4df5e3ad
-  data.tar.gz: 085ffa88bed9104eeb96e1ce0098c86d4da24ae5
+  metadata.gz: f8bc93ad5800cd2505cfb1e29dd1297e24f1314e
+  data.tar.gz: 69057fe1977ca9ba0918ec9df90a0ad0459730df
 SHA512:
-  metadata.gz: 34a695d6a4a69ec49798dfb59199ea6f7f4bfc6d43976d8c0ff00965b88008289b236f3ab7294c55d874819e1bc2c2b2cbeaf6eb36c2a23c279adbe903808583
-  data.tar.gz: 7195777fc8b4ecd80b5ef5b448e5ba4a666ac58dc1e198788b37b21cda1b4003d1cfb02b046cb30f41437b4b292b55afc2fe1a7d17f6a6e674bdcde49cdec0cb
+  metadata.gz: e8419dade2d8cfa512fcb0afabe4c9c5db592d13c70e634272f39f945eb8a1ee66796dd1cf663294fd7b85454cb754fd5a2faf3113c2219a36542587fa4457f6
+  data.tar.gz: 5466e882728576e0a1ae1ab2267a9b4fa1ff9771badab46b33ed9cc63d242f5cb6524ef9e21dbdce7b8ab40164704fb2bed1c09fbc973ea06c671f495e7d5bd3

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/).
 
+## 0.8.0 - 2016-05-11
+### Added
+- Publication metadata (description, doi, file, subtitle, title).
+
 ## 0.7.0 - 2016-05-10
 ### Added
 - Person metadata (affiliation, orcid).

data/README.md

@@ -173,6 +173,21 @@ Date range. If year is present, month and day will have data or an empty string.
 }
 ```
 
+## Publication data structures
+
+### file
+An array of files.
+
+```ruby
+[
+  {
+    "name"=>"foo.csv",
+    "mime"=>"application/octet-stream",
+    "size"=>"1616665158",
+    "url"=>"http://example.com/ws/rest/files/12345678/foo.csv",
+  },
+]
+```
 
 ## Utilities
 
@@ -206,6 +221,8 @@ Resource metadata
 
 ```ruby
 :dataset
+:person
+:publication
 ```
 
 Resource metadata (single hash only)

data/lib/puree/map.rb

@@ -16,7 +16,8 @@ module Puree
         resource_type: {
           dataset: {
             service: 'datasets',
-            response: 'GetDataSetsResponse'
+            response: 'GetDataSetsResponse',
+            xpath: nil
           }
         }
       }
@@ -39,6 +40,7 @@ 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/person.rb

@@ -13,7 +13,7 @@ module Puree
     # @return [Array<String>]
     def affiliation
       path = '//organisation/name/localizedString'
-      xpath_result =  xpath_doc.xpath path
+      xpath_result =  xpath_query path
       affiliations = []
       xpath_result.each { |i| affiliations << i.text }
       return affiliations.uniq

data/lib/puree/publication.rb

@@ -8,6 +8,80 @@ module Puree
       super(:publication)
     end
 
+    # Description
+    #
+    # @return [Array<String>]
+    def description
+      path = '//abstract/localizedString'
+      xpath_result =  xpath_query path
+      data_arr = []
+      xpath_result.each { |i| data_arr << i.text }
+      data_arr
+    end
+
+    # Digital Object Identifier
+    #
+    # @return [String]
+    def doi
+      path = '//doi'
+      xpath_result =  xpath_query path
+      xpath_result ? xpath_result.text : ''
+    end
+
+    # Supporting file
+    #
+    # @return [Array<Hash>]
+    def file
+      path = '//electronicVersionFileAssociations/electronicVersionFileAssociation/file'
+      xpath_result =  xpath_query path
+      docs = []
+      xpath_result.each do |d|
+        doc = {}
+        # doc['id'] = d.xpath('id').text
+        doc['name'] = d.xpath('fileName').text
+        doc['mime'] = d.xpath('mimeType').text
+        doc['size'] = d.xpath('size').text
+        doc['url'] = d.xpath('url').text
+        docs << doc
+      end
+      docs
+    end
+
+    # Title
+    #
+    # @return [Array<String>]
+    def title
+      path = '//content/title'
+      xpath_result =  xpath_query path
+      data_arr = []
+      xpath_result.each { |i| data_arr << i.text }
+      data_arr
+    end
+
+    # Subtitle
+    #
+    # @return [Array<String>]
+    def subtitle
+      path = '//content/subtitle'
+      xpath_result =  xpath_query path
+      data_arr = []
+      xpath_result.each { |i| data_arr << i.text }
+      data_arr
+    end
+
+    # All metadata
+    #
+    # @return [Hash]
+    def metadata
+      o = {}
+      o['description'] = description
+      o['doi'] = doi
+      o['file'] = file
+      o['subtitle'] = subtitle
+      o['title'] = title
+      o
+    end
+
   end
 
 end

data/lib/puree/resource.rb

@@ -88,8 +88,8 @@ module Puree
     # Node
     #
     # @return [Hash]
-    def node(*path)
-      @content ? @content.dig(*path) : {}
+    def node(path)
+      @content ? @content[path] : {}
     end
 
 
@@ -121,10 +121,11 @@ module Puree
       @endpoint + '/' + service_api_mode
     end
 
-    def xpath_doc
+    def xpath_query(path)
       xml = @response.body
       doc = Nokogiri::XML xml
       doc.remove_namespaces!
+      doc.xpath path
     end
 
   end

data/lib/puree/version.rb

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

data/puree.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'httparty', '~> 0.13', '>= 0.13.7'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.6', '>= 1.6.7.2'
+  spec.required_ruby_version = '~> 2.1'
+
+  spec.add_runtime_dependency 'httparty', '~> 0.13'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -17,9 +17,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.7
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.7.2
 description: Consumes the Pure Research Information System API and facilitates post-processing
   of metadata into simple data structures.
 email:
@@ -91,9 +79,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="