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.
Files changed (159) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.rubocop.yml +2 -7
  4. data/.rubocop_todo.yml +40 -9
  5. data/.solr_wrapper +6 -0
  6. data/README.md +1 -3
  7. data/active-fedora.gemspec +5 -9
  8. data/lib/active_fedora/associations/collection_association.rb +1 -1
  9. data/lib/active_fedora/associations/contained_finder.rb +2 -2
  10. data/lib/active_fedora/associations/has_many_association.rb +1 -1
  11. data/lib/active_fedora/associations/has_subresource_association.rb +2 -2
  12. data/lib/active_fedora/attribute_assignment.rb +0 -1
  13. data/lib/active_fedora/attributes.rb +1 -1
  14. data/lib/active_fedora/base.rb +3 -7
  15. data/lib/active_fedora/change_set.rb +6 -2
  16. data/lib/active_fedora/containers/container.rb +1 -1
  17. data/lib/active_fedora/core.rb +22 -25
  18. data/lib/active_fedora/fedora_attributes.rb +1 -1
  19. data/lib/active_fedora/file.rb +1 -1
  20. data/lib/active_fedora/indexing_service.rb +0 -4
  21. data/lib/active_fedora/orders/ordered_list.rb +2 -2
  22. data/lib/active_fedora/querying.rb +1 -1
  23. data/lib/active_fedora/railtie.rb +2 -2
  24. data/lib/active_fedora/rake_support.rb +1 -1
  25. data/lib/active_fedora/rdf.rb +0 -1
  26. data/lib/active_fedora/relation/delegation.rb +4 -0
  27. data/lib/active_fedora/solr_hit.rb +0 -4
  28. data/lib/active_fedora/solr_query_builder.rb +16 -12
  29. data/lib/active_fedora/version.rb +1 -1
  30. data/lib/active_fedora.rb +0 -10
  31. data/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml +11 -0
  32. data/lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml +1 -1
  33. data/spec/config_helper.rb +1 -1
  34. data/spec/integration/associations_spec.rb +17 -18
  35. data/spec/integration/attached_files_spec.rb +18 -8
  36. data/spec/integration/attributes_spec.rb +12 -16
  37. data/spec/integration/autosave_association_spec.rb +6 -6
  38. data/spec/integration/base_spec.rb +3 -3
  39. data/spec/integration/collection_association_spec.rb +2 -5
  40. data/spec/integration/date_time_properties_spec.rb +1 -2
  41. data/spec/integration/direct_container_spec.rb +8 -8
  42. data/spec/integration/directly_contains_one_association_spec.rb +11 -13
  43. data/spec/integration/eradicate_spec.rb +1 -1
  44. data/spec/integration/fedora_solr_sync_spec.rb +2 -2
  45. data/spec/integration/file_fixity_spec.rb +6 -8
  46. data/spec/integration/file_spec.rb +32 -34
  47. data/spec/integration/generators/solr_generator_spec.rb +7 -10
  48. data/spec/integration/has_many_associations_spec.rb +6 -8
  49. data/spec/integration/indexing_spec.rb +1 -1
  50. data/spec/integration/indirect_container_spec.rb +8 -9
  51. data/spec/integration/json_serialization_spec.rb +4 -4
  52. data/spec/integration/query_result_builder_spec.rb +9 -21
  53. data/spec/integration/rdf_nested_attributes_spec.rb +6 -6
  54. data/spec/integration/relation_delegation_spec.rb +8 -10
  55. data/spec/integration/relation_spec.rb +13 -16
  56. data/spec/integration/solr_hit_spec.rb +4 -4
  57. data/spec/integration/versionable_spec.rb +73 -327
  58. data/spec/spec_helper.rb +52 -10
  59. data/spec/unit/active_fedora_spec.rb +1 -1
  60. data/spec/unit/aggregation/list_source_spec.rb +37 -37
  61. data/spec/unit/aggregation/ordered_reader_spec.rb +4 -4
  62. data/spec/unit/association_hash_spec.rb +17 -31
  63. data/spec/unit/attached_files_spec.rb +35 -32
  64. data/spec/unit/attributes_spec.rb +25 -25
  65. data/spec/unit/base_active_model_spec.rb +8 -8
  66. data/spec/unit/base_cma_spec.rb +1 -1
  67. data/spec/unit/base_extra_spec.rb +7 -22
  68. data/spec/unit/base_spec.rb +14 -20
  69. data/spec/unit/callback_spec.rb +2 -2
  70. data/spec/unit/change_set_spec.rb +5 -5
  71. data/spec/unit/checksum_spec.rb +2 -2
  72. data/spec/unit/code_configurator_spec.rb +1 -1
  73. data/spec/unit/core_spec.rb +62 -26
  74. data/spec/unit/default_model_mapper_spec.rb +6 -6
  75. data/spec/unit/fedora_spec.rb +2 -2
  76. data/spec/unit/file_configurator_spec.rb +96 -96
  77. data/spec/unit/file_path_builder_spec.rb +1 -1
  78. data/spec/unit/file_spec.rb +61 -61
  79. data/spec/unit/files_hash_spec.rb +9 -9
  80. data/spec/unit/finder_methods_spec.rb +3 -3
  81. data/spec/unit/has_and_belongs_to_many_association_spec.rb +13 -14
  82. data/spec/unit/has_many_association_spec.rb +28 -13
  83. data/spec/unit/indexers/global_indexer_spec.rb +6 -6
  84. data/spec/unit/indexing_service_spec.rb +5 -5
  85. data/spec/unit/indexing_spec.rb +6 -6
  86. data/spec/unit/inheritance_spec.rb +11 -7
  87. data/spec/unit/loadable_from_json_spec.rb +4 -4
  88. data/spec/unit/logger_spec.rb +1 -1
  89. data/spec/unit/model_classifier_spec.rb +5 -5
  90. data/spec/unit/ordered_spec.rb +142 -142
  91. data/spec/unit/orders/list_node_spec.rb +21 -21
  92. data/spec/unit/orders/ordered_list_spec.rb +96 -96
  93. data/spec/unit/orders/reflection_spec.rb +4 -4
  94. data/spec/unit/pathing_spec.rb +4 -4
  95. data/spec/unit/persistence_spec.rb +28 -28
  96. data/spec/unit/property_spec.rb +2 -2
  97. data/spec/unit/query_spec.rb +10 -10
  98. data/spec/unit/rdf/indexing_service_spec.rb +26 -26
  99. data/spec/unit/readonly_spec.rb +5 -4
  100. data/spec/unit/reflection_spec.rb +3 -3
  101. data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb +9 -9
  102. data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb +9 -9
  103. data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb +9 -9
  104. data/spec/unit/schema_indexing_strategy_spec.rb +5 -5
  105. data/spec/unit/serializers_spec.rb +3 -4
  106. data/spec/unit/solr_config_options_spec.rb +13 -16
  107. data/spec/unit/solr_hit_spec.rb +9 -9
  108. data/spec/unit/solr_service_spec.rb +4 -10
  109. data/spec/unit/sparql_insert_spec.rb +2 -2
  110. data/spec/unit/validations_spec.rb +9 -9
  111. data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb +3 -2
  112. data/spec/unit/with_metadata/metadata_node_spec.rb +3 -2
  113. metadata +17 -118
  114. data/lib/active_fedora/datastreams/nokogiri_datastreams.rb +0 -119
  115. data/lib/active_fedora/datastreams.rb +0 -6
  116. data/lib/active_fedora/nom_datastream.rb +0 -73
  117. data/lib/active_fedora/om_datastream.rb +0 -118
  118. data/lib/active_fedora/qualified_dublin_core_datastream.rb +0 -158
  119. data/lib/active_fedora/rdf/datastream_indexing.rb +0 -49
  120. data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb +0 -13
  121. data/lib/active_fedora/rdf/rdf_datastream.rb +0 -173
  122. data/lib/active_fedora/rdf/rdfxml_datastream.rb +0 -13
  123. data/solr/config/_rest_managed.json +0 -3
  124. data/solr/config/admin-extra.html +0 -31
  125. data/solr/config/elevate.xml +0 -36
  126. data/solr/config/mapping-ISOLatin1Accent.txt +0 -246
  127. data/solr/config/protwords.txt +0 -21
  128. data/solr/config/schema.xml +0 -372
  129. data/solr/config/scripts.conf +0 -24
  130. data/solr/config/solrconfig.xml +0 -311
  131. data/solr/config/spellings.txt +0 -2
  132. data/solr/config/stopwords.txt +0 -58
  133. data/solr/config/stopwords_en.txt +0 -58
  134. data/solr/config/synonyms.txt +0 -31
  135. data/solr/config/xslt/example.xsl +0 -132
  136. data/solr/config/xslt/example_atom.xsl +0 -67
  137. data/solr/config/xslt/example_rss.xsl +0 -66
  138. data/solr/config/xslt/luke.xsl +0 -337
  139. data/spec/fixtures/damsObjectModel.xml +0 -38
  140. data/spec/fixtures/dublin_core_rdf_descMetadata.nt +0 -13
  141. data/spec/fixtures/mixed_rdf_descMetadata.nt +0 -7
  142. data/spec/fixtures/mods_articles/mods_article1.xml +0 -98
  143. data/spec/fixtures/solr_rdf_descMetadata.nt +0 -7
  144. data/spec/integration/complex_rdf_datastream_spec.rb +0 -227
  145. data/spec/integration/datastream_rdf_nested_attributes_spec.rb +0 -180
  146. data/spec/integration/ntriples_datastream_spec.rb +0 -215
  147. data/spec/integration/om_datastream_spec.rb +0 -78
  148. data/spec/samples/hydra-mods_article_datastream.rb +0 -515
  149. data/spec/samples/models/mods_article.rb +0 -9
  150. data/spec/samples/oral_history_sample.xml +0 -38
  151. data/spec/samples/oral_history_xml.xml +0 -35
  152. data/spec/samples/samples.rb +0 -2
  153. data/spec/unit/nom_datastream_spec.rb +0 -60
  154. data/spec/unit/ntriples_datastream_spec.rb +0 -167
  155. data/spec/unit/om_datastream_spec.rb +0 -294
  156. data/spec/unit/qualified_dublin_core_datastream_spec.rb +0 -119
  157. data/spec/unit/rdf_datastream_spec.rb +0 -84
  158. data/spec/unit/rdf_resource_datastream_spec.rb +0 -208
  159. data/spec/unit/rdfxml_datastream_spec.rb +0 -106
@@ -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 { subject.ordered_member_proxies << member }.to raise_error ActiveFedora::AssociationTypeMismatch
23
- expect(subject).not_to be_changed
24
- expect(subject.list_source).not_to be_changed
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
- subject.save!
66
- expect(subject.ordered_members << member).to eq [member]
67
- expect(subject.ordered_members).to eq [member]
68
- expect(subject.members).to eq [member]
69
- expect(subject.ordered_member_proxies.to_a.length).to eq 1
70
- subject.save!
71
- expect(subject.head).not_to be_blank
72
- expect(subject.reload.head).not_to be_blank
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
- subject.ordered_members << member
77
- subject.save
78
- subject.reload
79
- expect(subject.members).to eq [member]
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
- subject.ordered_members << member
87
- expect(subject.ordered_members).to eq [member]
88
- subject.ordered_members = [member_2, member_2]
89
- expect(subject.ordered_members).to eq [member_2, member_2]
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(subject.members).to contain_exactly member, member_2
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
- subject.ordered_members << member
99
- expect(subject.ordered_members += [member, member_2]).to eq [member, member, member_2]
100
- expect(subject.ordered_members).to eq [member, member, member_2]
101
- expect(subject.ordered_member_proxies.map(&:target)).to eq [member, member, member_2]
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
- subject.ordered_members += [member, member_2]
108
+ image.ordered_members += [member, member_2]
109
109
 
110
- expect(subject.ordered_members.delete_at(0)).to eq member
111
- expect(subject.ordered_members).to eq [member_2]
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
- subject.ordered_members += [member, member_2, member]
120
- subject.save!
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(subject.ordered_members.delete(member)).to eq member
126
- expect(subject.ordered_members.to_a).to eq [member_2]
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(subject.ordered_members.delete(member)).to eq member
130
- expect(subject.ordered_members.delete(member_2)).to eq member_2
131
- subject.save!
132
- expect(subject.reload.ordered_members.to_a).to eq []
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(subject.ordered_members.delete(Member.create)).to be_nil
139
- expect(subject.ordered_members.to_a).to eq [member, member_2, member]
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
- subject.ordered_members += [member, member_2]
148
+ image.ordered_members += [member, member_2]
149
149
 
150
- subject.ordered_members.insert_at(0, member_2)
151
- expect(subject.ordered_members).to eq [member_2, member, member_2]
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
- subject.ordered_members += [member, member_2]
156
+ image.ordered_members += [member, member_2]
157
157
 
158
- subject.ordered_members.insert_at(0, member_2)
159
- expect(subject.ordered_member_proxies.map(&:proxy_in).uniq).to eq [subject]
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
- subject.ordered_members += [member, member_2]
167
- subject.save
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 = subject.class.find(subject.id)
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
- subject.ordered_members += [member, member_2]
179
- subject.save
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 = subject.class.find(subject.id)
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
- subject.members << member
193
- expect(subject.ordered_members).to eq []
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
- subject.ordered_member_proxies.append_target member
198
+ image.ordered_member_proxies.append_target member
199
199
  end
200
- expect(subject.ordered_member_proxies.to_a.length).to eq 60
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 { subject.ordered_member_proxies.append_target bad_class }.to raise_error ActiveFedora::AssociationTypeMismatch
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
- subject.ordered_member_proxies.append_target member
209
- expect(subject.members).to eq [member]
210
- expect(subject.ordered_members).to eq [member]
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
- subject.ordered_member_proxies.append_target member
215
- subject.ordered_member_proxies.append_target member
216
- expect(subject.members).to eq [member]
217
- expect(subject.ordered_members).to eq [member, member]
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
- subject.ordered_member_proxies.append_target member
222
- subject.ordered_member_proxies.append_target member
223
- subject.save
224
- subject.reload
225
- expect(subject.ordered_members).to eq [member, member]
226
- expect(subject.ordered_member_ids).to eq [member.id, member.id]
227
- expect(subject.list_source.resource.query([nil, ::RDF::Vocab::ORE.proxyIn, subject.resource.rdf_subject]).to_a.length).to eq 2
228
- expect(subject.head_ids).to eq subject.list_source.head_id
229
- expect(subject.tail_ids).to eq subject.list_source.tail_id
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
- subject.ordered_member_proxies.append_target member
234
- subject.save
235
- subject.reload
236
- expect(subject.ordered_members).to eq [member]
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
- subject.ordered_member_proxies.append_target member
241
- subject.save
242
- subject.reload
240
+ image.ordered_member_proxies.append_target member
241
+ image.save
242
+ image.reload
243
243
  member_2 = Member.new
244
- subject.ordered_member_proxies.append_target member_2
245
- subject.save
246
- subject.reload
247
- expect(subject.ordered_members).to eq [member, member_2]
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
- subject.ordered_member_proxies.append_target member
255
- subject.ordered_member_proxies.append_target member
256
- subject.ordered_member_proxies.insert_target_at(1, member2)
257
- expect(subject.ordered_members).to eq [member, member2, member]
258
- subject.save
259
- subject.reload
260
- expect(subject.ordered_members).to eq [member, member2, member]
261
- subject.ordered_member_proxies.insert_target_at(2, member2)
262
- subject.save
263
- subject.reload
264
- expect(subject.ordered_members).to eq [member, member2, member2, member]
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
- subject.ordered_members += [member, member2]
271
+ image.ordered_members += [member, member2]
272
272
 
273
273
  allow(ActiveFedora::Base).to receive(:find).and_call_original
274
- subject.ordered_member_proxies.insert_target_id_at(1, member2.id)
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(subject.ordered_members).to eq [member, member2, member2]
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 { subject.ordered_member_proxies.insert_target_id_at(0, nil) }.to raise_error ArgumentError, "ID can not be nil"
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 { subject.ordered_member_proxies.insert_target_id_at(0, "test") }.to raise_error "test is not a part of members"
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
- subject.ordered_member_proxies.append_target member
294
- subject.ordered_member_proxies -= [subject.ordered_member_proxies.last]
295
- expect(subject.ordered_members).to eq []
296
- expect(subject.list_source.resource.statements.to_a.length).to eq 1
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
- subject.ordered_member_proxies.append_target member
302
- subject.ordered_member_proxies.append_target member_2
303
- subject.ordered_member_proxies.append_target member
304
- subject.ordered_member_proxies -= [subject.ordered_member_proxies[1]]
305
- expect(subject.ordered_members).to eq [member, member]
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
- subject.ordered_member_proxies.append_target member
310
- subject.ordered_member_proxies.append_target member
311
- subject.ordered_member_proxies.append_target member
312
- subject.save
313
- subject.reload
314
- subject.ordered_member_proxies -= [subject.ordered_member_proxies[1]]
315
- expect(subject.ordered_members).to eq [member, member]
316
- subject.save
317
- subject.reload
318
- expect(subject.ordered_members).to eq [member, member]
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(subject.list_source.resource.subjects.to_a.length).to eq 5
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
- subject.ordered_member_proxies.append_target member
329
- subject.ordered_member_proxies.append_target member
330
- subject.ordered_member_proxies.append_target member
331
- subject.ordered_member_proxies.delete_at(1)
332
- expect(subject.ordered_members).to eq [member, member]
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
- subject.ordered_members << member
337
- subject.ordered_members << member
338
- second_node = subject.ordered_member_proxies[1]
339
- expect(subject.ordered_member_proxies.delete_at(1)).to eq second_node
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(subject.ordered_member_proxies.delete_at(0)).to eq nil
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
- subject.ordered_member_proxies.append_target member
349
- subject.ordered_member_proxies.append_target member
350
- subject.ordered_member_proxies.append_target member
351
- subject.ordered_member_proxies.delete_at(3)
352
- subject.ordered_member_proxies.delete_at(nil)
353
- expect(subject.ordered_members).to eq [member, member, member]
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
- subject.ordered_member_proxies.append_target member
358
- subject.ordered_member_proxies.append_target member
359
- subject.ordered_member_proxies.append_target member
360
- expect(subject.ordered_members).to eq [member, member, member]
361
- subject.ordered_member_proxies.delete_at(1)
362
- subject.save
363
- subject.reload
364
- expect(subject.ordered_members).to eq [member, member]
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
- subject { described_class.new(node_cache, rdf_subject, graph) }
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
- subject.target = member
14
- expect(subject.target).to eq member
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(subject.target).to eq nil
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(subject.target).to eq member
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(subject.target.rdf_subject).to eq member.uri
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(subject.target_uri).to eq nil
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
- subject.target = m
64
+ list_node.target = m
65
65
 
66
- expect(subject.target_uri).to eq ActiveFedora::Base.translate_id_to_uri.call("test")
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
- subject.target = member
76
- expect(subject.target_id).to eq "member1"
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
- subject.target
92
+ list_node.target
93
93
 
94
- expect(subject.target_id).to eq member.id
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(subject.target_id).to eq member.id
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
- subject.proxy_in = member
112
- expect(subject.proxy_in_id).to eq "member1"
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
- subject.target
128
+ list_node.target
129
129
 
130
- expect(subject.proxy_in_id).to eq member.id
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(subject.proxy_in_id).to eq member.id
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(subject.to_graph.statements.to_a.length).to eq 0
147
+ expect(list_node.to_graph.statements.to_a.length).to eq 0
148
148
  end
149
149
  end
150
150
  end