puree 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5010e60daa336c9d45804049400f946af67d8d9e
-  data.tar.gz: 9c6d97bce8924ad81b3213c9066b344f268811ea
+  metadata.gz: a22ff7fedfd49fa3ae29510a7aa3fd532e3c9838
+  data.tar.gz: c879d11f1bf415b156e4959be2dde9119574d962
 SHA512:
-  metadata.gz: 1f15e9d9255f39007b9f1659c2210cfc061298b9e33d0df8fa67bea84a8ecb0d37f5f0de20816fc2da8c97d7c650f613d6afc8fdced6bc7700621b77a376a971
-  data.tar.gz: 2ce7fb3d3b2a7727fc8fea763e901fcc70c50daf04ab701df90be6e63f65fdf0c3628b53e28a8068a5b48cc6a056bc94fcdfe4a321717dbe5a41b4873d83eb2d
+  metadata.gz: e3ca6c455e0773a642bd5ad0bc513dc2a940ddc7c081be05deb0bc6ccd63e11789374a0ad70a12ad4caf8eaacff3d3ececb12fcedebe966880fa01cb6a176289
+  data.tar.gz: cc3a510f29157231b12cb3f47b4b9790638d721583769358b236b45854b98f9d9a9f1ab895d855fd21233494b06520f3c09e7e07ebea9c79fd3223adc763daef

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.12.0 - 2016-05-20
+### Added
+- Resource (created, modified, uuid).
+
 ## 0.11.0 - 2016-05-19
 ### Added
 - Event metadata (city, country, date, description, location, title, type).

data/README.md

@@ -43,12 +43,14 @@ d.get uuid:     'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx',
 d.access
 d.associated
 d.available
+d.created
 d.description
 d.doi
 d.file
 d.geographical
 d.keyword
 d.link
+d.modified
 d.person
 d.production
 d.project
@@ -94,10 +96,11 @@ uuids.each do |uuid|
 end
 ```
 
+## Data structures
 
-## Dataset data structures
+### Dataset
 
-### available
+#### available
 Date made available. If year is present, month and day will have data or an empty string.
 
 ```ruby
@@ -108,7 +111,7 @@ Date made available. If year is present, month and day will have data or an empt
 }
 ```
 
-### file
+#### file
 An array of files.
 
 ```ruby
@@ -127,7 +130,7 @@ An array of files.
 ]
 ```
 
-### link
+#### link
 An array of links.
 
 ```ruby
@@ -139,7 +142,7 @@ An array of links.
 ]
 ```
 
-### person
+#### person
 Contains an array of internal persons, an array of external persons and an array of other persons.
 
 ```ruby
@@ -167,7 +170,7 @@ Contains an array of internal persons, an array of external persons and an array
 }
 ```
 
-### project
+#### project
 An array of projects associated with the dataset.
 
 ```ruby
@@ -179,7 +182,7 @@ An array of projects associated with the dataset.
 ]
 ```
 
-### publication
+#### publication
 An array of research outputs associated with the dataset.
 
 ```ruby
@@ -217,7 +220,7 @@ An array of research outputs associated with the dataset.
 ]
 ```
 
-### production, temporal
+#### production, temporal
 Date range. If year is present, month and day will have data or an empty string.
 
 ```ruby
@@ -235,9 +238,9 @@ Date range. If year is present, month and day will have data or an empty string.
 }
 ```
 
-## Organisation data structures
+### Organisation
 
-### address
+#### address
 An array of addresses.
 
 ```ruby
@@ -252,9 +255,9 @@ An array of addresses.
 ]
 ```
 
-## Publication data structures
+### Publication
 
-### file
+#### file
 An array of files.
 
 ```ruby
@@ -306,7 +309,7 @@ Resource metadata
 :publication
 ```
 
-Resource metadata (single hash only)
+Resource metadata (system data and single hash only)
 
 ```ruby
 :journal

data/lib/puree/dataset.rb

