puree 0.15.0 → 0.16.0

data/lib/puree/person.rb

@@ -4,24 +4,70 @@ module Puree
   #
   class Person < Resource
 
-    # @param endpoint [String]
-    # @param optional username [String]
-    # @param optional password [String]
-    # @param optional basic_auth [Boolean]
-    def initialize(endpoint: nil, username: nil, password: nil, basic_auth: nil)
+    # @param base_url [String]
+    # @param username [String]
+    # @param password [String]
+    # @param basic_auth [Boolean]
+    def initialize(base_url: nil, username: nil, password: nil, basic_auth: nil)
       super(api: :person,
-            endpoint: endpoint,
+            base_url: base_url,
             username: username,
             password: password,
             basic_auth: basic_auth)
     end
 
-
-
     # Affiliation
     #
     # @return [Array<Hash>]
     def affiliation
+      @metadata['affiliation']
+    end
+
+    # Email
+    #
+    # @return [Array]
+    def email
+      @metadata['email']
+    end
+
+    # Image URL
+    #
+    # @return [Array<String>]
+    def image
+      @metadata['image']
+    end
+
+    # Keyword
+    #
+    # @return [Array<String>]
+    def keyword
+      @metadata['keyword']
+    end
+
+    # Name
+    #
+    # @return [Hash]
+    def name
+      @metadata['name']
+    end
+
+    # ORCID
+    #
+    # @return [String]
+    def orcid
+      @metadata['orcid']
+    end
+
+    # All metadata
+    #
+    # @return [Hash]
+    def metadata
+      @metadata
+    end
+
+    private
+
+    def extract_affiliation
       path = '//organisation'
       xpath_result =  xpath_query path
       data_arr = []
@@ -34,10 +80,7 @@ module Puree
       data_arr.uniq
     end
 
-    # Email
-    #
-    # @return [Array]
-    def email
+    def extract_email
       path = '//emails/classificationDefinedStringFieldExtension/value'
       xpath_result =  xpath_query path
       data = []
@@ -45,10 +88,7 @@ module Puree
       data.uniq
     end
 
-    # Image URL
-    #
-    # @return [Array<String>]
-    def image
+    def extract_image
       path = '/photos/file/url'
       xpath_result =  xpath_query path
       data = []
@@ -56,10 +96,7 @@ module Puree
       data.uniq
     end
 
-    # Keyword
-    #
-    # @return [Array<String>]
-    def keyword
+    def extract_keyword
       path = '//keywordGroup/keyword/userDefinedKeyword/freeKeyword'
       xpath_result =  xpath_query path
       data = []
@@ -67,10 +104,7 @@ module Puree
       data.uniq
     end
 
-    # Name
-    #
-    # @return [Hash]
-    def name
+    def extract_name
       path = '/name'
       xpath_result =  xpath_query path
       first = xpath_result.xpath('firstName').text.strip
@@ -81,26 +115,20 @@ module Puree
       o
     end
 
-    # ORCID
-    #
-    # @return [String]
-    def orcid
+    def extract_orcid
       path = '/orcid'
       xpath_query_for_single_value path
     end
 
-    # All metadata
-    #
-    # @return [Hash]
-    def metadata
+    def combine_metadata
       o = super
-      o['affiliation'] = affiliation
-      o['email'] = email
-      o['image'] = image
-      o['keyword'] = keyword
-      o['name'] = name
-      o['orcid'] = orcid
-      o
+      o['affiliation'] = extract_affiliation
+      o['email'] = extract_email
+      o['image'] = extract_image
+      o['keyword'] = extract_keyword
+      o['name'] = extract_name
+      o['orcid'] = extract_orcid
+      @metadata = o
     end
 
   end

data/lib/puree/project.rb

@@ -4,41 +4,110 @@ module Puree
   #
   class Project < Resource
 
-    # @param endpoint [String]
-    # @param optional username [String]
-    # @param optional password [String]
-    # @param optional basic_auth [Boolean]
-    def initialize(endpoint: nil, username: nil, password: nil, basic_auth: nil)
+    # @param base_url [String]
+    # @param username [String]
+    # @param password [String]
+    # @param basic_auth [Boolean]
+    def initialize(base_url: nil, username: nil, password: nil, basic_auth: nil)
       super(api: :project,
-            endpoint: endpoint,
+            base_url: base_url,
             username: username,
             password: password,
             bleeding: false,
             basic_auth: basic_auth)
     end
 
-
-
     # Acronym
     #
     # @return [String]
     def acronym
-      path = '/acronym'
-      xpath_query_for_single_value path
+      @metadata['acronym']
     end
 
     # Description
     #
     # @return [String]
     def description
-      path = '/description/localizedString'
-      xpath_query_for_single_value path
+      @metadata['description']
     end
 
     # Organisation
     #
     # @return [Array<Hash>]
     def organisation
