active-fedora 9.0.0 → 9.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 (89) hide show
  1. checksums.yaml +4 -4
  2. data/History.txt +97 -0
  3. data/README.md +40 -28
  4. data/active-fedora.gemspec +2 -1
  5. data/lib/active_fedora/associations/builder/contains.rb +5 -1
  6. data/lib/active_fedora/associations/builder/has_many.rb +1 -1
  7. data/lib/active_fedora/associations/collection_association.rb +1 -18
  8. data/lib/active_fedora/associations/contains_association.rb +3 -1
  9. data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb +12 -10
  10. data/lib/active_fedora/associations.rb +1 -1
  11. data/lib/active_fedora/attached_files.rb +7 -4
  12. data/lib/active_fedora/attributes/property_builder.rb +1 -0
  13. data/lib/active_fedora/attributes.rb +36 -9
  14. data/lib/active_fedora/change_set.rb +2 -2
  15. data/lib/active_fedora/clean_connection.rb +40 -0
  16. data/lib/active_fedora/core/fedora_id_translator.rb +12 -0
  17. data/lib/active_fedora/core/fedora_uri_translator.rb +9 -0
  18. data/lib/active_fedora/core.rb +26 -38
  19. data/lib/active_fedora/errors.rb +4 -0
  20. data/lib/active_fedora/fedora.rb +22 -4
  21. data/lib/active_fedora/fedora_attributes.rb +25 -1
  22. data/lib/active_fedora/file.rb +30 -24
  23. data/lib/active_fedora/indexing/map.rb +46 -0
  24. data/lib/active_fedora/indexing.rb +14 -0
  25. data/lib/active_fedora/inheritable_accessors.rb +26 -0
  26. data/lib/active_fedora/loadable_from_json.rb +5 -1
  27. data/lib/active_fedora/nom_datastream.rb +6 -4
  28. data/lib/active_fedora/persistence.rb +11 -7
  29. data/lib/active_fedora/rdf/datastream_indexing.rb +4 -0
  30. data/lib/active_fedora/rdf/fcrepo4.rb +1 -0
  31. data/lib/active_fedora/rdf/indexing_service.rb +18 -11
  32. data/lib/active_fedora/rdf/ldp.rb +3 -0
  33. data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb +0 -4
  34. data/lib/active_fedora/rdf/rdf_datastream.rb +12 -1
  35. data/lib/active_fedora/reflection.rb +3 -1
  36. data/lib/active_fedora/relation/finder_methods.rb +36 -5
  37. data/lib/active_fedora/solr_query_builder.rb +1 -1
  38. data/lib/active_fedora/solr_service.rb +1 -1
  39. data/lib/active_fedora/version.rb +1 -1
  40. data/lib/active_fedora/versions_graph.rb +7 -8
  41. data/lib/active_fedora.rb +6 -0
  42. data/spec/integration/associations_spec.rb +64 -21
  43. data/spec/integration/attached_files_spec.rb +24 -0
  44. data/spec/integration/attributes_spec.rb +49 -3
  45. data/spec/integration/belongs_to_association_spec.rb +118 -47
  46. data/spec/integration/clean_connection_spec.rb +21 -0
  47. data/spec/integration/collection_association_spec.rb +46 -0
  48. data/spec/integration/field_to_solr_name_spec.rb +11 -7
  49. data/spec/integration/has_and_belongs_to_many_associations_spec.rb +180 -137
  50. data/spec/integration/has_many_associations_spec.rb +6 -2
  51. data/spec/integration/json_serialization_spec.rb +11 -5
  52. data/spec/integration/nested_attribute_spec.rb +3 -1
  53. data/spec/integration/ntriples_datastream_spec.rb +23 -17
  54. data/spec/integration/persistence_spec.rb +3 -1
  55. data/spec/integration/query_result_builder_spec.rb +2 -2
  56. data/spec/integration/relation_delegation_spec.rb +3 -1
  57. data/spec/integration/scoped_query_spec.rb +3 -1
  58. data/spec/integration/solr_instance_loader_spec.rb +4 -2
  59. data/spec/integration/versionable_spec.rb +38 -1
  60. data/spec/samples/samples.rb +0 -1
  61. data/spec/spec_helper.rb +1 -0
  62. data/spec/unit/active_fedora_spec.rb +4 -2
  63. data/spec/unit/attributes_spec.rb +52 -12
  64. data/spec/unit/base_active_model_spec.rb +5 -3
  65. data/spec/unit/base_spec.rb +102 -2
  66. data/spec/unit/callback_spec.rb +4 -2
  67. data/spec/unit/change_set_spec.rb +4 -2
  68. data/spec/unit/core/fedora_id_translator_spec.rb +20 -0
  69. data/spec/unit/core/fedora_uri_translator_spec.rb +19 -0
  70. data/spec/unit/core_spec.rb +54 -2
  71. data/spec/unit/has_many_association_spec.rb +27 -2
  72. data/spec/unit/ntriples_datastream_spec.rb +24 -20
  73. data/spec/unit/qualified_dublin_core_datastream_spec.rb +0 -6
  74. data/spec/unit/query_result_builder_spec.rb +1 -1
  75. data/spec/unit/rdf/indexing_service_spec.rb +19 -17
  76. data/spec/unit/rdf_resource_datastream_spec.rb +14 -10
  77. data/spec/unit/reflection_spec.rb +44 -0
  78. data/spec/unit/simple_datastream_spec.rb +34 -0
  79. data/spec/unit/solr_query_builder_spec.rb +1 -1
  80. data/spec/unit/validations_spec.rb +4 -2
  81. metadata +28 -13
  82. data/spec/samples/marpa-dc_datastream.rb +0 -102
  83. data/spec/samples/models/audio_record.rb +0 -29
  84. data/spec/samples/models/image.rb +0 -5
  85. data/spec/samples/models/oral_history.rb +0 -36
  86. data/spec/samples/models/seminar.rb +0 -29
  87. data/spec/samples/models/seminar_audio_file.rb +0 -32
  88. data/spec/samples/oral_history_sample_model.rb +0 -30
  89. data/spec/samples/special_thing.rb +0 -44
