active-fedora 10.1.0 → 11.1.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 (208) 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/.travis.yml +6 -9
  7. data/Gemfile +1 -0
  8. data/History.txt +34 -0
  9. data/README.md +1 -3
  10. data/active-fedora.gemspec +7 -13
  11. data/lib/active_fedora/aggregation/list_source.rb +2 -0
  12. data/lib/active_fedora/associations/association_scope.rb +1 -1
  13. data/lib/active_fedora/associations/builder/aggregation.rb +1 -1
  14. data/lib/active_fedora/associations/builder/association.rb +1 -1
  15. data/lib/active_fedora/associations/builder/orders.rb +11 -3
  16. data/lib/active_fedora/associations/collection_association.rb +5 -5
  17. data/lib/active_fedora/associations/collection_proxy.rb +10 -10
  18. data/lib/active_fedora/associations/contained_finder.rb +2 -2
  19. data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb +1 -1
  20. data/lib/active_fedora/associations/has_many_association.rb +2 -2
  21. data/lib/active_fedora/associations/has_subresource_association.rb +2 -2
  22. data/lib/active_fedora/associations/orders_association.rb +4 -0
  23. data/lib/active_fedora/associations/rdf.rb +2 -0
  24. data/lib/active_fedora/attribute_assignment.rb +0 -1
  25. data/lib/active_fedora/attribute_methods/dirty.rb +1 -1
  26. data/lib/active_fedora/attribute_methods.rb +1 -1
  27. data/lib/active_fedora/attributes.rb +1 -1
  28. data/lib/active_fedora/base.rb +4 -8
  29. data/lib/active_fedora/change_set.rb +6 -2
  30. data/lib/active_fedora/cleaner.rb +1 -1
  31. data/lib/active_fedora/containers/container.rb +1 -1
  32. data/lib/active_fedora/core.rb +33 -30
  33. data/lib/active_fedora/fedora.rb +6 -2
  34. data/lib/active_fedora/fedora_attributes.rb +1 -1
  35. data/lib/active_fedora/file/streaming.rb +1 -1
  36. data/lib/active_fedora/file.rb +2 -1
  37. data/lib/active_fedora/file_configurator.rb +3 -3
  38. data/lib/active_fedora/indexing.rb +1 -18
  39. data/lib/active_fedora/indexing_service.rb +0 -9
  40. data/lib/active_fedora/initializing_connection.rb +1 -1
  41. data/lib/active_fedora/loadable_from_json.rb +12 -1
  42. data/lib/active_fedora/model_classifier.rb +1 -1
  43. data/lib/active_fedora/nested_attributes.rb +2 -2
  44. data/lib/active_fedora/null_logger.rb +10 -0
  45. data/lib/active_fedora/orders/list_node.rb +2 -2
  46. data/lib/active_fedora/orders/ordered_list.rb +8 -4
  47. data/lib/active_fedora/orders/target_proxy.rb +4 -0
  48. data/lib/active_fedora/querying.rb +1 -1
  49. data/lib/active_fedora/railtie.rb +2 -2
  50. data/lib/active_fedora/rake_support.rb +1 -1
  51. data/lib/active_fedora/rdf/field_map_entry.rb +6 -0
  52. data/lib/active_fedora/rdf/persistence.rb +1 -0
  53. data/lib/active_fedora/rdf/value_caster.rb +15 -0
  54. data/lib/active_fedora/rdf.rb +1 -1
  55. data/lib/active_fedora/relation/delegation.rb +4 -0
  56. data/lib/active_fedora/relation/finder_methods.rb +3 -1
  57. data/lib/active_fedora/solr_hit.rb +1 -14
  58. data/lib/active_fedora/solr_query_builder.rb +17 -13
  59. data/lib/active_fedora/version.rb +1 -1
  60. data/lib/active_fedora/with_metadata/metadata_node.rb +2 -1
  61. data/lib/active_fedora.rb +1 -12
  62. data/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml +11 -0
  63. data/lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml +1 -1
  64. data/lib/generators/active_fedora/model/model_generator.rb +1 -1
  65. data/lib/generators/active_fedora/model/templates/model.rb.erb +4 -4
  66. data/lib/tasks/active_fedora_dev.rake +1 -1
  67. data/spec/config_helper.rb +1 -1
  68. data/spec/integration/associations_spec.rb +23 -24
  69. data/spec/integration/attached_files_spec.rb +19 -9
  70. data/spec/integration/attributes_spec.rb +12 -16
  71. data/spec/integration/autosave_association_spec.rb +6 -6
  72. data/spec/integration/base_spec.rb +8 -8
  73. data/spec/integration/basic_contains_association_spec.rb +1 -1
  74. data/spec/integration/clean_connection_spec.rb +1 -1
  75. data/spec/integration/collection_association_spec.rb +2 -5
  76. data/spec/integration/date_time_properties_spec.rb +1 -17
  77. data/spec/integration/direct_container_spec.rb +12 -12
  78. data/spec/integration/directly_contains_one_association_spec.rb +11 -13
  79. data/spec/integration/eradicate_spec.rb +1 -1
  80. data/spec/integration/fedora_solr_sync_spec.rb +2 -2
  81. data/spec/integration/file_fixity_spec.rb +6 -8
  82. data/spec/integration/file_spec.rb +37 -39
  83. data/spec/integration/generators/solr_generator_spec.rb +7 -10
  84. data/spec/integration/has_and_belongs_to_many_associations_spec.rb +7 -7
  85. data/spec/integration/has_many_associations_spec.rb +9 -11
  86. data/spec/integration/indexing_spec.rb +2 -2
  87. data/spec/integration/indirect_container_spec.rb +11 -12
  88. data/spec/integration/json_serialization_spec.rb +4 -4
  89. data/spec/integration/query_result_builder_spec.rb +9 -21
  90. data/spec/integration/rdf_nested_attributes_spec.rb +7 -7
  91. data/spec/integration/relation_delegation_spec.rb +8 -10
  92. data/spec/integration/relation_spec.rb +13 -16
  93. data/spec/integration/scoped_query_spec.rb +3 -3
  94. data/spec/integration/scoping_spec.rb +3 -3
  95. data/spec/integration/solr_hit_spec.rb +4 -15
  96. data/spec/integration/versionable_spec.rb +73 -327
  97. data/spec/integration/with_metadata_spec.rb +1 -1
  98. data/spec/spec_helper.rb +52 -10
  99. data/spec/unit/active_fedora_spec.rb +1 -1
  100. data/spec/unit/aggregation/list_source_spec.rb +37 -37
  101. data/spec/unit/aggregation/ordered_reader_spec.rb +4 -4
  102. data/spec/unit/association_hash_spec.rb +17 -31
  103. data/spec/unit/attached_files_spec.rb +35 -32
  104. data/spec/unit/attributes_spec.rb +25 -25
  105. data/spec/unit/base_active_model_spec.rb +8 -8
  106. data/spec/unit/base_cma_spec.rb +1 -1
  107. data/spec/unit/base_extra_spec.rb +7 -22
  108. data/spec/unit/base_spec.rb +21 -27
  109. data/spec/unit/builder/has_and_belongs_to_many_spec.rb +1 -1
  110. data/spec/unit/callback_spec.rb +2 -2
  111. data/spec/unit/change_set_spec.rb +5 -5
  112. data/spec/unit/checksum_spec.rb +2 -2
  113. data/spec/unit/code_configurator_spec.rb +1 -1
  114. data/spec/unit/core/fedora_id_translator_spec.rb +2 -2
  115. data/spec/unit/core/fedora_uri_translator_spec.rb +2 -2
  116. data/spec/unit/core/logger_spec.rb +18 -0
  117. data/spec/unit/core_spec.rb +68 -32
  118. data/spec/unit/default_model_mapper_spec.rb +6 -6
  119. data/spec/unit/fedora_spec.rb +3 -4
  120. data/spec/unit/file_configurator_spec.rb +96 -96
  121. data/spec/unit/file_path_builder_spec.rb +3 -3
  122. data/spec/unit/file_spec.rb +93 -61
  123. data/spec/unit/files_hash_spec.rb +9 -9
  124. data/spec/unit/filter_spec.rb +3 -3
  125. data/spec/unit/finder_methods_spec.rb +3 -3
  126. data/spec/unit/forbidden_attributes_protection_spec.rb +2 -2
  127. data/spec/unit/has_and_belongs_to_many_association_spec.rb +14 -15
  128. data/spec/unit/has_many_association_spec.rb +28 -13
  129. data/spec/unit/indexers/global_indexer_spec.rb +6 -6
  130. data/spec/unit/indexing_service_spec.rb +5 -5
  131. data/spec/unit/indexing_spec.rb +8 -8
  132. data/spec/unit/inheritance_spec.rb +11 -7
  133. data/spec/unit/loadable_from_json_spec.rb +4 -4
  134. data/spec/unit/logger_spec.rb +1 -1
  135. data/spec/unit/model_classifier_spec.rb +5 -5
  136. data/spec/unit/ordered_spec.rb +144 -147
  137. data/spec/unit/orders/list_node_spec.rb +22 -22
  138. data/spec/unit/orders/ordered_list_spec.rb +96 -96
  139. data/spec/unit/orders/reflection_spec.rb +4 -4
  140. data/spec/unit/pathing_spec.rb +4 -4
  141. data/spec/unit/persistence_spec.rb +28 -28
  142. data/spec/unit/property_spec.rb +2 -2
  143. data/spec/unit/query_spec.rb +12 -12
  144. data/spec/unit/rdf/indexing_service_spec.rb +29 -29
  145. data/spec/unit/readonly_spec.rb +5 -4
  146. data/spec/unit/reflection_spec.rb +3 -3
  147. data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb +9 -9
  148. data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb +9 -9
  149. data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb +9 -9
  150. data/spec/unit/schema_indexing_strategy_spec.rb +5 -5
  151. data/spec/unit/serializers_spec.rb +3 -4
  152. data/spec/unit/solr_config_options_spec.rb +13 -16
  153. data/spec/unit/solr_hit_spec.rb +9 -9
  154. data/spec/unit/solr_service_spec.rb +4 -10
  155. data/spec/unit/sparql_insert_spec.rb +2 -2
  156. data/spec/unit/validations_spec.rb +12 -12
  157. data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb +3 -2
  158. data/spec/unit/with_metadata/metadata_node_spec.rb +3 -2
  159. metadata +30 -130
  160. data/lib/active_fedora/datastreams/nokogiri_datastreams.rb +0 -119
  161. data/lib/active_fedora/datastreams.rb +0 -6
  162. data/lib/active_fedora/nom_datastream.rb +0 -73
  163. data/lib/active_fedora/om_datastream.rb +0 -118
  164. data/lib/active_fedora/profile_indexing_service.rb +0 -11
  165. data/lib/active_fedora/qualified_dublin_core_datastream.rb +0 -158
  166. data/lib/active_fedora/rdf/datastream_indexing.rb +0 -49
  167. data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb +0 -13
  168. data/lib/active_fedora/rdf/rdf_datastream.rb +0 -167
  169. data/lib/active_fedora/rdf/rdfxml_datastream.rb +0 -13
  170. data/lib/active_fedora/solr_instance_loader.rb +0 -47
  171. data/solr/config/_rest_managed.json +0 -3
  172. data/solr/config/admin-extra.html +0 -31
  173. data/solr/config/elevate.xml +0 -36
  174. data/solr/config/mapping-ISOLatin1Accent.txt +0 -246
  175. data/solr/config/protwords.txt +0 -21
  176. data/solr/config/schema.xml +0 -372
  177. data/solr/config/scripts.conf +0 -24
  178. data/solr/config/solrconfig.xml +0 -311
  179. data/solr/config/spellings.txt +0 -2
  180. data/solr/config/stopwords.txt +0 -58
  181. data/solr/config/stopwords_en.txt +0 -58
  182. data/solr/config/synonyms.txt +0 -31
  183. data/solr/config/xslt/example.xsl +0 -132
  184. data/solr/config/xslt/example_atom.xsl +0 -67
  185. data/solr/config/xslt/example_rss.xsl +0 -66
  186. data/solr/config/xslt/luke.xsl +0 -337
  187. data/spec/fixtures/damsObjectModel.xml +0 -38
  188. data/spec/fixtures/dublin_core_rdf_descMetadata.nt +0 -13
  189. data/spec/fixtures/mixed_rdf_descMetadata.nt +0 -7
  190. data/spec/fixtures/mods_articles/mods_article1.xml +0 -98
  191. data/spec/fixtures/solr_rdf_descMetadata.nt +0 -7
  192. data/spec/integration/complex_rdf_datastream_spec.rb +0 -228
  193. data/spec/integration/datastream_rdf_nested_attributes_spec.rb +0 -179
  194. data/spec/integration/ntriples_datastream_spec.rb +0 -203
  195. data/spec/integration/om_datastream_spec.rb +0 -78
  196. data/spec/integration/solr_instance_loader_spec.rb +0 -156
  197. data/spec/samples/hydra-mods_article_datastream.rb +0 -517
  198. data/spec/samples/models/mods_article.rb +0 -9
  199. data/spec/samples/oral_history_sample.xml +0 -38
  200. data/spec/samples/oral_history_xml.xml +0 -35
  201. data/spec/samples/samples.rb +0 -2
  202. data/spec/unit/nom_datastream_spec.rb +0 -60
  203. data/spec/unit/ntriples_datastream_spec.rb +0 -170
  204. data/spec/unit/om_datastream_spec.rb +0 -294
  205. data/spec/unit/qualified_dublin_core_datastream_spec.rb +0 -119
  206. data/spec/unit/rdf_datastream_spec.rb +0 -84
  207. data/spec/unit/rdf_resource_datastream_spec.rb +0 -204
  208. data/spec/unit/rdfxml_datastream_spec.rb +0 -106
