puree 0.19.2 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6feda420454c2b733f415194279bfda4d17d191
-  data.tar.gz: 383112b4f6f4d95400d94fbbcb648e8cfc3eba58
+  metadata.gz: 8e8e3d618d4573ec565f88c56bdcc6c26db76a0d
+  data.tar.gz: 469f6ac49d1b8359f5199fb5f5d1c77c7f61ba78
 SHA512:
-  metadata.gz: 1e557f054b3c8e1f92cdc61bda7432a0c0286f6facdd26f6e1e72f93d83e0c733fa2731dff3395ec1cbf41395e8ccae5007052b19b44290098e855c1e0685412
-  data.tar.gz: ac9f865fdc1dec1dcba40858e40838ea3741160e4bc4db039694e4dd23b2ea5d9131404b90438c50c51be2f6c1e926565c43175d758be07b910e74f6005d6d43
+  metadata.gz: d2bd320fcca56cd78069f2c22eead8284aa71bf5d25f573d2aaf92a9a36eb5fce2f70bd4a9e6cd3e0a0f743d8c642d1b14768529713316e36e9a8478edaa5511
+  data.tar.gz: 9e1c28522ee527b73127349f0fb8224e65583604b0d56750849a36e3ec30ab2e5d8d774a756b6866437ad09855de307b89d40a3178bba94b2da00302bece4b78

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.20.0 - 2017-02-03
+### Added
+- Dataset - spatial_point.
+- Resource subclasses - locale.
+
+### Fixed
+- Collection - array of instances.
+
 ## 0.19.2 - 2017-01-27
 ### Fixed
 - Dataset - production, temporal extraction.

data/lib/puree/collection.rb

@@ -182,17 +182,25 @@ module Puree
       data = []
       resource_class = 'Puree::' + @resource_type.to_s.capitalize
 
-      if @options[:basic_auth] === true
-        r = Object.const_get(resource_class).new base_url:   @base_url,
-                                                 username:   @username,
-                                                 password:   @password,
-                                                 basic_auth: true
-      else
-        r = Object.const_get(resource_class).new base_url:   @base_url
-      end
+      # if @options[:basic_auth] === true
+      #   r = Object.const_get(resource_class).new base_url:   @base_url,
+      #                                            username:   @username,
+      #                                            password:   @password,
+      #                                            basic_auth: true
+      # else
+      #   r = Object.const_get(resource_class).new base_url:   @base_url
+      # end
       # whitelist symbol
       if @api_map[:resource_type].has_key?(@resource_type)
         uuid.each do |u|
+          if @options[:basic_auth] === true
+            r = Object.const_get(resource_class).new base_url:   @base_url,
+                                                     username:   @username,
+                                                     password:   @password,
+                                                     basic_auth: true
+          else
+            r = Object.const_get(resource_class).new base_url:   @base_url
+          end
           record = r.find uuid: u,
                           rendering:  @options[:record_rendering]
           # puts JSON.pretty_generate( record, :indent => '  ')

data/lib/puree/dataset.rb

@@ -121,13 +121,20 @@ module Puree
       @metadata['publisher']
     end
 
-    # Spatial coverage
+    # Spatial coverage (place names)
     #
     # @return [Array<String>]
     def spatial
       @metadata['spatial']
     end
 
+    # Spatial coverage point
+    #
+    # @return [Hash]
+    def spatial_point
+      @metadata['spatial_point']
+    end
+
     # Temporal coverage
     #
     # @return [Hash]
@@ -335,6 +342,7 @@ module Puree
     end
 
     def extract_spatial
+      # Data from free-form text box
       path = '/geographicalCoverage/localizedString'
       xpath_result = xpath_query path
       data = []
@@ -344,6 +352,18 @@ module Puree
       data
     end
 
+    def extract_spatial_point
+      path = '/geoLocation/point'
+      xpath_result = xpath_query path
+      o = {}
+      if !xpath_result[0].nil?
+        arr = xpath_result.text.split(',')
+        o['latitude'] = arr[0].strip.to_f
+        o['longitude'] = arr[1].strip.to_f
+      end
+      o
+    end
+
     def extract_temporal
       temporal_range 'temporalCoverageStartDate', 'temporalCoverageEndDate'
     end
@@ -377,6 +397,7 @@ module Puree
       o['publication'] = extract_publication
       o['publisher'] = extract_publisher
       o['spatial'] = extract_spatial
+      o['spatial_point'] = extract_spatial_point
       o['temporal'] = extract_temporal
       o['title'] = extract_title
       @metadata = o

data/lib/puree/project.rb

@@ -13,7 +13,7 @@ module Puree
             base_url: base_url,
             username: username,
             password: password,
-            bleeding: false,
+            bleeding: false, # stable API does not return person roles
             basic_auth: basic_auth)
     end
 