@@ -5,16 +5,20 @@ describe "An object with RDF backed attributes" do
5
5
  before do
6
6
  class TestOne < ActiveFedora::Base
7
7
  class MyMetadata < ActiveFedora::NtriplesRDFDatastream
8
- property :title, predicate: ::RDF::DC.title do |index|
9
- index.as :stored_searchable
10
- end
11
- property :date_uploaded, predicate: ::RDF::DC.dateSubmitted do |index|
12
- index.type :date
13
- index.as :stored_searchable, :sortable
8
+ Deprecation.silence(ActiveFedora::RDFDatastream) do
9
+ property :title, predicate: ::RDF::DC.title do |index|
10
+ index.as :stored_searchable
11
+ end
12
+ property :date_uploaded, predicate: ::RDF::DC.dateSubmitted do |index|
13
+ index.type :date
14
+ index.as :stored_searchable, :sortable
15
+ end
14
16
  end
15
17
  end
16
18
  has_metadata 'descMetadata', type: MyMetadata
17
- has_attributes :title, :date_uploaded, datastream: 'descMetadata'
19
+ Deprecation.silence(ActiveFedora::Attributes) do
20
+ has_attributes :title, :date_uploaded, datastream: 'descMetadata'
21
+ end
18
22
  end
19
23
  end
20
24
 
@@ -2,109 +2,131 @@ require 'spec_helper'
2
2
 
3
3
  describe ActiveFedora::Base do
4
4
  describe "with inverse" do
5
- before do
6
- class Book < ActiveFedora::Base
7
- has_and_belongs_to_many :topics, predicate: ::RDF::FOAF.primaryTopic, inverse_of: :books
8
- has_and_belongs_to_many :collections, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection
5
+ context "that is also a HABTM" do
6
+ before do
7
+ class Book < ActiveFedora::Base
8
+ has_and_belongs_to_many :topics, predicate: ::RDF::FOAF.primaryTopic, inverse_of: :books
9
+ end
10
+
11
+ class Topic < ActiveFedora::Base
12
+ has_and_belongs_to_many :books, predicate: ::RDF::FOAF.isPrimaryTopicOf
13
+ end
9
14
  end
10
15
 
11
- class SpecialInheritedBook < Book
16
+ after do
17
+ Object.send(:remove_const, :Book)
18
+ Object.send(:remove_const, :Topic)
12
19
  end
13
20
 
21
+ describe "an unsaved instance" do
22
+ let(:topic1) { Topic.create }
23
+ let(:book) { Book.create }
14
24
 
