rubydora 0.5.4 → 0.5.5
Sign up to get free protection for your applications and to get access to all the features.
- data/History.textile +3 -0
- data/VERSION +1 -1
- data/lib/rubydora/datastream.rb +3 -1
- data/lib/rubydora/rest_api_client.rb +4 -0
- data/spec/lib/datastream_spec.rb +4 -0
- data/spec/lib/rest_api_client_spec.rb +9 -0
- metadata +31 -31
data/History.textile
CHANGED
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.5.
|
1
|
+
0.5.5
|
data/lib/rubydora/datastream.rb
CHANGED
@@ -160,7 +160,9 @@ module Rubydora
|
|
160
160
|
options[:asOfDateTime] = asOfDateTime if asOfDateTime
|
161
161
|
options[:validateChecksum] = true if repository.config[:validateChecksum]
|
162
162
|
self.profile_xml_to_hash(repository.datastream(options))
|
163
|
-
rescue
|
163
|
+
rescue RestClient::Unauthorized => e
|
164
|
+
raise e
|
165
|
+
rescue StandardError
|
164
166
|
{}
|
165
167
|
end
|
166
168
|
end
|
@@ -205,6 +205,10 @@ module Rubydora
|
|
205
205
|
logger.error "Unable to connect to Fedora at #{@client.url}"
|
206
206
|
raise e
|
207
207
|
rescue RestClient::ResourceNotFound => e
|
208
|
+
logger.error "ResourceNotFound at #{client.url}/#{datastream_url(pid, dsid, options)}"
|
209
|
+
raise e
|
210
|
+
rescue RestClient::Unauthorized => e
|
211
|
+
logger.error "Unauthorized at #{client.url}/#{datastream_url(pid, dsid, options)}"
|
208
212
|
raise e
|
209
213
|
rescue RestClient::InternalServerError => e
|
210
214
|
logger.error e.response
|
data/spec/lib/datastream_spec.rb
CHANGED
@@ -454,6 +454,10 @@ describe Rubydora::Datastream do
|
|
454
454
|
XML
|
455
455
|
@datastream.profile(:validateChecksum=>true).should == {'dsChecksumValid' =>true}
|
456
456
|
end
|
457
|
+
it "should reraise Unauthorized errors" do
|
458
|
+
@mock_repository.should_receive(:datastream).and_raise(RestClient::Unauthorized)
|
459
|
+
lambda{@datastream.profile}.should raise_error(RestClient::Unauthorized)
|
460
|
+
end
|
457
461
|
describe "once it has a profile" do
|
458
462
|
it "should use the profile from cache" do
|
459
463
|
@mock_repository.should_receive(:datastream).once.and_return <<-XML
|
@@ -107,19 +107,28 @@ describe Rubydora::RestApiClient do
|
|
107
107
|
|
108
108
|
it "datastream" do
|
109
109
|
RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams?format=xml"))
|
110
|
+
logger.should_receive(:debug) # squelch message "Loaded datastream list for mypid (time)"
|
110
111
|
@mock_repository.datastream :pid => 'mypid'
|
111
112
|
end
|
112
113
|
|
113
114
|
it "datastream" do
|
114
115
|
RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa?format=xml"))
|
116
|
+
logger.should_receive(:debug) # squelch message "Loaded datastream mypid/aaa (time)"
|
115
117
|
@mock_repository.datastream :pid => 'mypid', :dsid => 'aaa'
|
116
118
|
end
|
117
119
|
|
118
120
|
it "should raise not found exception when getting a datastream" do
|
119
121
|
RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa?format=xml")).and_raise( RestClient::ResourceNotFound)
|
122
|
+
logger.should_receive(:error).with("ResourceNotFound at http://example.org/objects/mypid/datastreams/aaa?format=xml")
|
120
123
|
lambda {@mock_repository.datastream :pid => 'mypid', :dsid => 'aaa'}.should raise_error RestClient::ResourceNotFound
|
121
124
|
end
|
122
125
|
|
126
|
+
it "should raise Unauthorized exception when getting a datastream" do
|
127
|
+
RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa?format=xml")).and_raise( RestClient::Unauthorized)
|
128
|
+
logger.should_receive(:error).with("Unauthorized at http://example.org/objects/mypid/datastreams/aaa?format=xml")
|
129
|
+
lambda {@mock_repository.datastream :pid => 'mypid', :dsid => 'aaa'}.should raise_error RestClient::Unauthorized
|
130
|
+
end
|
131
|
+
|
123
132
|
it "datastream_dissemination" do
|
124
133
|
RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/content"))
|
125
134
|
@mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa'
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rubydora
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.5
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-03-
|
12
|
+
date: 2012-03-14 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: fastercsv
|
16
|
-
requirement: &
|
16
|
+
requirement: &70154491151220 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70154491151220
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: rest-client
|
27
|
-
requirement: &
|
27
|
+
requirement: &70154491145140 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70154491145140
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: nokogiri
|
38
|
-
requirement: &
|
38
|
+
requirement: &70154491159360 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70154491159360
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: mime-types
|
49
|
-
requirement: &
|
49
|
+
requirement: &70154491158840 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *70154491158840
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: activesupport
|
60
|
-
requirement: &
|
60
|
+
requirement: &70154491158180 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *70154491158180
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: activemodel
|
71
|
-
requirement: &
|
71
|
+
requirement: &70154491157400 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: '0'
|
77
77
|
type: :runtime
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *70154491157400
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: savon
|
82
|
-
requirement: &
|
82
|
+
requirement: &70154491154800 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ! '>='
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: '0'
|
88
88
|
type: :runtime
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *70154491154800
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: rake
|
93
|
-
requirement: &
|
93
|
+
requirement: &70154491152940 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ! '>='
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: '0'
|
99
99
|
type: :development
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *70154491152940
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: shoulda
|
104
|
-
requirement: &
|
104
|
+
requirement: &70154491180420 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ! '>='
|
@@ -109,10 +109,10 @@ dependencies:
|
|
109
109
|
version: '0'
|
110
110
|
type: :development
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *70154491180420
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: bundler
|
115
|
-
requirement: &
|
115
|
+
requirement: &70154491177460 !ruby/object:Gem::Requirement
|
116
116
|
none: false
|
117
117
|
requirements:
|
118
118
|
- - ! '>='
|
@@ -120,10 +120,10 @@ dependencies:
|
|
120
120
|
version: 1.0.14
|
121
121
|
type: :development
|
122
122
|
prerelease: false
|
123
|
-
version_requirements: *
|
123
|
+
version_requirements: *70154491177460
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: rspec
|
126
|
-
requirement: &
|
126
|
+
requirement: &70154491193220 !ruby/object:Gem::Requirement
|
127
127
|
none: false
|
128
128
|
requirements:
|
129
129
|
- - ! '>='
|
@@ -131,10 +131,10 @@ dependencies:
|
|
131
131
|
version: '0'
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
|
-
version_requirements: *
|
134
|
+
version_requirements: *70154491193220
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: yard
|
137
|
-
requirement: &
|
137
|
+
requirement: &70154491191840 !ruby/object:Gem::Requirement
|
138
138
|
none: false
|
139
139
|
requirements:
|
140
140
|
- - ! '>='
|
@@ -142,10 +142,10 @@ dependencies:
|
|
142
142
|
version: '0'
|
143
143
|
type: :development
|
144
144
|
prerelease: false
|
145
|
-
version_requirements: *
|
145
|
+
version_requirements: *70154491191840
|
146
146
|
- !ruby/object:Gem::Dependency
|
147
147
|
name: jettywrapper
|
148
|
-
requirement: &
|
148
|
+
requirement: &70154491190920 !ruby/object:Gem::Requirement
|
149
149
|
none: false
|
150
150
|
requirements:
|
151
151
|
- - ! '>='
|
@@ -153,7 +153,7 @@ dependencies:
|
|
153
153
|
version: '0'
|
154
154
|
type: :development
|
155
155
|
prerelease: false
|
156
|
-
version_requirements: *
|
156
|
+
version_requirements: *70154491190920
|
157
157
|
description: ! 'Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+'
|
158
158
|
email:
|
159
159
|
- chris@cbeer.info
|
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
213
213
|
version: '0'
|
214
214
|
segments:
|
215
215
|
- 0
|
216
|
-
hash: -
|
216
|
+
hash: -3533612321507909257
|
217
217
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
218
218
|
none: false
|
219
219
|
requirements:
|
@@ -222,10 +222,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
222
222
|
version: '0'
|
223
223
|
segments:
|
224
224
|
- 0
|
225
|
-
hash: -
|
225
|
+
hash: -3533612321507909257
|
226
226
|
requirements: []
|
227
227
|
rubyforge_project:
|
228
|
-
rubygems_version: 1.8.
|
228
|
+
rubygems_version: 1.8.15
|
229
229
|
signing_key:
|
230
230
|
specification_version: 3
|
231
231
|
summary: Fedora Commons REST API ruby library
|