puree 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 702c6796091f8038d2f16e64a08771e0c7de343a
-  data.tar.gz: 159ce8cf44a772788a75d09c805646270b6a4191
+  metadata.gz: 1a632a407b779c5a615440921a4f68b102720cf4
+  data.tar.gz: f5c253baddaf154171a1e48b8bfed12f8164faf1
 SHA512:
-  metadata.gz: 016eab3513888247691e34ebf767d229cbf93cd60a0e29b06473a81a697334fd3e4de07da7153b11050e7042e9806483640b9d7b6afa2a70e1096a8043d8702b
-  data.tar.gz: 7ccfa0e8cc2c138dfd7fe9cb54b27889172e29d4c7055d942b578b4b47fc7f3f43991d67d320f90a5deb579eaa47da69c9bb9730f72bae0854d4a5a2088dde64
+  metadata.gz: 77cb22c6d59964e383dea0f8aea621c7d11cbd62929a91c4a34636c21a8d17cbce45907d6b9d637c7390a3002e65b6b78be27ffce46ee1e251ed7e8f7c66cbfb
+  data.tar.gz: 0adf28ac11d47aae6767f7e36c92eda2736d92391b6bfe7b9730c86a96d015dffce02d1e533cbab52c664792070dc67c9302c72e1e89a697d47f5ff4abf54dbf

data/CHANGELOG.md

@@ -7,6 +7,14 @@ 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.17.0 - 2016-09-02
+### Added
+- Resource subclasses - uuid, created, modified as methods.
+- Resource subclasses - set content from XML string.
+
+### Fixed
+- Organisation - organisation extraction.
+
 ## 0.16.1 - 2016-08-30
 ### Fixed
 - Dataset, Project, Publication - person uuid returns text rather than a Nokogiri object.

data/README.md

@@ -50,8 +50,4 @@ metadata = c.find limit: 50
 ## Documentation
 [API in YARD](http://www.rubydoc.info/gems/puree)
 
-[Detailed usage](https://github.com/lulibrary/puree/wiki)
-
-
-
-
+[Detailed usage in GitBook](https://aalbinclark.gitbooks.io/puree)

data/lib/puree.rb

@@ -17,6 +17,8 @@ require 'puree/download'
 require 'puree/server'
 require 'puree/version'
 
+# Top level namespace
+#
 module Puree
 
   class << self

data/lib/puree/configuration.rb

@@ -1,5 +1,7 @@
 module Puree
 
+  # Configuration options
+  #
   module Configuration
 
       attr_accessor :base_url, :username, :password, :basic_auth

data/lib/puree/date.rb

@@ -1,5 +1,7 @@
 module Puree
 
+  # Date utilities
+  #
   module Date
 
     # Converts a date with three components (year, month, day) to ISO 8601 date format

data/lib/puree/map.rb

@@ -1,5 +1,7 @@
 module Puree
 
+  # Pure API map
+  #
   class Map
 
     def initialize
@@ -36,7 +38,7 @@ module Puree
       # add_family
     end
 
-    # Pure API map
+    # Get
     #
     # @return [Hash]
     def get

data/lib/puree/organisation.rb

@@ -164,6 +164,7 @@ module Puree
       o['address'] = extract_address
       o['email'] = extract_email
       o['name'] = extract_name
+      o['organisation'] = extract_organisation
       o['parent'] = extract_parent
       o['phone'] = extract_phone
       o['type'] = extract_type

data/lib/puree/project.rb

@@ -47,7 +47,7 @@ module Puree
 
     # Person (internal, external, other)
     #
-    # @return [Array<Hash>]
+    # @return [Hash<Array,Array,Array>]
     def person
       @metadata['person']
     end

data/lib/puree/publication.rb

@@ -60,14 +60,14 @@ module Puree
 
     # Page
     #
-    # @return [Array<String>]
+    # @return [String]
     def page
       @metadata['page']
     end
 
     # Person (internal, external, other)
     #
-    # @return [Array<Hash>]
+    # @return [Hash<Array,Array,Array>]
     def person
       @metadata['person']
     end

data/lib/puree/resource.rb

@@ -27,6 +27,12 @@ module Puree
         @username = username.nil? ? Puree.username : username
         @password = password.nil? ? Puree.password : password
       end
+      @metadata = {}
+      @options = {
+          basic_auth:     @basic_auth,
+          latest_api:     @latest_api,
+          resource_type:  @resource_type.to_sym
+      }
     end
 
     # Get
@@ -37,14 +43,9 @@ module Puree
     def get(uuid: nil, id: nil, rendering: :xml_long)
       reset
 
-      @options = {
-          basic_auth:     @basic_auth,
-          latest_api:     @latest_api,
-          resource_type:  @resource_type.to_sym,
-          rendering:      rendering,
-          uuid:           uuid,
-          id:             id
-      }
+      @options[:rendering] = rendering
+      @options[:uuid] = uuid
+      @options[:id] = id
 
       missing = missing_credentials
       if !missing.empty?
@@ -76,8 +77,8 @@ module Puree
         end
       end
 
-      if @options['rendering']
-        query['rendering'] = @options['rendering']
+      if @options[:rendering]
+        query['rendering'] = @options[:rendering]
       end
 
       begin
@@ -87,8 +88,7 @@ module Puree
           req = req.auth headers['Authorization']
         end
         @response = req.get(url, params: query)
-        @doc = Nokogiri::XML @response.body
-        @doc.remove_namespaces!
+        make_doc @response.body
 
       rescue HTTP::Error => e
         puts 'HTTP::Error '+ e.message
@@ -98,47 +98,57 @@ module Puree
 
     end
 
-    # Set content
+    # UUID
     #
-    # @param content [Hash]
-    def set_content(content)
-      if !content.nil? && !content.empty?
-        @content = content
-      else
-        @content = {}
-      end
+    # @return [String]
+    def uuid
+      @metadata['uuid']
     end
 
-    # Content
+    # Created (UTC datetime)
     #
-    # @return [Hash]
-    def content
-      @content ? @content : {}
+    # @return [String]
+    def created
+      @metadata['created']
     end
 
+    # Modified (UTC datetime)
+    #
+    # @return [String]
+    def modified
+      @metadata['modified']
+    end
 
+    # Set content from XML. In order for metadata extraction to work, the XML must have
+    # been retrieved using the .current version of the Pure API endpoints
+    #
+    # @param xml [String]
+    def set_content(xml)
+      if xml
+        make_doc xml
+        if get_data?
+          combine_metadata
+        end
+      end
+    end
 
     private
 
-    # Created (UTC datetime)
-    #
-    # @return [String]
+    def make_doc(xml)
+      @doc = Nokogiri::XML xml
+      @doc.remove_namespaces!
+    end
+
     def extract_created
       path = '/created'
       xpath_query_for_single_value path
     end
 
-    # Modified (UTC datetime)
-    #
-    # @return [String]
     def extract_modified
       path = '/modified'
       xpath_query_for_single_value path
     end
 
-    # UUID
-    #
-    # @return [String]
     def extract_uuid
       path = '/@uuid'
       xpath_query_for_single_value path
@@ -232,5 +242,6 @@ module Puree
 
     alias :find :get
 
+
   end
 end

data/lib/puree/server.rb

@@ -22,6 +22,7 @@ module Puree
         @username = username.nil? ? Puree.username : username
         @password = password.nil? ? Puree.password : password
       end
+      @metadata = {}
     end
 
     # Get

data/lib/puree/version.rb

@@ -1,3 +1,5 @@
 module Puree
-  VERSION = "0.16.1"
+  # Semantic version number
+  #
+  VERSION = "0.17.0"
 end

data/puree.gemspec

@@ -10,9 +10,8 @@ Gem::Specification.new do |spec|
   spec.email         = ["a.albin-clark@lancaster.ac.uk"]
   spec.summary       = %q{A client for the Pure Research Information System API.}
   spec.description   = %q{Consumes the Pure Research Information System API and puts the metadata into simple data structures.}
-  spec.homepage      = "https://github.com/lulibrary/puree.git"
+  spec.homepage      = "https://rubygems.org/gems/puree/"
   spec.license       = "MIT"
-
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/spec/dataset.rb

@@ -2,6 +2,18 @@ require 'spec_helper'
 
 describe 'Dataset' do
 
+  def request
+    base_url = ENV['PURE_BASE_URL']
+    username = ENV['PURE_USERNAME']
+    password = ENV['PURE_PASSWORD']
+    @uuid = ENV['PURE_DATASET_UUID']
+    @p = Puree::Dataset.new(base_url: base_url,
+                            username: username,
+                            password: password,
+                            basic_auth: true)
+    @metadata = @p.find uuid: @uuid
+  end
+
   it '#new' do
     p = Puree::Dataset.new
     expect(p).to be_an_instance_of Puree::Dataset
@@ -9,93 +21,111 @@ describe 'Dataset' do
 
   describe 'data retrieval' do
     before(:all) do
-      base_url = ENV['PURE_BASE_URL']
-      username = ENV['PURE_USERNAME']
-      password = ENV['PURE_PASSWORD']
-      uuid = ENV['PURE_DATASET_UUID']
-      @p = Puree::Dataset.new(base_url: base_url,
-                              username: username,
-                              password: password,
-                              basic_auth: true)
-      @metadata = @p.find uuid: uuid
-    end
-
-    it '@metadata' do
+      request
+    end
+
+    it '#find' do
       expect(@metadata).to be_an_instance_of(Hash)
     end
 
     it '#access' do
-      expect(@metadata['access']).to be_an_instance_of(String)
+      expect(@p.access).to be_an_instance_of(String)
     end
 
     it '#associated' do
-      expect(@metadata['associated']).to be_an_instance_of(Array)
+      expect(@p.associated).to be_an_instance_of(Array)
     end
 
     it '#available' do
-      expect(@metadata['available']).to be_an_instance_of(Hash)
+      expect(@p.available).to be_an_instance_of(Hash)
     end
 
     it '#created' do
-      expect(@metadata['created']).to be_an_instance_of(String)
+      expect(@p.created).to be_an_instance_of(String)
     end
 
     it '#description' do
-      expect(@metadata['description']).to be_an_instance_of(String)
+      expect(@p.description).to be_an_instance_of(String)
     end
 
     it '#doi' do
-      expect(@metadata['doi']).to be_an_instance_of(String)
+      expect(@p.doi).to be_an_instance_of(String)
     end
 
     it '#file' do
-      expect(@metadata['file']).to be_an_instance_of(Array)
+      expect(@p.file).to be_an_instance_of(Array)
     end
 
     it '#keyword' do
-      expect(@metadata['keyword']).to be_an_instance_of(Array)
+      expect(@p.keyword).to be_an_instance_of(Array)
     end
 
     it '#link' do
-      expect(@metadata['link']).to be_an_instance_of(Array)
+      expect(@p.link).to be_an_instance_of(Array)
+    end
+
+    it '#metadata' do
+      expect(@p.metadata).to be_an_instance_of(Hash)
     end
 
     it '#modified' do
-      expect(@metadata['modified']).to be_an_instance_of(String)
+      expect(@p.modified).to be_an_instance_of(String)
     end
 
     it '#person' do
-      expect(@metadata['person']).to be_an_instance_of(Hash)
+      expect(@p.person).to be_an_instance_of(Hash)
     end
 
     it '#production' do
-      expect(@metadata['production']).to be_an_instance_of(Hash)
+      expect(@p.production).to be_an_instance_of(Hash)
     end
 
     it '#project' do
-      expect(@metadata['project']).to be_an_instance_of(Array)
+      expect(@p.project).to be_an_instance_of(Array)
     end
 
     it '#publication' do
-      expect(@metadata['publication']).to be_an_instance_of(Array)
+      expect(@p.publication).to be_an_instance_of(Array)
     end
 
     it '#publisher' do
-      expect(@metadata['publisher']).to be_an_instance_of(String)
+      expect(@p.publisher).to be_an_instance_of(String)
     end
 
     it '#spatial' do
-      expect(@metadata['spatial']).to be_an_instance_of(Array)
+      expect(@p.spatial).to be_an_instance_of(Array)
     end
 
     it '#temporal' do
-      expect(@metadata['temporal']).to be_an_instance_of(Hash)
+      expect(@p.temporal).to be_an_instance_of(Hash)
     end
 
     it '#title' do
-      expect(@metadata['title']).to be_an_instance_of(String)
+      expect(@p.title).to be_an_instance_of(String)
+    end
+
+    it '#uuid' do
+      expect(@p.uuid).to be_an_instance_of(String)
+    end
+  end
+
+  describe 'data retrieval from file' do
+    before(:all) do
+      request
+
+      filename = "#{ENV['PURE_FILE_PATH']}dataset.#{@uuid}.xml"
+      File.write(filename, @p.response.body)
+
+      @metadata = @p.set_content File.read(filename)
     end
 
+    it '#set_content' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#metadata' do
+      expect(@p.metadata).to be_an_instance_of(Hash)
+    end
 
   end
 

data/spec/download.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'Download' do
+
+  it '#new' do
+    p = Puree::Download.new
+    expect(p).to be_an_instance_of Puree::Download
+  end
+
+  describe 'data retrieval' do
+    before(:all) do
+      base_url = ENV['PURE_BASE_URL']
+      username = ENV['PURE_USERNAME']
+      password = ENV['PURE_PASSWORD']
+      @p = Puree::Download.new(base_url: base_url,
+                              username: username,
+                              password: password,
+                              basic_auth: true)
+      @metadata = @p.find resource: :dataset,
+                          limit:    10
+    end
+
+    it '#find' do
+      expect(@metadata).to be_an_instance_of(Array)
+    end
+
+  end
+
+end

data/spec/event.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+describe 'Event' do
+
+  def request
+    base_url = ENV['PURE_BASE_URL']
+    username = ENV['PURE_USERNAME']
+    password = ENV['PURE_PASSWORD']
+    @uuid = ENV['PURE_EVENT_UUID']
+    @p = Puree::Event.new(base_url: base_url,
+                            username: username,
+                            password: password,
+                            basic_auth: true)
+    @metadata = @p.find uuid: @uuid
+  end
+
+  it '#new' do
+    p = Puree::Event.new
+    expect(p).to be_an_instance_of Puree::Event
+  end
+
+  describe 'data retrieval' do
+    before(:all) do
+      request
+    end
+
+    it '#find' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#city' do
+      expect(@p.city).to be_an_instance_of(String)
+    end
+
+    it '#country' do
+      expect(@p.country).to be_an_instance_of(String)
+    end
+
+    it '#created' do
+      expect(@p.created).to be_an_instance_of(String)
+    end
+
+    it '#date' do
+      expect(@p.date).to be_an_instance_of(Hash)
+    end
+
+    it '#description' do
+      expect(@p.description).to be_an_instance_of(String)
+    end
+
+    it '#location' do
+      expect(@p.location).to be_an_instance_of(String)
+    end
+
+    it '#metadata' 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 '#title' do
+      expect(@p.title).to be_an_instance_of(String)
+    end
+
+    it '#type' do
+      expect(@p.type).to be_an_instance_of(String)
+    end
+
+    it '#uuid' do
+      expect(@p.uuid).to be_an_instance_of(String)
+    end
+  end
+
+  describe 'data retrieval from file' do
+    before(:all) do
+      request
+
+      filename = "#{ENV['PURE_FILE_PATH']}event.#{@uuid}.xml"
+      File.write(filename, @p.response.body)
+
+      @metadata = @p.set_content File.read(filename)
+    end
+
+    it '#set_content' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#metadata' do
+      expect(@p.metadata).to be_an_instance_of(Hash)
+    end
+
+  end
+
+end

data/spec/journal.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe 'Journal' do
+
+  def request
+    base_url = ENV['PURE_BASE_URL']
+    username = ENV['PURE_USERNAME']
+    password = ENV['PURE_PASSWORD']
+    @uuid = ENV['PURE_JOURNAL_UUID']
+    @p = Puree::Journal.new(base_url: base_url,
+                          username: username,
+                          password: password,
+                          basic_auth: true)
+    @metadata = @p.find uuid: @uuid
+  end
+
+  it '#new' do
+    p = Puree::Journal.new
+    expect(p).to be_an_instance_of Puree::Journal
+  end
+
+  describe 'data retrieval' do
+    before(:all) do
+      request
+    end
+
+    it '#find' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#created' do
+      expect(@p.created).to be_an_instance_of(String)
+    end
+
+    it '#metadata' 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 '#uuid' do
+      expect(@p.uuid).to be_an_instance_of(String)
+    end
+  end
+
+  describe 'data retrieval from file' do
+    before(:all) do
+      request
+
+      filename = "#{ENV['PURE_FILE_PATH']}journal.#{@uuid}.xml"
+      File.write(filename, @p.response.body)
+
+      @metadata = @p.set_content File.read(filename)
+    end
+
+    it '#set_content' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#metadata' do
+      expect(@p.metadata).to be_an_instance_of(Hash)
+    end
+
+  end
+
+end

data/spec/organisation.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+describe 'Organisation' do
+
+  def request
+    base_url = ENV['PURE_BASE_URL']
+    username = ENV['PURE_USERNAME']
+    password = ENV['PURE_PASSWORD']
+    @uuid = ENV['PURE_ORGANISATION_UUID']
+    @p = Puree::Organisation.new(base_url: base_url,
+                            username: username,
+                            password: password,
+                            basic_auth: true)
+    @metadata = @p.find uuid: @uuid
+  end
+
+  it '#new' do
+    p = Puree::Organisation.new
+    expect(p).to be_an_instance_of Puree::Organisation
+  end
+
+  describe 'data retrieval' do
+    before(:all) do
+      request
+    end
+
+    it '#find' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#address' do
+      expect(@p.address).to be_an_instance_of(Array)
+    end
+
+    it '#created' do
+      expect(@p.created).to be_an_instance_of(String)
+    end
+
+    it '#email' do
+      expect(@p.email).to be_an_instance_of(Array)
+    end
+
+    it '#metadata' 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 '#name' do
+      expect(@p.name).to be_an_instance_of(String)
+    end
+
+    it '#organisation' do
+      expect(@p.organisation).to be_an_instance_of(Array)
+    end
+
+    it '#parent' do
+      expect(@p.parent).to be_an_instance_of(Hash)
+    end
+
+    it '#phone' do
+      expect(@p.phone).to be_an_instance_of(Array)
+    end
+
+    it '#type' do
+      expect(@p.type).to be_an_instance_of(String)
+    end
+
+    it '#url' do
+      expect(@p.url).to be_an_instance_of(Array)
+    end
+
+    it '#uuid' do
+      expect(@p.uuid).to be_an_instance_of(String)
+    end
+  end
+
+  describe 'data retrieval from file' do
+    before(:all) do
+      request
+
+      filename = "#{ENV['PURE_FILE_PATH']}organisation.#{@uuid}.xml"
+      File.write(filename, @p.response.body)
+
+      @metadata = @p.set_content File.read(filename)
+    end
+
+    it '#set_content' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#metadata' do
+      expect(@p.metadata).to be_an_instance_of(Hash)
+    end
+
+  end
+
+end

data/spec/person.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe 'Person' do
+
+  def request
+    base_url = ENV['PURE_BASE_URL']
+    username = ENV['PURE_USERNAME']
+    password = ENV['PURE_PASSWORD']
+    @uuid = ENV['PURE_PERSON_UUID']
+    @p = Puree::Person.new(base_url: base_url,
+                                 username: username,
+                                 password: password,
+                                 basic_auth: true)
+    @metadata = @p.find uuid: @uuid
+  end
+
+  it '#new' do
+    p = Puree::Person.new
+    expect(p).to be_an_instance_of Puree::Person
+  end
+
+  describe 'data retrieval' do
+    before(:all) do
+      request
+    end
+
+    it '#find' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#affiliation' do
+      expect(@p.affiliation).to be_an_instance_of(Array)
+    end
+
+    it '#created' do
+      expect(@p.created).to be_an_instance_of(String)
+    end
+
+    it '#email' do
+      expect(@p.email).to be_an_instance_of(Array)
+    end
+
+    it '#image' do
+      expect(@p.image).to be_an_instance_of(Array)
+    end
+
+    it '#keyword' do
+      expect(@p.keyword).to be_an_instance_of(Array)
+    end
+
+    it '#metadata' 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 '#name' do
+      expect(@p.name).to be_an_instance_of(Hash)
+    end
+
+    it '#orcid' do
+      expect(@p.orcid).to be_an_instance_of(String)
+    end
+
+    it '#uuid' do
+      expect(@p.uuid).to be_an_instance_of(String)
+    end
+  end
+
+  describe 'data retrieval from file' do
+    before(:all) do
+      request
+
+      filename = "#{ENV['PURE_FILE_PATH']}person.#{@uuid}.xml"
+      File.write(filename, @p.response.body)
+
+      @metadata = @p.set_content File.read(filename)
+    end
+
+    it '#set_content' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#metadata' do
+      expect(@p.metadata).to be_an_instance_of(Hash)
+    end
+
+  end
+
+end

data/spec/project.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+describe 'Project' do
+
+  def request
+    base_url = ENV['PURE_BASE_URL']
+    username = ENV['PURE_USERNAME']
+    password = ENV['PURE_PASSWORD']
+    @uuid = ENV['PURE_PROJECT_UUID']
+    @p = Puree::Project.new(base_url: base_url,
+                           username: username,
+                           password: password,
+                           basic_auth: true)
+    @metadata = @p.find uuid: @uuid
+  end
+
+  it '#new' do
+    p = Puree::Project.new
+    expect(p).to be_an_instance_of Puree::Project
+  end
+
+  describe 'data retrieval' do
+    before(:all) do
+      request
+    end
+
+    it '#find' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#acronym' do
+      expect(@p.acronym).to be_an_instance_of(String)
+    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
+
+    it '#metadata' 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 '#organisation' do
+      expect(@p.organisation).to be_an_instance_of(Array)
+    end
+
+    it '#owner' do
+      expect(@p.owner).to be_an_instance_of(Hash)
+    end
+
+    it '#person' do
+      expect(@p.person).to be_an_instance_of(Hash)
+    end
+
+    it '#status' do
+      expect(@p.status).to be_an_instance_of(String)
+    end
+
+    it '#temporal' do
+      expect(@p.temporal).to be_an_instance_of(Hash)
+    end
+
+    it '#title' do
+      expect(@p.title).to be_an_instance_of(String)
+    end
+
+    it '#type' do
+      expect(@p.type).to be_an_instance_of(String)
+    end
+
+    it '#url' do
+      expect(@p.url).to be_an_instance_of(String)
+    end
+
+    it '#uuid' do
+      expect(@p.uuid).to be_an_instance_of(String)
+    end
+  end
+
+  describe 'data retrieval from file' do
+    before(:all) do
+      request
+
+      filename = "#{ENV['PURE_FILE_PATH']}project.#{@uuid}.xml"
+      File.write(filename, @p.response.body)
+
+      @metadata = @p.set_content File.read(filename)
+    end
+
+    it '#set_content' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#metadata' do
+      expect(@p.metadata).to be_an_instance_of(Hash)
+    end
+
+  end
+
+end

data/spec/publication.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+
+describe 'Publication' do
+
+  def request
+    base_url = ENV['PURE_BASE_URL']
+    username = ENV['PURE_USERNAME']
+    password = ENV['PURE_PASSWORD']
+    @uuid = ENV['PURE_PUBLICATION_UUID']
+    @p = Puree::Publication.new(base_url: base_url,
+                            username: username,
+                            password: password,
+                            basic_auth: true)
+    @metadata = @p.find uuid: @uuid
+  end
+
+  it '#new' do
+    p = Puree::Publication.new
+    expect(p).to be_an_instance_of Puree::Publication
+  end
+
+  describe 'data retrieval' do
+    before(:all) do
+      request
+    end
+
+    it '#find' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#category' do
+      expect(@p.category).to be_an_instance_of(String)
+    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
+
+    it '#doi' do
+      expect(@p.doi).to be_an_instance_of(String)
+    end
+
+    it '#event' do
+      expect(@p.event).to be_an_instance_of(Hash)
+    end
+
+    it '#file' do
+      expect(@p.file).to be_an_instance_of(Array)
+    end
+
+    it '#metadata' 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 '#organisation' do
+      expect(@p.organisation).to be_an_instance_of(Array)
+    end
+
+    it '#page' do
+      expect(@p.page).to be_an_instance_of(String)
+    end
+
+    it '#person' do
+      expect(@p.person).to be_an_instance_of(Hash)
+    end
+
+    it '#status' do
+      expect(@p.status).to be_an_instance_of(Array)
+    end
+
+    it '#subtitle' do
+      expect(@p.subtitle).to be_an_instance_of(String)
+    end
+
+    it '#title' do
+      expect(@p.title).to be_an_instance_of(String)
+    end
+
+    it '#type' do
+      expect(@p.type).to be_an_instance_of(String)
+    end
+
+    it '#uuid' do
+      expect(@p.uuid).to be_an_instance_of(String)
+    end
+  end
+
+  describe 'data retrieval from file' do
+    before(:all) do
+      request
+
+      filename = "#{ENV['PURE_FILE_PATH']}publication.#{@uuid}.xml"
+      File.write(filename, @p.response.body)
+
+      @metadata = @p.set_content File.read(filename)
+    end
+
+    it '#set_content' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#metadata' do
+      expect(@p.metadata).to be_an_instance_of(Hash)
+    end
+
+  end
+
+end

data/spec/publisher.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe 'Publisher' do
+
+  def request
+    base_url = ENV['PURE_BASE_URL']
+    username = ENV['PURE_USERNAME']
+    password = ENV['PURE_PASSWORD']
+    @uuid = ENV['PURE_PUBLISHER_UUID']
+    @p = Puree::Publisher.new(base_url: base_url,
+                                username: username,
+                                password: password,
+                                basic_auth: true)
+    @metadata = @p.find uuid: @uuid
+  end
+
+  it '#new' do
+    p = Puree::Publisher.new
+    expect(p).to be_an_instance_of Puree::Publisher
+  end
+
+  describe 'data retrieval' do
+    before(:all) do
+      request
+    end
+
+    it '#find' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#created' do
+      expect(@p.created).to be_an_instance_of(String)
+    end
+
+    it '#metadata' 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 '#uuid' do
+      expect(@p.uuid).to be_an_instance_of(String)
+    end
+  end
+
+  describe 'data retrieval from file' do
+    before(:all) do
+      request
+
+      filename = "#{ENV['PURE_FILE_PATH']}publisher.#{@uuid}.xml"
+      File.write(filename, @p.response.body)
+
+      @metadata = @p.set_content File.read(filename)
+    end
+
+    it '#set_content' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#metadata' do
+      expect(@p.metadata).to be_an_instance_of(Hash)
+    end
+
+  end
+
+end

data/spec/server.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'Server' do
+
+  it '#new' do
+    p = Puree::Server.new
+    expect(p).to be_an_instance_of Puree::Server
+  end
+
+  describe 'data retrieval' do
+    before(:all) do
+      base_url = ENV['PURE_BASE_URL']
+      username = ENV['PURE_USERNAME']
+      password = ENV['PURE_PASSWORD']
+      @p = Puree::Server.new(base_url: base_url,
+                              username: username,
+                              password: password,
+                              basic_auth: true)
+      @metadata = @p.find
+    end
+
+    it '#find' do
+      expect(@metadata).to be_an_instance_of(Hash)
+    end
+
+    it '#version' do
+      expect(@p.version).to be_an_instance_of(String)
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -72,8 +72,17 @@ files:
 - puree.gemspec
 - spec/collection.rb
 - spec/dataset.rb
+- spec/download.rb
+- spec/event.rb
+- spec/journal.rb
+- spec/organisation.rb
+- spec/person.rb
+- spec/project.rb
+- spec/publication.rb
+- spec/publisher.rb
+- spec/server.rb
 - spec/spec_helper.rb
-homepage: https://github.com/lulibrary/puree.git
+homepage: https://rubygems.org/gems/puree/
 licenses:
 - MIT
 metadata: {}
@@ -100,5 +109,14 @@ summary: A client for the Pure Research Information System API.
 test_files:
 - spec/collection.rb
 - spec/dataset.rb
+- spec/download.rb
+- spec/event.rb
+- spec/journal.rb
+- spec/organisation.rb
+- spec/person.rb
+- spec/project.rb
+- spec/publication.rb
+- spec/publisher.rb
+- spec/server.rb
 - spec/spec_helper.rb
 has_rdoc: