active-fedora 10.3.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 (164) 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/active-fedora.gemspec +6 -10
  6. data/lib/active_fedora/aggregation/list_source.rb +2 -0
  7. data/lib/active_fedora/associations/association_scope.rb +1 -1
  8. data/lib/active_fedora/associations/builder/aggregation.rb +1 -1
  9. data/lib/active_fedora/associations/builder/association.rb +1 -1
  10. data/lib/active_fedora/associations/builder/orders.rb +11 -3
  11. data/lib/active_fedora/associations/collection_association.rb +3 -3
  12. data/lib/active_fedora/associations/contained_finder.rb +2 -2
  13. data/lib/active_fedora/associations/has_many_association.rb +1 -1
  14. data/lib/active_fedora/associations/orders_association.rb +4 -0
  15. data/lib/active_fedora/associations/rdf.rb +2 -0
  16. data/lib/active_fedora/attribute_assignment.rb +0 -1
  17. data/lib/active_fedora/attribute_methods/dirty.rb +1 -1
  18. data/lib/active_fedora/attributes.rb +1 -1
  19. data/lib/active_fedora/base.rb +4 -8
  20. data/lib/active_fedora/change_set.rb +6 -2
  21. data/lib/active_fedora/core.rb +22 -27
  22. data/lib/active_fedora/fedora.rb +2 -6
  23. data/lib/active_fedora/fedora_attributes.rb +1 -1
  24. data/lib/active_fedora/file/streaming.rb +1 -1
  25. data/lib/active_fedora/indexing.rb +1 -18
  26. data/lib/active_fedora/indexing_service.rb +0 -9
  27. data/lib/active_fedora/loadable_from_json.rb +12 -1
  28. data/lib/active_fedora/nested_attributes.rb +2 -2
  29. data/lib/active_fedora/orders/list_node.rb +2 -2
  30. data/lib/active_fedora/orders/ordered_list.rb +7 -3
  31. data/lib/active_fedora/orders/target_proxy.rb +4 -0
  32. data/lib/active_fedora/querying.rb +1 -1
  33. data/lib/active_fedora/railtie.rb +2 -2
  34. data/lib/active_fedora/rdf/persistence.rb +1 -0
  35. data/lib/active_fedora/rdf.rb +0 -1
  36. data/lib/active_fedora/relation/delegation.rb +4 -0
  37. data/lib/active_fedora/solr_hit.rb +0 -13
  38. data/lib/active_fedora/solr_query_builder.rb +17 -13
  39. data/lib/active_fedora/version.rb +1 -1
  40. data/lib/active_fedora.rb +0 -12
  41. data/lib/generators/active_fedora/model/model_generator.rb +1 -1
  42. data/lib/generators/active_fedora/model/templates/model.rb.erb +4 -4
  43. data/lib/tasks/active_fedora_dev.rake +1 -1
  44. data/spec/config_helper.rb +1 -1
  45. data/spec/integration/associations_spec.rb +23 -24
  46. data/spec/integration/attached_files_spec.rb +18 -8
  47. data/spec/integration/attributes_spec.rb +12 -16
  48. data/spec/integration/autosave_association_spec.rb +6 -6
  49. data/spec/integration/base_spec.rb +3 -3
  50. data/spec/integration/basic_contains_association_spec.rb +1 -1
  51. data/spec/integration/clean_connection_spec.rb +1 -1
  52. data/spec/integration/collection_association_spec.rb +2 -5
  53. data/spec/integration/date_time_properties_spec.rb +1 -17
  54. data/spec/integration/direct_container_spec.rb +12 -12
  55. data/spec/integration/directly_contains_one_association_spec.rb +11 -13
  56. data/spec/integration/fedora_solr_sync_spec.rb +2 -2
  57. data/spec/integration/file_fixity_spec.rb +6 -8
  58. data/spec/integration/file_spec.rb +32 -34
  59. data/spec/integration/has_and_belongs_to_many_associations_spec.rb +5 -5
  60. data/spec/integration/has_many_associations_spec.rb +9 -11
  61. data/spec/integration/indexing_spec.rb +2 -2
  62. data/spec/integration/indirect_container_spec.rb +11 -12
  63. data/spec/integration/json_serialization_spec.rb +4 -4
  64. data/spec/integration/query_result_builder_spec.rb +9 -21
  65. data/spec/integration/rdf_nested_attributes_spec.rb +7 -7
  66. data/spec/integration/relation_delegation_spec.rb +8 -10
  67. data/spec/integration/relation_spec.rb +13 -16
  68. data/spec/integration/scoped_query_spec.rb +3 -3
  69. data/spec/integration/solr_hit_spec.rb +4 -15
  70. data/spec/integration/versionable_spec.rb +73 -327
  71. data/spec/integration/with_metadata_spec.rb +1 -1
  72. data/spec/spec_helper.rb +52 -10
  73. data/spec/unit/active_fedora_spec.rb +1 -1
  74. data/spec/unit/aggregation/list_source_spec.rb +37 -37
  75. data/spec/unit/aggregation/ordered_reader_spec.rb +4 -4
  76. data/spec/unit/association_hash_spec.rb +17 -31
  77. data/spec/unit/attached_files_spec.rb +35 -32
  78. data/spec/unit/attributes_spec.rb +25 -25
  79. data/spec/unit/base_active_model_spec.rb +8 -8
  80. data/spec/unit/base_cma_spec.rb +1 -1
  81. data/spec/unit/base_extra_spec.rb +7 -22
  82. data/spec/unit/base_spec.rb +17 -24
  83. data/spec/unit/callback_spec.rb +2 -2
  84. data/spec/unit/change_set_spec.rb +5 -5
  85. data/spec/unit/checksum_spec.rb +2 -2
  86. data/spec/unit/code_configurator_spec.rb +1 -1
  87. data/spec/unit/core/fedora_id_translator_spec.rb +2 -2
  88. data/spec/unit/core/fedora_uri_translator_spec.rb +2 -2
  89. data/spec/unit/core_spec.rb +65 -29
  90. data/spec/unit/default_model_mapper_spec.rb +6 -6
  91. data/spec/unit/fedora_spec.rb +3 -4
  92. data/spec/unit/file_configurator_spec.rb +96 -96
  93. data/spec/unit/file_path_builder_spec.rb +1 -1
  94. data/spec/unit/file_spec.rb +61 -61
  95. data/spec/unit/files_hash_spec.rb +9 -9
  96. data/spec/unit/filter_spec.rb +3 -3
  97. data/spec/unit/finder_methods_spec.rb +3 -3
  98. data/spec/unit/forbidden_attributes_protection_spec.rb +2 -2
  99. data/spec/unit/has_and_belongs_to_many_association_spec.rb +14 -15
  100. data/spec/unit/has_many_association_spec.rb +5 -5
  101. data/spec/unit/indexers/global_indexer_spec.rb +6 -6
  102. data/spec/unit/indexing_service_spec.rb +5 -5
  103. data/spec/unit/indexing_spec.rb +6 -6
  104. data/spec/unit/inheritance_spec.rb +11 -7
  105. data/spec/unit/loadable_from_json_spec.rb +4 -4
  106. data/spec/unit/logger_spec.rb +1 -1
  107. data/spec/unit/model_classifier_spec.rb +5 -5
  108. data/spec/unit/ordered_spec.rb +144 -147
  109. data/spec/unit/orders/list_node_spec.rb +21 -21
  110. data/spec/unit/orders/ordered_list_spec.rb +96 -96
  111. data/spec/unit/orders/reflection_spec.rb +4 -4
  112. data/spec/unit/pathing_spec.rb +4 -4
  113. data/spec/unit/persistence_spec.rb +28 -28
  114. data/spec/unit/property_spec.rb +2 -2
  115. data/spec/unit/query_spec.rb +6 -6
  116. data/spec/unit/rdf/indexing_service_spec.rb +29 -29
  117. data/spec/unit/readonly_spec.rb +5 -4
  118. data/spec/unit/reflection_spec.rb +3 -3
  119. data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb +9 -9
  120. data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb +9 -9
  121. data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb +9 -9
  122. data/spec/unit/schema_indexing_strategy_spec.rb +5 -5
  123. data/spec/unit/serializers_spec.rb +3 -4
  124. data/spec/unit/solr_config_options_spec.rb +13 -16
  125. data/spec/unit/solr_hit_spec.rb +9 -9
  126. data/spec/unit/solr_service_spec.rb +4 -10
  127. data/spec/unit/sparql_insert_spec.rb +2 -2
  128. data/spec/unit/validations_spec.rb +9 -9
  129. data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb +3 -2
  130. data/spec/unit/with_metadata/metadata_node_spec.rb +3 -2
  131. metadata +18 -92
  132. data/lib/active_fedora/datastreams/nokogiri_datastreams.rb +0 -119
  133. data/lib/active_fedora/datastreams.rb +0 -6
  134. data/lib/active_fedora/nom_datastream.rb +0 -73
  135. data/lib/active_fedora/om_datastream.rb +0 -118
  136. data/lib/active_fedora/profile_indexing_service.rb +0 -11
  137. data/lib/active_fedora/qualified_dublin_core_datastream.rb +0 -158
  138. data/lib/active_fedora/rdf/datastream_indexing.rb +0 -49
  139. data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb +0 -13
  140. data/lib/active_fedora/rdf/rdf_datastream.rb +0 -167
  141. data/lib/active_fedora/rdf/rdfxml_datastream.rb +0 -13
  142. data/lib/active_fedora/solr_instance_loader.rb +0 -47
  143. data/spec/fixtures/damsObjectModel.xml +0 -38
  144. data/spec/fixtures/dublin_core_rdf_descMetadata.nt +0 -13
  145. data/spec/fixtures/mixed_rdf_descMetadata.nt +0 -7
  146. data/spec/fixtures/mods_articles/mods_article1.xml +0 -98
  147. data/spec/fixtures/solr_rdf_descMetadata.nt +0 -7
  148. data/spec/integration/complex_rdf_datastream_spec.rb +0 -228
  149. data/spec/integration/datastream_rdf_nested_attributes_spec.rb +0 -179
  150. data/spec/integration/ntriples_datastream_spec.rb +0 -203
  151. data/spec/integration/om_datastream_spec.rb +0 -78
  152. data/spec/integration/solr_instance_loader_spec.rb +0 -156
  153. data/spec/samples/hydra-mods_article_datastream.rb +0 -517
  154. data/spec/samples/models/mods_article.rb +0 -9
  155. data/spec/samples/oral_history_sample.xml +0 -38
  156. data/spec/samples/oral_history_xml.xml +0 -35
  157. data/spec/samples/samples.rb +0 -2
  158. data/spec/unit/nom_datastream_spec.rb +0 -60
  159. data/spec/unit/ntriples_datastream_spec.rb +0 -170
  160. data/spec/unit/om_datastream_spec.rb +0 -294
  161. data/spec/unit/qualified_dublin_core_datastream_spec.rb +0 -119
  162. data/spec/unit/rdf_datastream_spec.rb +0 -84
  163. data/spec/unit/rdf_resource_datastream_spec.rb +0 -204
  164. data/spec/unit/rdfxml_datastream_spec.rb +0 -106