15
- class Collection < ActiveFedora::Base
16
- end
25
+ it "habtm should set and remove relationships bidirectionally" do
26
+ book.topics << topic1
27
+ expect(book.topics).to eq [topic1]
28
+ expect(topic1.books).to eq [book]
29
+ expect(topic1.reload.books).to eq [book]
17
30
 
18
- class Topic < ActiveFedora::Base
19
- has_and_belongs_to_many :books, predicate: ::RDF::FOAF.isPrimaryTopicOf
20
- end
21
- end
31
+ book.topics.delete(topic1)
32
+ expect(book.topics).to be_empty
33
+ expect(topic1.books).to be_empty
34
+ end
22
35
 
23
- after do
24
- Object.send(:remove_const, :SpecialInheritedBook)
25
- Object.send(:remove_const, :Book)
26
- Object.send(:remove_const, :Collection)
27
- Object.send(:remove_const, :Topic)
28
- end
36
+ it "Should allow for more than 10 items" do
37
+ (1..12).each do
38
+ book.topics << Topic.create
39
+ end
40
+ book.save
41
+ expect(book.topics.count).to eq 12
42
+ book2 = Book.find(book.id)
43
+ expect(book2.topics.count).to eq 12
44
+ end
29
45
 
30
- describe "an unsaved instance" do
31
- let(:topic1) { Topic.create }
32
- before do
33
- @book = Book.create
34
- end
46
+ context "with subclassed objects" do
47
+ before do
48
+ class SpecialInheritedBook < Book
49
+ end
50
+ end
35
51
 
36
- it "habtm should set and remove relationships bidirectionally" do
37
- @book.topics << topic1
38
- expect(@book.topics).to eq [topic1]
39
- expect(topic1.books).to eq [@book]
40
- expect(topic1.reload.books).to eq [@book]
52
+ after do
53
+ Object.send(:remove_const, :SpecialInheritedBook)
54
+ end
41
55
 
42
- @book.topics.delete(topic1)
43
- expect(@book.topics).to be_empty
44
- expect(topic1.books).to be_empty
56
+ let!(:special_book) { SpecialInheritedBook.create }
57
+ it "Should find inherited objects along with base objects" do
58
+ book.topics << topic1
59
+ special_book.topics << topic1
60
+ expect(topic1.books).to match_array [book, special_book]
61
+ expect(topic1.reload.books).to match_array [book, special_book]
62
+ end
63
+ end
45
64
  end
46
65
 
47
- it "Should allow for more than 10 items" do
48
- (1..12).each do
49
- @book.topics << Topic.create
50
- end
51
- @book.save
52
- expect(@book.topics.count).to eq 12
53
- book2 = Book.find(@book.id)
54
- expect(book2.topics.count).to eq 12
55
- end
56
-
57
- context "with subclassed objects" do
58
- let!(:special_book) { SpecialInheritedBook.create }
59
- it "Should find inherited objects along with base objects" do
60
- @book.topics << topic1
61
- special_book.topics << topic1
62
- expect(topic1.books).to eq [@book, special_book]
63
- expect(topic1.reload.books).to eq [@book, special_book]
66
+ describe "a saved instance" do
67
+ let!(:book) { Book.create }
68
+ let!(:topic1) { Topic.create }
69
+ let!(:topic2) { Topic.create }
70
+
71
+ it "should set relationships bidirectionally" do
72
+ book.topics << topic1
73
+ expect(book.topics).to eq [topic1]
74
+ expect(book['topic_ids']).to eq [topic1.id]
75
+ expect(topic1['book_ids']).to eq [book.id]
76
+ expect(Topic.find(topic1.id).books).to eq [book] #Can't have saved it because book isn't saved yet.
64
77
  end
65
- end
66
78
 
67
- it "Should cast found books to the correct cmodel" do
68
- topic1.books[0].class == Book
69
- topic1.books[1].class == SpecialInheritedBook
70
- end
79
+ it "should save new child objects" do
80
+ book.topics << Topic.new
81
+ expect(book.topics.first.id).to_not be_nil
82
+ end
71
83
 
72
- end
84
+ it "should clear out the old associtions" do
85
+ book.topics = [topic1]
86
+ book.topics = [topic2]
87
+ expect(book.topic_ids).to eq [topic2.id]
88
+ end
73
89
 
74
- describe "a saved instance" do
75
- let!(:book) { Book.create }
76
- let!(:topic1) { Topic.create }
77
- let!(:topic2) { Topic.create }
90
+ context "with members" do
91
+ before do
92
+ book.topics = [topic1, topic2]
93
+ book.save
94
+ end
78
95
 
79
- it "should set relationships bidirectionally" do
80
- book.topics << topic1
81
- expect(book.topics).to eq [topic1]
82
- expect(book['topic_ids']).to eq [topic1.id]
83
- expect(topic1['book_ids']).to eq [book.id]
84
- expect(Topic.find(topic1.id).books).to eq [book] #Can't have saved it because book isn't saved yet.
96
+ context "destroy" do
97
+ it "should remove the associations" do
98
+ book.destroy
99
+ end
100
+ end
101
+ end
85
102
  end
103
+ end
86
104
 
87
- it "should save new child objects" do
88
- book.topics << Topic.new
89
- expect(book.topics.first.id).to_not be_nil
105
+ context "that is a has_many" do
106
+ before do
107
+ class Book < ActiveFedora::Base
108
+ has_many :collections
109
+ end
110
+
111
+ class Collection < ActiveFedora::Base
112
+ has_and_belongs_to_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection
113
+ end
90
114
  end
91
115
 
92
- it "should clear out the old associtions" do
93
- book.topics = [topic1]
94
- book.topics = [topic2]
95
- expect(book.topic_ids).to eq [topic2.id]
116
+ after do
117
+ Object.send(:remove_const, :Book)
118
+ Object.send(:remove_const, :Collection)
96
119
  end
97
120
 
98
- context "with members" do
99
- before do
100
- book.topics = [topic1, topic2]
101
- book.save
102
- end
121
+ describe "add and remove members" do
122
+ let(:collection) { Collection.create }
123
+ let(:book) { Book.create }
103
124
 
104
- context "destroy" do
105
- it "should remove the associations" do
106
- book.destroy
107
- end
125
+ it "is successful" do
126
+ collection.books << book
127
+ expect {
128
+ collection.books.delete(book)
129
+ }.to change { collection.books.size }.from(1).to(0)
108
130
  end
109
131
  end
110
132
  end
@@ -297,87 +319,108 @@ describe ActiveFedora::Base do
297
319
  end
298
320
  end
299
321
  end
300
- end
301
322
 
302
- describe "create" do
303
- before do
304
- class Book < ActiveFedora::Base
305
- has_and_belongs_to_many :collections, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection
306
- end
323
+ describe "create" do
324
+ before do
325
+ class Book < ActiveFedora::Base
326
+ has_and_belongs_to_many :collections, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection
327
+ end
307
328
 
308
- class Collection < ActiveFedora::Base
309
- property :title, predicate: ::RDF::DC.title
329
+ class Collection < ActiveFedora::Base
330
+ property :title, predicate: ::RDF::DC.title
331
+ end
310
332
  end
311
- end
312
333
 
313
- after do
314
- Object.send(:remove_const, :Book)
315
- Object.send(:remove_const, :Collection)
316
- end
334
+ after do
335
+ Object.send(:remove_const, :Book)
336
+ Object.send(:remove_const, :Collection)
337
+ end
317
338
 
318
- let(:book) { Book.create }
339
+ let(:book) { Book.create }
319
340
 
320
- it "should create" do
321
- collection = book.collections.create(title: ["Permanent"])
322
- expect(collection).to be_kind_of Collection
323
- expect(book.collections).to include collection
324
- book.save
325
- expect(book.reload.collections.first.title).to eq ['Permanent']
341
+ it "should create" do
342
+ collection = book.collections.create(title: ["Permanent"])
343
+ expect(collection).to be_kind_of Collection
344
+ expect(book.collections).to include collection
345
+ book.save
346
+ expect(book.reload.collections.first.title).to eq ['Permanent']
347
+ end
326
348
  end
327
- end
328
349
 
329
350
 
330
- describe "Autosave" do
331
- before do
332
- class Item < ActiveFedora::Base
333
- has_many :components
334
- has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
335
- m.field "title", :string
351
+ describe "Autosave" do
352
+ before do
353
+ class Item < ActiveFedora::Base
354
+ has_many :components
355
+ has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
356
+ m.field "title", :string
357
+ end
358
+ Deprecation.silence(ActiveFedora::Attributes) do
359
+ has_attributes :title, datastream: 'foo'
360
+ end
336
361
  end
337
- has_attributes :title, datastream: 'foo'
338
- end
339
362
 
340
- class Component < ActiveFedora::Base
341
- has_and_belongs_to_many :items, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
342
- has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
343
- m.field "description", :string
363
+ class Component < ActiveFedora::Base
364
+ has_and_belongs_to_many :items, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
365
+ has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
366
+ m.field "description", :string
367
+ end
368
+ Deprecation.silence(ActiveFedora::Attributes) do
369
+ has_attributes :description, datastream: 'foo'
370
+ end
344
371
  end
345
- has_attributes :description, datastream: 'foo'
346
372
  end
347
- end
348
373
 
349
- after do
350
- Object.send(:remove_const, :Item)
351
- Object.send(:remove_const, :Component)
352
- end
374
+ after do
375
+ Object.send(:remove_const, :Item)
376
+ Object.send(:remove_const, :Component)
377
+ end
353
378
 
354
- describe "From the has_and_belongs_to_many side" do
355
- describe "dependent records" do
356
- let(:component) { Component.create(items: [Item.new(title: 'my title')]) }
379
+ describe "From the has_and_belongs_to_many side" do
380
+ describe "dependent records" do
381
+ let(:component) { Component.create(items: [Item.new(title: 'my title')]) }
357
382
 
358
- it "should be saved" do
359
- component.reload
360
- expect(component.items.first.title).to eq 'my title'
383
+ it "should be saved" do
384
+ component.reload
385
+ expect(component.items.first.title).to eq 'my title'
386
+ end
361
387
  end
362
- end
363
388
 
364
- describe "shifting" do
365
- let(:component) { Component.new }
366
- let(:item) { Item.create }
389
+ describe "shifting" do
390
+ let(:component) { Component.new }
391
+ let(:item) { Item.create }
367
392
 
368
- it "should set item_ids" do
369
- component.items << item
370
- expect(component.item_ids).to eq [item.id]
393
+ it "should set item_ids" do
394
+ component.items << item
395
+ expect(component.item_ids).to eq [item.id]
396
+ end
397
+ end
398
+
399
+ context "when the has_and_belongs_to_many provides an inverse_of" do
400
+ let(:reflection) { Component.reflect_on_association(:items) }
401
+ before do
402
+ reflection.options[:inverse_of] = :components
403
+ end
404
+
405
+ describe "shifting" do
406
+ let(:component) { Component.create }
407
+ let(:item) { Item.new }
408
+
409
+ it "should set item_ids" do
410
+ component.items << item
411
+ expect(component.item_ids).to eq [item.id]
412
+ end
413
+ end
371
414
  end
372
415
  end
373
- end
374
416
 
375
- describe "From the has_many side" do
376
- let(:item) { Item.create(components: [Component.new(description: 'my description')]) }
417
+ describe "From the has_many side" do
418
+ let(:item) { Item.create(components: [Component.new(description: 'my description')]) }
377
419
 
378
- it "should save dependent records" do
379
- item.reload
380
- expect(item.components.first.description).to eq 'my description'
420
+ it "should save dependent records" do
421
+ item.reload
422
+ expect(item.components.first.description).to eq 'my description'
423
+ end
381
424
  end
382
425
  end
383
426
  end
@@ -276,14 +276,18 @@ describe "Autosave" do
276
276
  has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
277
277
  m.field "title", :string
278
278
  end
279
- has_attributes :title, datastream: 'foo'
279
+ Deprecation.silence(ActiveFedora::Attributes) do
280
+ has_attributes :title, datastream: 'foo'
281
+ end
280
282
  end
281
283
  class Component < ActiveFedora::Base
282
284
  belongs_to :item, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
283
285
  has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
284
286
  m.field "description", :string
285
287
  end
286
- has_attributes :description, datastream: 'foo'
288
+ Deprecation.silence(ActiveFedora::Attributes) do
289
+ has_attributes :description, datastream: 'foo'
290
+ end
287
291
  end
288
292
  end
289
293
 
@@ -12,8 +12,10 @@ describe "Objects should be serialized to JSON" do
12
12
  m.field "foo", :text
13
13
  m.field "bar", :text
14
14
  end
