puree 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8606b12e11591ec4334727202ae94c999da7e2ce
-  data.tar.gz: 8a44e408a74e383891861e0ae275945b4bcd0dda
+  metadata.gz: be040161fa2a4bfb0252b864310d90d56e88ac19
+  data.tar.gz: 1b6437a55b0e4d08da2dd59af0bb5b68278d770e
 SHA512:
-  metadata.gz: 7b9158b6150662333fbab474f62f8fb43f81ef6d431c0fad7b00cbd4caee07e3b5d35521532262955ec79db8637594e6a8c7cfaf59fe2b9ee7f6f54411037fea
-  data.tar.gz: 054591f8cb907856077074bca300fab524e7e9c5d8f5f5170cca1296c71b972a6ab71efd2c434427dc4cce69a57dd2358ca0be000266c9cdddc8577933baac44
+  metadata.gz: 8ffe42bacb00c82a8fc81c2c70fec93a30d2cfd01e171d1999b18d878741f91a6ba02769ed079e11c3af0858e84fc9cedf135923e4df2d00af8fcc00c10bd11f
+  data.tar.gz: bca33fed3f5467ed1c62153c2100eb26cb3252f427e66b140934fb38648b449d45dc03da742247048bc6beffc2ea85f1dafb2c3f9e943e0ae27aa26a53242b32

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/).
 
+## 2.2.0 2018-04-20
+### Added
+- Count, random for resource extractors.
+
 ## 2.1.1 2018-04-18
 ### Fixed
 - Handle missing created and modified.

data/README.md