@@ -1,7 +1,7 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  RSpec.describe ActiveFedora::Orders::OrderedList do
4
- subject { described_class.new(graph, head_uri, tail_uri) }
4
+ let(:ordered_list) { described_class.new(graph, head_uri, tail_uri) }
5
5
 
6
6
  let(:graph) { ActiveTriples::Resource.new(RDF::URI("stuff")) }
7
7
  let(:head_uri) { nil }
@@ -9,34 +9,34 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
9
9
  describe "#last" do
10
10
  context "with no nodes" do
11
11
  it "is nil" do
12
- expect(subject.last).to eq nil
12
+ expect(ordered_list.last).to eq nil
13
13
  end
14
14
  end
15
15
  context "with one node" do
16
16
  it "is that node" do
17
17
  member = instance_double(ActiveFedora::Base)
18
- subject.append_target member
18
+ ordered_list.append_target member
19
19
 
20
- expect(subject.last.target).to eq member
20
+ expect(ordered_list.last.target).to eq member
21
21
  end
22
22
  end
23
23
  context "with two nodes" do
24
24
  it "is the last node" do
25
25
  member = instance_double(ActiveFedora::Base)
26
26
  member_2 = instance_double(ActiveFedora::Base)
27
- subject.append_target member
28
- subject.append_target member_2
27
+ ordered_list.append_target member
28
+ ordered_list.append_target member_2
29
29
 
30
- expect(subject.last.target).to eq member_2
30
+ expect(ordered_list.last.target).to eq member_2
31
31
  end
32
32
  end
33
33
  end
34
34
 
35
35
  describe "#order_will_change!" do
36
36
  it "marks it as changed" do
37
- expect(subject).not_to be_changed
38
- subject.order_will_change!
39
- expect(subject).to be_changed
37
+ expect(ordered_list).not_to be_changed
38
+ ordered_list.order_will_change!
39
+ expect(ordered_list).to be_changed
40
40
  end
41
41
  end
42
42
 
@@ -52,16 +52,16 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
52
52
  graph << [node_subject, RDF::Vocab::ORE.proxyIn, parent_uri]
53
53
  allow(ActiveFedora::Base).to receive(:from_uri)
54
54
 
55
- expect(subject.target_ids).to eq ["member1"]
55
+ expect(ordered_list.target_ids).to eq ["member1"]
56
56
  expect(ActiveFedora::Base).not_to have_received(:from_uri)
57
57
  end
58
58
  end
59
59
  context "from a built up list" do
60
60
  it "returns the IDs" do
61
61
  member = instance_double(ActiveFedora::Base, id: "member1")
62
- subject.append_target member
62
+ ordered_list.append_target member
63
63
 
64
- expect(subject.target_ids).to eq ["member1"]
64
+ expect(ordered_list.target_ids).to eq ["member1"]
65
65
  end
66
66
  end
67
67
  end
@@ -70,29 +70,29 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
70
70
  context "when there's one proxy in" do
71
71
  it "returns it" do
72
72
  member = instance_double(ActiveFedora::Base)
73
- subject.append_target member, proxy_in: RDF::URI("http://tar.dis")
73
+ ordered_list.append_target member, proxy_in: RDF::URI("http://tar.dis")
74
74
 
75
- expect(subject.proxy_in).to eq RDF::URI("http://tar.dis")
75
+ expect(ordered_list.proxy_in).to eq RDF::URI("http://tar.dis")
76
76
  end
77
77
  end
78
78
  context "when the proxy in is an AF::Base object" do
79
79
  it "returns the ID" do
80
80
  member = instance_double(ActiveFedora::Base)
81
81
  owner = instance_double(ActiveFedora::Base, id: "member1")
82
- subject.append_target member, proxy_in: owner
82
+ ordered_list.append_target member, proxy_in: owner
83
83
 
84
- expect(subject.proxy_in).to eq "member1"
84
+ expect(ordered_list.proxy_in).to eq "member1"
85
85
  end
86
86
  end
87
87
  context "when there's two proxy ins" do
88
88
  it "returns the first and throws a warning" do
89
89
  member = instance_double(ActiveFedora::Base)
90
- subject.append_target member, proxy_in: RDF::URI("http://tar.dis")
91
- subject.append_target member, proxy_in: RDF::URI("http://tar.di")
90
+ ordered_list.append_target member, proxy_in: RDF::URI("http://tar.dis")
91
+ ordered_list.append_target member, proxy_in: RDF::URI("http://tar.di")
92
92
  ActiveFedora::Base.logger = Logger.new(STDERR)
93
93
  allow(ActiveFedora::Base.logger).to receive(:warn)
94
94
 
95
- expect(subject.proxy_in).to eq RDF::URI("http://tar.dis")
95
+ expect(ordered_list.proxy_in).to eq RDF::URI("http://tar.dis")
96
96
  expect(ActiveFedora::Base.logger).to have_received(:warn).with("WARNING: List contains nodes aggregated under different URIs. Returning only the first.")
97
97
  end
98
98
  end
@@ -101,39 +101,39 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
101
101
  describe "#[]" do
102
102
  context "with no nodes" do
103
103
  it "is always nil" do
104
- expect(subject[0]).to eq nil
104
+ expect(ordered_list[0]).to eq nil
105
105
  end
106
106
  end
107
107
  context "with two nodes" do
108
108
  let(:member) { instance_double(ActiveFedora::Base) }
109
109
  let(:member_2) { instance_double(ActiveFedora::Base) }
110
110
  before do
111
- subject.append_target member
112
- subject.append_target member_2
111
+ ordered_list.append_target member
112
+ ordered_list.append_target member_2
113
113
  end
114
114
  it "can return the first" do
115
- expect(subject[0].target).to eq member
115
+ expect(ordered_list[0].target).to eq member
116
116
  end
117
117
  it "can return the last" do
118
- expect(subject[1].target).to eq member_2
118
+ expect(ordered_list[1].target).to eq member_2
119
119
  end
120
120
  it "returns nil for out of bounds values" do
121
- expect(subject[3]).to eq nil
121
+ expect(ordered_list[3]).to eq nil
122
122
  end
123
123
  end
124
124
  end
125
125
  describe "#first" do
126
126
  context "with no nodes" do
127
127
  it "is nil" do
128
- expect(subject.first).to eq nil
128
+ expect(ordered_list.first).to eq nil
129
129
  end
130
130
  end
131
131
  context "with a node" do
132
132
  it "returns that node" do
133
133
  member = instance_double(ActiveFedora::Base)
134
- subject.append_target member
135
- expect(subject.first.target).to eq member
136
- expect(subject).to be_changed
134
+ ordered_list.append_target member
135
+ expect(ordered_list.first.target).to eq member
136
+ expect(ordered_list).to be_changed
137
137
  end
138
138
  end
139
139
  context "with an item from the graph" do
@@ -145,10 +145,10 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
145
145
  parent_uri = RDF::URI.new("parent")
146
146
  graph << [node_subject, RDF::Vocab::ORE.proxyFor, member_uri]
147
147
  graph << [node_subject, RDF::Vocab::ORE.proxyIn, parent_uri]
148
- expect(subject.first.proxy_for).to eq member_uri
149
- expect(subject.first.proxy_for).to be_kind_of RDF::URI
150
- expect(subject.first.proxy_in).to eq parent_uri
151
- expect(subject.first).not_to eq nil
148
+ expect(ordered_list.first.proxy_for).to eq member_uri
149
+ expect(ordered_list.first.proxy_for).to be_kind_of RDF::URI
150
+ expect(ordered_list.first.proxy_in).to eq parent_uri
151
+ expect(ordered_list.first).not_to eq nil
152
152
  end
153
153
  it "is changed by a delete" do
154
154
  node_subject = RDF::URI.new("parent#bla")
@@ -157,9 +157,9 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
157
157
  graph << [node_subject, RDF::Vocab::ORE.proxyFor, member_uri]
158
158
  graph << [node_subject, RDF::Vocab::ORE.proxyIn, parent_uri]
159
159
 
160
- expect(subject).not_to be_changed
161
- subject.delete_at(0)
162
- expect(subject).to be_changed
160
+ expect(ordered_list).not_to be_changed
161
+ ordered_list.delete_at(0)
162
+ expect(ordered_list).to be_changed
163
163
  end
164
164
  context "with multiple nodes" do
165
165
  let(:tail_uri) { RDF::URI.new("parent#bla2") }
@@ -174,10 +174,10 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
174
174
  graph << [node_2_subject, RDF::Vocab::IANA.prev, node_subject]
175
175
  graph << [node_2_subject, RDF::Vocab::ORE.proxyFor, member_uri]
176
176
  graph << [node_2_subject, RDF::Vocab::ORE.proxyIn, parent_uri]
177
- expect(subject.length).to eq 2
178
- expect(subject.tail.prev.prev).to eq subject.head.next
179
- expect(subject.map(&:target).map(&:rdf_subject)).to eq [member_uri, member_uri]
180
- expect(subject).not_to be_changed
177
+ expect(ordered_list.length).to eq 2
178
+ expect(ordered_list.tail.prev.prev).to eq ordered_list.head.next
179
+ expect(ordered_list.map(&:target).map(&:rdf_subject)).to eq [member_uri, member_uri]
180
+ expect(ordered_list).not_to be_changed
181
181
  end
182
182
  end
183
183
  end
@@ -188,11 +188,11 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
188
188
  member = instance_double(ActiveFedora::Base)
189
189
  proxy_in = instance_double(ActiveFedora::Base, uri: RDF::URI("obj1"))
190
190
  600.times do
191
- subject.append_target member, proxy_in: proxy_in
191
+ ordered_list.append_target member, proxy_in: proxy_in
192
192
  end
193
- expect(subject.length).to eq 600
194
- expect(subject.to_a.last.next).not_to eq nil
195
- expect(subject.to_a.last.proxy_in).to eq proxy_in
193
+ expect(ordered_list.length).to eq 600
194
+ expect(ordered_list.to_a.last.next).not_to eq nil
195
+ expect(ordered_list.to_a.last.proxy_in).to eq proxy_in
196
196
  end
197
197
  end
198
198
 
@@ -201,24 +201,24 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
201
201
  member = instance_double(ActiveFedora::Base)
202
202
  member_2 = instance_double(ActiveFedora::Base)
203
203
  3.times do
204
- subject.append_target member
204
+ ordered_list.append_target member
205
205
  end
206
206
 
207
- subject.insert_at(1, member_2)
207
+ ordered_list.insert_at(1, member_2)
208
208
 
209
- expect(subject.to_a.map(&:target)).to eq [member, member_2, member, member]
210
- expect(subject).to be_changed
209
+ expect(ordered_list.to_a.map(&:target)).to eq [member, member_2, member, member]
210
+ expect(ordered_list).to be_changed
211
211
  end
212
212
  it "can insert at the beginning" do
213
213
  member = instance_double(ActiveFedora::Base)
214
214
  member_2 = instance_double(ActiveFedora::Base)
215
215
  2.times do
216
- subject.append_target member
216
+ ordered_list.append_target member
217
217
  end
218
218
 
219
- subject.insert_at(0, member_2)
219
+ ordered_list.insert_at(0, member_2)
220
220
 
221
- expect(subject.to_a.map(&:target)).to eq [member_2, member, member]
221
+ expect(ordered_list.to_a.map(&:target)).to eq [member_2, member, member]
222
222
  end
223
223
  end
224
224
 
@@ -226,35 +226,35 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
226
226
  it "can delete a node in the middle" do
227
227
  member = instance_double(ActiveFedora::Base)
228
228
  member_2 = instance_double(ActiveFedora::Base)
229
- subject.append_target member
230
- subject.append_target member_2
231
- subject.append_target member
229
+ ordered_list.append_target member
230
+ ordered_list.append_target member_2
231
+ ordered_list.append_target member
232
232
 
233
- subject.delete_node(subject.to_a[1])
233
+ ordered_list.delete_node(ordered_list.to_a[1])
234
234
 
235
- expect(subject.map(&:target)).to eq [member, member]
235
+ expect(ordered_list.map(&:target)).to eq [member, member]
236
236
  end
237
237
  it "can delete a node at the start" do
238
238
  member = instance_double(ActiveFedora::Base)
239
239
  member_2 = instance_double(ActiveFedora::Base)
240
- subject.append_target member_2
241
- subject.append_target member
242
- subject.append_target member
240
+ ordered_list.append_target member_2
241
+ ordered_list.append_target member
242
+ ordered_list.append_target member
243
243
 
244
- subject.delete_node(subject.to_a[0])
244
+ ordered_list.delete_node(ordered_list.to_a[0])
245
245
 
246
- expect(subject.map(&:target)).to eq [member, member]
246
+ expect(ordered_list.map(&:target)).to eq [member, member]
247
247
  end
248
248
  it "can delete a node at the end" do
249
249
  member = instance_double(ActiveFedora::Base)
250
250
  member_2 = instance_double(ActiveFedora::Base)
251
- subject.append_target member
252
- subject.append_target member
253
- subject.append_target member_2
251
+ ordered_list.append_target member
252
+ ordered_list.append_target member
253
+ ordered_list.append_target member_2
254
254
 
255
- subject.delete_node(subject.to_a[2])
255
+ ordered_list.delete_node(ordered_list.to_a[2])
256
256
 
257
- expect(subject.map(&:target)).to eq [member, member]
257
+ expect(ordered_list.map(&:target)).to eq [member, member]
258
258
  end
259
259
  end
260
260
 
@@ -262,47 +262,47 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
262
262
  it "can delete a node in the middle" do
263
263
  member = instance_double(ActiveFedora::Base)
264
264
  member_2 = instance_double(ActiveFedora::Base)
265
- subject.append_target member
266
- subject.append_target member_2
267
- subject.append_target member
265
+ ordered_list.append_target member
266
+ ordered_list.append_target member_2
267
+ ordered_list.append_target member
268
268
 
269
- subject.delete_at(1)
269
+ ordered_list.delete_at(1)
270
270
 
271
- expect(subject.map(&:target)).to eq [member, member]
271
+ expect(ordered_list.map(&:target)).to eq [member, member]
272
272
  end
273
273
  it "can delete a node at the start" do
274
274
  member = instance_double(ActiveFedora::Base)
275
275
  member_2 = instance_double(ActiveFedora::Base)
276
- subject.append_target member_2
277
- subject.append_target member
278
- subject.append_target member
276
+ ordered_list.append_target member_2
277
+ ordered_list.append_target member
278
+ ordered_list.append_target member
279
279
 
280
- subject.delete_at(0)
280
+ ordered_list.delete_at(0)
281
281
 
282
- expect(subject.map(&:target)).to eq [member, member]
282
+ expect(ordered_list.map(&:target)).to eq [member, member]
283
283
  end
284
284
  it "can delete a node at the end" do
285
285
  member = instance_double(ActiveFedora::Base)
286
286
  member_2 = instance_double(ActiveFedora::Base)
287
- subject.append_target member
288
- subject.append_target member
289
- subject.append_target member_2
287
+ ordered_list.append_target member
288
+ ordered_list.append_target member
289
+ ordered_list.append_target member_2
290
290
 
291
- subject.delete_at(2)
291
+ ordered_list.delete_at(2)
292
292
 
293
- expect(subject.map(&:target)).to eq [member, member]
293
+ expect(ordered_list.map(&:target)).to eq [member, member]
294
294
  end
295
295
  it "does not delete nodes if the loc is out of bounds" do
296
296
  member = instance_double(ActiveFedora::Base)
297
297
  member_2 = instance_double(ActiveFedora::Base)
298
- subject.append_target member
299
- subject.append_target member
300
- subject.append_target member_2
298
+ ordered_list.append_target member
299
+ ordered_list.append_target member
300
+ ordered_list.append_target member_2
301
301
 
302
- subject.delete_at(3)
303
- subject.delete_at(nil)
302
+ ordered_list.delete_at(3)
303
+ ordered_list.delete_at(nil)
304
304
 
305
- expect(subject.map(&:target)).to eq [member, member, member_2]
305
+ expect(ordered_list.map(&:target)).to eq [member, member, member_2]
306
306
  end
307
307
  end
308
308
 
@@ -310,13 +310,13 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
310
310
  it "creates a good graph" do
311
311
  member = instance_double(ActiveFedora::Base, id: '123/456')
312
312
  owner = instance_double(ActiveFedora::Base, uri: RDF::URI("http://owner.org"))
313
- subject.append_target member
314
- subject.append_target member, proxy_in: owner
313
+ ordered_list.append_target member
314
+ ordered_list.append_target member, proxy_in: owner
315
315
 
316
- graph = subject.to_graph
316
+ graph = ordered_list.to_graph
317
317
 
318
318
  expect(graph.statements.to_a.length).to eq 5
319
- expect(graph.subjects.to_a).to eq subject.to_a.map(&:rdf_subject)
319
+ expect(graph.subjects.to_a).to contain_exactly(*ordered_list.to_a.map(&:rdf_subject))
320
320
  expect(graph.query([nil, RDF::Vocab::ORE.proxyFor, nil]).to_a.last.object).to be_kind_of RDF::URI
321
321
  end
322
322
  end
@@ -324,12 +324,12 @@ RSpec.describe ActiveFedora::Orders::OrderedList do
324
324
  describe "#changes_committed!" do
325
325
  it "sets changed back to false" do
326
326
  member = instance_double(ActiveFedora::Base, uri: RDF::URI("http://test.org"))
327
- subject.append_target member
328
- expect(subject).to be_changed
327
+ ordered_list.append_target member
328
+ expect(ordered_list).to be_changed
329
329
 
330
- subject.changes_committed!
330
+ ordered_list.changes_committed!
331
331
 
332
- expect(subject).not_to be_changed
332
+ expect(ordered_list).not_to be_changed
333
333
  end
334
334
  end
335
335
  end
@@ -1,22 +1,22 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  RSpec.describe ActiveFedora::Reflection::OrdersReflection do
4
- subject { described_class.new(name, scope, options, active_fedora) }
4
+ let(:orders_reflection) { described_class.new(name, scope, options, active_fedora) }
5
5
  let(:macro) { :orders }
6
6
  let(:name) { "ordered_member_proxies" }
7
7
  let(:options) { {} }
8
8
  let(:scope) { nil }
9
- let(:active_fedora) { double("active_fedora") }
9
+ let(:active_fedora) { instance_double(ActiveFedora::Base) }
10
10
 
11
11
  describe "#klass" do
12
12
  it "is a proxy" do
13
- expect(subject.klass).to eq ActiveFedora::Orders::ListNode
13
+ expect(orders_reflection.klass).to eq ActiveFedora::Orders::ListNode
14
14
  end
15
15
  end
16
16
 
17
17
  describe "#class_name" do
18
18
  it "is a list node" do
19
- expect(subject.class_name).to eq "ActiveFedora::Orders::ListNode"
19
+ expect(orders_reflection.class_name).to eq "ActiveFedora::Orders::ListNode"
20
20
  end
21
21
  end
22
22
  end
@@ -17,19 +17,19 @@ describe ActiveFedora::Base do
17
17
  Object.send(:remove_const, :FooHistory)
18
18
  end
19
19
 
20
- subject { FooHistory.new(title: ["Root foo"]) }
20
+ subject(:history) { FooHistory.new(title: ["Root foo"]) }
21
21
 
22
22
  it { is_expected.to have_uri_prefix }
23
23
 
24
24
  it "uses the root path in the uri" do
25
- expect(subject.uri_prefix).to eql path
25
+ expect(history.uri_prefix).to eql path
26
26
  end
27
27
 
28
28
  context "when the object is saved" do
29
- before { subject.save }
29
+ before { history.save }
30
30
 
31
31
  it "persists the path in the uri" do
32
- expect(subject.uri.to_s).to include(path)
32
+ expect(history.uri.to_s).to include(path)
33
33
  end
34
34
  end
35
35
  end
@@ -3,27 +3,27 @@ require 'spec_helper'
3
3
  describe ActiveFedora::Persistence do
4
4
  describe '#new_record?' do
5
5
  context 'with an new object' do
6
- subject { ActiveFedora::Base.new }
6
+ subject(:persistence) { ActiveFedora::Base.new }
7
7
  it { is_expected.to be_new_record }
8
8
  end
9
9
 
10
10
  context 'with an destroyed object' do
11
- subject { ActiveFedora::Base.create }
12
- before { subject.delete }
11
+ subject(:persistence) { ActiveFedora::Base.create }
12
+ before { persistence.delete }
13
13
  it { is_expected.not_to be_new_record }
14
14
  end
15
15
  end
16
16
 
17
17
  describe '.delete' do
18
18
  context 'with an unsaved object' do
19
- subject { ActiveFedora::Base.new }
20
- before { subject.delete }
21
- it { is_expected.to eq subject }
19
+ subject(:persistence) { ActiveFedora::Base.new }
20
+ before { persistence.delete }
21
+ it { is_expected.to eq persistence }
22
22
  end
23
23
 
24
24
  context 'with a saved object' do
25
- subject { ActiveFedora::Base.create! }
26
- before { subject.delete }
25
+ subject(:persistence) { ActiveFedora::Base.create! }
26
+ before { persistence.delete }
27
27
  it { is_expected.to be_frozen }
28
28
  end
29
29
  end
@@ -46,68 +46,68 @@ describe ActiveFedora::Persistence do
46
46
  end
47
47
 
48
48
  describe '.destroy' do
49
- subject { ActiveFedora::Base.create! }
49
+ subject(:persistence) { ActiveFedora::Base.create! }
50
50
  context 'with no options' do
51
- before { subject.destroy }
51
+ before { persistence.destroy }
52
52
  it 'does not clear the id' do
53
- expect(subject.id).not_to be_nil
53
+ expect(persistence.id).not_to be_nil
54
54
  end
55
55
  end
56
56
 
57
57
  context 'with option eradicate: true' do
58
58
  it 'deletes the tombstone' do
59
- expect(subject.class).to receive(:eradicate).with(subject.id).and_return(true)
60
- subject.destroy(eradicate: true)
59
+ expect(persistence.class).to receive(:eradicate).with(persistence.id).and_return(true)
60
+ persistence.destroy(eradicate: true)
61
61
  end
62
62
  end
63
63
  end
64
64
 
65
65
  describe "save" do
66
- subject { ActiveFedora::Base.new }
66
+ subject(:persistence) { ActiveFedora::Base.new }
67
67
 
68
68
  context "when called with option update_index: false" do
69
69
  context "on a new record" do
70
70
  it "does not update the index" do
71
- expect(subject).to_not receive(:update_index)
72
- subject.save(update_index: false)
71
+ expect(persistence).to_not receive(:update_index)
72
+ persistence.save(update_index: false)
73
73
  end
74
74
  end
75
75
 
76
76
  context "on a persisted record" do
77
77
  before do
78
- allow(subject).to receive(:new_record?) { false }
78
+ allow(persistence).to receive(:new_record?) { false }
79
79
  allow_any_instance_of(Ldp::Orm).to receive(:save) { true }