15
- has_attributes :foo, datastream: 'descMetadata', multiple: true
16
- has_attributes :bar, datastream: 'descMetadata', multiple: false
15
+ Deprecation.silence(ActiveFedora::Attributes) do
16
+ has_attributes :foo, datastream: 'descMetadata', multiple: true
17
+ has_attributes :bar, datastream: 'descMetadata', multiple: false
18
+ end
17
19
  property :title, predicate: ::RDF::DC.title
18
20
  end
19
21
  end
@@ -43,8 +45,10 @@ describe "Objects should be serialized to JSON" do
43
45
  end
44
46
 
45
47
  class DummyResource < ActiveFedora::RDFDatastream
46
- property :license, predicate: ::RDF::DC[:license], class_name: DummySubnode do |index|
47
- index.as :searchable, :displayable
48
+ Deprecation.silence(ActiveFedora::RDFDatastream) do
49
+ property :license, predicate: ::RDF::DC[:license], class_name: DummySubnode do |index|
50
+ index.as :searchable, :displayable
51
+ end
48
52
  end
49
53
  def serialization_format
50
54
  :ntriples
@@ -53,7 +57,9 @@ describe "Objects should be serialized to JSON" do
53
57
 
54
58
  class DummyAsset < ActiveFedora::Base
55
59
  has_metadata 'descMetadata', type: DummyResource
56
- has_attributes :relation, datastream: 'descMetadata', at: [:license, :relation], multiple: false
60
+ Deprecation.silence(ActiveFedora::Attributes) do
61
+ has_attributes :relation, datastream: 'descMetadata', at: [:license, :relation], multiple: false
62
+ end
57
63
  end
58
64
  end
59
65
 
@@ -8,7 +8,9 @@ describe "NestedAttribute behavior" do
8
8
  m.field "uno", :string
9
9
  m.field "dos", :string
10
10
  end
11
- has_attributes :uno, :dos, datastream: 'someData', multiple: false
11
+ Deprecation.silence(ActiveFedora::Attributes) do
12
+ has_attributes :uno, :dos, datastream: 'someData', multiple: false
13
+ end
12
14
  end
13
15
 
14
16
  # base Car class, used in test for association updates and :allow_destroy flag
@@ -7,27 +7,31 @@ describe ActiveFedora::NtriplesRDFDatastream do
7
7
  property :size
8
8
  end
9
9
 
10
- class MyDatastream < ActiveFedora::NtriplesRDFDatastream
11
- property :title, predicate: ::RDF::DC.title do |index|
12
- index.as :stored_searchable, :facetable
13
- end
14
- property :date_uploaded, predicate: ::RDF::DC.dateSubmitted do |index|
15
- index.type :date
16
- index.as :stored_searchable, :sortable
17
- end
18
- property :filesize, predicate: FileVocabulary.size do |index|
19
- index.type :integer
20
- index.as :stored_sortable
10
+ Deprecation.silence(ActiveFedora::RDFDatastream) do
11
+ class MyDatastream < ActiveFedora::NtriplesRDFDatastream
12
+ property :title, predicate: ::RDF::DC.title do |index|
13
+ index.as :stored_searchable, :facetable
14
+ end
15
+ property :date_uploaded, predicate: ::RDF::DC.dateSubmitted do |index|
16
+ index.type :date
17
+ index.as :stored_searchable, :sortable
18
+ end
19
+ property :filesize, predicate: FileVocabulary.size do |index|
20
+ index.type :integer
21
+ index.as :stored_sortable
22
+ end
23
+ property :part, predicate: ::RDF::DC.hasPart
24
+ property :based_near, predicate: ::RDF::FOAF.based_near
25
+ property :related_url, predicate: ::RDF::RDFS.seeAlso
21
26
  end
22
- property :part, predicate: ::RDF::DC.hasPart
23
- property :based_near, predicate: ::RDF::FOAF.based_near
24
- property :related_url, predicate: ::RDF::RDFS.seeAlso
25
27
  end
26
28
 
27
29
  class RdfTest < ActiveFedora::Base
28
30
  has_metadata 'rdf', type: MyDatastream