data/lib/puree/resource.rb

@@ -119,6 +119,13 @@ module Puree
       @metadata['modified']
     end
 
+    # Locale (e.g. en-GB)
+    #
+    # @return [String]
+    def locale
+      @metadata['locale']
+    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
     #
@@ -154,6 +161,12 @@ module Puree
       xpath_query_for_single_value path
     end
 
+    def extract_locale
+      path = '/@locale'
+      str = xpath_query_for_single_value path
+      str.gsub('_','-')
+    end
+
     # All metadata
     #
     # @return [Hash]
@@ -162,6 +175,7 @@ module Puree
       o['uuid'] = extract_uuid
       o['created'] = extract_created
       o['modified'] = extract_modified
+      o['locale'] = extract_locale
       o
     end
 

data/lib/puree/version.rb

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

data/spec/{dataset.rb → dataset_spec.rb}

@@ -64,6 +64,10 @@ describe 'Dataset' do
       expect(@p.link).to be_an_instance_of(Array)
     end
 
+    it '#locale' do
+      expect(@p.locale).to be_an_instance_of(String)
+    end
+
     it '#metadata' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
@@ -100,6 +104,10 @@ describe 'Dataset' do
       expect(@p.spatial).to be_an_instance_of(Array)
     end
 
+    it '#spatial_point' do
+      expect(@p.spatial_point).to be_an_instance_of(Hash)
+    end
+
     it '#temporal' do
       expect(@p.temporal).to be_an_instance_of(Hash)
     end

data/spec/{event.rb → event_spec.rb}

@@ -52,6 +52,10 @@ describe 'Event' do
       expect(@p.location).to be_an_instance_of(String)
     end
 
+    it '#locale' do
+      expect(@p.locale).to be_an_instance_of(String)
+    end
+
     it '#metadata' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end

data/spec/{journal.rb → journal_spec.rb}

@@ -36,6 +36,10 @@ describe 'Journal' do
       expect(@p.issn).to be_an_instance_of(String)
     end
 
+    it '#locale' do
+      expect(@p.locale).to be_an_instance_of(String)
+    end
+
     it '#metadata' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end

data/spec/{organisation.rb → organisation_spec.rb}

@@ -40,6 +40,10 @@ describe 'Organisation' do
       expect(@p.email).to be_an_instance_of(Array)
     end
 
+    it '#locale' do
+      expect(@p.locale).to be_an_instance_of(String)
+    end
+
     it '#metadata' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end

data/spec/{person.rb → person_spec.rb}

@@ -48,6 +48,10 @@ describe 'Person' do
       expect(@p.keyword).to be_an_instance_of(Array)
     end
 
+    it '#locale' do
+      expect(@p.locale).to be_an_instance_of(String)
+    end
+
     it '#metadata' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end

data/spec/{project.rb → project_spec.rb}

@@ -40,6 +40,10 @@ describe 'Project' do
       expect(@p.description).to be_an_instance_of(String)
     end
 
+    it '#locale' do
+      expect(@p.locale).to be_an_instance_of(String)
+    end
+
     it '#metadata' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end

data/spec/{publication.rb → publication_spec.rb}

@@ -52,6 +52,10 @@ describe 'Publication' do
       expect(@p.file).to be_an_instance_of(Array)
     end
 
+    it '#locale' do
+      expect(@p.locale).to be_an_instance_of(String)
+    end
+
     it '#metadata' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end

data/spec/{publisher.rb → publisher_spec.rb}

@@ -32,6 +32,10 @@ describe 'Publisher' do
       expect(@p.created).to be_an_instance_of(String)
     end
 
+    it '#locale' do
+      expect(@p.locale).to be_an_instance_of(String)
+    end
+
     it '#metadata' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.20.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -71,17 +71,17 @@ files:
 - lib/puree/server.rb
 - lib/puree/version.rb
 - 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/collection_spec.rb
+- spec/dataset_spec.rb
+- spec/download_spec.rb
+- spec/event_spec.rb
+- spec/journal_spec.rb
+- spec/organisation_spec.rb
+- spec/person_spec.rb
+- spec/project_spec.rb
+- spec/publication_spec.rb
+- spec/publisher_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
 homepage: https://aalbinclark.gitbooks.io/puree
 licenses:
@@ -108,16 +108,16 @@ signing_key:
 specification_version: 4
 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/collection_spec.rb
+- spec/dataset_spec.rb
+- spec/download_spec.rb
+- spec/event_spec.rb
+- spec/journal_spec.rb
+- spec/organisation_spec.rb
+- spec/person_spec.rb
+- spec/project_spec.rb
+- spec/publication_spec.rb
+- spec/publisher_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
 has_rdoc: