active-fedora 11.0.0.rc1 → 11.0.0
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.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.rubocop.yml +2 -7
- data/.rubocop_todo.yml +40 -9
- data/.solr_wrapper +6 -0
- data/README.md +1 -3
- data/active-fedora.gemspec +5 -9
- data/lib/active_fedora/associations/collection_association.rb +1 -1
- data/lib/active_fedora/associations/contained_finder.rb +2 -2
- data/lib/active_fedora/associations/has_many_association.rb +1 -1
- data/lib/active_fedora/associations/has_subresource_association.rb +2 -2
- data/lib/active_fedora/attribute_assignment.rb +0 -1
- data/lib/active_fedora/attributes.rb +1 -1
- data/lib/active_fedora/base.rb +3 -7
- data/lib/active_fedora/change_set.rb +6 -2
- data/lib/active_fedora/containers/container.rb +1 -1
- data/lib/active_fedora/core.rb +22 -25
- data/lib/active_fedora/fedora_attributes.rb +1 -1
- data/lib/active_fedora/file.rb +1 -1
- data/lib/active_fedora/indexing_service.rb +0 -4
- data/lib/active_fedora/orders/ordered_list.rb +2 -2
- data/lib/active_fedora/querying.rb +1 -1
- data/lib/active_fedora/railtie.rb +2 -2
- data/lib/active_fedora/rake_support.rb +1 -1
- data/lib/active_fedora/rdf.rb +0 -1
- data/lib/active_fedora/relation/delegation.rb +4 -0
- data/lib/active_fedora/solr_hit.rb +0 -4
- data/lib/active_fedora/solr_query_builder.rb +16 -12
- data/lib/active_fedora/version.rb +1 -1
- data/lib/active_fedora.rb +0 -10
- data/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml +11 -0
- data/lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml +1 -1
- data/spec/config_helper.rb +1 -1
- data/spec/integration/associations_spec.rb +17 -18
- data/spec/integration/attached_files_spec.rb +18 -8
- data/spec/integration/attributes_spec.rb +12 -16
- data/spec/integration/autosave_association_spec.rb +6 -6
- data/spec/integration/base_spec.rb +3 -3
- data/spec/integration/collection_association_spec.rb +2 -5
- data/spec/integration/date_time_properties_spec.rb +1 -2
- data/spec/integration/direct_container_spec.rb +8 -8
- data/spec/integration/directly_contains_one_association_spec.rb +11 -13
- data/spec/integration/eradicate_spec.rb +1 -1
- data/spec/integration/fedora_solr_sync_spec.rb +2 -2
- data/spec/integration/file_fixity_spec.rb +6 -8
- data/spec/integration/file_spec.rb +32 -34
- data/spec/integration/generators/solr_generator_spec.rb +7 -10
- data/spec/integration/has_many_associations_spec.rb +6 -8
- data/spec/integration/indexing_spec.rb +1 -1
- data/spec/integration/indirect_container_spec.rb +8 -9
- data/spec/integration/json_serialization_spec.rb +4 -4
- data/spec/integration/query_result_builder_spec.rb +9 -21
- data/spec/integration/rdf_nested_attributes_spec.rb +6 -6
- data/spec/integration/relation_delegation_spec.rb +8 -10
- data/spec/integration/relation_spec.rb +13 -16
- data/spec/integration/solr_hit_spec.rb +4 -4
- data/spec/integration/versionable_spec.rb +73 -327
- data/spec/spec_helper.rb +52 -10
- data/spec/unit/active_fedora_spec.rb +1 -1
- data/spec/unit/aggregation/list_source_spec.rb +37 -37
- data/spec/unit/aggregation/ordered_reader_spec.rb +4 -4
- data/spec/unit/association_hash_spec.rb +17 -31
- data/spec/unit/attached_files_spec.rb +35 -32
- data/spec/unit/attributes_spec.rb +25 -25
- data/spec/unit/base_active_model_spec.rb +8 -8
- data/spec/unit/base_cma_spec.rb +1 -1
- data/spec/unit/base_extra_spec.rb +7 -22
- data/spec/unit/base_spec.rb +14 -20
- data/spec/unit/callback_spec.rb +2 -2
- data/spec/unit/change_set_spec.rb +5 -5
- data/spec/unit/checksum_spec.rb +2 -2
- data/spec/unit/code_configurator_spec.rb +1 -1
- data/spec/unit/core_spec.rb +62 -26
- data/spec/unit/default_model_mapper_spec.rb +6 -6
- data/spec/unit/fedora_spec.rb +2 -2
- data/spec/unit/file_configurator_spec.rb +96 -96
- data/spec/unit/file_path_builder_spec.rb +1 -1
- data/spec/unit/file_spec.rb +61 -61
- data/spec/unit/files_hash_spec.rb +9 -9
- data/spec/unit/finder_methods_spec.rb +3 -3
- data/spec/unit/has_and_belongs_to_many_association_spec.rb +13 -14
- data/spec/unit/has_many_association_spec.rb +28 -13
- data/spec/unit/indexers/global_indexer_spec.rb +6 -6
- data/spec/unit/indexing_service_spec.rb +5 -5
- data/spec/unit/indexing_spec.rb +6 -6
- data/spec/unit/inheritance_spec.rb +11 -7
- data/spec/unit/loadable_from_json_spec.rb +4 -4
- data/spec/unit/logger_spec.rb +1 -1
- data/spec/unit/model_classifier_spec.rb +5 -5
- data/spec/unit/ordered_spec.rb +142 -142
- data/spec/unit/orders/list_node_spec.rb +21 -21
- data/spec/unit/orders/ordered_list_spec.rb +96 -96
- data/spec/unit/orders/reflection_spec.rb +4 -4
- data/spec/unit/pathing_spec.rb +4 -4
- data/spec/unit/persistence_spec.rb +28 -28
- data/spec/unit/property_spec.rb +2 -2
- data/spec/unit/query_spec.rb +10 -10
- data/spec/unit/rdf/indexing_service_spec.rb +26 -26
- data/spec/unit/readonly_spec.rb +5 -4
- data/spec/unit/reflection_spec.rb +3 -3
- data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb +9 -9
- data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb +9 -9
- data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb +9 -9
- data/spec/unit/schema_indexing_strategy_spec.rb +5 -5
- data/spec/unit/serializers_spec.rb +3 -4
- data/spec/unit/solr_config_options_spec.rb +13 -16
- data/spec/unit/solr_hit_spec.rb +9 -9
- data/spec/unit/solr_service_spec.rb +4 -10
- data/spec/unit/sparql_insert_spec.rb +2 -2
- data/spec/unit/validations_spec.rb +9 -9
- data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb +3 -2
- data/spec/unit/with_metadata/metadata_node_spec.rb +3 -2
- metadata +17 -118
- data/lib/active_fedora/datastreams/nokogiri_datastreams.rb +0 -119
- data/lib/active_fedora/datastreams.rb +0 -6
- data/lib/active_fedora/nom_datastream.rb +0 -73
- data/lib/active_fedora/om_datastream.rb +0 -118
- data/lib/active_fedora/qualified_dublin_core_datastream.rb +0 -158
- data/lib/active_fedora/rdf/datastream_indexing.rb +0 -49
- data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb +0 -13
- data/lib/active_fedora/rdf/rdf_datastream.rb +0 -173
- data/lib/active_fedora/rdf/rdfxml_datastream.rb +0 -13
- data/solr/config/_rest_managed.json +0 -3
- data/solr/config/admin-extra.html +0 -31
- data/solr/config/elevate.xml +0 -36
- data/solr/config/mapping-ISOLatin1Accent.txt +0 -246
- data/solr/config/protwords.txt +0 -21
- data/solr/config/schema.xml +0 -372
- data/solr/config/scripts.conf +0 -24
- data/solr/config/solrconfig.xml +0 -311
- data/solr/config/spellings.txt +0 -2
- data/solr/config/stopwords.txt +0 -58
- data/solr/config/stopwords_en.txt +0 -58
- data/solr/config/synonyms.txt +0 -31
- data/solr/config/xslt/example.xsl +0 -132
- data/solr/config/xslt/example_atom.xsl +0 -67
- data/solr/config/xslt/example_rss.xsl +0 -66
- data/solr/config/xslt/luke.xsl +0 -337
- data/spec/fixtures/damsObjectModel.xml +0 -38
- data/spec/fixtures/dublin_core_rdf_descMetadata.nt +0 -13
- data/spec/fixtures/mixed_rdf_descMetadata.nt +0 -7
- data/spec/fixtures/mods_articles/mods_article1.xml +0 -98
- data/spec/fixtures/solr_rdf_descMetadata.nt +0 -7
- data/spec/integration/complex_rdf_datastream_spec.rb +0 -227
- data/spec/integration/datastream_rdf_nested_attributes_spec.rb +0 -180
- data/spec/integration/ntriples_datastream_spec.rb +0 -215
- data/spec/integration/om_datastream_spec.rb +0 -78
- data/spec/samples/hydra-mods_article_datastream.rb +0 -515
- data/spec/samples/models/mods_article.rb +0 -9
- data/spec/samples/oral_history_sample.xml +0 -38
- data/spec/samples/oral_history_xml.xml +0 -35
- data/spec/samples/samples.rb +0 -2
- data/spec/unit/nom_datastream_spec.rb +0 -60
- data/spec/unit/ntriples_datastream_spec.rb +0 -167
- data/spec/unit/om_datastream_spec.rb +0 -294
- data/spec/unit/qualified_dublin_core_datastream_spec.rb +0 -119
- data/spec/unit/rdf_datastream_spec.rb +0 -84
- data/spec/unit/rdf_resource_datastream_spec.rb +0 -208
- data/spec/unit/rdfxml_datastream_spec.rb +0 -106
data/spec/unit/ordered_spec.rb
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
require 'spec_helper'
|
|
2
2
|
|
|
3
3
|
describe ActiveFedora::Orders do
|
|
4
|
-
subject { Image.new }
|
|
4
|
+
subject(:image) { Image.new }
|
|
5
5
|
before do
|
|
6
6
|
class Member < ActiveFedora::Base
|
|
7
7
|
end
|
|
@@ -19,9 +19,9 @@ describe ActiveFedora::Orders do
|
|
|
19
19
|
describe "<<" do
|
|
20
20
|
it "does not accept base objects" do
|
|
21
21
|
member = Member.new
|
|
22
|
-
expect {
|
|
23
|
-
expect(
|
|
24
|
-
expect(
|
|
22
|
+
expect { image.ordered_member_proxies << member }.to raise_error ActiveFedora::AssociationTypeMismatch
|
|
23
|
+
expect(image).not_to be_changed
|
|
24
|
+
expect(image.list_source).not_to be_changed
|
|
25
25
|
end
|
|
26
26
|
end
|
|
27
27
|
|
|
@@ -62,53 +62,53 @@ describe ActiveFedora::Orders do
|
|
|
62
62
|
describe "<<" do
|
|
63
63
|
it "appends" do
|
|
64
64
|
member = Member.new
|
|
65
|
-
|
|
66
|
-
expect(
|
|
67
|
-
expect(
|
|
68
|
-
expect(
|
|
69
|
-
expect(
|
|
70
|
-
|
|
71
|
-
expect(
|
|
72
|
-
expect(
|
|
65
|
+
image.save!
|
|
66
|
+
expect(image.ordered_members << member).to eq [member]
|
|
67
|
+
expect(image.ordered_members).to eq [member]
|
|
68
|
+
expect(image.members).to eq [member]
|
|
69
|
+
expect(image.ordered_member_proxies.to_a.length).to eq 1
|
|
70
|
+
image.save!
|
|
71
|
+
expect(image.head).not_to be_blank
|
|
72
|
+
expect(image.reload.head).not_to be_blank
|
|
73
73
|
end
|
|
74
74
|
it "maintains member associations" do
|
|
75
75
|
member = Member.create
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
expect(
|
|
76
|
+
image.ordered_members << member
|
|
77
|
+
image.save
|
|
78
|
+
image.reload
|
|
79
|
+
expect(image.members).to eq [member]
|
|
80
80
|
end
|
|
81
81
|
end
|
|
82
82
|
describe "#=" do
|
|
83
83
|
it "sets ordered members" do
|
|
84
84
|
member = Member.new
|
|
85
85
|
member_2 = Member.new
|
|
86
|
-
|
|
87
|
-
expect(
|
|
88
|
-
|
|
89
|
-
expect(
|
|
86
|
+
image.ordered_members << member
|
|
87
|
+
expect(image.ordered_members).to eq [member]
|
|
88
|
+
image.ordered_members = [member_2, member_2]
|
|
89
|
+
expect(image.ordered_members).to eq [member_2, member_2]
|
|
90
90
|
# Removing from ordering is not the same as removing from aggregation.
|
|
91
|
-
expect(
|
|
91
|
+
expect(image.members).to contain_exactly member, member_2
|
|
92
92
|
end
|
|
93
93
|
end
|
|
94
94
|
describe "+=" do
|
|
95
95
|
it "appends ordered members" do
|
|
96
96
|
member = Member.new
|
|
97
97
|
member_2 = Member.new
|
|
98
|
-
|
|
99
|
-
expect(
|
|
100
|
-
expect(
|
|
101
|
-
expect(
|
|
98
|
+
image.ordered_members << member
|
|
99
|
+
expect(image.ordered_members += [member, member_2]).to eq [member, member, member_2]
|
|
100
|
+
expect(image.ordered_members).to eq [member, member, member_2]
|
|
101
|
+
expect(image.ordered_member_proxies.map(&:target)).to eq [member, member, member_2]
|
|
102
102
|
end
|
|
103
103
|
end
|
|
104
104
|
describe "#delete_at" do
|
|
105
105
|
it "deletes that position" do
|
|
106
106
|
member = Member.new
|
|
107
107
|
member_2 = Member.new
|
|
108
|
-
|
|
108
|
+
image.ordered_members += [member, member_2]
|
|
109
109
|
|
|
110
|
-
expect(
|
|
111
|
-
expect(
|
|
110
|
+
expect(image.ordered_members.delete_at(0)).to eq member
|
|
111
|
+
expect(image.ordered_members).to eq [member_2]
|
|
112
112
|
end
|
|
113
113
|
end
|
|
114
114
|
|
|
@@ -116,27 +116,27 @@ describe ActiveFedora::Orders do
|
|
|
116
116
|
let(:member) { Member.create }
|
|
117
117
|
let(:member_2) { Member.create }
|
|
118
118
|
before do
|
|
119
|
-
|
|
120
|
-
|
|
119
|
+
image.ordered_members += [member, member_2, member]
|
|
120
|
+
image.save!
|
|
121
121
|
end
|
|
122
122
|
|
|
123
123
|
context "with an object found in the list" do
|
|
124
124
|
it "deletes all occurences of the object" do
|
|
125
|
-
expect(
|
|
126
|
-
expect(
|
|
125
|
+
expect(image.ordered_members.delete(member)).to eq member
|
|
126
|
+
expect(image.ordered_members.to_a).to eq [member_2]
|
|
127
127
|
end
|
|
128
128
|
it "can delete all" do
|
|
129
|
-
expect(
|
|
130
|
-
expect(
|
|
131
|
-
|
|
132
|
-
expect(
|
|
129
|
+
expect(image.ordered_members.delete(member)).to eq member
|
|
130
|
+
expect(image.ordered_members.delete(member_2)).to eq member_2
|
|
131
|
+
image.save!
|
|
132
|
+
expect(image.reload.ordered_members.to_a).to eq []
|
|
133
133
|
end
|
|
134
134
|
end
|
|
135
135
|
|
|
136
136
|
context "with an object not found in the list" do
|
|
137
137
|
it "returns nil" do
|
|
138
|
-
expect(
|
|
139
|
-
expect(
|
|
138
|
+
expect(image.ordered_members.delete(Member.create)).to be_nil
|
|
139
|
+
expect(image.ordered_members.to_a).to eq [member, member_2, member]
|
|
140
140
|
end
|
|
141
141
|
end
|
|
142
142
|
end
|
|
@@ -145,29 +145,29 @@ describe ActiveFedora::Orders do
|
|
|
145
145
|
it "adds at a given position" do
|
|
146
146
|
member = Member.new
|
|
147
147
|
member_2 = Member.new
|
|
148
|
-
|
|
148
|
+
image.ordered_members += [member, member_2]
|
|
149
149
|
|
|
150
|
-
|
|
151
|
-
expect(
|
|
150
|
+
image.ordered_members.insert_at(0, member_2)
|
|
151
|
+
expect(image.ordered_members).to eq [member_2, member, member_2]
|
|
152
152
|
end
|
|
153
153
|
it "adds a proxy_in statement" do
|
|
154
154
|
member = Member.new
|
|
155
155
|
member_2 = Member.new
|
|
156
|
-
|
|
156
|
+
image.ordered_members += [member, member_2]
|
|
157
157
|
|
|
158
|
-
|
|
159
|
-
expect(
|
|
158
|
+
image.ordered_members.insert_at(0, member_2)
|
|
159
|
+
expect(image.ordered_member_proxies.map(&:proxy_in).uniq).to eq [image]
|
|
160
160
|
end
|
|
161
161
|
end
|
|
162
162
|
describe "lazy loading" do
|
|
163
163
|
it "does not instantiate every record on append" do
|
|
164
164
|
member = Member.new
|
|
165
165
|
member_2 = Member.new
|
|
166
|
-
|
|
167
|
-
|
|
166
|
+
image.ordered_members += [member, member_2]
|
|
167
|
+
image.save
|
|
168
168
|
allow(ActiveFedora::Base).to receive(:find).and_call_original
|
|
169
169
|
|
|
170
|
-
reloaded =
|
|
170
|
+
reloaded = image.class.find(image.id)
|
|
171
171
|
reloaded.ordered_members << member
|
|
172
172
|
|
|
173
173
|
expect(ActiveFedora::Base).not_to have_received(:find).with(member_2.id)
|
|
@@ -175,11 +175,11 @@ describe ActiveFedora::Orders do
|
|
|
175
175
|
it "does not instantiate every record on #insert_at" do
|
|
176
176
|
member = Member.new
|
|
177
177
|
member_2 = Member.new
|
|
178
|
-
|
|
179
|
-
|
|
178
|
+
image.ordered_members += [member, member_2]
|
|
179
|
+
image.save
|
|
180
180
|
allow(ActiveFedora::Base).to receive(:find).and_call_original
|
|
181
181
|
|
|
182
|
-
reloaded =
|
|
182
|
+
reloaded = image.class.find(image.id)
|
|
183
183
|
reloaded.ordered_members.insert_at(0, member)
|
|
184
184
|
|
|
185
185
|
expect(ActiveFedora::Base).not_to have_received(:find).with(member_2.id)
|
|
@@ -189,179 +189,179 @@ describe ActiveFedora::Orders do
|
|
|
189
189
|
describe "append_target" do
|
|
190
190
|
it "doesn't add all members" do
|
|
191
191
|
member = Member.new
|
|
192
|
-
|
|
193
|
-
expect(
|
|
192
|
+
image.members << member
|
|
193
|
+
expect(image.ordered_members).to eq []
|
|
194
194
|
end
|
|
195
195
|
it "can handle adding many objects" do
|
|
196
196
|
member = Member.new
|
|
197
197
|
60.times do
|
|
198
|
-
|
|
198
|
+
image.ordered_member_proxies.append_target member
|
|
199
199
|
end
|
|
200
|
-
expect(
|
|
200
|
+
expect(image.ordered_member_proxies.to_a.length).to eq 60
|
|
201
201
|
end
|
|
202
202
|
it "can't add items not accepted by indirect container" do
|
|
203
203
|
bad_class = BadClass.new
|
|
204
|
-
expect {
|
|
204
|
+
expect { image.ordered_member_proxies.append_target bad_class }.to raise_error ActiveFedora::AssociationTypeMismatch
|
|
205
205
|
end
|
|
206
206
|
it "adds a member if it doesn't exist in members" do
|
|
207
207
|
member = Member.new
|
|
208
|
-
|
|
209
|
-
expect(
|
|
210
|
-
expect(
|
|
208
|
+
image.ordered_member_proxies.append_target member
|
|
209
|
+
expect(image.members).to eq [member]
|
|
210
|
+
expect(image.ordered_members).to eq [member]
|
|
211
211
|
end
|
|
212
212
|
it "doesn't add a member twice" do
|
|
213
213
|
member = Member.new
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
expect(
|
|
217
|
-
expect(
|
|
214
|
+
image.ordered_member_proxies.append_target member
|
|
215
|
+
image.ordered_member_proxies.append_target member
|
|
216
|
+
expect(image.members).to eq [member]
|
|
217
|
+
expect(image.ordered_members).to eq [member, member]
|
|
218
218
|
end
|
|
219
219
|
it "survives persistence" do
|
|
220
220
|
member = Member.new
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
expect(
|
|
226
|
-
expect(
|
|
227
|
-
expect(
|
|
228
|
-
expect(
|
|
229
|
-
expect(
|
|
221
|
+
image.ordered_member_proxies.append_target member
|
|
222
|
+
image.ordered_member_proxies.append_target member
|
|
223
|
+
image.save
|
|
224
|
+
image.reload
|
|
225
|
+
expect(image.ordered_members).to eq [member, member]
|
|
226
|
+
expect(image.ordered_member_ids).to eq [member.id, member.id]
|
|
227
|
+
expect(image.list_source.resource.query([nil, ::RDF::Vocab::ORE.proxyIn, image.resource.rdf_subject]).to_a.length).to eq 2
|
|
228
|
+
expect(image.head_ids).to eq image.list_source.head_id
|
|
229
|
+
expect(image.tail_ids).to eq image.list_source.tail_id
|
|
230
230
|
end
|
|
231
231
|
it "can add already persisted items" do
|
|
232
232
|
member = Member.create
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
expect(
|
|
233
|
+
image.ordered_member_proxies.append_target member
|
|
234
|
+
image.save
|
|
235
|
+
image.reload
|
|
236
|
+
expect(image.ordered_members).to eq [member]
|
|
237
237
|
end
|
|
238
238
|
it "can append to a pre-persisted item" do
|
|
239
239
|
member = Member.new
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
240
|
+
image.ordered_member_proxies.append_target member
|
|
241
|
+
image.save
|
|
242
|
+
image.reload
|
|
243
243
|
member_2 = Member.new
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
expect(
|
|
244
|
+
image.ordered_member_proxies.append_target member_2
|
|
245
|
+
image.save
|
|
246
|
+
image.reload
|
|
247
|
+
expect(image.ordered_members).to eq [member, member_2]
|
|
248
248
|
end
|
|
249
249
|
end
|
|
250
250
|
describe "insert_target_at" do
|
|
251
251
|
it "can add between items" do
|
|
252
252
|
member = Member.new
|
|
253
253
|
member2 = Member.new
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
expect(
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
expect(
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
expect(
|
|
254
|
+
image.ordered_member_proxies.append_target member
|
|
255
|
+
image.ordered_member_proxies.append_target member
|
|
256
|
+
image.ordered_member_proxies.insert_target_at(1, member2)
|
|
257
|
+
expect(image.ordered_members).to eq [member, member2, member]
|
|
258
|
+
image.save
|
|
259
|
+
image.reload
|
|
260
|
+
expect(image.ordered_members).to eq [member, member2, member]
|
|
261
|
+
image.ordered_member_proxies.insert_target_at(2, member2)
|
|
262
|
+
image.save
|
|
263
|
+
image.reload
|
|
264
|
+
expect(image.ordered_members).to eq [member, member2, member2, member]
|
|
265
265
|
end
|
|
266
266
|
end
|
|
267
267
|
describe "insert_target_id_at" do
|
|
268
268
|
it "can add between items" do
|
|
269
269
|
member = Member.create
|
|
270
270
|
member2 = Member.create
|
|
271
|
-
|
|
271
|
+
image.ordered_members += [member, member2]
|
|
272
272
|
|
|
273
273
|
allow(ActiveFedora::Base).to receive(:find).and_call_original
|
|
274
|
-
|
|
274
|
+
image.ordered_member_proxies.insert_target_id_at(1, member2.id)
|
|
275
275
|
expect(ActiveFedora::Base).not_to have_received(:find).with(member2.id)
|
|
276
|
-
expect(
|
|
276
|
+
expect(image.ordered_members).to eq [member, member2, member2]
|
|
277
277
|
expect(ActiveFedora::Base).to have_received(:find).with(member2.id)
|
|
278
278
|
end
|
|
279
279
|
context "when given a nil id" do
|
|
280
280
|
it "raises an ArgumentError" do
|
|
281
|
-
expect {
|
|
281
|
+
expect { image.ordered_member_proxies.insert_target_id_at(0, nil) }.to raise_error ArgumentError, "ID can not be nil"
|
|
282
282
|
end
|
|
283
283
|
end
|
|
284
284
|
context "when given an ID not in members" do
|
|
285
285
|
it "raises an ArgumentError" do
|
|
286
|
-
expect {
|
|
286
|
+
expect { image.ordered_member_proxies.insert_target_id_at(0, "test") }.to raise_error "test is not a part of members"
|
|
287
287
|
end
|
|
288
288
|
end
|
|
289
289
|
end
|
|
290
290
|
describe "-=" do
|
|
291
291
|
it "can remove proxies" do
|
|
292
292
|
member = Member.new
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
expect(
|
|
296
|
-
expect(
|
|
293
|
+
image.ordered_member_proxies.append_target member
|
|
294
|
+
image.ordered_member_proxies -= [image.ordered_member_proxies.last]
|
|
295
|
+
expect(image.ordered_members).to eq []
|
|
296
|
+
expect(image.list_source.resource.statements.to_a.length).to eq 1
|
|
297
297
|
end
|
|
298
298
|
it "can remove proxies in the middle" do
|
|
299
299
|
member = Member.new
|
|
300
300
|
member_2 = Member.new
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
expect(
|
|
301
|
+
image.ordered_member_proxies.append_target member
|
|
302
|
+
image.ordered_member_proxies.append_target member_2
|
|
303
|
+
image.ordered_member_proxies.append_target member
|
|
304
|
+
image.ordered_member_proxies -= [image.ordered_member_proxies[1]]
|
|
305
|
+
expect(image.ordered_members).to eq [member, member]
|
|
306
306
|
end
|
|
307
307
|
it "can remove proxies post-create" do
|
|
308
308
|
member = Member.new
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
expect(
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
expect(
|
|
309
|
+
image.ordered_member_proxies.append_target member
|
|
310
|
+
image.ordered_member_proxies.append_target member
|
|
311
|
+
image.ordered_member_proxies.append_target member
|
|
312
|
+
image.save
|
|
313
|
+
image.reload
|
|
314
|
+
image.ordered_member_proxies -= [image.ordered_member_proxies[1]]
|
|
315
|
+
expect(image.ordered_members).to eq [member, member]
|
|
316
|
+
image.save
|
|
317
|
+
image.reload
|
|
318
|
+
expect(image.ordered_members).to eq [member, member]
|
|
319
319
|
# THIS NEEDS TO PASS - can't delete fragment URI resources via sparql
|
|
320
320
|
# update?
|
|
321
321
|
# Blocked by https://jira.duraspace.org/browse/FCREPO-1764
|
|
322
|
-
# expect(
|
|
322
|
+
# expect(image.list_source.resource.subjects.to_a.length).to eq 5
|
|
323
323
|
end
|
|
324
324
|
end
|
|
325
325
|
describe ".delete_at" do
|
|
326
326
|
it "can remove in the middle" do
|
|
327
327
|
member = Member.new
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
expect(
|
|
328
|
+
image.ordered_member_proxies.append_target member
|
|
329
|
+
image.ordered_member_proxies.append_target member
|
|
330
|
+
image.ordered_member_proxies.append_target member
|
|
331
|
+
image.ordered_member_proxies.delete_at(1)
|
|
332
|
+
expect(image.ordered_members).to eq [member, member]
|
|
333
333
|
end
|
|
334
334
|
it "returns the node" do
|
|
335
335
|
member = Member.new
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
second_node =
|
|
339
|
-
expect(
|
|
336
|
+
image.ordered_members << member
|
|
337
|
+
image.ordered_members << member
|
|
338
|
+
second_node = image.ordered_member_proxies[1]
|
|
339
|
+
expect(image.ordered_member_proxies.delete_at(1)).to eq second_node
|
|
340
340
|
end
|
|
341
341
|
context "when the node doesn't exist" do
|
|
342
342
|
it "returns nil" do
|
|
343
|
-
expect(
|
|
343
|
+
expect(image.ordered_member_proxies.delete_at(0)).to eq nil
|
|
344
344
|
end
|
|
345
345
|
end
|
|
346
346
|
it "doesn't do anything if passed a bad value" do
|
|
347
347
|
member = Member.new
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
expect(
|
|
348
|
+
image.ordered_member_proxies.append_target member
|
|
349
|
+
image.ordered_member_proxies.append_target member
|
|
350
|
+
image.ordered_member_proxies.append_target member
|
|
351
|
+
image.ordered_member_proxies.delete_at(3)
|
|
352
|
+
image.ordered_member_proxies.delete_at(nil)
|
|
353
|
+
expect(image.ordered_members).to eq [member, member, member]
|
|
354
354
|
end
|
|
355
355
|
it "can persist a deletion" do
|
|
356
356
|
member = Member.new
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
expect(
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
expect(
|
|
357
|
+
image.ordered_member_proxies.append_target member
|
|
358
|
+
image.ordered_member_proxies.append_target member
|
|
359
|
+
image.ordered_member_proxies.append_target member
|
|
360
|
+
expect(image.ordered_members).to eq [member, member, member]
|
|
361
|
+
image.ordered_member_proxies.delete_at(1)
|
|
362
|
+
image.save
|
|
363
|
+
image.reload
|
|
364
|
+
expect(image.ordered_members).to eq [member, member]
|
|
365
365
|
end
|
|
366
366
|
end
|
|
367
367
|
end
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
require 'spec_helper'
|
|
2
2
|
|
|
3
3
|
RSpec.describe ActiveFedora::Orders::ListNode do
|
|
4
|
-
|
|
4
|
+
let(:list_node) { described_class.new(node_cache, rdf_subject, graph) }
|
|
5
5
|
let(:node_cache) { {} }
|
|
6
6
|
let(:rdf_subject) { RDF::URI("#bla") }
|
|
7
7
|
let(:graph) { ActiveTriples::Resource.new }
|
|
@@ -10,14 +10,14 @@ RSpec.describe ActiveFedora::Orders::ListNode do
|
|
|
10
10
|
context "when a target is set" do
|
|
11
11
|
it "returns it" do
|
|
12
12
|
member = instance_double("member")
|
|
13
|
-
|
|
14
|
-
expect(
|
|
13
|
+
list_node.target = member
|
|
14
|
+
expect(list_node.target).to eq member
|
|
15
15
|
end
|
|
16
16
|
end
|
|
17
17
|
context "when no target is set" do
|
|
18
18
|
context "and it's not in the graph" do
|
|
19
19
|
it "returns nil" do
|
|
20
|
-
expect(
|
|
20
|
+
expect(list_node.target).to eq nil
|
|
21
21
|
end
|
|
22
22
|
end
|
|
23
23
|
context "and it's set in the graph" do
|
|
@@ -31,13 +31,13 @@ RSpec.describe ActiveFedora::Orders::ListNode do
|
|
|
31
31
|
it "returns it" do
|
|
32
32
|
member = Member.create
|
|
33
33
|
graph << [rdf_subject, RDF::Vocab::ORE.proxyFor, member.resource.rdf_subject]
|
|
34
|
-
expect(
|
|
34
|
+
expect(list_node.target).to eq member
|
|
35
35
|
end
|
|
36
36
|
context "and it doesn't exist" do
|
|
37
37
|
it "returns an AT::Resource" do
|
|
38
|
-
member = Member.new("testing")
|
|
38
|
+
member = Member.new(id: "testing")
|
|
39
39
|
graph << [rdf_subject, RDF::Vocab::ORE.proxyFor, member.resource.rdf_subject]
|
|
40
|
-
expect(
|
|
40
|
+
expect(list_node.target.rdf_subject).to eq member.uri
|
|
41
41
|
end
|
|
42
42
|
end
|
|
43
43
|
end
|
|
@@ -47,7 +47,7 @@ RSpec.describe ActiveFedora::Orders::ListNode do
|
|
|
47
47
|
describe "#target_uri" do
|
|
48
48
|
context "with a null target_id" do
|
|
49
49
|
it "returns nil" do
|
|
50
|
-
expect(
|
|
50
|
+
expect(list_node.target_uri).to eq nil
|
|
51
51
|
end
|
|
52
52
|
end
|
|
53
53
|
context "with a target" do
|
|
@@ -61,9 +61,9 @@ RSpec.describe ActiveFedora::Orders::ListNode do
|
|
|
61
61
|
it "returns a built URI" do
|
|
62
62
|
m = Member.new
|
|
63
63
|
allow(m).to receive(:id).and_return("test")
|
|
64
|
-
|
|
64
|
+
list_node.target = m
|
|
65
65
|
|
|
66
|
-
expect(
|
|
66
|
+
expect(list_node.target_uri).to eq ActiveFedora::Base.translate_id_to_uri.call("test")
|
|
67
67
|
end
|
|
68
68
|
end
|
|
69
69
|
end
|
|
@@ -72,8 +72,8 @@ RSpec.describe ActiveFedora::Orders::ListNode do
|
|
|
72
72
|
context "when a target is set" do
|
|
73
73
|
it "returns its id" do
|
|
74
74
|
member = instance_double("member", id: "member1")
|
|
75
|
-
|
|
76
|
-
expect(
|
|
75
|
+
list_node.target = member
|
|
76
|
+
expect(list_node.target_id).to eq "member1"
|
|
77
77
|
end
|
|
78
78
|
end
|
|
79
79
|
context "when a target is from the graph" do
|
|
@@ -89,9 +89,9 @@ RSpec.describe ActiveFedora::Orders::ListNode do
|
|
|
89
89
|
member = Member.create
|
|
90
90
|
graph << [rdf_subject, RDF::Vocab::ORE.proxyFor, member.resource.rdf_subject]
|
|
91
91
|
allow(ActiveFedora::Base).to receive(:from_uri).and_return(ActiveTriples::Resource.new(member.resource.rdf_subject))
|
|
92
|
-
|
|
92
|
+
list_node.target
|
|
93
93
|
|
|
94
|
-
expect(
|
|
94
|
+
expect(list_node.target_id).to eq member.id
|
|
95
95
|
end
|
|
96
96
|
end
|
|
97
97
|
it "doesn't re-ify the target" do
|
|
@@ -99,7 +99,7 @@ RSpec.describe ActiveFedora::Orders::ListNode do
|
|
|
99
99
|
graph << [rdf_subject, RDF::Vocab::ORE.proxyFor, member.resource.rdf_subject]
|
|
100
100
|
allow(ActiveFedora::Base).to receive(:from_uri).and_call_original
|
|
101
101
|
|
|
102
|
-
expect(
|
|
102
|
+
expect(list_node.target_id).to eq member.id
|
|
103
103
|
expect(ActiveFedora::Base).not_to have_received(:from_uri)
|
|
104
104
|
end
|
|
105
105
|
end
|
|
@@ -108,8 +108,8 @@ RSpec.describe ActiveFedora::Orders::ListNode do
|
|
|
108
108
|
context "when a target is set" do
|
|
109
109
|
it "returns its id" do
|
|
110
110
|
member = instance_double("member", id: "member1")
|
|
111
|
-
|
|
112
|
-
expect(
|
|
111
|
+
list_node.proxy_in = member
|
|
112
|
+
expect(list_node.proxy_in_id).to eq "member1"
|
|
113
113
|
end
|
|
114
114
|
end
|
|
115
115
|
context "when a proxy_in is from the graph" do
|
|
@@ -125,9 +125,9 @@ RSpec.describe ActiveFedora::Orders::ListNode do
|
|
|
125
125
|
member = Member.create
|
|
126
126
|
graph << [rdf_subject, RDF::Vocab::ORE.proxyIn, member.resource.rdf_subject]
|
|
127
127
|
allow(ActiveFedora::Base).to receive(:from_uri).and_return(ActiveTriples::Resource.new(member.resource.rdf_subject))
|
|
128
|
-
|
|
128
|
+
list_node.target
|
|
129
129
|
|
|
130
|
-
expect(
|
|
130
|
+
expect(list_node.proxy_in_id).to eq member.id
|
|
131
131
|
end
|
|
132
132
|
end
|
|
133
133
|
it "doesn't re-ify the target" do
|
|
@@ -135,7 +135,7 @@ RSpec.describe ActiveFedora::Orders::ListNode do
|
|
|
135
135
|
graph << [rdf_subject, RDF::Vocab::ORE.proxyIn, member.resource.rdf_subject]
|
|
136
136
|
allow(ActiveFedora::Base).to receive(:from_uri).and_call_original
|
|
137
137
|
|
|
138
|
-
expect(
|
|
138
|
+
expect(list_node.proxy_in_id).to eq member.id
|
|
139
139
|
expect(ActiveFedora::Base).not_to have_received(:from_uri)
|
|
140
140
|
end
|
|
141
141
|
end
|
|
@@ -144,7 +144,7 @@ RSpec.describe ActiveFedora::Orders::ListNode do
|
|
|
144
144
|
describe "#to_graph" do
|
|
145
145
|
context "with no data" do
|
|
146
146
|
it "returns an empty graph" do
|
|
147
|
-
expect(
|
|
147
|
+
expect(list_node.to_graph.statements.to_a.length).to eq 0
|
|
148
148
|
end
|
|
149
149
|
end
|
|
150
150
|
end
|