29
- has_attributes :based_near, :related_url, :part, :date_uploaded, datastream: 'rdf', multiple: true
30
- has_attributes :title, :filesize, datastream: 'rdf', multiple: false
31
+ Deprecation.silence(ActiveFedora::Attributes) do
32
+ has_attributes :based_near, :related_url, :part, :date_uploaded, datastream: 'rdf', multiple: true
33
+ has_attributes :title, :filesize, datastream: 'rdf', multiple: false
34
+ end
31
35
  end
32
36
  @subject = RdfTest.new
33
37
  end
@@ -216,7 +220,9 @@ describe ActiveFedora::NtriplesRDFDatastream do
216
220
  end
217
221
  class Foobar < ActiveFedora::Base
218
222
  has_metadata 'rdf', type: TitleDatastream
219
- has_attributes :title, datastream: 'rdf', multiple: true
223
+ Deprecation.silence(ActiveFedora::Attributes) do
224
+ has_attributes :title, datastream: 'rdf', multiple: true
225
+ end
220
226
  end
221
227
  @subject = Foobar.new
222
228
  @subject.title = ["title1", "title2", "title3"]
@@ -6,7 +6,9 @@ describe "persisting objects" do
6
6
  has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"foo" do |m|
7
7
  m.field "name", :string
8
8
  end
9
- has_attributes :name, datastream: 'foo', multiple: false
9
+ Deprecation.silence(ActiveFedora::Attributes) do
10
+ has_attributes :name, datastream: 'foo', multiple: false
11
+ end
10
12
  validates :name, presence: true
11
13
  end
12
14
  end
@@ -30,7 +30,7 @@ describe ActiveFedora::QueryResultBuilder do
30
30
  Object.send(:remove_const, :FooObject)
31
31
  end
32
32
  it "should return an array of objects that are of the class stored in active_fedora_model_s" do
33
- query = "id\:#{RSolr.escape(@test_object.id)} OR id\:#{RSolr.escape(@foo_object.id)}"
33
+ query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([@test_object.id, @foo_object.id])
34
34
  solr_result = ActiveFedora::SolrService.query(query)
35
35
  result = ActiveFedora::QueryResultBuilder.reify_solr_results(solr_result)
36
36
  expect(result.length).to eq 2
@@ -40,7 +40,7 @@ describe ActiveFedora::QueryResultBuilder do
40
40
  end
41
41
 
42
42
  it 'should #reify a lightweight object as a new instance' do
43
- query = "id\:#{RSolr.escape(@foo_object.id)}"
43
+ query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([@foo_object.id])
44
44
  solr_result = ActiveFedora::SolrService.query(query)
45
45
  result = ActiveFedora::QueryResultBuilder.reify_solr_results(solr_result,{:load_from_solr=>true})
46
46
  expect(result.first).to be_instance_of FooObject
@@ -11,7 +11,9 @@ describe ActiveFedora::Model do
11
11
  m.field "baz", :string
12
12
  end
13
13
 
14
- has_attributes :foo, :bar, :baz, datastream: 'properties', multiple: true
14
+ Deprecation.silence(ActiveFedora::Attributes) do
15
+ has_attributes :foo, :bar, :baz, datastream: 'properties', multiple: true
16
+ end
15
17
 
16
18
  def to_solr(doc = {})
17
19
  doc = super
@@ -11,7 +11,9 @@ describe "scoped queries" do
11
11
  m.field "baz", :string
12
12
  end
13
13
 
14
- has_attributes :foo, :bar, :baz, datastream: 'properties', multiple: true
14
+ Deprecation.silence(ActiveFedora::Attributes) do
15
+ has_attributes :foo, :bar, :baz, datastream: 'properties', multiple: true
16
+ end
15
17
 
16
18
  def to_solr(doc = {})
17
19
  doc = super
@@ -7,8 +7,10 @@ describe ActiveFedora::SolrInstanceLoader do
7
7
  m.field "foo", :text
8
8
  m.field "bar", :text
9
9
  end
10
- has_attributes :foo, datastream: 'descMetadata', multiple: true
11
- has_attributes :bar, datastream: 'descMetadata', multiple: false
10
+ Deprecation.silence(ActiveFedora::Attributes) do
11
+ has_attributes :foo, datastream: 'descMetadata', multiple: true
12
+ has_attributes :bar, datastream: 'descMetadata', multiple: false
13
+ end
12
14
  property :title, predicate: ::RDF::DC.title, multiple: false
13
15
  property :description, predicate: ::RDF::DC.description
14
16
  belongs_to :another, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'Foo'