+      @metadata['organisation']
+    end
+
+    # Owner
+    #
+    # @return [Hash]
+    def owner
+      @metadata['owner']
+    end
+
+    # Person (internal, external, other)
+    #
+    # @return [Array<Hash>]
+    def person
+      @metadata['person']
+    end
+
+    # Status
+    #
+    # @return [String]
+    def status
+      @metadata['status']
+    end
+
+    # Temporal, expected and actual start and end dates as UTC datetime.
+    #
+    # @return [Hash]
+    def temporal
+      @metadata['temporal']
+    end
+
+    # Title
+    #
+    # @return [String]
+    def title
+      @metadata['title']
+    end
+
+    # Type
+    #
+    # @return [String]
+    def type
+      @metadata['type']
+    end
+
+    # URL
+    #
+    # @return [String]
+    def url
+      @metadata['url']
+    end
+
+    # All metadata
+    #
+    # @return [Hash]
+    def metadata
+      @metadata
+    end
+
+
+    private
+
+    def extract_acronym
+      path = '/acronym'
+      xpath_query_for_single_value path
+    end
+
+    def extract_description
+      path = '/description/localizedString'
+      xpath_query_for_single_value path
+    end
+
+    def extract_organisation
       path = '/organisations/association/organisation'
       xpath_result = xpath_query path
       data = []
@@ -52,10 +121,7 @@ module Puree
       data
     end
 
-    # Owner
-    #
-    # @return [Hash]
-    def owner
+    def extract_owner
       path = '/owner'
       xpath_result =  xpath_query path
       o = {}
@@ -65,10 +131,7 @@ module Puree
       o
     end
 
-    # Person (internal, external, other)
-    #
-    # @return [Array<Hash>]
-    def person
+    def extract_person
       data = {}
       # internal
       path = '/persons/participantAssociation'
@@ -104,18 +167,12 @@ module Puree
       data
     end
 
-    # Status
-    #
-    # @return [String]
-    def status
+    def extract_status
       path = '/status/term/localizedString'
       xpath_query_for_single_value path
     end
 
-    # Temporal, expected and actual start and end dates as UTC datetime.
-    #
-    # @return [Hash]
-    def temporal
+    def extract_temporal
       o = {}
       o['expected'] = {}
       o['actual'] = {}
@@ -139,46 +196,34 @@ module Puree
       o
     end
 
-    # Title
-    #
-    # @return [String]
-    def title
+    def extract_title
       path = '/title/localizedString'
       xpath_query_for_single_value path
     end
 
-    # Type
-    #
-    # @return [String]
-    def type
+    def extract_type
       path = '/typeClassification/term/localizedString'
       xpath_query_for_single_value path
     end
 
-    # URL
-    #
-    # @return [String]
-    def url
+    def extract_url
       path = '/projectURL'
       xpath_query_for_single_value path
     end
 
-    # All metadata
-    #
-    # @return [Hash]
-    def metadata
+    def combine_metadata
       o = super
-      o['acronym'] = acronym
-      o['description'] = description
-      o['organisation'] = organisation
-      o['owner'] = owner
-      o['person'] = person
-      o['status'] = status
-      o['temporal'] = temporal
-      o['title'] = title
-      o['type'] = type
-      o['url'] = url
-      o
+      o['acronym'] = extract_acronym
+      o['description'] = extract_description
+      o['organisation'] = extract_organisation
+      o['owner'] = extract_owner
+      o['person'] = extract_person
+      o['status'] = extract_status
+      o['temporal'] = extract_temporal
+      o['title'] = extract_title
+      o['type'] = extract_type
+      o['url'] = extract_url
+      @metadata = o
     end
 
   end

data/lib/puree/publication.rb

@@ -4,13 +4,13 @@ module Puree
   #
   class Publication < Resource
 
-    # @param endpoint [String]
-    # @param optional username [String]
-    # @param optional password [String]
-    # @param optional basic_auth [Boolean]
-    def initialize(endpoint: nil, username: nil, password: nil, basic_auth: nil)
+    # @param base_url [String]
+    # @param username [String]
+    # @param password [String]
+    # @param basic_auth [Boolean]
+    def initialize(base_url: nil, username: nil, password: nil, basic_auth: nil)
       super(api: :publication,
-            endpoint: endpoint,
+            base_url: base_url,
             username: username,
             password: password,
             basic_auth: basic_auth)
@@ -20,42 +20,121 @@ module Puree
     #
     # @return [String]
     def category
-      path = '/publicationCategory/publicationCategory/term/localizedString'
-      xpath_query_for_single_value path
+      @metadata['category']
     end
 
     # Description
     #
     # @return [String]
     def description
-      path = '/abstract/localizedString'
-      xpath_query_for_single_value path
+      @metadata['description']
     end
 
     # Event
     #
     # @return [Hash]
     def event
