puree 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c24eb641ac01ba9ed21562d4dce8df4046b08000f41940fc508a6db329ce7da
-  data.tar.gz: d89a38743bf799cfe5ac1e40cdfbbf50194849d54e6a2dc7ddbf81121cf3fb4a
+  metadata.gz: d9e2d38e9e15a3b7da9abc9cc7350783a2bb4953b580ebbc4316532e10cff8a0
+  data.tar.gz: 68549513f64206b24c00fc0624584e27af33d98d95d33022c7af83c08cf7b5c8
 SHA512:
-  metadata.gz: f0fc15bc9e77345916ff7bc1265dbf453a5a57c3dfe9045d47e5d8e56a45c6a94c42b9a5319c682f83db5cc52edd6c4a0c2dc7fcb8403b8b865e1b2cffd35991
-  data.tar.gz: e782937aa2b31e9515e494f3d6dff3f0000fcd947670dfe38a0e5e65b566e966c1eb900ea08ed91b47e0ddf825c340e5539793610c012d6cec07a53c7422e175
+  metadata.gz: 47858f41df3685614811f02d9336c2b0c19c8f88d3e14b797bec0a1154f3d1de73dd9ea7e42aeb31f2dfd20105b8bb9f9c120be5081b94ef61ff832449878b5f
+  data.tar.gz: 56dec4190827a75dc549af1cd7424146090efccbce1488a4996a585c0840e2d57c91196756f56227b598a1b4fa8b1cccee5fcf5c9388311f7643c4eb9d0ce685

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.7.0 2019-06-06
+### Changed
+- For Pure API 513.
+    - Dataset, person, research output - keywords.
+
+### Added
+- Resource subclasses - id.
+
 ## 2.6.0 2019-01-14
 ### Added
 - Resource subclasses - previous_uuids.

data/README.md

@@ -38,7 +38,8 @@ Purée version | Pure API version
 :---: | :---:
 < 2.0 | < 59
 &gt;= 2.0, < 2.5 | 59, 510
-&gt;= 2.5 | 511, 512
+&gt;= 2.5, < 2.7 | 511, 512
+2.7 | 513
 
 ## Extractor module
 ```ruby

data/lib/puree/model/resource.rb

@@ -5,6 +5,9 @@ module Puree
     #
     class Resource
 
+      # @return [String, nil]
+      attr_reader :id
+
       # @return [String, nil]
       attr_reader :uuid
 
@@ -23,6 +26,11 @@ module Puree
       # @return [Time, nil]
       attr_reader :modified_at
 
+      # @param v [String]
+      def id=(v)
+        @id = v if v && !v.empty?
+      end
+
       # @param v [String]
       def uuid=(v)
         @uuid = v if v && !v.empty?

data/lib/puree/version.rb

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

data/lib/puree/xml_extractor/mixins/keyword_mixin.rb

@@ -10,7 +10,7 @@ module Puree
 
       # @return [Array<String>]
       def keyword_group(logical_name)
-        xpath_result = xpath_query "/keywordGroups/keywordGroup[@logicalName='#{logical_name}']/keywords/keyword"
+        xpath_result = xpath_query "/keywordGroups/keywordGroup[@logicalName='#{logical_name}']//freeKeyword"
         data_arr = xpath_result.map { |i| i.text.strip }
         data_arr.uniq
       end

data/lib/puree/xml_extractor/resource.rb

@@ -37,6 +37,11 @@ module Puree
         Time.parse xpath_result if xpath_result
       end
 
+      # @return [String, nil]
+      def id
+        xpath_query_for_single_value '/@pureId'
+      end
+
       # @return [String, nil]
       def uuid
         xpath_query_for_single_value '/@uuid'
@@ -58,6 +63,7 @@ module Puree
       # @return [Hash]
       def combine_metadata
         raise 'No model to populate' if !@model
+        @model.id = id
         @model.uuid = uuid
         @model.created_by = created_by
         @model.created_at = created_at

data/puree.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |spec|
   spec.email         = 'a.albin-clark@lancaster.ac.uk'
   spec.summary       = %q{Metadata extraction from the Pure Research Information System.}
   spec.metadata = {
-    'source_code_uri' => 'https://github.com/lulibrary/puree'
+    'source_code_uri' => 'https://github.com/lulibrary/puree',
+    "documentation_uri" => "https://www.rubydoc.info/gems/puree/2.7.0",
   }
   spec.license       = 'MIT'
   spec.files         = `git ls-files -z`.split("\x0")

data/test/integration/research_output_types_test.rb

@@ -23,7 +23,7 @@ class TestResearchOutputTypes < Minitest::Test
     types.each do |type|
       params = {
         size: size,
-        typeUri: [type[:uri]]
+        typeUris: [type[:uri]]
       }
       response = client.research_outputs.all_complex params: params
       # puts response

data/test/rest/base_test.rb

@@ -13,18 +13,17 @@ class TestResourceBase < Minitest::Test
   def test_post_request_collection
     params = {
         size: 3,
-        employmentTypeUri: ['/dk/atira/pure/person/employmenttypes/academic'],
+        employmentTypeUris: ['/dk/atira/pure/person/employmenttypes/academic'],
         employmentStatus: 'ACTIVE'
     }
     response = client.persons.all_complex params: params
-    # puts response
     assert_equal response.code, 200
     assert_instance_of HTTP::Response, response
   end
 
   def test_collection_count
     params = {
-      employmentTypeUri: ['/dk/atira/pure/person/employmenttypes/academic'],
+      employmentTypeUris: ['/dk/atira/pure/person/employmenttypes/academic'],
       employmentStatus: 'ACTIVE'
     }
     extractor = Puree::Extractor::Person.new config

data/test/test_xml_extractor_helper.rb

@@ -9,6 +9,8 @@ def asserts_resource(x)
 
   assert_instance_of String, x.modified_by
 
+  assert_instance_of String, x.id
+
   assert_instance_of String, x.uuid
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -236,6 +236,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/lulibrary/puree
+  documentation_uri: https://www.rubydoc.info/gems/puree/2.7.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -251,8 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Metadata extraction from the Pure Research Information System.