@@ -3,7 +3,7 @@ require 'spec_helper'
3
3
  describe ActiveFedora::File do
4
4
  let(:file) { described_class.new }
5
5
 
6
- subject { file }
6
+ subject(:af_file) { file }
7
7
 
8
8
  it { is_expected.not_to be_metadata }
9
9
 
@@ -43,7 +43,7 @@ describe ActiveFedora::File do
43
43
  end
44
44
 
45
45
  describe "#uri" do
46
- subject { file.uri }
46
+ subject(:uri) { file.uri }
47
47
 
48
48
  context "when the file is in an ldp:BasicContainer" do
49
49
  let(:parent) { ActiveFedora::Base.new(id: '1234') }
@@ -51,14 +51,14 @@ describe ActiveFedora::File do
51
51
  context "and it's initialized with the URI" do
52
52
  let(:file) { described_class.new(parent.uri + "/FOO1") }
53
53
  it "works" do
54
- expect(subject.to_s).to eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/1234/FOO1"
54
+ expect(uri.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
55
55
  end
56
56
  end
57
57
 
58
58
  context "and it's initialized with an ID" do
59
59
  let(:file) { described_class.new(parent.id + "/FOO1") }
60
60
  it "works" do
61
- expect(subject.to_s).to eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/1234/FOO1"
61
+ expect(uri.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
62
62
  end
63
63
  end
64
64
  end
@@ -91,18 +91,18 @@ describe ActiveFedora::File do
91
91
  let(:ldp_source) { Ldp::Resource.new(mock_client, path) }
92
92
 
93
93
  before do
94
- allow(subject).to receive(:ldp_source).and_return(ldp_source)
94
+ allow(af_file).to receive(:ldp_source).and_return(ldp_source)
95
95
  end
96
96
 
97
97
  describe '#persisted_size' do
98
98
  it 'loads the file size attribute from the fedora repository' do
99
- expect(subject.size).to eq 9999
99
+ expect(af_file.size).to eq 9999
100
100
  end
101
101
 
102
102
  it 'returns nil without making a head request to Ldp::Resource::BinarySource if it is a new record' do
103
- allow(subject).to receive(:new_record?).and_return(true)
104
- expect(subject.ldp_source).not_to receive(:head)
105
- expect(subject.persisted_size).to eq nil
103
+ allow(af_file).to receive(:new_record?).and_return(true)
104
+ expect(af_file.ldp_source).not_to receive(:head)
105
+ expect(af_file.persisted_size).to eq nil
106
106
  end
107
107
  end
108
108
 
@@ -110,17 +110,17 @@ describe ActiveFedora::File do
110
110
  context 'when content has changed from what is currently persisted' do
111
111
  context 'and has been set to something that has a #size method (i.e. string or File)' do
112
112
  it 'returns the size of the dirty content' do
113
- dirty_content = double
113
+ dirty_content = instance_double(::File)
114
114
  allow(dirty_content).to receive(:size) { 8_675_309 }
115
- subject.content = dirty_content
116
- expect(subject.size).to eq dirty_content.size
115
+ af_file.content = dirty_content
116
+ expect(af_file.size).to eq dirty_content.size
117
117
  end
118
118
  end
119
119
  end
120
120
 
121
121
  context 'when content has not changed from what is currently persisted' do
122
122
  it 'returns nil, indicating that the content is not "dirty", but its not necessarily 0 either.' do
123
- expect(subject.dirty_size).to be_nil
123
+ expect(af_file.dirty_size).to be_nil
124
124
  end
125
125
  end
126
126
  end
@@ -128,55 +128,55 @@ describe ActiveFedora::File do
128
128
  describe '#size' do
129
129
  context 'when content has not changed' do
130
130
  it 'returns the value of .persisted_size' do
131
- expect(subject.size).to eq subject.persisted_size
131
+ expect(af_file.size).to eq af_file.persisted_size
132
132
  end
133
133
  end
134
134
 
135
135
  context 'when content has changed' do
136
136
  it 'returns the value of .dirty_size' do
137
- subject.content = "i have changed!"
138
- expect(subject.size).to eq subject.dirty_size
137
+ af_file.content = "i have changed!"
138
+ expect(af_file.size).to eq af_file.dirty_size
139
139
  end
140
140
  end
141
141
 
142
142
  it 'returns nil when #persisted_size and #dirty_size return nil' do
143
- allow(subject).to receive(:persisted_size) { nil }
144
- allow(subject).to receive(:dirty_size) { nil }
145
- expect(subject.size).to be_nil
143
+ allow(af_file).to receive(:persisted_size) { nil }
144
+ allow(af_file).to receive(:dirty_size) { nil }
145
+ expect(af_file.size).to be_nil
146
146
  end
147
147
  end
148
148
 
149
149
  describe ".empty?" do
150
150
  it "does not be empty" do
151
- expect(subject.empty?).to be false
151
+ expect(af_file.empty?).to be false
152
152
  end
153
153
  end
154
154
 
155
155
  describe ".has_content?" do
156
156
  context "when there's content" do
157
157
  before do
158
- allow(subject).to receive(:size).and_return(10)
158
+ allow(af_file).to receive(:size).and_return(10)
159
159
  end
160
160
  it "returns true" do
161
- expect(subject.has_content?).to be true
161
+ expect(af_file.has_content?).to be true
162
162
  end
163
163
  end
164
164
 
165
165
  context "when size is nil" do
166
166
  before do
167
- allow(subject).to receive(:size).and_return(nil)
167
+ allow(af_file).to receive(:size).and_return(nil)
168
168
  end
169
169
  it "does not have content" do
170
- expect(subject).to_not have_content
170
+ expect(af_file).to_not have_content
171
171
  end
172
172
  end
173
173
 
174
174
  context "when content is zero" do
175
175
  before do
176
- allow(subject).to receive(:size).and_return(0)
176
+ allow(af_file).to receive(:size).and_return(0)
177
177
  end
178
178
  it "returns false" do
179
- expect(subject.has_content?).to be false
179
+ expect(af_file.has_content?).to be false
180
180
  end
181
181
  end
182
182
  end
@@ -286,14 +286,14 @@ describe ActiveFedora::File do
286
286
  describe "#checksum" do
287
287
  let(:digest) { RDF::URI.new("urn:sha1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15") }
288
288
  before do
289
- allow(subject).to receive(:digest) { [digest] }
289
+ allow(af_file).to receive(:digest) { [digest] }
290
290
  end
291
291
  its(:checksum) { is_expected.to be_a(ActiveFedora::Checksum) }
292
292
  it "has the right value" do
293
- expect(subject.checksum.value).to eq("f1d2d2f924e986ac86fdf7b36c94bcdf32beec15")
293
+ expect(af_file.checksum.value).to eq("f1d2d2f924e986ac86fdf7b36c94bcdf32beec15")
294
294
  end
295
295
  it "has the right algorithm" do
296
- expect(subject.checksum.algorithm).to eq("SHA1")
296
+ expect(af_file.checksum.algorithm).to eq("SHA1")
297
297
  end
298
298
  end
299
299
 
@@ -358,7 +358,7 @@ describe ActiveFedora::File do
358
358
  Object.send(:remove_const, :MyFile)
359
359
  end
360
360
 
361
- subject { MyFile.new }
361
+ subject(:my_file) { MyFile.new }
362
362
 
363
363
  describe "initialize" do
364
364
  specify {
@@ -370,21 +370,21 @@ describe ActiveFedora::File do
370
370
  describe "create" do
371
371
  describe "when content is not nil" do
372
372
  specify {
373
- expect(subject).to receive(:b_create).once
374
- expect(subject).to receive(:a_create).once
375
- expect(subject).to receive(:b_save).once
376
- expect(subject).to receive(:a_save).once
377
- subject.content = "foo"
378
- subject.save
373
+ expect(my_file).to receive(:b_create).once
374
+ expect(my_file).to receive(:a_create).once
375
+ expect(my_file).to receive(:b_save).once
376
+ expect(my_file).to receive(:a_save).once
377
+ my_file.content = "foo"
378
+ my_file.save
379
379
  }
380
380
  end
381
381
  describe "when content is nil" do
382
382
  specify {
383
- expect(subject).to receive(:b_create).once
384
- expect(subject).not_to receive(:a_create)
385
- expect(subject).to receive(:b_save).once
386
- expect(subject).not_to receive(:a_save)
387
- subject.save
383
+ expect(my_file).to receive(:b_create).once
384
+ expect(my_file).not_to receive(:a_create)
385
+ expect(my_file).to receive(:b_save).once
386
+ expect(my_file).not_to receive(:a_save)
387
+ my_file.save
388
388
  }
389
389
  end
390
390
  end
@@ -392,37 +392,69 @@ describe ActiveFedora::File do
392
392
  describe "update" do
393
393
  describe "when content has changed" do
394
394
  specify {
395
- subject.content = "foo"
396
- subject.save
397
- expect(subject).to receive(:b_save).once
398
- expect(subject).to receive(:a_save).once
399
- expect(subject).to receive(:b_update).once
400
- expect(subject).to receive(:a_update).once
401
- subject.content = "bar"
402
- subject.save
395
+ my_file.content = "foo"
396
+ my_file.save
397
+ expect(my_file).to receive(:b_save).once
398
+ expect(my_file).to receive(:a_save).once
399
+ expect(my_file).to receive(:b_update).once
400
+ expect(my_file).to receive(:a_update).once
401
+ my_file.content = "bar"
402
+ my_file.save
403
403
  }
404
404
  end
405
405
  describe "when content has not changed" do
406
406
  specify {
407
- subject.content = "foo"
408
- subject.save
409
- expect(subject).to receive(:b_save).once
410
- expect(subject).to receive(:a_save)
411
- expect(subject).to receive(:b_update).once
412
- expect(subject).to receive(:a_update)
413
- subject.save
407
+ my_file.content = "foo"
408
+ my_file.save
409
+ expect(my_file).to receive(:b_save).once
410
+ expect(my_file).to receive(:a_save)
411
+ expect(my_file).to receive(:b_update).once
412
+ expect(my_file).to receive(:a_update)
413
+ my_file.save
414
414
  }
415
415
  end
416
416
  end
417
417
 
418
418
  describe "destroy" do
419
419
  specify {
420
- subject.content = "foo"
421
- subject.save
422
- expect(subject).to receive(:b_destroy).once
423
- expect(subject).to receive(:a_destroy).once
424
- subject.destroy
420
+ my_file.content = "foo"
421
+ my_file.save
422
+ expect(my_file).to receive(:b_destroy).once
423
+ expect(my_file).to receive(:a_destroy).once
424
+ my_file.destroy
425
425
  }
426
426
  end
427
427
  end
428
+
429
+ describe "#new" do
430
+ let(:file2) do
431
+ described_class.new do |file|
432
+ file.content = "My Content"
433
+ file.save!
434
+ end
435
+ end
436
+
437
+ context "when uri is passed to new" do
438
+ subject { described_class.new(file2.uri).content }
439
+
440
+ it { is_expected.to eq "My Content" }
441
+ end
442
+
443
+ context "when id is passed to new" do
444
+ subject { described_class.new(file2.id).content }
445
+
446
+ it { is_expected.to eq "My Content" }
447
+ end
448
+
449
+ context "when object responding to .uri is passed to new" do
450
+ subject { described_class.new(file2).content }
451
+ it { is_expected.to eq "My Content" }
452
+ end
453
+
454
+ context "when Array passed to new" do
455
+ it "raises an expection" do
456
+ expect { described_class.new([]) }.to raise_error
457
+ end
458
+ end
459
+ end
428
460
  end
@@ -10,26 +10,26 @@ describe ActiveFedora::FilesHash do
10
10
 
11
11
  after { Object.send(:remove_const, :FilesContainer) }
12
12
 
13
- let(:reflection) { double('reflection') }
14
- let(:association) { double('association', reader: object) }
13
+ let(:reflection) { instance_double(ActiveFedora::Reflection::MacroReflection) }
14
+ let(:association) { instance_double(ActiveFedora::Associations::SingularAssociation, reader: object) }
15
15
  let(:object) { double('object') }
16
16
  let(:container) { FilesContainer.new }
17
17
 
18
- subject { described_class.new(container) }
18
+ subject(:file_hash) { described_class.new(container) }
19
19
 
20
20
  describe "#key?" do
21
21
  context 'when the key is present' do
22
22
  it "is true" do
23
- expect(subject.key?(:file)).to be true
23
+ expect(file_hash.key?(:file)).to be true
24
24
  end
25
25
  it "returns true if a string is passed" do
26
- expect(subject.key?('file')).to be true
26
+ expect(file_hash.key?('file')).to be true
27
27
  end
28
28
  end
29
29
 
30
30
  context 'when the key is not present' do
31
31
  it "is false" do
32
- expect(subject.key?(:foo)).to be false
32
+ expect(file_hash.key?(:foo)).to be false
33
33
  end
34
34
  end
35
35
  end
@@ -37,16 +37,16 @@ describe ActiveFedora::FilesHash do
37
37
  describe "#[]" do
38
38
  context 'when the key is present' do
39
39
  it "returns the object" do
40
- expect(subject[:file]).to eq object
40
+ expect(file_hash[:file]).to eq object
41
41
  end
42
42
  it "returns the object if a string is passed" do
43
- expect(subject['file']).to eq object
43
+ expect(file_hash['file']).to eq object
44
44
  end
45
45
  end
46
46
 
47
47
  context 'when the key is not present' do
48
48
  it "is nil" do
49
- expect(subject[:foo]).to be_nil
49
+ expect(file_hash[:foo]).to be_nil
50
50
  end
51
51
  end
52
52
  end
@@ -55,7 +55,7 @@ describe ActiveFedora::Associations::FilterAssociation do
55
55
  image.child_collections = [another_collection]
56
56
  end
57
57
  it "overwrites existing matches" do
58
- expect(image.members).to eq [test_object, another_collection]
58
+ expect(image.members).to contain_exactly test_object, another_collection
59
59
  end
60
60
  end
61
61
  end
@@ -75,7 +75,7 @@ describe ActiveFedora::Associations::FilterAssociation do
75
75
  end
76
76
 
77
77
  it "updates the parent" do
78
- expect(image.members).to eq [test_object, test_collection, another_collection]
78
+ expect(image.members).to contain_exactly test_object, test_collection, another_collection
79
79
  end
80
80
  end
81
81
  end
@@ -128,6 +128,6 @@ describe ActiveFedora::Associations::FilterAssociation do
128
128
 
129
129
  subject { image.members }
130
130
 
131
- it { is_expected.to eq [test_collection, another_object] }
131
+ it { is_expected.to contain_exactly test_collection, another_object }
132
132
  end
133
133
  end
@@ -57,9 +57,9 @@ describe ActiveFedora::FinderMethods do
57
57
  end
58
58
 
59
59
  describe "#search_in_batches" do
60
- let(:docs) { double('docs', has_next?: false) }
60
+ let(:docs) { instance_double(RSolr::Response::PaginatedDocSet, has_next?: false) }
61
61
  let(:select_handler) { 'select' }
62
- let(:connection) { double('conn') }
62
+ let(:connection) { instance_double(RSolr::Client) }
63
63
  before do
64
64
  expect(finder).to receive(:create_query).with('age_t' => '21').and_return('dummy query')
65
65
  allow(ActiveFedora::SolrService.instance).to receive(:conn).and_return(connection)
@@ -84,7 +84,7 @@ describe ActiveFedora::FinderMethods do
84
84
 
85
85
  describe '#search_by_id' do
86
86
  context 'with a document in solr' do
87
- let(:doc) { double('Document') }
87
+ let(:doc) { instance_double(Hash) }
88
88
 
89
89
  before do
90
90
  expect(finder).to receive(:search_with_conditions).with({ id: 'x' }, hash_including(rows: 1)).and_return([doc])
@@ -24,8 +24,8 @@ describe ActiveFedora::Attributes, ".new" do
24
24
  end
25
25
 
26
26
  class Person < ActiveFedora::Base
27
- property :first_name, predicate: ::RDF::FOAF.firstName, multiple: false
28
- property :gender, predicate: ::RDF::FOAF.gender, multiple: false
27
+ property :first_name, predicate: ::RDF::Vocab::FOAF.firstName, multiple: false
28
+ property :gender, predicate: ::RDF::Vocab::FOAF.gender, multiple: false
29
29
  end
30
30
  end
31
31
 
@@ -7,33 +7,32 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
7
7
  end
8
8
  class Page < ActiveFedora::Base
9
9
  end
10
- allow_any_instance_of(Book).to receive(:load_datastreams).and_return(false)
11
- allow_any_instance_of(Page).to receive(:load_datastreams).and_return(false)
12
10
 
13
- allow(subject).to receive(:new_record?).and_return(false)
14
- allow(subject).to receive(:save).and_return(true)
11
+ allow(book).to receive(:new_record?).and_return(false)
12
+ allow(book).to receive(:save).and_return(true)
15
13
  end
16
14
 
17
15
  after do
18
16
  Object.send(:remove_const, :Book)
19
17
  Object.send(:remove_const, :Page)
20
18
  end
21
- subject { Book.new('subject-a') }
19
+
20
+ subject(:book) { Book.new(id: 'subject-a') }
22
21
 
23
22
  context "a one way relationship " do
24
23
  describe "adding memeber" do
25
24
  it "sets the relationship attribute" do
26
25
  reflection = ActiveFedora::Reflection.create(:has_and_belongs_to_many, :pages, nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Book)
27
26
  allow(ActiveFedora::SolrService).to receive(:query).and_return([])
28
- ac = described_class.new(subject, reflection)
27
+ ac = described_class.new(book, reflection)
29
28
  expect(ac).to receive(:callback).twice
30
29
  object = Page.new
31
30
  allow(object).to receive(:new_record?).and_return(false)
32
31
  allow(object).to receive(:save).and_return(true)
33
32
  allow(object).to receive(:id).and_return('1234')
34
33
 
35
- allow(subject).to receive(:[]).with('page_ids').and_return([])
36
- expect(subject).to receive(:[]=).with('page_ids', ['1234'])
34
+ allow(book).to receive(:[]).with('page_ids').and_return([])
35
+ expect(book).to receive(:[]=).with('page_ids', ['1234'])
37
36
 
38
37
  ac.concat object
39
38
  end
@@ -42,9 +41,9 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
42
41
  describe "finding member" do
43
42
  let(:ids) { (0..15).map(&:to_s) }
44
43
  let(:reflection) { ActiveFedora::Reflection.create(:has_and_belongs_to_many, :pages, nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Book) }
45
- let(:association) { described_class.new(subject, reflection) }
44
+ let(:association) { described_class.new(book, reflection) }
46
45
  it "calls ActiveFedora::Base.find" do
47
- expect(subject).to receive(:[]).with('page_ids').and_return(ids)
46
+ expect(book).to receive(:[]).with('page_ids').and_return(ids)
48
47
  expect(ActiveFedora::Base).to receive(:find).with(ids)
49
48
  association.send(:find_target)
50
49
  end
@@ -54,7 +53,7 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
54
53
  context "with an inverse reflection" do
55
54
  let!(:inverse) { ActiveFedora::Reflection.create(:has_and_belongs_to_many, :books, nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Page) }
56
55
  let(:reflection) { ActiveFedora::Reflection.create(:has_and_belongs_to_many, :pages, nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, inverse_of: 'books' }, Book) }
57
- let(:ac) { described_class.new(subject, reflection) }
56
+ let(:ac) { described_class.new(book, reflection) }
58
57
  let(:object) { Page.new }
59
58
 
60
59
  it "sets the relationship attribute on subject and object when inverse_of is given" do
@@ -63,11 +62,11 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
63
62
  allow(object).to receive(:new_record?).and_return(false)
64
63
  allow(object).to receive(:save).and_return(true)
65
64
 
66
- allow(subject).to receive(:[]).with('page_ids').and_return([])
67
- expect(subject).to receive(:[]=).with('page_ids', [object.id])
65
+ allow(book).to receive(:[]).with('page_ids').and_return([])
66
+ expect(book).to receive(:[]=).with('page_ids', [object.id])
68
67
 
69
68
  expect(object).to receive(:[]).with('book_ids').and_return([]).twice
70
- expect(object).to receive(:[]=).with('book_ids', [subject.id])
69
+ expect(object).to receive(:[]=).with('book_ids', [book.id])
71
70
 
72
71
  ac.concat object
73
72
  end
@@ -114,7 +113,7 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
114
113
  it "clears the object set" do
115
114
  expect(collection.members).to eq [thing]
116
115
  collection.member_ids = [thing2.id, thing3.id]
117
- expect(collection.members).to eq [thing2, thing3]
116
+ expect(collection.members).to contain_exactly thing2, thing3
118
117
  end
119
118
  end
120
119
 
@@ -12,8 +12,8 @@ describe ActiveFedora::Associations::HasManyAssociation do
12
12
  Object.send(:remove_const, :Book)
13
13
  Object.send(:remove_const, :Page)
14
14
  end
15
- let(:book) { Book.new('subject-a') }
16
- let(:page) { Page.new('object-b') }
15
+ let(:book) { Book.new(id: 'subject-a') }
16
+ let(:page) { Page.new(id: 'object-b') }
17
17
 
18
18
  describe "setting the foreign key" do
19
19
  before do
@@ -32,19 +32,34 @@ describe ActiveFedora::Associations::HasManyAssociation do
32
32
  end
33
33
  end
34
34
 
35
- describe "Finding a polymorphic inverse relation" do
36
- before do
37
- # :books must come first, so that we can test that is being passed over in favor of :contents
38
- Page.has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
39
- Page.has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
40
- end
35
+ describe "#find_polymorphic_inverse" do
41
36
  let(:book_reflection) { ActiveFedora::Reflection.create(:has_many, 'pages', nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
42
37
  let(:association) { described_class.new(book, book_reflection) }
43
38
 
44
- subject { association.send(:find_polymorphic_inverse, page) }
39
+ subject(:af_page) { association.send(:find_polymorphic_inverse, page) }
40
+
41
+ context "when a has_many is present" do
42
+ before do
43
+ # :books must come first, so that we can test that is being passed over in favor of :contents
44
+ Page.has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
45
+ Page.has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
46
+ end
47
+
48
+ it "finds the HABTM reflection" do
49
+ expect(af_page.name).to eq :contents
50
+ end
51
+ end
52
+
53
+ context "when multiple belongs_to are present" do
54
+ before do
55
+ # :foo must come first, so that we can test that is being passed over in favor of :bar
56
+ Page.belongs_to :foo, predicate: ::RDF::Vocab::DC.isPartOf, class_name: 'ActiveFedora::Base'
57
+ Page.belongs_to :bar, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
58
+ end
45
59
 
46
- it "finds the HABTM reflection" do
47
- expect(subject.name).to eq :contents
60
+ it "finds the belongs_to reflection" do
61
+ expect(af_page.name).to eq :bar
62
+ end
48
63
  end
49
64
  end
50
65
 
@@ -95,8 +110,8 @@ describe ActiveFedora::Associations::HasManyAssociation do
95
110
  end
96
111
 
97
112
  describe "#ids_reader" do
98
- let(:owner) { double('owner') }
99
- let(:reflection) { double('reflection', check_validity!: true) }
113
+ let(:owner) { instance_double(ActiveFedora::Base) }
114
+ let(:reflection) { instance_double(ActiveFedora::Reflection::AssociationReflection, check_validity!: true) }
100
115
  let(:association) { described_class.new(owner, reflection) }
101
116
 
102
117
  let(:r1) { ActiveFedora::Base.new(id: 'r1-id', &:mark_for_destruction) }
@@ -1,14 +1,14 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  RSpec.describe ActiveFedora::Indexers::GlobalIndexer do
4
- subject { described_class.new(index_types) }
4
+ let(:global_indexer) { described_class.new(index_types) }
5
5
  let(:index_types) {}
6
6
 
7
7
  describe "#new" do
8
8
  # The global indexer acts as both an indexer factory and an indexer, since
9
9
  # the property doesn't matter.
10
10
  it "returns itself" do
11
- expect(subject.new("bla")).to eq subject
11
+ expect(global_indexer.new("bla")).to eq global_indexer
12
12
  end
13
13
  end
14
14
  describe "#index" do
@@ -16,7 +16,7 @@ RSpec.describe ActiveFedora::Indexers::GlobalIndexer do
16
16
  context "with one index type" do
17
17
  let(:index_types) { :symbol }
18
18
  it "passes that to index_obj" do
19
- subject.index(index_obj)
19
+ global_indexer.index(index_obj)
20
20
 
21
21
  expect(index_obj).to have_received(:as).with(:symbol)
22
22
  end
@@ -24,15 +24,15 @@ RSpec.describe ActiveFedora::Indexers::GlobalIndexer do
24
24
  context "with multiple index types" do
25
25
  let(:index_types) { [:symbol, :stored_searchable] }
26
26
  it "passes that to index_obj" do
27
- subject.index(index_obj)
27
+ global_indexer.index(index_obj)
28
28
 
29
29
  expect(index_obj).to have_received(:as).with(:symbol, :stored_searchable)
30
30
  end
31
31
  end
32
32
  context "with no index types" do
33
- subject { described_class.new }
33
+ let(:global_indexer) { described_class.new }
34
34
  it "does not pass anything to index_obj" do
35
- subject.index(index_obj)
35
+ global_indexer.index(index_obj)
36
36
 
37
37
  expect(index_obj).not_to have_received(:as)
38
38
  end
@@ -6,22 +6,22 @@ describe ActiveFedora::IndexingService do
6
6
 
7
7
  describe "#generate_solr_document" do
8
8
  context "when no block is passed" do
9
- subject { indexer.generate_solr_document }
9
+ subject(:solr_doc) { indexer.generate_solr_document }
10
10
  it "produces a document" do
11
- expect(subject['has_model_ssim']).to eq ['ActiveFedora::Base']
11
+ expect(solr_doc['has_model_ssim']).to eq ['ActiveFedora::Base']
12
12
  end
13
13
  end
14
14
 
15
15
  context "when a block is passed" do
16
- subject do
16
+ subject(:solr_doc) do
17
17
  indexer.generate_solr_document do |solr_doc|
18
18
  solr_doc['noid'] = '12345'
19
19
  end
20
20
  end
21
21
 
22
22
  it "produces and yield the document" do
23
- expect(subject['has_model_ssim']).to eq ['ActiveFedora::Base']
24
- expect(subject['noid']).to eq '12345'
23
+ expect(solr_doc['has_model_ssim']).to eq ['ActiveFedora::Base']
24
+ expect(solr_doc['noid']).to eq '12345'
25
25
  end
26
26
  end
27
27
  end