rubydora 0.5.6 → 0.5.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/History.textile +4 -1
- data/VERSION +1 -1
- data/lib/rubydora/datastream.rb +1 -0
- data/spec/lib/datastream_spec.rb +48 -37
- metadata +29 -29
data/History.textile
CHANGED
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.5.
|
1
|
+
0.5.7
|
data/lib/rubydora/datastream.rb
CHANGED
@@ -154,6 +154,7 @@ module Rubydora
|
|
154
154
|
## Force a recheck of the profile if they've passed :validateChecksum and we don't have dsChecksumValid
|
155
155
|
return @profile
|
156
156
|
end
|
157
|
+
return @profile = {} unless digital_object.respond_to? :repository
|
157
158
|
@profile = begin
|
158
159
|
options = { :pid => pid, :dsid => dsid }
|
159
160
|
options.merge!(opts)
|
data/spec/lib/datastream_spec.rb
CHANGED
@@ -443,51 +443,62 @@ describe Rubydora::Datastream do
|
|
443
443
|
end
|
444
444
|
|
445
445
|
describe "profile" do
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
XML
|
455
|
-
@datastream.profile(:validateChecksum=>true).should == {'dsChecksumValid' =>true}
|
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)
|
446
|
+
describe "with a digital_object that doesn't have a repository" do
|
447
|
+
### see UnsavedDigitalObject in ActiveFedora
|
448
|
+
before(:each) do
|
449
|
+
@datastream = Rubydora::Datastream.new stub(:foo), 'dsid'
|
450
|
+
end
|
451
|
+
it "should be empty if the digital_object doesn't have a repository" do
|
452
|
+
@datastream.profile.should == {}
|
453
|
+
end
|
460
454
|
end
|
461
|
-
describe "
|
462
|
-
|
463
|
-
@
|
464
|
-
<datastreamProfile>
|
465
|
-
<dsChecksumValid>true</dsChecksumValid>
|
466
|
-
</datastreamProfile>
|
467
|
-
XML
|
468
|
-
@datastream.profile().should == {'dsChecksumValid' =>true}
|
469
|
-
#second time should not trigger the mock, which demonstrates that the profile is coming from cache.
|
470
|
-
@datastream.profile().should == {'dsChecksumValid' =>true}
|
455
|
+
describe "with a digital_object that has a repository" do
|
456
|
+
before(:each) do
|
457
|
+
@datastream = Rubydora::Datastream.new @mock_object, 'dsid'
|
471
458
|
end
|
472
|
-
it "should
|
473
|
-
@mock_repository.should_receive(:datastream).
|
474
|
-
<datastreamProfile>
|
475
|
-
<dsLabel>The description of the content</dsLabel>
|
476
|
-
</datastreamProfile>
|
477
|
-
XML
|
478
|
-
@mock_repository.should_receive(:datastream).with(hash_including(:validateChecksum => true)).once.and_return <<-XML
|
459
|
+
it "should accept a validateChecksum argument" do
|
460
|
+
@mock_repository.should_receive(:datastream).with(hash_including(:validateChecksum => true)).and_return <<-XML
|
479
461
|
<datastreamProfile>
|
480
|
-
<dsLabel>The description of the content</dsLabel>
|
481
462
|
<dsChecksumValid>true</dsChecksumValid>
|
482
463
|
</datastreamProfile>
|
483
464
|
XML
|
484
|
-
@datastream.profile().should == {
|
485
|
-
|
486
|
-
|
487
|
-
@
|
465
|
+
@datastream.profile(:validateChecksum=>true).should == {'dsChecksumValid' =>true}
|
466
|
+
end
|
467
|
+
it "should reraise Unauthorized errors" do
|
468
|
+
@mock_repository.should_receive(:datastream).and_raise(RestClient::Unauthorized)
|
469
|
+
lambda{@datastream.profile}.should raise_error(RestClient::Unauthorized)
|
488
470
|
end
|
489
|
-
end
|
490
471
|
|
472
|
+
describe "once it has a profile" do
|
473
|
+
it "should use the profile from cache" do
|
474
|
+
@mock_repository.should_receive(:datastream).once.and_return <<-XML
|
475
|
+
<datastreamProfile>
|
476
|
+
<dsChecksumValid>true</dsChecksumValid>
|
477
|
+
</datastreamProfile>
|
478
|
+
XML
|
479
|
+
@datastream.profile().should == {'dsChecksumValid' =>true}
|
480
|
+
#second time should not trigger the mock, which demonstrates that the profile is coming from cache.
|
481
|
+
@datastream.profile().should == {'dsChecksumValid' =>true}
|
482
|
+
end
|
483
|
+
it "should re-fetch and replace the profile when validateChecksum is passed in, and there is no dsChecksumValid in the existing profile" do
|
484
|
+
@mock_repository.should_receive(:datastream).once.and_return <<-XML
|
485
|
+
<datastreamProfile>
|
486
|
+
<dsLabel>The description of the content</dsLabel>
|
487
|
+
</datastreamProfile>
|
488
|
+
XML
|
489
|
+
@mock_repository.should_receive(:datastream).with(hash_including(:validateChecksum => true)).once.and_return <<-XML
|
490
|
+
<datastreamProfile>
|
491
|
+
<dsLabel>The description of the content</dsLabel>
|
492
|
+
<dsChecksumValid>true</dsChecksumValid>
|
493
|
+
</datastreamProfile>
|
494
|
+
XML
|
495
|
+
@datastream.profile().should == {"dsLabel"=>"The description of the content"}
|
496
|
+
@datastream.profile(:validateChecksum=>true).should == {"dsLabel"=>"The description of the content", 'dsChecksumValid' =>true}
|
497
|
+
## Third time should not trigger a mock, which demonstrates that the profile is coming from cache.
|
498
|
+
@datastream.profile(:validateChecksum=>true)
|
499
|
+
end
|
500
|
+
end
|
501
|
+
end
|
491
502
|
end
|
492
503
|
|
493
504
|
describe "to_api_params" do
|
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.7
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ 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: &70357365893180 !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: *70357365893180
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: rest-client
|
27
|
-
requirement: &
|
27
|
+
requirement: &70357365887520 !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: *70357365887520
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: nokogiri
|
38
|
-
requirement: &
|
38
|
+
requirement: &70357365901640 !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: *70357365901640
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: mime-types
|
49
|
-
requirement: &
|
49
|
+
requirement: &70357365901000 !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: *70357365901000
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: activesupport
|
60
|
-
requirement: &
|
60
|
+
requirement: &70357365900400 !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: *70357365900400
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: activemodel
|
71
|
-
requirement: &
|
71
|
+
requirement: &70357365899700 !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: *70357365899700
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: savon
|
82
|
-
requirement: &
|
82
|
+
requirement: &70357365897940 !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: *70357365897940
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: rake
|
93
|
-
requirement: &
|
93
|
+
requirement: &70357365895460 !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: *70357365895460
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: shoulda
|
104
|
-
requirement: &
|
104
|
+
requirement: &70357365893860 !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: *70357365893860
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: bundler
|
115
|
-
requirement: &
|
115
|
+
requirement: &70357365920960 !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: *70357365920960
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: rspec
|
126
|
-
requirement: &
|
126
|
+
requirement: &70357365914820 !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: *70357365914820
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: yard
|
137
|
-
requirement: &
|
137
|
+
requirement: &70357365934120 !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: *70357365934120
|
146
146
|
- !ruby/object:Gem::Dependency
|
147
147
|
name: jettywrapper
|
148
|
-
requirement: &
|
148
|
+
requirement: &70357365933200 !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: *70357365933200
|
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: -4514414545578735851
|
217
217
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
218
218
|
none: false
|
219
219
|
requirements:
|
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
222
222
|
version: '0'
|
223
223
|
segments:
|
224
224
|
- 0
|
225
|
-
hash: -
|
225
|
+
hash: -4514414545578735851
|
226
226
|
requirements: []
|
227
227
|
rubyforge_project:
|
228
228
|
rubygems_version: 1.8.15
|