puree 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86f3775fc9747a946a2d480bd0621971d4e8ecd2
-  data.tar.gz: e565564db8ce6ae7af9c1d68e99f4cada1474f1f
+  metadata.gz: 1b90e69c2963be1ee72e58ade3f738570c68145a
+  data.tar.gz: 746b0c3ca920c13ffd51f43cea9fa9db3ebe3f81
 SHA512:
-  metadata.gz: 7787556f42cf0ec6c39658200e827561a085d71164b11b60c7ea99ae3ce11c40bb73364252ac955696d7dbdeced7fc892de7c1f8e97db439bc8e6298f142d2de
-  data.tar.gz: fa50727a5235c18815aa667a53474faf022563c9decede02e2bec591c1c7656d525d2b492c40f2bbd2d8c9d37f765df0a6a42bc0731278a0669ba34a08f77a14
+  metadata.gz: 45d1dfafa6bd935cd527fec223f1b27e4136f4183e7132c17d7440fa07133eb772b8b9bbaa7d690a7ff84523413610d8d565cc844675fd5cb603083959c68017
+  data.tar.gz: f2daa254050056dee8482d2804fdf124340518de7ca6a07af130e0ba2936e7483c197ff1d1eeae5f7862e2f8388ee042c4975629270d7d321890c5c7a0c5c674

data/CHANGELOG.md

@@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Factory to make resource objects?
 - Make ALL dates ISO 8601 YYYY-MM-DD, rather than mirror varying formats from Pure?
 
+## 0.19.1 - 2016-11-30
+### Fixed
+- Dataset, Publication - person role extraction.
+
 ## 0.19.0 - 2016-09-21
 ### Added
 - Journal - issn, publisher.

data/lib/puree/dataset.rb

@@ -261,7 +261,6 @@ module Puree
 
     def extract_person
       data = {}
-      # internal
       path = '/persons/dataSetPersonAssociation'
       xpath_result = xpath_query path
       internal = []
@@ -274,7 +273,24 @@ module Puree
         name['first'] = i.xpath('name/firstName').text.strip
         name['last'] = i.xpath('name/lastName').text.strip
         o['name'] = name
-        o['role'] = i.xpath('personRole/term/localizedString').text.strip
+
+        roles = {
+            '/dk/atira/pure/dataset/roles/dataset/contributor'    => 'Contributor',
+            '/dk/atira/pure/dataset/roles/dataset/creator'        => 'Creator',
+            '/dk/atira/pure/dataset/roles/dataset/datacollector'  => 'Data Collector',
+            '/dk/atira/pure/dataset/roles/dataset/datamanager'    => 'Data Manager',
+            '/dk/atira/pure/dataset/roles/dataset/distributor'    => 'Distributor',
+            '/dk/atira/pure/dataset/roles/dataset/editor'         => 'Editor',
+            '/dk/atira/pure/dataset/roles/dataset/funder'         => 'Funder',
+            '/dk/atira/pure/dataset/roles/dataset/owner'          => 'Owner',
+            '/dk/atira/pure/dataset/roles/dataset/other'          => 'Other',
+            '/dk/atira/pure/dataset/roles/dataset/producer'       => 'Producer',
+            '/dk/atira/pure/dataset/roles/dataset/rightsholder'   => 'Rights Holder',
+            '/dk/atira/pure/dataset/roles/dataset/sponsor'        => 'Sponsor',
+            '/dk/atira/pure/dataset/roles/dataset/supervisor'     => 'Supervisor'
+        }
+        role_uri = i.xpath('personRole/uri').text.strip
+        o['role'] = roles[role_uri].to_s
 
         uuid_internal = i.at_xpath('person/@uuid')
         uuid_external = i.at_xpath('externalPerson/@uuid')

data/lib/puree/publication.rb

@@ -171,7 +171,6 @@ module Puree
 
     def extract_person
       data = {}
-      # internal
       path = '/persons/personAssociation'
       xpath_result = xpath_query path
       internal = []
@@ -184,7 +183,7 @@ module Puree
         name['first'] = i.xpath('name/firstName').text.strip
         name['last'] = i.xpath('name/lastName').text.strip
         o['name'] = name
-        o['role'] = i.xpath('personRole/term/localizedString').text.strip
+        o['role'] = 'Author'
 
         uuid_internal = i.at_xpath('person/@uuid')
         uuid_external = i.at_xpath('externalPerson/@uuid')

data/lib/puree/version.rb

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

data/spec/dataset.rb

@@ -68,6 +68,10 @@ describe 'Dataset' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
     it '#modified' do
       expect(@p.modified).to be_an_instance_of(String)
     end
@@ -127,6 +131,10 @@ describe 'Dataset' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
   end
 
 end

data/spec/download.rb

@@ -24,6 +24,10 @@ describe 'Download' do
       expect(@metadata).to be_an_instance_of(Array)
     end
 
+    it '#find' do
+      expect(@metadata).not_to be_empty
+    end
+
   end
 
 end

data/spec/event.rb

@@ -56,6 +56,10 @@ describe 'Event' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
     it '#modified' do
       expect(@p.modified).to be_an_instance_of(String)
     end
@@ -91,6 +95,10 @@ describe 'Event' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
   end
 
 end

data/spec/journal.rb

@@ -40,6 +40,10 @@ describe 'Journal' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
     it '#modified' do
       expect(@p.modified).to be_an_instance_of(String)
     end
@@ -75,6 +79,10 @@ describe 'Journal' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
   end
 
 end

data/spec/organisation.rb

@@ -44,6 +44,10 @@ describe 'Organisation' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
     it '#modified' do
       expect(@p.modified).to be_an_instance_of(String)
     end
@@ -95,6 +99,10 @@ describe 'Organisation' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
   end
 
 end

data/spec/person.rb

@@ -52,6 +52,10 @@ describe 'Person' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
     it '#modified' do
       expect(@p.modified).to be_an_instance_of(String)
     end
@@ -87,6 +91,10 @@ describe 'Person' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
   end
 
 end

data/spec/project.rb

@@ -44,6 +44,10 @@ describe 'Project' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
     it '#modified' do
       expect(@p.modified).to be_an_instance_of(String)
     end
@@ -103,6 +107,10 @@ describe 'Project' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
   end
 
 end

data/spec/publication.rb

@@ -56,6 +56,10 @@ describe 'Publication' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
     it '#modified' do
       expect(@p.modified).to be_an_instance_of(String)
     end
@@ -111,6 +115,10 @@ describe 'Publication' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
   end
 
 end

data/spec/publisher.rb

@@ -36,6 +36,10 @@ describe 'Publisher' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
     it '#modified' do
       expect(@p.modified).to be_an_instance_of(String)
     end
@@ -72,6 +76,10 @@ describe 'Publisher' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#metadata' do
+      expect(@p.metadata).not_to be_empty
+    end
+
   end
 
 end

data/spec/server.rb

@@ -23,6 +23,10 @@ describe 'Server' do
       expect(@metadata).to be_an_instance_of(Hash)
     end
 
+    it '#find' do
+      expect(@metadata).not_to be_empty
+    end
+
     it '#version' do
       expect(@p.version).to be_an_instance_of(String)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http