puree 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 589862f38fbdf73c8255cfd00e51191fbbdde42a
-  data.tar.gz: 146680ea5def8f36b7a4bc377413949e2c244de4
+  metadata.gz: c7129e92fd2ea35a0f0fde2fbf9a205b4df5e3ad
+  data.tar.gz: 085ffa88bed9104eeb96e1ce0098c86d4da24ae5
 SHA512:
-  metadata.gz: 9728d190508de23b7b08e3fb0094700f9ec190b40573d32dd8740fad263fca7447b3ff169b89eff6831dc2cf933a3cc2224e6947601610d31c203ffff615018e
-  data.tar.gz: 470051d32055bbd820d7e44a3d931a48419a087cad860a8522c890c8e58a16321fbe60167609f25d528c38b7c8813ae764df6f037c5b4315d61c48c2abeac85f
+  metadata.gz: 34a695d6a4a69ec49798dfb59199ea6f7f4bfc6d43976d8c0ff00965b88008289b236f3ab7294c55d874819e1bc2c2b2cbeaf6eb36c2a23c279adbe903808583
+  data.tar.gz: 7195777fc8b4ecd80b5ef5b448e5ba4a666ac58dc1e198788b37b21cda1b4003d1cfb02b046cb30f41437b4b292b55afc2fe1a7d17f6a6e674bdcde49cdec0cb

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.7.0 - 2016-05-10
+### Added
+- Person metadata (affiliation, orcid).
+- Nokogiri.
+
 ## 0.6.0 - 2016-05-06
 ### Added
 - API map factored out of Resource.

data/lib/puree.rb

@@ -1,4 +1,5 @@
 require 'httparty'
+require 'nokogiri'
 require 'puree/date'
 require 'puree/map'
 require 'puree/resource'

data/lib/puree/person.rb

@@ -8,6 +8,39 @@ module Puree
       super(:person)
     end
 
+    # Affiliation
+    #
+    # @return [Array<String>]
+    def affiliation
+      path = '//organisation/name/localizedString'
+      xpath_result =  xpath_doc.xpath path
+      affiliations = []
+      xpath_result.each { |i| affiliations << i.text }
+      return affiliations.uniq
+    end
+
+    # ORCID
+    #
+    # @return [String]
+    def orcid
+      data = node 'orcid'
+      if !data.nil? && !data.empty?
+        !data.nil? && !data.empty? ? data : ''
+      else
+        ''
+      end
+    end
+
+    # All metadata
+    #
+    # @return [Hash]
+    def metadata
+      o = {}
+      o['affiliation'] = affiliation
+      o['orcid'] = orcid
+      o
+    end
+
   end
 
 end

data/lib/puree/resource.rb

@@ -88,10 +88,11 @@ module Puree
     # Node
     #
     # @return [Hash]
-    def node(name)
-      @content ? @content[name] : {}
+    def node(*path)
+      @content ? @content.dig(*path) : {}
     end
 
+
     # Is there any data after get?
     #
     # @return [Boolean]
@@ -120,5 +121,11 @@ module Puree
       @endpoint + '/' + service_api_mode
     end
 
+    def xpath_doc
+      xml = @response.body
+      doc = Nokogiri::XML xml
+      doc.remove_namespaces!
+    end
+
   end
 end

data/lib/puree/version.rb

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

data/puree.gemspec

@@ -18,7 +18,6 @@ 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'
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency 'rake', '~> 0'
+  spec.add_runtime_dependency 'httparty', '~> 0.13', '>= 0.13.7'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.6', '>= 1.6.7.2'
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'httparty'
+require 'nokogiri'
 require 'puree/date'
 require 'puree/map'
 require 'puree/resource'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -16,42 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '0.13'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 0.13.7
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.7.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        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:
@@ -103,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A client for the Pure Research Information System API.