@@ -13,7 +13,7 @@ module Puree
     # @return [Array<Hash>]
     def link
       path = '//links/link'
-      xpath_result =  xpath_query path
+      xpath_result = xpath_query path
       data = []
       xpath_result.each { |i|
         o = {}
@@ -29,7 +29,7 @@ module Puree
     # @return [String]
     def publisher
       path = '//publisher/name'
-      xpath_result =  xpath_query path
+      xpath_result = xpath_query path
       xpath_result ? xpath_result.text.strip : ''
     end
 
@@ -76,7 +76,7 @@ module Puree
     # @return [String]
     def title
       path = '//title/localizedString'
-      xpath_result =  xpath_query path
+      xpath_result = xpath_query path
       xpath_result ? xpath_result.text.strip : ''
     end
 
@@ -95,7 +95,7 @@ module Puree
     # @return [String]
     def description
       path = '//descriptions/classificationDefinedField/value/localizedString'
-      xpath_result =  xpath_query path
+      xpath_result = xpath_query path
       xpath_result ? xpath_result.text.strip : ''
     end
 
@@ -203,7 +203,7 @@ module Puree
     # @return [Array<Hash>]
     def file
       path = '//documents/document'
-      xpath_result =  xpath_query path
+      xpath_result = xpath_query path
 
       docs = []
 
@@ -236,7 +236,7 @@ module Puree
     # @return [String]
     def doi
       path = '//content/doi'
-      xpath_result =  xpath_query path
+      xpath_result = xpath_query path
       xpath_result ? xpath_result.text.strip : ''
     end
 
@@ -250,7 +250,7 @@ module Puree
     #
     # @return [Hash]
     def metadata
-      o = {}
+      o = super
       o['access'] = access
       o['associated'] = associated
       o['available'] = available

data/lib/puree/date.rb

@@ -2,7 +2,7 @@ module Puree
 
   module Date
 
-    # Converts a date with three components (year, month, day) to ISO8601 format
+    # Converts a date with three components (year, month, day) to ISO 8601 date format
     #
     # @param data [Hash]
     # @return [String]
@@ -17,7 +17,7 @@ module Puree
         iso_date
       end
       if !month.empty?
-        # Add leading zero to convert to ISO 8601
+        # Add leading zero to convert to ISO 8601 date component
         if month.length < 2
           month.insert(0, '0')
         end
@@ -26,7 +26,7 @@ module Puree
         iso_date
       end
       if !day.empty?
-        # Add leading zero to convert to ISO 8601
+        # Add leading zero to convert to ISO 8601 date component
         if day.length < 2
           day.insert(0, '0')
         end

data/lib/puree/event.rb

@@ -72,7 +72,7 @@ module Puree
     #
     # @return [Hash]
     def metadata
-      o = {}
+      o = super
       o['city'] = city
       o['country'] = country
       o['date'] = date

data/lib/puree/journal.rb

@@ -8,6 +8,13 @@ module Puree
       super(:journal)
     end
 
+    # All metadata
+    #
+    # @return [Hash]
+    def metadata
+      super
+    end
+
   end
 
 end

data/lib/puree/map.rb

@@ -44,6 +44,7 @@ module Puree
       end
     end
 
+
   end
 
 end

data/lib/puree/organisation.rb

@@ -64,7 +64,7 @@ module Puree
     # @return [String]
     def type
       path = '//content/typeClassification/term/localizedString'
-      xpath_result =  xpath_query path
+      xpath_result = xpath_query path
       xpath_result ? xpath_result.text.strip : ''
     end
 
@@ -73,7 +73,7 @@ module Puree
     # @return [Array<String>]
     def url
       path = '//content/webAddresses/classificationDefinedFieldExtension/value/localizedString'
-      xpath_result =  xpath_query path
+      xpath_result = xpath_query path
       arr = []
       xpath_result.each { |i| arr << i.text.strip }
       arr.uniq
@@ -83,7 +83,7 @@ module Puree
     #
     # @return [Hash]
     def metadata
-      o = {}
+      o = super
       o['address'] = address
       o['email'] = email
       o['name'] = name

data/lib/puree/person.rb

@@ -16,7 +16,7 @@ module Puree
       xpath_result =  xpath_query path
       affiliations = []
       xpath_result.each { |i| affiliations << i.text }
-      return affiliations.uniq
+      affiliations.uniq
     end
 
     # Image
@@ -38,7 +38,7 @@ module Puree
       xpath_result =  xpath_query path
       data = []
       xpath_result.each { |i| data << i.text }
-      return data.uniq
+      data.uniq
     end
 
     # Name
@@ -66,7 +66,7 @@ module Puree
     #
     # @return [Hash]
     def metadata
-      o = {}
+      o = super
       o['affiliation'] = affiliation
       o['image'] = image
       o['keyword'] = keyword

data/lib/puree/project.rb

@@ -8,6 +8,13 @@ module Puree
       super(:project)
     end
 
+    # All metadata
+    #
+    # @return [Hash]
+    def metadata
+      super
+    end
+
   end
 
 end

data/lib/puree/publication.rb

@@ -50,7 +50,7 @@ module Puree
     # @return [String]
     def title
       path = '//content/title'
-      xpath_result =  xpath_query path
+      xpath_result = xpath_query path
       xpath_result ? xpath_result.text.strip : ''
     end
 
@@ -59,7 +59,7 @@ module Puree
     # @return [String]
     def subtitle
       path = '//content/subtitle'
-      xpath_result =  xpath_query path
+      xpath_result = xpath_query path
       xpath_result ? xpath_result.text.strip : ''
     end
 
@@ -67,7 +67,7 @@ module Puree
     #
     # @return [Hash]
     def metadata
-      o = {}
+      o = super
       o['description'] = description
       o['doi'] = doi
       o['file'] = file

data/lib/puree/publisher.rb

@@ -8,6 +8,13 @@ module Puree
       super(:publisher)
     end
 
+    # All metadata
+    #
+    # @return [Hash]
+    def metadata
+      super
+    end
+
   end
 
 end

data/lib/puree/resource.rb

@@ -83,7 +83,40 @@ module Puree
       @content ? @content : {}
     end
 
+    # Created (UTC datetime)
+    #
+    # @return [String]
+    def created
+      data = node 'created'
+      !data.nil? && !data.empty? ? data.strip : ''
+    end
+
+    # Modified (UTC datetime)
+    #
+    # @return [String]
+    def modified
+      data = node 'modified'
+      !data.nil? && !data.empty? ? data.strip : ''
+    end
+
+    # UUID
+    #
+    # @return [String]
+    def uuid
+      data = node 'uuid'
+      !data.nil? && !data.empty? ? data.strip : ''
+    end
 
+    # All metadata
+    #
+    # @return [Hash]
+    def metadata
+      o = {}
+      o['uuid'] = uuid
+      o['created'] = created
+      o['modified'] = modified
+      o
+    end
 
     private
 
@@ -132,5 +165,6 @@ module Puree
       doc.xpath path
     end
 
+
   end
 end

data/lib/puree/version.rb

@@ -1,3 +1,3 @@
 module Puree
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/spec/dataset.rb

@@ -32,6 +32,10 @@ describe 'Dataset' do
       expect(@p.available).to be_an_instance_of(Hash)
     end
 
+    it '#created' do
+      expect(@p.created).to be_an_instance_of(String)
+    end
+
     it '#description' do
       expect(@p.description).to be_an_instance_of(String)
     end
@@ -60,6 +64,10 @@ describe 'Dataset' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
+    it '#modified' do
+      expect(@p.modified).to be_an_instance_of(String)
+    end
+
     it '#person' do
       expect(@p.person).to be_an_instance_of(Hash)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty