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