-      path = '/event'
-      xpath_result = xpath_query path
-      o = {}
-      o['uuid'] = xpath_result.xpath('@uuid').text.strip
-      o['title'] = xpath_result.xpath('title/localizedString').text.strip
-      o
+      @metadata['event']
     end
 
     # Digital Object Identifier
     #
     # @return [String]
     def doi
-      path = '//doi'
-      xpath_query_for_single_value path
+      @metadata['doi']
     end
 
     # Supporting file
     #
     # @return [Array<Hash>]
     def file
+      @metadata['file']
+    end
+
+    # Organisation
+    #
+    # @return [Array<Hash>]
+    def organisation
+      @metadata['organisation']
+    end
+
+    # Page
+    #
+    # @return [Array<String>]
+    def page
+      @metadata['page']
+    end
+
+    # Person (internal, external, other)
+    #
+    # @return [Array<Hash>]
+    def person
+      @metadata['person']
+    end
+
+    # Status
+    #
+    # @return [Array<Hash>]
+    def status
+      @metadata['status']
+    end
+
+    # Title
+    #
+    # @return [String]
+    def title
+      @metadata['title']
+    end
+
+    # Subtitle
+    #
+    # @return [String]
+    def subtitle
+      @metadata['subtitle']
+    end
+
+    # Type
+    #
+    # @return [String]
+    def type
+      @metadata['type']
+    end
+
+    # All metadata
+    #
+    # @return [Hash]
+    def metadata
+      @metadata
+    end
+
+
+    private
+
+    def extract_category
+      path = '/publicationCategory/publicationCategory/term/localizedString'
+      xpath_query_for_single_value path
+    end
+
+    def extract_description
+      path = '/abstract/localizedString'
+      xpath_query_for_single_value path
+    end
+
+    def extract_event
+      path = '/event'
+      xpath_result = xpath_query path
+      o = {}
+      o['uuid'] = xpath_result.xpath('@uuid').text.strip
+      o['title'] = xpath_result.xpath('title/localizedString').text.strip
+      o
+    end
+
+    def extract_doi
+      path = '//doi'
+      xpath_query_for_single_value path
+    end
+
+    def extract_file
       path = '/electronicVersionAssociations/electronicVersionFileAssociations/electronicVersionFileAssociation/file'
       xpath_result = xpath_query path
       docs = []
@@ -71,10 +150,7 @@ module Puree
       docs.uniq
     end
 
-    # Organisation
-    #
-    # @return [Array<Hash>]
-    def organisation
+    def extract_organisation
       path = '/organisations/association/organisation'
       xpath_result = xpath_query path
       data = []
@@ -88,18 +164,12 @@ module Puree
       data
     end
 
-    # Page
-    #
-    # @return [Array<String>]
-    def page
+    def extract_page
       path = '/numberOfPages'
       xpath_query_for_single_value path
     end
 
-    # Person (internal, external, other)
-    #
-    # @return [Array<Hash>]
-    def person
+    def extract_person
       data = {}
       # internal
       path = '/persons/personAssociation'
@@ -135,10 +205,7 @@ module Puree
       data
     end
 
-    # Status
-    #
-    # @return [Array<Hash>]
-    def status
+    def extract_status
       path = '/publicationStatuses/publicationStatus'
       xpath_result = xpath_query path
       data = []
@@ -155,48 +222,36 @@ module Puree
       data
     end
 
-    # Title
-    #
-    # @return [String]
-    def title
+    def extract_title
       path = '/title'
       xpath_query_for_single_value path
     end
 
-    # Subtitle
-    #
-    # @return [String]
-    def subtitle
+    def extract_subtitle
       path = '/subtitle'
       xpath_query_for_single_value path
     end
 
-    # Type
-    #
-    # @return [String]
-    def type
+    def extract_type
       path = '/typeClassification/term/localizedString'
       xpath_query_for_single_value path
     end
 
-    # All metadata
-    #
-    # @return [Hash]
-    def metadata
+    def combine_metadata
       o = super
-      o['category'] = category
-      o['description'] = description
-      o['doi'] = doi
-      o['event'] = event
-      o['file'] = file
-      o['organisation'] = organisation
-      o['page'] = page
-      o['person'] = person
-      o['status'] = status
-      o['subtitle'] = subtitle
-      o['title'] = title
-      o['type'] = type
-      o
+      o['category'] = extract_category
+      o['description'] = extract_description
+      o['doi'] = extract_doi
+      o['event'] = extract_event
+      o['file'] = extract_file
+      o['organisation'] = extract_organisation
+      o['page'] = extract_page
+      o['person'] = extract_person
+      o['status'] = extract_status
+      o['subtitle'] = extract_subtitle
+      o['title'] = extract_title
+      o['type'] = extract_type
+      @metadata = o
     end
 
   end