puree 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 539976142cda876c73eb0caf03ae4b2eca425775
-  data.tar.gz: f5896f3afb50cbc67bca6d20124fef8d85ae4052
+  metadata.gz: 6b99230d8fee3aa6a259149b6b0fcf1beb258f43
+  data.tar.gz: 3c6e08559c575caa1edb25c986d91f670f157384
 SHA512:
-  metadata.gz: a6f35ad8908b500f03ff30f00b38621bf8d570fc5b3c9f53be7e24ef1b7eb024e342fe3d56e8f99b7b8d23cdeaed466e2e3c372cb73b09a0f24e47c17d9a1ed6
-  data.tar.gz: 1b6b644bbb9157f345b29a03428805cee300a2982ac44378b5c3aa873fd8487a964bce711bb6f7553eaab3cf426c3c2e1f1abca0a0051738165d3024c67c304a
+  metadata.gz: 083843de876a7502201a2cea2180c39e0c0b9b7ea67d2dce14ad577e47f30243bd798a085d4a6fe48a0ec42a4be0ea901e945b0452bfe269206d4decf40fcea3
+  data.tar.gz: 48c0c50c3a3c1d9cddaed24ad7f9bc8ed90e750721ff244a7eed6150fbca37424827c304145b295259b44107cb9eeb5466289ebe56a6631e91f97a262cfa0031

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+- Download stats.
+
+## 0.14.0 - 2016-06-10
+### Added
+- Dataset (organisation).
+- Organisation (parent).
+- Credentials set globally.
+- Global credentials override in ctor of resource.
+- Find as alias for get.
+
+### Removed
+- Credentials passed with get.
+
 ## 0.13.0 - 2016-05-20
 ### Added
 - Collection server-side search by date range (created, modified) and paging.

data/README.md

@@ -1,5 +1,4 @@
-# Purée
-
+# Purée [![Gem Version](https://badge.fury.io/rb/puree.svg)](https://badge.fury.io/rb/puree)
 A Ruby client for the Pure Research Information System API.
 
 
@@ -18,26 +17,46 @@ Or install it yourself as:
     $ gem install puree
 
 ## Usage
+ Authentication
+
 ```ruby
-endpoint = 'http://example.com/ws/rest'
+
+# Global settings together
+Puree::Configuration.configure do |c|
+  c.endpoint = ENV['PURE_ENDPOINT']
+  c.username = ENV['PURE_USERNAME']
+  c.password = ENV['PURE_PASSWORD']
+end
+
+# Global settings individually
+Puree::Configuration.endpoint = ENV['PURE_ENDPOINT']
+Puree::Configuration.username = ENV['PURE_USERNAME']
+Puree::Configuration.password = ENV['PURE_PASSWORD']
+
+# Use global settings
+d = Puree::Dataset.new
+
+# Override one or more global settings in an instance
+d = Puree::Dataset.new endpoint: 'http://example.com/ws/rest',
+                       username: 'another_username',
+                       password: 'another_password'
 ```
 
-Dataset.
+
+Dataset
 
 ```ruby
+
 d = Puree::Dataset.new
 
 # Get metadata using ID
-d.get id:       12345678,
-      endpoint: endpoint,
-      username: username,
-      password: password
+d.find id: 12345678
+
+# Reuse instance
+d.find id: 87654321
 
 # Get metadata using UUID
-d.get uuid:     'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx',
-      endpoint: endpoint,
-      username: username,
-      password: password
+d.find uuid: 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'
 
 # Filter metadata into simple data structures
 d.access
@@ -51,6 +70,7 @@ d.geographical
 d.keyword
 d.link
 d.modified
+d.organisation
 d.person
 d.production
 d.project
@@ -70,21 +90,18 @@ d.response.message
 d.response.headers # hash
 ```
 
