puree 0.19.0 → 0.19.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/lib/puree/dataset.rb +18 -2
- data/lib/puree/publication.rb +1 -2
- data/lib/puree/version.rb +1 -1
- data/spec/dataset.rb +8 -0
- data/spec/download.rb +4 -0
- data/spec/event.rb +8 -0
- data/spec/journal.rb +8 -0
- data/spec/organisation.rb +8 -0
- data/spec/person.rb +8 -0
- data/spec/project.rb +8 -0
- data/spec/publication.rb +8 -0
- data/spec/publisher.rb +8 -0
- data/spec/server.rb +4 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1b90e69c2963be1ee72e58ade3f738570c68145a
|
4
|
+
data.tar.gz: 746b0c3ca920c13ffd51f43cea9fa9db3ebe3f81
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 45d1dfafa6bd935cd527fec223f1b27e4136f4183e7132c17d7440fa07133eb772b8b9bbaa7d690a7ff84523413610d8d565cc844675fd5cb603083959c68017
|
7
|
+
data.tar.gz: f2daa254050056dee8482d2804fdf124340518de7ca6a07af130e0ba2936e7483c197ff1d1eeae5f7862e2f8388ee042c4975629270d7d321890c5c7a0c5c674
|
data/CHANGELOG.md
CHANGED
@@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|
7
7
|
- Factory to make resource objects?
|
8
8
|
- Make ALL dates ISO 8601 YYYY-MM-DD, rather than mirror varying formats from Pure?
|
9
9
|
|
10
|
+
## 0.19.1 - 2016-11-30
|
11
|
+
### Fixed
|
12
|
+
- Dataset, Publication - person role extraction.
|
13
|
+
|
10
14
|
## 0.19.0 - 2016-09-21
|
11
15
|
### Added
|
12
16
|
- Journal - issn, publisher.
|
data/lib/puree/dataset.rb
CHANGED
@@ -261,7 +261,6 @@ module Puree
|
|
261
261
|
|
262
262
|
def extract_person
|
263
263
|
data = {}
|
264
|
-
# internal
|
265
264
|
path = '/persons/dataSetPersonAssociation'
|
266
265
|
xpath_result = xpath_query path
|
267
266
|
internal = []
|
@@ -274,7 +273,24 @@ module Puree
|
|
274
273
|
name['first'] = i.xpath('name/firstName').text.strip
|
275
274
|
name['last'] = i.xpath('name/lastName').text.strip
|
276
275
|
o['name'] = name
|
277
|
-
|
276
|
+
|
277
|
+
roles = {
|
278
|
+
'/dk/atira/pure/dataset/roles/dataset/contributor' => 'Contributor',
|
279
|
+
'/dk/atira/pure/dataset/roles/dataset/creator' => 'Creator',
|
280
|
+
'/dk/atira/pure/dataset/roles/dataset/datacollector' => 'Data Collector',
|
281
|
+
'/dk/atira/pure/dataset/roles/dataset/datamanager' => 'Data Manager',
|
282
|
+
'/dk/atira/pure/dataset/roles/dataset/distributor' => 'Distributor',
|
283
|
+
'/dk/atira/pure/dataset/roles/dataset/editor' => 'Editor',
|
284
|
+
'/dk/atira/pure/dataset/roles/dataset/funder' => 'Funder',
|
285
|
+
'/dk/atira/pure/dataset/roles/dataset/owner' => 'Owner',
|
286
|
+
'/dk/atira/pure/dataset/roles/dataset/other' => 'Other',
|
287
|
+
'/dk/atira/pure/dataset/roles/dataset/producer' => 'Producer',
|
288
|
+
'/dk/atira/pure/dataset/roles/dataset/rightsholder' => 'Rights Holder',
|
289
|
+
'/dk/atira/pure/dataset/roles/dataset/sponsor' => 'Sponsor',
|
290
|
+
'/dk/atira/pure/dataset/roles/dataset/supervisor' => 'Supervisor'
|
291
|
+
}
|
292
|
+
role_uri = i.xpath('personRole/uri').text.strip
|
293
|
+
o['role'] = roles[role_uri].to_s
|
278
294
|
|
279
295
|
uuid_internal = i.at_xpath('person/@uuid')
|
280
296
|
uuid_external = i.at_xpath('externalPerson/@uuid')
|
data/lib/puree/publication.rb
CHANGED
@@ -171,7 +171,6 @@ module Puree
|
|
171
171
|
|
172
172
|
def extract_person
|
173
173
|
data = {}
|
174
|
-
# internal
|
175
174
|
path = '/persons/personAssociation'
|
176
175
|
xpath_result = xpath_query path
|
177
176
|
internal = []
|
@@ -184,7 +183,7 @@ module Puree
|
|
184
183
|
name['first'] = i.xpath('name/firstName').text.strip
|
185
184
|
name['last'] = i.xpath('name/lastName').text.strip
|
186
185
|
o['name'] = name
|
187
|
-
o['role'] =
|
186
|
+
o['role'] = 'Author'
|
188
187
|
|
189
188
|
uuid_internal = i.at_xpath('person/@uuid')
|
190
189
|
uuid_external = i.at_xpath('externalPerson/@uuid')
|
data/lib/puree/version.rb
CHANGED
data/spec/dataset.rb
CHANGED
@@ -68,6 +68,10 @@ describe 'Dataset' do
|
|
68
68
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
69
69
|
end
|
70
70
|
|
71
|
+
it '#metadata' do
|
72
|
+
expect(@p.metadata).not_to be_empty
|
73
|
+
end
|
74
|
+
|
71
75
|
it '#modified' do
|
72
76
|
expect(@p.modified).to be_an_instance_of(String)
|
73
77
|
end
|
@@ -127,6 +131,10 @@ describe 'Dataset' do
|
|
127
131
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
128
132
|
end
|
129
133
|
|
134
|
+
it '#metadata' do
|
135
|
+
expect(@p.metadata).not_to be_empty
|
136
|
+
end
|
137
|
+
|
130
138
|
end
|
131
139
|
|
132
140
|
end
|
data/spec/download.rb
CHANGED
data/spec/event.rb
CHANGED
@@ -56,6 +56,10 @@ describe 'Event' do
|
|
56
56
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
57
57
|
end
|
58
58
|
|
59
|
+
it '#metadata' do
|
60
|
+
expect(@p.metadata).not_to be_empty
|
61
|
+
end
|
62
|
+
|
59
63
|
it '#modified' do
|
60
64
|
expect(@p.modified).to be_an_instance_of(String)
|
61
65
|
end
|
@@ -91,6 +95,10 @@ describe 'Event' do
|
|
91
95
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
92
96
|
end
|
93
97
|
|
98
|
+
it '#metadata' do
|
99
|
+
expect(@p.metadata).not_to be_empty
|
100
|
+
end
|
101
|
+
|
94
102
|
end
|
95
103
|
|
96
104
|
end
|
data/spec/journal.rb
CHANGED
@@ -40,6 +40,10 @@ describe 'Journal' do
|
|
40
40
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
41
41
|
end
|
42
42
|
|
43
|
+
it '#metadata' do
|
44
|
+
expect(@p.metadata).not_to be_empty
|
45
|
+
end
|
46
|
+
|
43
47
|
it '#modified' do
|
44
48
|
expect(@p.modified).to be_an_instance_of(String)
|
45
49
|
end
|
@@ -75,6 +79,10 @@ describe 'Journal' do
|
|
75
79
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
76
80
|
end
|
77
81
|
|
82
|
+
it '#metadata' do
|
83
|
+
expect(@p.metadata).not_to be_empty
|
84
|
+
end
|
85
|
+
|
78
86
|
end
|
79
87
|
|
80
88
|
end
|
data/spec/organisation.rb
CHANGED
@@ -44,6 +44,10 @@ describe 'Organisation' do
|
|
44
44
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
45
45
|
end
|
46
46
|
|
47
|
+
it '#metadata' do
|
48
|
+
expect(@p.metadata).not_to be_empty
|
49
|
+
end
|
50
|
+
|
47
51
|
it '#modified' do
|
48
52
|
expect(@p.modified).to be_an_instance_of(String)
|
49
53
|
end
|
@@ -95,6 +99,10 @@ describe 'Organisation' do
|
|
95
99
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
96
100
|
end
|
97
101
|
|
102
|
+
it '#metadata' do
|
103
|
+
expect(@p.metadata).not_to be_empty
|
104
|
+
end
|
105
|
+
|
98
106
|
end
|
99
107
|
|
100
108
|
end
|
data/spec/person.rb
CHANGED
@@ -52,6 +52,10 @@ describe 'Person' do
|
|
52
52
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
53
53
|
end
|
54
54
|
|
55
|
+
it '#metadata' do
|
56
|
+
expect(@p.metadata).not_to be_empty
|
57
|
+
end
|
58
|
+
|
55
59
|
it '#modified' do
|
56
60
|
expect(@p.modified).to be_an_instance_of(String)
|
57
61
|
end
|
@@ -87,6 +91,10 @@ describe 'Person' do
|
|
87
91
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
88
92
|
end
|
89
93
|
|
94
|
+
it '#metadata' do
|
95
|
+
expect(@p.metadata).not_to be_empty
|
96
|
+
end
|
97
|
+
|
90
98
|
end
|
91
99
|
|
92
100
|
end
|
data/spec/project.rb
CHANGED
@@ -44,6 +44,10 @@ describe 'Project' do
|
|
44
44
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
45
45
|
end
|
46
46
|
|
47
|
+
it '#metadata' do
|
48
|
+
expect(@p.metadata).not_to be_empty
|
49
|
+
end
|
50
|
+
|
47
51
|
it '#modified' do
|
48
52
|
expect(@p.modified).to be_an_instance_of(String)
|
49
53
|
end
|
@@ -103,6 +107,10 @@ describe 'Project' do
|
|
103
107
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
104
108
|
end
|
105
109
|
|
110
|
+
it '#metadata' do
|
111
|
+
expect(@p.metadata).not_to be_empty
|
112
|
+
end
|
113
|
+
|
106
114
|
end
|
107
115
|
|
108
116
|
end
|
data/spec/publication.rb
CHANGED
@@ -56,6 +56,10 @@ describe 'Publication' do
|
|
56
56
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
57
57
|
end
|
58
58
|
|
59
|
+
it '#metadata' do
|
60
|
+
expect(@p.metadata).not_to be_empty
|
61
|
+
end
|
62
|
+
|
59
63
|
it '#modified' do
|
60
64
|
expect(@p.modified).to be_an_instance_of(String)
|
61
65
|
end
|
@@ -111,6 +115,10 @@ describe 'Publication' do
|
|
111
115
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
112
116
|
end
|
113
117
|
|
118
|
+
it '#metadata' do
|
119
|
+
expect(@p.metadata).not_to be_empty
|
120
|
+
end
|
121
|
+
|
114
122
|
end
|
115
123
|
|
116
124
|
end
|
data/spec/publisher.rb
CHANGED
@@ -36,6 +36,10 @@ describe 'Publisher' do
|
|
36
36
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
37
37
|
end
|
38
38
|
|
39
|
+
it '#metadata' do
|
40
|
+
expect(@p.metadata).not_to be_empty
|
41
|
+
end
|
42
|
+
|
39
43
|
it '#modified' do
|
40
44
|
expect(@p.modified).to be_an_instance_of(String)
|
41
45
|
end
|
@@ -72,6 +76,10 @@ describe 'Publisher' do
|
|
72
76
|
expect(@p.metadata).to be_an_instance_of(Hash)
|
73
77
|
end
|
74
78
|
|
79
|
+
it '#metadata' do
|
80
|
+
expect(@p.metadata).not_to be_empty
|
81
|
+
end
|
82
|
+
|
75
83
|
end
|
76
84
|
|
77
85
|
end
|
data/spec/server.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: puree
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.19.
|
4
|
+
version: 0.19.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Adrian Albin-Clark
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-11-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: http
|