80
- allow(subject).to receive(:update_modified_date)
80
+ allow(persistence).to receive(:update_modified_date)
81
81
  end
82
82
 
83
83
  it "does not update the index" do
84
- expect(subject).to_not receive(:update_index)
85
- subject.save(update_index: false)
84
+ expect(persistence).to_not receive(:update_index)
85
+ persistence.save(update_index: false)
86
86
  end
87
87
  end
88
88
  end
89
89
 
90
90
  context "when called with option :update_index=>true" do
91
91
  context "on create" do
92
- before { allow(subject).to receive(:create_needs_index?) { false } }
92
+ before { allow(persistence).to receive(:create_needs_index?) { false } }
93
93
 
94
94
  it "does not override `create_needs_index?'" do
95
- expect(subject).to_not receive(:update_index)
96
- subject.save(update_index: true)
95
+ expect(persistence).to_not receive(:update_index)
96
+ persistence.save(update_index: true)
97
97
  end
98
98
  end
99
99
 
100
100
  context "on update" do
101
101
  before do
102
- allow(subject).to receive(:new_record?) { false }
102
+ allow(persistence).to receive(:new_record?) { false }
103
103
  allow_any_instance_of(Ldp::Orm).to receive(:save) { true }
104
- allow(subject).to receive(:update_needs_index?) { false }
105
- allow(subject).to receive(:update_modified_date)
104
+ allow(persistence).to receive(:update_needs_index?) { false }
105
+ allow(persistence).to receive(:update_modified_date)
106
106
  end
107
107
 
108
108
  it "does not override `update_needs_index?'" do
109
- expect(subject).to_not receive(:update_index)
110
- subject.save(update_index: true)
109
+ expect(persistence).to_not receive(:update_index)
110
+ persistence.save(update_index: true)
111
111
  end
112
112
  end
113
113
  end
@@ -1,8 +1,8 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  describe ActiveFedora::Property do
4
- before(:each) do
5
- @test_property = described_class.new(double("model_stub"), "file_name", :string)
4
+ before do
5
+ @test_property = described_class.new(instance_double(ActiveFedora::Base), "file_name", :string)
6
6
  end
7
7
 
8
8
  it 'provides .new' do
@@ -8,7 +8,7 @@ describe ActiveFedora::Base do
8
8
  end
9
9
  end
10
10
  let(:sort_query) { ActiveFedora.index_field_mapper.solr_name("system_create", :stored_sortable, type: :date) + ' asc' }
11
- let(:model_query) { "_query_:\"{!field f=has_model_ssim}SpecModel::Basic\"" }
11
+ let(:model_query) { "_query_:\"{!raw f=has_model_ssim}SpecModel::Basic\"" }
12
12
 
13
13
  after(:all) do
14
14
  Object.send(:remove_const, :SpecModel)
@@ -244,7 +244,7 @@ describe ActiveFedora::Base do
244
244
  describe '#search_with_conditions' do
245
245
  let(:mock_result) { double('Result') }
246
246
  let(:klass) { SpecModel::Basic }
247
- subject { klass.search_with_conditions(conditions) }
247
+ subject(:search_with_conditions) { klass.search_with_conditions(conditions) }
248
248
 
249
249
  before do
250
250
  expect(ActiveFedora::SolrService).to receive(:query)
@@ -259,7 +259,7 @@ describe ActiveFedora::Base do
259
259
  let(:conditions) { { foo: 'bar', baz: ['quix', 'quack'] } }
260
260
 
261
261
  it "makes a query to solr and returns the results" do
262
- expect(subject).to eq mock_result
262
+ expect(search_with_conditions).to eq mock_result
263
263
  end
264
264
  end
265
265
 
@@ -271,7 +271,7 @@ describe ActiveFedora::Base do
271
271
  let(:conditions) { { foo: '9" Nails', baz: ['7" version', 'quack'] } }
272
272
 
273
273
  it "escapes quotes" do
274
- expect(subject).to eq mock_result
274
+ expect(search_with_conditions).to eq mock_result
275
275
  end
276
276
  end
277
277
 
@@ -282,7 +282,7 @@ describe ActiveFedora::Base do
282
282
  let(:conditions) { { baz: 'quack' } }
283
283
  let(:expected_query) { "_query_:\"{!field f=baz}quack\"" }
284
284
  it "doesn't use the class if it's called on AF:Base " do
285
- expect(subject).to eq mock_result
285
+ expect(search_with_conditions).to eq mock_result
286
286
  end
287
287
  end
288
288
 
@@ -290,7 +290,7 @@ describe ActiveFedora::Base do
290
290
  let(:conditions) { 'chunky:monkey' }
291
291
  let(:expected_query) { '(chunky:monkey)' }
292
292
  it "uses the query string if it's provided and wrap it in parentheses" do
293
- expect(subject).to eq mock_result
293
+ expect(search_with_conditions).to eq mock_result
294
294
  end
295
295
  end
296
296
  end