-Collection.
+Collection
 
 ```ruby
-c = Puree::Collection.new(resource_type: :dataset)
+c = Puree::Collection.new api: :dataset
 
 # Get three minimal datasets, starting at record ten, created and modified in January 2016.
-c.get endpoint:       endpoint,
-      username:       username,
-      password:       password,
-      limit:          3,  # optional, default 20
-      offset:         10, # optional, default 0
-      created_start:  '2016-01-01', # optional
-      created_end:    '2016-01-31', # optional
-      modified_start: '2016-01-01', # optional
-      modified_end:   '2016-01-31'  # optional
+c.find limit:          3,  # optional, default 20
+       offset:         10, # optional, default 0
+       created_start:  '2016-01-01', # optional
+       created_end:    '2016-01-31', # optional
+       modified_start: '2016-01-01', # optional
+       modified_end:   '2016-01-31'  # optional
 
 # Get UUIDs for datasets
 uuids = c.uuid
@@ -93,10 +110,7 @@ uuids = c.uuid
 datasets = []
 uuids.each do |uuid|
     d = Puree::Dataset.new
-    d.get endpoint: endpoint,
-          username: username,
-          password: password,
-          uuid:     uuid
+    d.find uuid: uuid
     datasets << d.metadata
 end
 ```
@@ -110,9 +124,9 @@ Date made available. If year is present, month and day will have data or an empt
 
 ```ruby
 {
-  "year"=>"2016",
-  "month"=>"2",
-  "day"=>"4"
+  "year" => "2016",
+  "month" => "2",
+  "day" => "4"
 }
 ```
 
@@ -122,14 +136,14 @@ An array of files.
 ```ruby
 [
   {
-    "name"=>"foo.csv",
-    "mime"=>"application/octet-stream",
-    "size"=>"1616665158",
-    "url"=>"http://example.com/ws/rest/files/12345678/foo.csv",
-    "title"=>"foo.csv",
-    "license"=>{
-      "name"=>"CC BY-NC",
-      "url"=>"http://creativecommons.org/licenses/by-nc/4.0/"
+    "name" => "foo.csv",
+    "mime" => "application/octet-stream",
+    "size" => "1616665158",
+    "url" => "http://example.com/ws/rest/files/12345678/foo.csv",
+    "title" => "foo.csv",
+    "license" => {
+      "name" => "CC BY-NC",
+      "url" => "http://creativecommons.org/licenses/by-nc/4.0/"
     }
   },
 ]
@@ -141,37 +155,48 @@ An array of links.
 ```ruby
 [
   {
-    "url": "http://www.example.com/~abc1234/xyz/",
-    "description": "An interesting description"
+    "url" => "http://www.example.com/~abc1234/xyz/",
+    "description" => "An interesting description"
   },
 ]
 ```
 
+#### organisation
+Organisation responsible.
+
+```ruby
+{
+  "uuid" => "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx",
+  "name" => "Institute for the Arts",
+  "type" => "Department"
+}
+```
+
 #### person
 Contains an array of internal persons, an array of external persons and an array of other persons.
 
 ```ruby
 {
-  "internal"=>[
+  "internal" => [
     {
-      "name"=>{
-        "first"=>"Stan",
-        "last"=>"Laurel"
+      "name" => {
+        "first" => "Stan",
+        "last" => "Laurel"
        },
-       "role"=>"Creator",
-       "uuid"=>"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
+       "role" => "Creator",
+       "uuid" => "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
     },
   ],
-  "external"=>[
+  "external" => [
   ],
-  "other"=>[
+  "other" => [
     {
-      "name"=>{
-        "first"=>"Hal",
-        "last"=>"Roach"
+      "name" => {
+        "first" => "Hal",
+        "last" => "Roach"
       },
-      "role"=>"Contributor",
-      "uuid"=>""
+      "role" => "Contributor",
+      "uuid" => ""
     },
   ]
 }
@@ -183,8 +208,8 @@ An array of projects associated with the dataset.
 ```ruby
 [
   {
-    "title": "An interesting project title",
-    "uuid": "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
+    "title" => "An interesting project title",
+    "uuid" => "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
   },
 ]
 ```
@@ -195,34 +220,34 @@ An array of research outputs associated with the dataset.
 ```ruby
 [
   {
-    "type": "Journal article",
-    "title": "An interesting journal article title",
-    "uuid": "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
+    "type" => "Journal article",
+    "title" => "An interesting journal article title",
+    "uuid" => "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
   },
   {
-    "type": "Conference paper",
-    "title": "An interesting conference paper title",
-    "uuid": "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
+    "type" => "Conference paper",
+    "title" => "An interesting conference paper title",
+    "uuid" => "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
   },
   {
-    "type": "Working paper",
-    "title": "An interesting working paper title",
-    "uuid": "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
+    "type" => "Working paper",
+    "title" => "An interesting working paper title",
+    "uuid" => "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
   },
   {
-    "type": "Paper",
-    "title": "An interesting paper title",
-    "uuid": "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
+    "type" => "Paper",
+    "title" => "An interesting paper title",
+    "uuid" => "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
   },
   {
-    "type": "Dataset",
-    "title": "An interesting dataset title",
-    "uuid": "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
+    "type" => "Dataset",
+    "title" => "An interesting dataset title",
+    "uuid" => "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
   },
   {
-    "type": "Chapter",
-    "title": "An interesting chapter title",
-    "uuid": "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
+    "type" => "Chapter",
+    "title" => "An interesting chapter title",
+    "uuid" => "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
   },
 ]
 ```
@@ -232,15 +257,15 @@ Date range. If year is present, month and day will have data or an empty string.
 
 ```ruby
 {
-  "start"=>{
-    "year"=>"2005",
-    "month"=>"5",
-    "day"=>"10"
+  "start" => {
+    "year" => "2005",
+    "month" => "5",
+    "day" => "10"
   },
-  "end"=>{
-    "year"=>"2011",
-    "month"=>"9",
-    "day"=>"18"
+  "end" => {
+    "year" => "2011",
+    "month" => "9",
+    "day" => "18"
   }
 }
 ```
@@ -253,15 +278,26 @@ An array of addresses.
 ```ruby
 [
   {
-    "street"=>"Lancaster University",
-    "building"=>"Bowland North",
-    "postcode"=>"LA1 4YN",
-    "city"=>"Lancaster",
-    "country"=>"United Kingdom"
+    "street" => "Lancaster University",
+    "building" => "Bowland North",
+    "postcode" => "LA1 4YN",
+    "city" => "Lancaster",
+    "country" => "United Kingdom"
   },
 ]
 ```
 
+#### parent
+Parent organisation.
+
+```ruby
+{
+  "uuid" => "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx",
+  "name" => "Institute for the Arts",
+  "type" => "Department"
+}
+```
+
 ### Publication
 
 #### file
@@ -270,10 +306,10 @@ An array of files.
 ```ruby
 [
   {
-    "name"=>"foo.csv",
-    "mime"=>"application/octet-stream",
-    "size"=>"1616665158",
-    "url"=>"http://example.com/ws/rest/files/12345678/foo.csv",
+    "name" => "foo.csv",
+    "mime" => "application/octet-stream",
+    "size" => "1616665158",
+    "url" => "http://example.com/ws/rest/files/12345678/foo.csv",
   },
 ]
 ```
@@ -287,9 +323,9 @@ Puree::Date.iso d.available
 ```
 ```ruby
 {
-  "year"=>"2016",
-  "month"=>"4",
-  "day"=>"18"
+  "year" => "2016",
+  "month" => "4",
+  "day" => "18"
 }
 ```
 becomes

data/lib/puree.rb

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

data/lib/puree/collection.rb

@@ -4,30 +4,48 @@ module Puree
   #
   class Collection < Resource
 
-    def initialize(resource_type: nil)
-      super(resource_type)
+    # @param api [Symbol]
+    # @param endpoint [String]
+    # @param optional username [String]
+    # @param optional password [String]
+    def initialize(api: nil,
+                   endpoint: nil,
+                   username: nil,
+                   password: nil)
+      super(api: api,
+            endpoint: endpoint,
+            username: username,
+            password: password)
       @uuids = []
     end
 
     # Get
     #
-    # @param endpoint [String]
-    # @param username [String]
-    # @param password [String]
-    # @param qty [Integer]
+    # @param optional limit [Integer]
+    # @param optional offset [Integer]
+    # @param optional created_start [String]
+    # @param optional created_end [String]
+    # @param optional modified_start [String]
+    # @param optional modified_end [String]
     # @return [HTTParty::Response]
-    def get(endpoint:         nil,
-            username:         nil,
-            password:         nil,
+    def get(
             limit:            20,
             offset:           0,
             created_start:    nil,
             created_end:      nil,
             modified_start:   nil,
             modified_end:     nil)
+
+      missing = missing_credentials
+      if !missing.empty?
+        missing.each do |m|
+          puts "#{self.class.name}" + '#' + "#{__method__} missing #{m}"
+        end
+        exit
+      end
       # strip any trailing slash
-      @endpoint = endpoint.sub(/(\/)+$/, '')
-      @auth = Base64::strict_encode64(username + ':' + password)
+      @endpoint = @endpoint.sub(/(\/)+$/, '')
+      @auth = Base64::strict_encode64(@username + ':' + @password)
 
       @options = {
           latest_api:       true,
@@ -95,6 +113,7 @@ module Puree
       xpath_result.each { |i| @uuids << i.text.strip }
     end
 
+    alias :find :get
 
   end
 

data/lib/puree/configuration.rb

@@ -0,0 +1,17 @@
+module Puree
+
+  module Configuration
+
+    class << self
+
+      attr_accessor :endpoint, :username, :password
+
+      def configure
+        yield self
+      end
+
+    end
+
+  end
+
+end

data/lib/puree/dataset.rb

@@ -4,8 +4,14 @@ module Puree
   #
   class Dataset < Resource
 
-    def initialize
-      super(:dataset)
+    # @param endpoint [String]
+    # @param optional username [String]
+    # @param optional password [String]
+    def initialize(endpoint: nil, username: nil, password: nil)
+      super(api: :dataset,
+            endpoint: endpoint,
+            username: username,
+            password: password)
     end
 
     # Link
@@ -21,7 +27,20 @@ module Puree
         o['description'] = i.xpath('description').text.strip
         data << o
       }
-      return data.uniq
+      data.uniq
+    end
+
+    # Organisation
+    #
+    # @return [Hash]
+    def organisation
+      path = '//content/managedBy'
+      xpath_result =  xpath_query path
+      o = {}
+      o['uuid'] = xpath_result.xpath('@uuid').text.strip
+      o['name'] = xpath_result.xpath('name/localizedString').text.strip
+      o['type'] = xpath_result.xpath('typeClassification/term/localizedString').text.strip
+      o
     end
 
     # Publisher
@@ -260,6 +279,7 @@ module Puree
       o['geographical'] = geographical
       o['keyword'] = keyword
       o['link'] = link
+      o['organisation'] = organisation
       o['person'] = person
       o['project'] = project
       o['production'] = production

data/lib/puree/download.rb

@@ -0,0 +1,26 @@
+module Puree
+
+  # Download resource
+  #
+  class Download < Resource
+
+    # @param endpoint [String]
+    # @param optional username [String]
+    # @param optional password [String]
+    def initialize(endpoint: nil, username: nil, password: nil)
+      super(api: :download,
+            endpoint: endpoint,
+            username: username,
+            password: password)
+    end
+
+    # All metadata
+    #
+    # @return [Hash]
+    # def metadata
+    #   super
+    # end
+
+  end
+
+end

data/lib/puree/event.rb

@@ -4,8 +4,14 @@ module Puree
   #
   class Event < Resource
 
-    def initialize
-      super(:event)
+    # @param endpoint [String]
+    # @param optional username [String]
+    # @param optional password [String]
+    def initialize(endpoint: nil, username: nil, password: nil)
+      super(api: :event,
+            endpoint: endpoint,
+            username: username,
+            password: password)
     end
 
     # City

data/lib/puree/journal.rb

@@ -4,8 +4,14 @@ module Puree
   #
   class Journal < Resource
 
-    def initialize
-      super(:journal)
+    # @param endpoint [String]
+    # @param optional username [String]
+    # @param optional password [String]
+    def initialize(endpoint: nil, username: nil, password: nil)
+      super(api: :journal,
+            endpoint: endpoint,
+            username: username,
+            password: password)
     end
 
     # All metadata

data/lib/puree/map.rb

@@ -17,8 +17,13 @@ module Puree
         resource_type: {
           dataset: {
             service: 'datasets',
-            response: 'GetDataSetsResponse'
-          }
+            response: 'GetDataSetsResponse',
+            family: 'dk.atira.pure.modules.datasets.external.model.dataset.DataSet'
+          },
+          download: {
+              service: 'downloadcount',
+              response: 'GetDownloadCountResponse'
+          },
         }
       }
 

data/lib/puree/organisation.rb

@@ -4,8 +4,14 @@ module Puree
   #
   class Organisation < Resource
 
-    def initialize
-      super(:organisation)
+    # @param endpoint [String]
+    # @param optional username [String]
+    # @param optional password [String]
+    def initialize(endpoint: nil, username: nil, password: nil)
+      super(api: :organisation,
+            endpoint: endpoint,
+            username: username,
+            password: password)
     end
 
     # Address
@@ -48,6 +54,18 @@ module Puree
       !data.nil? && !data.empty? ? data['localizedString']['__content__'].strip : ''
     end
 
+    # Parent
+    #
+    # @return [Hash]
+    def parent
+      data = organisation
+      o = {}
+      if !data.empty?
+        o = data.first
+      end
+      o
+    end
+
     # Phone
     #
     # @return [Array<String>]
@@ -87,12 +105,37 @@ module Puree
       o['address'] = address
       o['email'] = email
       o['name'] = name
+      o['parent'] = parent
       o['phone'] = phone
       o['type'] = type
       o['url'] = url
       o
     end
 
+
+    private
+
+
+    # Organisation
+    #
+    # @return [Array<Hash>]
+    def organisation
+      path = '//organisations/organisation'
+      xpath_result =  xpath_query path
+
+      data = []
+
+      xpath_result.each do |d|
+        o = {}
+        o['uuid'] = d.xpath('@uuid').text.strip
+        o['name'] = d.xpath('name/localizedString').text.strip
+        o['type'] = d.xpath('typeClassification/term/localizedString').text.strip
+        data << o
+      end
+      data.uniq
+    end
+
+
   end
 
 end

data/lib/puree/person.rb

@@ -4,8 +4,14 @@ module Puree
   #
   class Person < Resource
 
-    def initialize
-      super(:person)
+    # @param endpoint [String]
+    # @param optional username [String]
+    # @param optional password [String]
+    def initialize(endpoint: nil, username: nil, password: nil)
+      super(api: :person,
+            endpoint: endpoint,
+            username: username,
+            password: password)
     end
 
     # Affiliation

data/lib/puree/project.rb

@@ -4,8 +4,14 @@ module Puree
   #
   class Project < Resource
 
-    def initialize
-      super(:project)
+    # @param endpoint [String]
+    # @param optional username [String]
+    # @param optional password [String]
+    def initialize(endpoint: nil, username: nil, password: nil)
+      super(api: :project,
+            endpoint: endpoint,
+            username: username,
+            password: password)
     end
 
     # All metadata

data/lib/puree/publication.rb

@@ -4,8 +4,14 @@ module Puree
   #
   class Publication < Resource
 
-    def initialize
-      super(:publication)
+    # @param endpoint [String]
+    # @param optional username [String]
+    # @param optional password [String]
+    def initialize(endpoint: nil, username: nil, password: nil)
+      super(api: :publication,
+            endpoint: endpoint,
+            username: username,
+            password: password)
     end
 
     # Description

data/lib/puree/publisher.rb

@@ -4,8 +4,14 @@ module Puree
   #
   class Publisher < Resource
 
-    def initialize
-      super(:publisher)
+    # @param endpoint [String]
+    # @param optional username [String]
+    # @param optional password [String]
+    def initialize(endpoint: nil, username: nil, password: nil)
+      super(api: :publisher,
+            endpoint: endpoint,
+            username: username,
+            password: password)
     end
 
     # All metadata

data/lib/puree/resource.rb

@@ -4,28 +4,38 @@ module Puree
   #
   class Resource
 
-    def initialize(resource_type)
-      @resource_type = resource_type
+    # @param api [String]
+    # @param endpoint [String]
+    # @param optional username [String]
+    # @param optional password [String]
+    def initialize( api: nil,
+                    endpoint: nil,
+                    username: nil,
+                    password: nil)
+      @resource_type = api
       @api_map = Puree::Map.new.get
+      @endpoint = endpoint.nil? ? Puree::Configuration.endpoint : endpoint
+      @username = username.nil? ? Puree::Configuration.username : username
+      @password = password.nil? ? Puree::Configuration.password : password
     end
 
     # Get
     #
-    # @param endpoint [String]
-    # @param username [String]
-    # @param password [String]
     # @param uuid [String]
     # @param id [String]
     # @return [HTTParty::Response]
-    def get(endpoint:       nil,
-            username:       nil,
-            password:       nil,
-            uuid:           nil,
-            id:             nil
-    )
+    def get(uuid: nil, id: nil)
+      missing = missing_credentials
+      if !missing.empty?
+        missing.each do |m|
+          puts "#{self.class.name}" + '#' + "#{__method__} missing #{m}"
+        end
+        exit
+      end
+
       # strip any trailing slash
-      @endpoint = endpoint.sub(/(\/)+$/, '')
-      @auth = Base64::strict_encode64(username + ':' + password)
+      @endpoint = @endpoint.sub(/(\/)+$/, '')
+      @auth = Base64::strict_encode64(@username + ':' + @password)
 
       @options = {
           latest_api:     true,
@@ -124,9 +134,20 @@ module Puree
       o
     end
 
+
+
     private
 
 
+    def collect_uuid
+      path = '//renderedItem/@renderedContentUUID'
+      xpath_result = xpath_query path
+      xpath_result.each { |i| @uuids << i.text.strip }
+    end
+
+
+
+
 
     # Node
     #
@@ -171,6 +192,21 @@ module Puree
       doc.xpath path
     end
 
+    def missing_credentials
+      missing = []
+      if @endpoint.nil?
+        missing << 'endpoint'
+      end
+      if @username.nil?
+        missing << 'username'
+      end
+      if @password.nil?
+        missing << 'password'
+      end
+      missing
+    end
+
+    alias :find :get
 
   end
 end

data/lib/puree/version.rb

@@ -1,3 +1,3 @@
 module Puree
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/spec/collection.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Collection' do
 
   it '#new' do
-    p = Puree::Collection.new(resource_type: :dataset)
+    p = Puree::Collection.new(api: :dataset)
     expect(p).to be_an_instance_of Puree::Collection
   end
 
@@ -12,10 +12,11 @@ describe 'Collection' do
       endpoint = ENV['PURE_ENDPOINT']
       username = ENV['PURE_USERNAME']
       password = ENV['PURE_PASSWORD']
-      @p = Puree::Collection.new(resource_type: :dataset)
-      @p.get endpoint: endpoint,
-             username: username,
-             password: password
+      @p = Puree::Collection.new(api: :dataset,
+                                 endpoint: endpoint,
+                                 username: username,
+                                 password: password)
+      @p.find limit: 5
     end
 
     it '#UUID' do

data/spec/dataset.rb

@@ -13,11 +13,10 @@ describe 'Dataset' do
       username = ENV['PURE_USERNAME']
       password = ENV['PURE_PASSWORD']
       uuid = ENV['PURE_DATASET_UUID']
-      @p = Puree::Dataset.new
-      @p.get endpoint: endpoint,
-             username: username,
-             password: password,
-             uuid: uuid
+      @p = Puree::Dataset.new(endpoint: endpoint,
+                              username: username,
+                              password: password)
+      @p.find uuid: uuid
     end
 
     it '#access' do

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'httparty'
 require 'nokogiri'
+require 'puree/configuration'
 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.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -54,8 +54,10 @@ files:
 - Rakefile
 - lib/puree.rb
 - lib/puree/collection.rb
+- lib/puree/configuration.rb
 - lib/puree/dataset.rb
 - lib/puree/date.rb
+- lib/puree/download.rb
 - lib/puree/event.rb
 - lib/puree/journal.rb
 - lib/puree/map.rb