@@ -33,15 +33,25 @@ config = {
 ```
 
 ## Extractor module
-Find a resource by identifier and get Ruby objects.
-
 ```ruby
-# Configure an extractor
+# Configure an extractor for a resource
 extractor = Puree::Extractor::Dataset.new config
 ```
 
 ```ruby
-# Fetch the metadata for a resource with a particular identifier
+# Find out how many records are available
+extractor.count
+#=> 1000
+```
+
+```ruby
+# Fetch a random record
+extractor.random
+#=> #<Puree::Model::Dataset:0x00c0ffee>
+```
+
+```ruby
+# Fetch the metadata for a record with a particular identifier
 dataset = extractor.find 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'
 #=> #<Puree::Model::Dataset:0x00c0ffee>
 ```
@@ -61,7 +71,7 @@ dataset.persons_internal[0].name.last_initial
 ## XMLExtractor module
 Get Ruby objects from Pure XML.
 
-### Single resource
+### Single record
 ```ruby
 xml = '<project> ... </project>'
 ```
@@ -83,7 +93,7 @@ xml_extractor.model
 #=> #<Puree::Model::Project:0x00c0ffee>
 ```
 
-### Homogeneous resource collection
+### Homogeneous record collection
 ```ruby
 xml = '<result>
         <dataSet> ... </dataSet>
@@ -98,7 +108,7 @@ Puree::XMLExtractor::Collection.datasets xml
 #=> [#<Puree::Model::Dataset:0x00c0ffee>, ...]
 ```
 
-### Heterogeneous resource collection
+### Heterogeneous record collection
 ```ruby
 xml = '<result>
         <contributionToJournal> ... </contributionToJournal>

data/lib/puree/extractor/conference_paper.rb

@@ -3,13 +3,14 @@ module Puree
 
     # Conference paper extractor.
     #
-    class ConferencePaper < Puree::Extractor::Paper
+    class ConferencePaper < Puree::Extractor::Resource
 
       # @param id [String]
+      # @return [Puree::Model::ConferencePaper, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :research_output,
-                         xml_extractor_resource_type: :conference_paper
+        super id: id,
+              api_resource_type: :research_output,
+              xml_extractor_resource_type: :conference_paper
       end
 
     end

data/lib/puree/extractor/dataset.rb

@@ -6,16 +6,26 @@ module Puree
     #
     class Dataset < Puree::Extractor::Resource
 
-      # @option (see Puree::Extractor::Resource#initialize)
-      def initialize(config)
-        super
-      end
-
       # @param id [String]
+      # @return [Puree::Model::Dataset, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :dataset,
-                         xml_extractor_resource_type: :dataset
+        super id: id,
+              api_resource_type: :dataset,
+              xml_extractor_resource_type: :dataset
+      end
+
+      # Count of records available.
+      #
+      # @return [Fixnum]
+      def count
+        record_count :dataset
+      end
+
+      # Random record.
+      #
+      # @return [Puree::Model::Dataset, nil]
+      def random
+        super :dataset
       end
 
     end

data/lib/puree/extractor/doctoral_thesis.rb

@@ -3,18 +3,14 @@ module Puree
 
     # Doctoral thesis extractor.
     #
-    class DoctoralThesis < Puree::Extractor::Thesis
-
-      # @option (see Puree::Extractor::Resource#initialize)
-      def initialize(config)
-        super
-      end
+    class DoctoralThesis < Puree::Extractor::Resource
 
       # @param id [String]
+      # @return [Puree::Model::DoctoralThesis, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :research_output,
-                         xml_extractor_resource_type: :doctoral_thesis
+        super id: id,
+              api_resource_type: :research_output,
+              xml_extractor_resource_type: :doctoral_thesis
       end
 
     end

data/lib/puree/extractor/event.rb

@@ -6,16 +6,26 @@ module Puree
     #
     class Event < Puree::Extractor::Resource
 
-      # @option (see Puree::Extractor::Resource#initialize)
-      def initialize(config)
-        super
-      end
-
       # @param id [String]
+      # @return [Puree::Model::Event, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :event,
-                         xml_extractor_resource_type: :event
+        super id: id,
+              api_resource_type: :event,
+              xml_extractor_resource_type: :event
+      end
+
+      # Count of records available.
+      #
+      # @return [Fixnum]
+      def count
+        record_count :event
+      end
+
+      # Random record.
+      #
+      # @return [Puree::Model::Event, nil]
+      def random
+        super :event
       end
 
     end

data/lib/puree/extractor/external_organisation.rb

@@ -6,16 +6,26 @@ module Puree
     #
     class ExternalOrganisation < Puree::Extractor::Resource
 
-      # @option (see Puree::Extractor::Resource#initialize)
-      def initialize(config)
-        super
-      end
-
       # @param id [String]
+      # @return [Puree::Model::ExternalOrganisation, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :external_organisation,
-                         xml_extractor_resource_type: :external_organisation
+        super id: id,
+              api_resource_type: :external_organisation,
+              xml_extractor_resource_type: :external_organisation
+      end
+
+      # Count of records available.
+      #
+      # @return [Fixnum]
+      def count
+        record_count :external_organisation
+      end
+
+      # Random record.
+      #
+      # @return [Puree::Model::ExternalOrganisation, nil]
+      def random
+        super :external_organisation
       end
 
     end

data/lib/puree/extractor/journal.rb

@@ -6,16 +6,26 @@ module Puree
     #
     class Journal < Puree::Extractor::Resource
 
-      # @option (see Puree::Extractor::Resource#initialize)
-      def initialize(config)
-        super
-      end
-
       # @param id [String]
+      # @return [Puree::Model::Journal, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :journal,
-                         xml_extractor_resource_type: :journal
+        super id: id,
+              api_resource_type: :journal,
+              xml_extractor_resource_type: :journal
+      end
+
+      # Count of records available.
+      #
+      # @return [Fixnum]
+      def count
+        record_count :journal
+      end
+
+      # Random record.
+      #
+      # @return [Puree::Model::Journal, nil]
+      def random
+        super :journal
       end
 
     end

data/lib/puree/extractor/journal_article.rb

@@ -3,18 +3,21 @@ module Puree
 
     # Journal article extractor.
     #
-    class JournalArticle < Puree::Extractor::ResearchOutput
-
-      # @option (see Puree::Extractor::Resource#initialize)
-      def initialize(config)
-        super
-      end
+    class JournalArticle < Puree::Extractor::Resource
 
       # @param id [String]
+      # @return [Puree::Model::JournalArticle, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :research_output,
-                         xml_extractor_resource_type: :journal_article
+        super id: id,
+              api_resource_type: :research_output,
+              xml_extractor_resource_type: :journal_article
+      end
+
+      # Random record.
+      #
+      # @return [Puree::Model::JournalArticle, nil]
+      def random
+        record_count :journal_article
       end
 
     end

data/lib/puree/extractor/masters_thesis.rb

@@ -3,18 +3,14 @@ module Puree
 
     # Master's thesis extractor.
     #
-    class MastersThesis < Puree::Extractor::Thesis
-
-      # @option (see Puree::Extractor::Resource#initialize)
-      def initialize(config)
-        super
-      end
+    class MastersThesis < Puree::Extractor::Resource
 
       # @param id [String]
+      # @return [Puree::Model::MastersThesis, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :research_output,
-                         xml_extractor_resource_type: :masters_thesis
+        super id: id,
+              api_resource_type: :research_output,
+              xml_extractor_resource_type: :masters_thesis
       end
 
     end

data/lib/puree/extractor/organisational_unit.rb

@@ -6,16 +6,26 @@ module Puree
     #
     class OrganisationalUnit < Puree::Extractor::Resource
 
-      # @option (see Puree::Extractor::Resource#initialize)
-      def initialize(config)
-        super
-      end
-
       # @param id [String]
+      # @return [Puree::Model::OrganisationalUnit, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :organisational_unit,
-                         xml_extractor_resource_type: :organisational_unit
+        super id: id,
+              api_resource_type: :organisational_unit,
+              xml_extractor_resource_type: :organisational_unit
+      end
+
+      # Count of records available.
+      #
+      # @return [Fixnum]
+      def count
+        record_count :organisational_unit
+      end
+
+      # Random record.
+      #
+      # @return [Puree::Model::OrganisationalUnit, nil]
+      def random
+        super :organisational_unit
       end
 
     end

data/lib/puree/extractor/paper.rb

@@ -3,13 +3,14 @@ module Puree
 
     # Paper extractor.
     #
-    class Paper < Puree::Extractor::ResearchOutput
+    class Paper < Puree::Extractor::Resource
 
       # @param id [String]
+      # @return [Puree::Model::Paper, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :research_output,
-                         xml_extractor_resource_type: :paper
+        super id: id,
+              api_resource_type: :research_output,
+              xml_extractor_resource_type: :paper
       end
 
     end

data/lib/puree/extractor/person.rb

@@ -7,10 +7,25 @@ module Puree
     class Person < Puree::Extractor::Resource
 
       # @param id [String]
+      # @return [Puree::Model::Person, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :person,
-                         xml_extractor_resource_type: :person
+        super id: id,
+              api_resource_type: :person,
+              xml_extractor_resource_type: :person
+      end
+
+      # Count of records available.
+      #
+      # @return [Fixnum]
+      def count
+        record_count :person
+      end
+
+      # Random record.
+      #
+      # @return [Puree::Model::Person, nil]
+      def random
+        super :person
       end
 
     end

data/lib/puree/extractor/project.rb

@@ -7,10 +7,25 @@ module Puree
     class Project < Puree::Extractor::Resource
 
       # @param id [String]
+      # @return [Puree::Model::Project, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :project,
-                         xml_extractor_resource_type: :project
+        super id: id,
+              api_resource_type: :project,
+              xml_extractor_resource_type: :project
+      end
+
+      # Count of records available.
+      #
+      # @return [Fixnum]
+      def count
+        record_count :project
+      end
+
+      # Random record.
+      #
+      # @return [Puree::Model::Project, nil]
+      def random
+        super :project
       end
 
     end

data/lib/puree/extractor/publisher.rb

@@ -7,10 +7,25 @@ module Puree
     class Publisher < Puree::Extractor::Resource
 
       # @param id [String]
+      # @return [Puree::Model::Publisher, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :publisher,
-                         xml_extractor_resource_type: :publisher
+        super id: id,
+              api_resource_type: :publisher,
+              xml_extractor_resource_type: :publisher
+      end
+
+      # Count of records available.
+      #
+      # @return [Fixnum]
+      def count
+        record_count :publisher
+      end
+
+      # Random record.
+      #
+      # @return [Puree::Model::Publisher, nil]
+      def random
+        super :publisher
       end
 
     end

data/lib/puree/extractor/research_output.rb

@@ -7,10 +7,34 @@ module Puree
     class ResearchOutput < Puree::Extractor::Resource
 
       # @param id [String]
+      # @return [Puree::Model::ResearchOutput, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :research_output,
-                         xml_extractor_resource_type: :research_output
+        super id: id,
+              api_resource_type: :research_output,
+              xml_extractor_resource_type: :research_output
+      end
+
+      # Count of records available.
+      #
+      # @return [Fixnum]
+      def count
+        record_count :research_output
+      end
+
+      # Random record. Includes the metadata from Puree::Model::ResearchOutput as a minimum.
+      #
+      # @return [Puree::Model::ResearchOutput or subclass, nil]
+      def random
+        client = Puree::REST::Client.new @config
+        offset = rand(0..count-1)
+        response = client.research_outputs.all params: {size: 1, offset: offset}
+        research_outputs_hash = Puree::XMLExtractor::Collection.research_outputs response.to_s
+        research_outputs_array = []
+        research_outputs_hash.each do |k, v|
+          research_outputs_array += v
+        end
+        return nil if research_outputs_array.empty?
+        research_outputs_array[0]
       end
 
     end

data/lib/puree/extractor/resource.rb

@@ -20,7 +20,7 @@ module Puree
       # @param id [String]
       # @param api_resource_type [Symbol]
       # @param xml_extractor_resource_type [Symbol]
-      def find_and_extract(id:, api_resource_type:, xml_extractor_resource_type:)
+      def find(id:, api_resource_type:, xml_extractor_resource_type:)
         api_resource = make_api_resource api_resource_type
         response = api_resource.find id: id
         return unless response.code === 200
@@ -38,6 +38,21 @@ module Puree
         Object.const_get(resource_class).new xml
       end
 
+      def record_count(api_resource_type)
+        api_resource = make_api_resource api_resource_type
+        response = api_resource.all params: {size: 0}
+        return unless response.code === 200
+        Puree::XMLExtractor::Collection.count response.to_s
+      end
+
+      def random(api_resource_type)
+        offset = rand(0..record_count(api_resource_type)-1)
+        api_resource = make_api_resource api_resource_type
+        response = api_resource.all params: {size: 1, offset: offset}
+        models = Puree::XMLExtractor::Collection.send "#{api_resource_type}s", response.to_s
+        return nil if models.empty?
+        models[0]
+      end
 
     end
 

data/lib/puree/extractor/thesis.rb

@@ -3,18 +3,14 @@ module Puree
 
     # Thesis extractor.
     #
-    class Thesis < Puree::Extractor::ResearchOutput
-
-      # @option (see Puree::Extractor::Resource#initialize)
-      def initialize(config)
-        super
-      end
+    class Thesis < Puree::Extractor::Resource
 
       # @param id [String]
+      # @return [Puree::Model::Thesis, nil]
       def find(id)
-        find_and_extract id: id,
-                         api_resource_type: :research_output,
-                         xml_extractor_resource_type: :thesis
+        super id: id,
+              api_resource_type: :research_output,
+              xml_extractor_resource_type: :thesis
       end
 
     end

data/lib/puree/rest/activity.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class Activity < Puree::REST::Base
 
-      # @option (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/application.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class Application < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/classification_scheme.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class ClassificationScheme < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/curricula_vitae.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class CurriculaVitae < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/dataset.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class Dataset < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/equipment.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class Equipment < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/event.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class Event < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/external_organisation.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class ExternalOrganisation < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/external_person.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class ExternalPerson < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/impact.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class Impact < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/journal.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class Journal < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/organisational_unit.rb

@@ -33,11 +33,6 @@ module Puree
       include Puree::REST::ResearchOutputMixin
       include Puree::REST::StudentThesisMixin
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/person.rb

@@ -32,11 +32,6 @@ module Puree
       include Puree::REST::ResearchOutputMixin
       include Puree::REST::StudentThesisMixin
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       # (see Puree::REST::Base#find)
       def curricula_vitae(id:, params: {}, accept: :xml)
         get_request_singleton_subcollection(id: id,

data/lib/puree/rest/press_media.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class PressMedia < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/prize.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class Prize < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/project.rb

@@ -9,11 +9,6 @@ module Puree
     class Project < Puree::REST::Base
       include Puree::REST::ActiveMixin
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/rest/publisher.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class Publisher < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       # (see Puree::REST::Base#all)
       def approved(params: {}, accept: :xml)
         get_request_collection_subcollection(subcollection: 'approved',

data/lib/puree/rest/research_output.rb

@@ -6,11 +6,6 @@ module Puree
     #
     class ResearchOutput < Puree::REST::Base
 
-      # (see Puree::REST::Base#initialize)
-      def initialize(config)
-        super
-      end
-
       private
 
       def collection

data/lib/puree/version.rb

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

data/lib/puree/xml_extractor/collection.rb

@@ -62,6 +62,14 @@ module Puree
         models :person, xml, '/person'
       end
 
+      # Get models from any multi-record person XML response
+      #
+      # @param xml [String]
+      # @return [Array<Puree::Model::Publisher>]
+      def self.publishers(xml)
+        models :publisher, xml, '/publisher'
+      end
+
       # Get models from any multi-record Research output XML response
       #
       # @param xml [String]
@@ -102,6 +110,12 @@ module Puree
         data
       end
 
+      def self.count(xml)
+        doc = Nokogiri::XML xml
+        doc.remove_namespaces!
+        doc.xpath('/result/count').text.to_i
+      end
+
       private
 
       # Get models from any multi-record resource XML response

data/test/extractor/resource_count_test.rb

@@ -0,0 +1,68 @@
+require 'test_helper'
+
+class TestResourceCount < Minitest::Test
+
+  def test_dataset_count
+    extractor = Puree::Extractor::Dataset.new config
+    count = extractor.count
+
+    assert_instance_of Fixnum, count
+  end
+
+  def test_external_organisation_count
+    extractor = Puree::Extractor::ExternalOrganisation.new config
+    count = extractor.count
+
+    assert_instance_of Fixnum, count
+  end
+
+  def test_event_count
+    extractor = Puree::Extractor::Event.new config
+    count = extractor.count
+
+    assert_instance_of Fixnum, count
+  end
+
+  def test_journal_count
+    extractor = Puree::Extractor::Journal.new config
+    count = extractor.count
+
+    assert_instance_of Fixnum, count
+  end
+
+  def test_organisational_unit_count
+    extractor = Puree::Extractor::OrganisationalUnit.new config
+    count = extractor.count
+
+    assert_instance_of Fixnum, count
+  end
+
+  def test_person_count
+    extractor = Puree::Extractor::Person.new config
+    count = extractor.count
+
+    assert_instance_of Fixnum, count
+  end
+
+  def test_project_count
+    extractor = Puree::Extractor::Project.new config
+    count = extractor.count
+
+    assert_instance_of Fixnum, count
+  end
+
+  def test_publisher_count
+    extractor = Puree::Extractor::Publisher.new config
+    count = extractor.count
+
+    assert_instance_of Fixnum, count
+  end
+
+  def test_research_output_count
+    extractor = Puree::Extractor::ResearchOutput.new config
+    count = extractor.count
+
+    assert_instance_of Fixnum, count
+  end
+
+end

data/test/extractor/resource_random_test.rb

@@ -0,0 +1,66 @@
+require 'test_helper'
+
+class TestResourceRandom < Minitest::Test
+
+  def test_dataset_random
+    extractor = Puree::Extractor::Dataset.new config
+
+    assert_instance_of Puree::Model::Dataset, extractor.random
+  end
+
+  def test_external_organisation_random
+    extractor = Puree::Extractor::ExternalOrganisation.new config
+
+    assert_instance_of Puree::Model::ExternalOrganisation, extractor.random
+  end
+
+  def test_event_random
+    extractor = Puree::Extractor::Event.new config
+
+    assert_instance_of Puree::Model::Event, extractor.random
+  end
+
+  def test_journal_random
+    extractor = Puree::Extractor::Journal.new config
+
+    assert_instance_of Puree::Model::Journal, extractor.random
+  end
+
+  def test_organisational_unit_random
+    extractor = Puree::Extractor::OrganisationalUnit.new config
+
+    assert_instance_of Puree::Model::OrganisationalUnit, extractor.random
+  end
+
+  def test_person_random
+    extractor = Puree::Extractor::Person.new config
+
+    assert_instance_of Puree::Model::Person, extractor.random
+  end
+
+  def test_project_random
+    extractor = Puree::Extractor::Project.new config
+
+    assert_instance_of Puree::Model::Project, extractor.random
+  end
+
+  def test_publisher_random
+    extractor = Puree::Extractor::Publisher.new config
+
+    assert_instance_of Puree::Model::Publisher, extractor.random
+  end
+
+  def test_research_output_random
+    extractor = Puree::Extractor::ResearchOutput.new config
+
+    class_possibilities = [
+        Puree::Model::ResearchOutput,
+        Puree::Model::ConferencePaper,
+        Puree::Model::Thesis,
+        Puree::Model::JournalArticle
+    ]
+    random = extractor.random
+    assert_includes class_possibilities, random.class
+  end
+
+end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ require 'puree'
 
 def config
   {
-      url:      ENV['PURE_URL_TEST_59'],
+      url:      ENV['PURE_URL_59'],
       username: ENV['PURE_USERNAME'],
       password: ENV['PURE_PASSWORD'],
       api_key:  ENV['PURE_API_KEY']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -199,7 +199,9 @@ files:
 - lib/puree/xml_extractor/thesis.rb
 - lib/puree/xml_extractor/xml_extractor.rb
 - puree.gemspec
-- test/extractor/resource_test.rb
+- test/extractor/resource_count_test.rb
+- test/extractor/resource_find_test.rb
+- test/extractor/resource_random_test.rb
 - test/rest/base_test.rb
 - test/rest/common_test.rb
 - test/test_extractor_helper.rb
@@ -244,7 +246,9 @@ signing_key:
 specification_version: 4
 summary: Metadata extraction from the Pure Research Information System.
 test_files:
-- test/extractor/resource_test.rb
+- test/extractor/resource_count_test.rb
+- test/extractor/resource_find_test.rb
+- test/extractor/resource_random_test.rb
 - test/rest/base_test.rb
 - test/rest/common_test.rb
 - test/test_extractor_helper.rb