active-fedora 11.0.0.rc1 → 11.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.rubocop.yml +2 -7
- data/.rubocop_todo.yml +40 -9
- data/.solr_wrapper +6 -0
- data/README.md +1 -3
- data/active-fedora.gemspec +5 -9
- data/lib/active_fedora/associations/collection_association.rb +1 -1
- data/lib/active_fedora/associations/contained_finder.rb +2 -2
- data/lib/active_fedora/associations/has_many_association.rb +1 -1
- data/lib/active_fedora/associations/has_subresource_association.rb +2 -2
- data/lib/active_fedora/attribute_assignment.rb +0 -1
- data/lib/active_fedora/attributes.rb +1 -1
- data/lib/active_fedora/base.rb +3 -7
- data/lib/active_fedora/change_set.rb +6 -2
- data/lib/active_fedora/containers/container.rb +1 -1
- data/lib/active_fedora/core.rb +22 -25
- data/lib/active_fedora/fedora_attributes.rb +1 -1
- data/lib/active_fedora/file.rb +1 -1
- data/lib/active_fedora/indexing_service.rb +0 -4
- data/lib/active_fedora/orders/ordered_list.rb +2 -2
- data/lib/active_fedora/querying.rb +1 -1
- data/lib/active_fedora/railtie.rb +2 -2
- data/lib/active_fedora/rake_support.rb +1 -1
- data/lib/active_fedora/rdf.rb +0 -1
- data/lib/active_fedora/relation/delegation.rb +4 -0
- data/lib/active_fedora/solr_hit.rb +0 -4
- data/lib/active_fedora/solr_query_builder.rb +16 -12
- data/lib/active_fedora/version.rb +1 -1
- data/lib/active_fedora.rb +0 -10
- data/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml +11 -0
- data/lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml +1 -1
- data/spec/config_helper.rb +1 -1
- data/spec/integration/associations_spec.rb +17 -18
- data/spec/integration/attached_files_spec.rb +18 -8
- data/spec/integration/attributes_spec.rb +12 -16
- data/spec/integration/autosave_association_spec.rb +6 -6
- data/spec/integration/base_spec.rb +3 -3
- data/spec/integration/collection_association_spec.rb +2 -5
- data/spec/integration/date_time_properties_spec.rb +1 -2
- data/spec/integration/direct_container_spec.rb +8 -8
- data/spec/integration/directly_contains_one_association_spec.rb +11 -13
- data/spec/integration/eradicate_spec.rb +1 -1
- data/spec/integration/fedora_solr_sync_spec.rb +2 -2
- data/spec/integration/file_fixity_spec.rb +6 -8
- data/spec/integration/file_spec.rb +32 -34
- data/spec/integration/generators/solr_generator_spec.rb +7 -10
- data/spec/integration/has_many_associations_spec.rb +6 -8
- data/spec/integration/indexing_spec.rb +1 -1
- data/spec/integration/indirect_container_spec.rb +8 -9
- data/spec/integration/json_serialization_spec.rb +4 -4
- data/spec/integration/query_result_builder_spec.rb +9 -21
- data/spec/integration/rdf_nested_attributes_spec.rb +6 -6
- data/spec/integration/relation_delegation_spec.rb +8 -10
- data/spec/integration/relation_spec.rb +13 -16
- data/spec/integration/solr_hit_spec.rb +4 -4
- data/spec/integration/versionable_spec.rb +73 -327
- data/spec/spec_helper.rb +52 -10
- data/spec/unit/active_fedora_spec.rb +1 -1
- data/spec/unit/aggregation/list_source_spec.rb +37 -37
- data/spec/unit/aggregation/ordered_reader_spec.rb +4 -4
- data/spec/unit/association_hash_spec.rb +17 -31
- data/spec/unit/attached_files_spec.rb +35 -32
- data/spec/unit/attributes_spec.rb +25 -25
- data/spec/unit/base_active_model_spec.rb +8 -8
- data/spec/unit/base_cma_spec.rb +1 -1
- data/spec/unit/base_extra_spec.rb +7 -22
- data/spec/unit/base_spec.rb +14 -20
- data/spec/unit/callback_spec.rb +2 -2
- data/spec/unit/change_set_spec.rb +5 -5
- data/spec/unit/checksum_spec.rb +2 -2
- data/spec/unit/code_configurator_spec.rb +1 -1
- data/spec/unit/core_spec.rb +62 -26
- data/spec/unit/default_model_mapper_spec.rb +6 -6
- data/spec/unit/fedora_spec.rb +2 -2
- data/spec/unit/file_configurator_spec.rb +96 -96
- data/spec/unit/file_path_builder_spec.rb +1 -1
- data/spec/unit/file_spec.rb +61 -61
- data/spec/unit/files_hash_spec.rb +9 -9
- data/spec/unit/finder_methods_spec.rb +3 -3
- data/spec/unit/has_and_belongs_to_many_association_spec.rb +13 -14
- data/spec/unit/has_many_association_spec.rb +28 -13
- data/spec/unit/indexers/global_indexer_spec.rb +6 -6
- data/spec/unit/indexing_service_spec.rb +5 -5
- data/spec/unit/indexing_spec.rb +6 -6
- data/spec/unit/inheritance_spec.rb +11 -7
- data/spec/unit/loadable_from_json_spec.rb +4 -4
- data/spec/unit/logger_spec.rb +1 -1
- data/spec/unit/model_classifier_spec.rb +5 -5
- data/spec/unit/ordered_spec.rb +142 -142
- data/spec/unit/orders/list_node_spec.rb +21 -21
- data/spec/unit/orders/ordered_list_spec.rb +96 -96
- data/spec/unit/orders/reflection_spec.rb +4 -4
- data/spec/unit/pathing_spec.rb +4 -4
- data/spec/unit/persistence_spec.rb +28 -28
- data/spec/unit/property_spec.rb +2 -2
- data/spec/unit/query_spec.rb +10 -10
- data/spec/unit/rdf/indexing_service_spec.rb +26 -26
- data/spec/unit/readonly_spec.rb +5 -4
- data/spec/unit/reflection_spec.rb +3 -3
- data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb +9 -9
- data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb +9 -9
- data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb +9 -9
- data/spec/unit/schema_indexing_strategy_spec.rb +5 -5
- data/spec/unit/serializers_spec.rb +3 -4
- data/spec/unit/solr_config_options_spec.rb +13 -16
- data/spec/unit/solr_hit_spec.rb +9 -9
- data/spec/unit/solr_service_spec.rb +4 -10
- data/spec/unit/sparql_insert_spec.rb +2 -2
- data/spec/unit/validations_spec.rb +9 -9
- data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb +3 -2
- data/spec/unit/with_metadata/metadata_node_spec.rb +3 -2
- metadata +17 -118
- data/lib/active_fedora/datastreams/nokogiri_datastreams.rb +0 -119
- data/lib/active_fedora/datastreams.rb +0 -6
- data/lib/active_fedora/nom_datastream.rb +0 -73
- data/lib/active_fedora/om_datastream.rb +0 -118
- data/lib/active_fedora/qualified_dublin_core_datastream.rb +0 -158
- data/lib/active_fedora/rdf/datastream_indexing.rb +0 -49
- data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb +0 -13
- data/lib/active_fedora/rdf/rdf_datastream.rb +0 -173
- data/lib/active_fedora/rdf/rdfxml_datastream.rb +0 -13
- data/solr/config/_rest_managed.json +0 -3
- data/solr/config/admin-extra.html +0 -31
- data/solr/config/elevate.xml +0 -36
- data/solr/config/mapping-ISOLatin1Accent.txt +0 -246
- data/solr/config/protwords.txt +0 -21
- data/solr/config/schema.xml +0 -372
- data/solr/config/scripts.conf +0 -24
- data/solr/config/solrconfig.xml +0 -311
- data/solr/config/spellings.txt +0 -2
- data/solr/config/stopwords.txt +0 -58
- data/solr/config/stopwords_en.txt +0 -58
- data/solr/config/synonyms.txt +0 -31
- data/solr/config/xslt/example.xsl +0 -132
- data/solr/config/xslt/example_atom.xsl +0 -67
- data/solr/config/xslt/example_rss.xsl +0 -66
- data/solr/config/xslt/luke.xsl +0 -337
- data/spec/fixtures/damsObjectModel.xml +0 -38
- data/spec/fixtures/dublin_core_rdf_descMetadata.nt +0 -13
- data/spec/fixtures/mixed_rdf_descMetadata.nt +0 -7
- data/spec/fixtures/mods_articles/mods_article1.xml +0 -98
- data/spec/fixtures/solr_rdf_descMetadata.nt +0 -7
- data/spec/integration/complex_rdf_datastream_spec.rb +0 -227
- data/spec/integration/datastream_rdf_nested_attributes_spec.rb +0 -180
- data/spec/integration/ntriples_datastream_spec.rb +0 -215
- data/spec/integration/om_datastream_spec.rb +0 -78
- data/spec/samples/hydra-mods_article_datastream.rb +0 -515
- data/spec/samples/models/mods_article.rb +0 -9
- data/spec/samples/oral_history_sample.xml +0 -38
- data/spec/samples/oral_history_xml.xml +0 -35
- data/spec/samples/samples.rb +0 -2
- data/spec/unit/nom_datastream_spec.rb +0 -60
- data/spec/unit/ntriples_datastream_spec.rb +0 -167
- data/spec/unit/om_datastream_spec.rb +0 -294
- data/spec/unit/qualified_dublin_core_datastream_spec.rb +0 -119
- data/spec/unit/rdf_datastream_spec.rb +0 -84
- data/spec/unit/rdf_resource_datastream_spec.rb +0 -208
- data/spec/unit/rdfxml_datastream_spec.rb +0 -106
data/spec/config_helper.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
def mock_yaml(hash, path)
|
|
2
|
-
mock_file =
|
|
2
|
+
mock_file = instance_double(File, path.split("/")[-1])
|
|
3
3
|
allow(File).to receive(:exist?).with(path).and_return(true)
|
|
4
4
|
allow(File).to receive(:open).with(path).and_return(mock_file)
|
|
5
5
|
allow(Psych).to receive(:load).and_return(hash)
|
|
@@ -17,7 +17,7 @@ describe ActiveFedora::Base do
|
|
|
17
17
|
end
|
|
18
18
|
|
|
19
19
|
let(:person) { Person.create }
|
|
20
|
-
|
|
20
|
+
subject(:book) { Book.new(author: person) }
|
|
21
21
|
|
|
22
22
|
it "goes" do
|
|
23
23
|
book.save
|
|
@@ -524,18 +524,19 @@ describe ActiveFedora::Base do
|
|
|
524
524
|
end
|
|
525
525
|
|
|
526
526
|
describe "removing association" do
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
527
|
+
let(:p1) { Page.create }
|
|
528
|
+
let(:p2) { Page.create }
|
|
529
|
+
subject(:book) do
|
|
530
|
+
book = LibraryBook.create
|
|
531
|
+
book.pages << p1 << p2
|
|
532
|
+
book.save!
|
|
533
|
+
book
|
|
533
534
|
end
|
|
534
535
|
it "saves between the before and after hooks" do
|
|
535
|
-
expect(
|
|
536
|
-
expect(
|
|
537
|
-
expect(
|
|
538
|
-
|
|
536
|
+
expect(book).to receive(:before_count).with(1)
|
|
537
|
+
expect(book).to receive(:after_count).with(0)
|
|
538
|
+
expect(book).to receive(:say_hi).with(p2).twice
|
|
539
|
+
book.pages.delete(p2)
|
|
539
540
|
end
|
|
540
541
|
end
|
|
541
542
|
end
|
|
@@ -555,14 +556,12 @@ describe ActiveFedora::Base do
|
|
|
555
556
|
end
|
|
556
557
|
|
|
557
558
|
describe "removing association" do
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
@p2 = subject.pages.build
|
|
562
|
-
end
|
|
559
|
+
let(:p1) { book.pages.build }
|
|
560
|
+
let(:p2) { book.pages.build }
|
|
561
|
+
let(:book) { LibraryBook.new }
|
|
563
562
|
it "runs the hooks" do
|
|
564
|
-
expect(
|
|
565
|
-
|
|
563
|
+
expect(book).to receive(:say_hi).with(p2)
|
|
564
|
+
book.pages.delete(p2)
|
|
566
565
|
end
|
|
567
566
|
end
|
|
568
567
|
end
|
|
@@ -65,30 +65,40 @@ describe ActiveFedora::AttachedFiles do
|
|
|
65
65
|
let(:obj) { ActiveFedora::Base.new }
|
|
66
66
|
|
|
67
67
|
describe ".attached_files" do
|
|
68
|
-
subject { obj.attached_files }
|
|
68
|
+
subject(:attached_files) { obj.attached_files }
|
|
69
69
|
it "returns a Hash of datastreams from fedora" do
|
|
70
|
-
expect(
|
|
71
|
-
expect(
|
|
70
|
+
expect(attached_files).to be_a_kind_of(ActiveFedora::FilesHash)
|
|
71
|
+
expect(attached_files).to be_empty
|
|
72
72
|
end
|
|
73
73
|
|
|
74
74
|
it "initializes the datastream pointers with @new_object=false" do
|
|
75
|
-
|
|
75
|
+
attached_files.each_value do |ds|
|
|
76
76
|
expect(ds).to_not be_new
|
|
77
77
|
end
|
|
78
78
|
end
|
|
79
79
|
end
|
|
80
80
|
|
|
81
81
|
describe ".metadata_streams" do
|
|
82
|
-
let(:mds1) { ActiveFedora::QualifiedDublinCoreDatastream.new }
|
|
83
|
-
let(:mds2) { ActiveFedora::QualifiedDublinCoreDatastream.new }
|
|
84
|
-
let(:fds) { ActiveFedora::File.new }
|
|
85
82
|
before do
|
|
86
|
-
|
|
83
|
+
class Metadata < ActiveFedora::File
|
|
84
|
+
def metadata?
|
|
85
|
+
true
|
|
86
|
+
end
|
|
87
|
+
end
|
|
88
|
+
|
|
87
89
|
obj.attach_file(mds1, 'md1')
|
|
88
90
|
obj.attach_file(mds2, 'qdc')
|
|
89
91
|
obj.attach_file(fds, 'fds')
|
|
90
92
|
end
|
|
91
93
|
|
|
94
|
+
let(:mds1) { Metadata.new }
|
|
95
|
+
let(:mds2) { Metadata.new }
|
|
96
|
+
let(:fds) { ActiveFedora::File.new }
|
|
97
|
+
|
|
98
|
+
after do
|
|
99
|
+
Object.send(:remove_const, :Metadata)
|
|
100
|
+
end
|
|
101
|
+
|
|
92
102
|
it "returns all of the datastreams from the object that are kinds of OmDatastream" do
|
|
93
103
|
expect(obj.metadata_streams).to match_array [mds1, mds2]
|
|
94
104
|
end
|
|
@@ -20,9 +20,9 @@ describe "delegating attributes" do
|
|
|
20
20
|
|
|
21
21
|
describe "#index_config" do
|
|
22
22
|
context "on a class with properties" do
|
|
23
|
-
subject { RdfObject.index_config }
|
|
23
|
+
subject(:index_config) { RdfObject.index_config }
|
|
24
24
|
it "has configuration" do
|
|
25
|
-
expect(
|
|
25
|
+
expect(index_config[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
|
|
26
26
|
end
|
|
27
27
|
end
|
|
28
28
|
|
|
@@ -36,42 +36,38 @@ describe "delegating attributes" do
|
|
|
36
36
|
Object.send(:remove_const, :InheritedObject)
|
|
37
37
|
end
|
|
38
38
|
|
|
39
|
-
subject { InheritedObject.index_config }
|
|
39
|
+
subject(:index_config) { InheritedObject.index_config }
|
|
40
40
|
|
|
41
41
|
it "has configuration" do
|
|
42
|
-
expect(
|
|
42
|
+
expect(index_config[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
|
|
43
43
|
end
|
|
44
44
|
|
|
45
45
|
context "when the inherited config is modifed" do
|
|
46
46
|
before do
|
|
47
47
|
InheritedObject.index_config[:resource_type].behaviors.delete(:stored_searchable)
|
|
48
48
|
end
|
|
49
|
-
subject { RdfObject.index_config }
|
|
49
|
+
subject(:index_config) { RdfObject.index_config }
|
|
50
50
|
|
|
51
51
|
it "the parent config is unchanged" do
|
|
52
|
-
expect(
|
|
52
|
+
expect(index_config[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
|
|
53
53
|
end
|
|
54
54
|
end
|
|
55
55
|
end
|
|
56
56
|
end
|
|
57
57
|
|
|
58
58
|
describe "previous_changes" do
|
|
59
|
-
subject
|
|
60
|
-
TitledObject.create(title: ["Hydra for Dummies"])
|
|
61
|
-
end
|
|
59
|
+
subject(:titled_object) { TitledObject.create(title: ["Hydra for Dummies"]) }
|
|
62
60
|
it "keeps a list of changes after a successful save" do
|
|
63
|
-
expect(
|
|
64
|
-
expect(
|
|
61
|
+
expect(titled_object.previous_changes).to_not be_empty
|
|
62
|
+
expect(titled_object.previous_changes.keys).to include("title")
|
|
65
63
|
end
|
|
66
64
|
end
|
|
67
65
|
|
|
68
66
|
describe "#changes" do
|
|
69
|
-
|
|
70
|
-
TitledObject.create(title: ["Hydra for Dummies"])
|
|
71
|
-
end
|
|
67
|
+
let(:titled_object) { TitledObject.create(title: ["Hydra for Dummies"]) }
|
|
72
68
|
it "cleans out changes" do
|
|
73
|
-
expect(
|
|
74
|
-
expect(
|
|
69
|
+
expect(titled_object).to_not be_title_changed
|
|
70
|
+
expect(titled_object.changes).to be_empty
|
|
75
71
|
end
|
|
76
72
|
end
|
|
77
73
|
end
|
|
@@ -9,16 +9,16 @@ describe ActiveFedora::Base do
|
|
|
9
9
|
Object.send(:remove_const, :MockAFBaseRelationship)
|
|
10
10
|
end
|
|
11
11
|
|
|
12
|
-
subject { MockAFBaseRelationship.new }
|
|
12
|
+
subject(:relationship) { MockAFBaseRelationship.new }
|
|
13
13
|
|
|
14
14
|
context '#changed_for_autosave?' do
|
|
15
|
-
before
|
|
16
|
-
expect(
|
|
17
|
-
expect(
|
|
18
|
-
expect(
|
|
15
|
+
before do
|
|
16
|
+
expect(relationship).to receive(:new_record?).and_return(false)
|
|
17
|
+
expect(relationship).to receive(:changed?).and_return(false)
|
|
18
|
+
expect(relationship).to receive(:marked_for_destruction?).and_return(false)
|
|
19
19
|
end
|
|
20
20
|
it {
|
|
21
|
-
expect {
|
|
21
|
+
expect { relationship.changed_for_autosave? }.to_not raise_error
|
|
22
22
|
}
|
|
23
23
|
end
|
|
24
24
|
end
|
|
@@ -145,7 +145,7 @@ describe ActiveFedora::Base do
|
|
|
145
145
|
let(:conditions) { { foo: "bar" } }
|
|
146
146
|
context "and at least one object matches the conditions" do
|
|
147
147
|
it "returns true" do
|
|
148
|
-
allow(ActiveFedora::SolrService).to receive(:query) { [
|
|
148
|
+
allow(ActiveFedora::SolrService).to receive(:query) { [instance_double(RSolr::HashWithResponse)] }
|
|
149
149
|
expect(described_class.exists?(conditions)).to be true
|
|
150
150
|
end
|
|
151
151
|
end
|
|
@@ -159,7 +159,7 @@ describe ActiveFedora::Base do
|
|
|
159
159
|
end
|
|
160
160
|
|
|
161
161
|
describe "overriding resource_class_factory" do
|
|
162
|
-
subject { TestBase.new }
|
|
162
|
+
subject(:test_base) { TestBase.new }
|
|
163
163
|
before do
|
|
164
164
|
class TestResource < ActiveTriples::Resource
|
|
165
165
|
end
|
|
@@ -174,7 +174,7 @@ describe ActiveFedora::Base do
|
|
|
174
174
|
Object.send(:remove_const, :TestBase)
|
|
175
175
|
end
|
|
176
176
|
it "uses that factory for #resource" do
|
|
177
|
-
expect(
|
|
177
|
+
expect(test_base.resource.class.ancestors).to include TestResource
|
|
178
178
|
end
|
|
179
179
|
end
|
|
180
180
|
end
|
|
@@ -135,10 +135,9 @@ describe ActiveFedora::Base do
|
|
|
135
135
|
end
|
|
136
136
|
|
|
137
137
|
let(:instance) { SpecContainer.new }
|
|
138
|
-
subject { instance.items }
|
|
139
138
|
|
|
140
139
|
it "raises an error" do
|
|
141
|
-
expect {
|
|
140
|
+
expect { instance.items }.to raise_error "No :inverse_of or :predicate attribute was set or could be inferred for has_many :items on SpecContainer"
|
|
142
141
|
end
|
|
143
142
|
end
|
|
144
143
|
|
|
@@ -161,9 +160,7 @@ describe ActiveFedora::Base do
|
|
|
161
160
|
let(:instance) { Foo::Container.new }
|
|
162
161
|
subject { instance.items }
|
|
163
162
|
|
|
164
|
-
it
|
|
165
|
-
expect(subject).to eq []
|
|
166
|
-
end
|
|
163
|
+
it { is_expected.to eq [] }
|
|
167
164
|
end
|
|
168
165
|
end
|
|
169
166
|
end
|
|
@@ -34,9 +34,8 @@ describe ActiveFedora::Base do
|
|
|
34
34
|
describe 'serializing' do
|
|
35
35
|
let(:object) { Foo.new(date: [date]) }
|
|
36
36
|
let(:triple) { object.resource.query(predicate: ::RDF::Vocab::DC.date).to_a.first }
|
|
37
|
-
subject { triple.to_s }
|
|
38
37
|
it 'time zone must have semicolin to be a cannonical XMLSchema#dateTime' do
|
|
39
|
-
expect(
|
|
38
|
+
expect(triple.to_s).to match(/\+01:00/)
|
|
40
39
|
end
|
|
41
40
|
end
|
|
42
41
|
end
|
|
@@ -32,16 +32,16 @@ describe "Direct containers" do
|
|
|
32
32
|
end
|
|
33
33
|
|
|
34
34
|
describe "#first" do
|
|
35
|
-
subject { reloaded.files.first }
|
|
35
|
+
subject(:first_file) { reloaded.files.first }
|
|
36
36
|
it "has the content" do
|
|
37
|
-
expect(
|
|
37
|
+
expect(first_file.content).to eq 'HMMM'
|
|
38
38
|
end
|
|
39
39
|
end
|
|
40
40
|
|
|
41
41
|
describe "#to_a" do
|
|
42
|
-
subject { reloaded.files }
|
|
42
|
+
subject(:files) { reloaded.files }
|
|
43
43
|
it "has the content" do
|
|
44
|
-
expect(
|
|
44
|
+
expect(files.to_a).to eq [file]
|
|
45
45
|
end
|
|
46
46
|
end
|
|
47
47
|
|
|
@@ -102,9 +102,9 @@ describe "Direct containers" do
|
|
|
102
102
|
end
|
|
103
103
|
|
|
104
104
|
describe "#first" do
|
|
105
|
-
subject { reloaded.files.first }
|
|
105
|
+
subject(:first_file) { reloaded.files.first }
|
|
106
106
|
it "has the content" do
|
|
107
|
-
expect(
|
|
107
|
+
expect(first_file.content).to eq 'HMMM'
|
|
108
108
|
end
|
|
109
109
|
end
|
|
110
110
|
end
|
|
@@ -140,9 +140,9 @@ describe "Direct containers" do
|
|
|
140
140
|
end
|
|
141
141
|
|
|
142
142
|
describe "#first" do
|
|
143
|
-
subject { reloaded.files.first }
|
|
143
|
+
subject(:first_file) { reloaded.files.first }
|
|
144
144
|
it "has the content" do
|
|
145
|
-
expect(
|
|
145
|
+
expect(first_file.content).to eq 'HMMM'
|
|
146
146
|
end
|
|
147
147
|
end
|
|
148
148
|
end
|
|
@@ -36,15 +36,15 @@ describe ActiveFedora::Base do
|
|
|
36
36
|
primary_file.content = "I'm in a container all alone!"
|
|
37
37
|
page_image.save!
|
|
38
38
|
end
|
|
39
|
-
subject { reloaded_page_image.primary_file }
|
|
39
|
+
subject(:reloaded_file) { reloaded_page_image.primary_file }
|
|
40
40
|
it "initializes an object within the container" do
|
|
41
|
-
expect(
|
|
42
|
-
expect(
|
|
41
|
+
expect(reloaded_file.content).to eq("I'm in a container all alone!")
|
|
42
|
+
expect(reloaded_file.metadata_node.type).to include(::RDF::URI.new("http://example.com/primaryFile"))
|
|
43
43
|
end
|
|
44
44
|
it "relies on info from the :through association, including class_name" do
|
|
45
45
|
expect(page_image.files).to include(primary_file)
|
|
46
46
|
expect(primary_file.uri.to_s).to include("/files/")
|
|
47
|
-
expect(
|
|
47
|
+
expect(reloaded_file.class).to eq FileWithMetadata
|
|
48
48
|
end
|
|
49
49
|
end
|
|
50
50
|
end
|
|
@@ -61,9 +61,7 @@ describe ActiveFedora::Base do
|
|
|
61
61
|
primary_file.content = "I am too"
|
|
62
62
|
page_image.save!
|
|
63
63
|
end
|
|
64
|
-
it
|
|
65
|
-
expect(subject).to eq primary_file
|
|
66
|
-
end
|
|
64
|
+
it { is_expected.to eq primary_file }
|
|
67
65
|
end
|
|
68
66
|
context "if class_name is set" do
|
|
69
67
|
before do
|
|
@@ -71,10 +69,10 @@ describe ActiveFedora::Base do
|
|
|
71
69
|
alternative_file.content = "I am too"
|
|
72
70
|
page_image.save!
|
|
73
71
|
end
|
|
74
|
-
subject { reloaded_page_image.alternative_file }
|
|
72
|
+
subject(:reloaded_file) { reloaded_page_image.alternative_file }
|
|
75
73
|
it "uses the specified class to load objects" do
|
|
76
|
-
expect(
|
|
77
|
-
expect(
|
|
74
|
+
expect(reloaded_file).to eq alternative_file
|
|
75
|
+
expect(reloaded_file).to be_instance_of AlternativeFileWithMetadata
|
|
78
76
|
end
|
|
79
77
|
end
|
|
80
78
|
end
|
|
@@ -85,13 +83,13 @@ describe ActiveFedora::Base do
|
|
|
85
83
|
primary_file.content = "I am too"
|
|
86
84
|
page_image.save!
|
|
87
85
|
end
|
|
88
|
-
subject { reloaded_page_image.files }
|
|
86
|
+
subject(:reloaded_file) { reloaded_page_image.files }
|
|
89
87
|
it "replaces existing record without disturbing the other contents of the container" do
|
|
90
88
|
replacement_file = page_image.primary_file = FileWithMetadata.new
|
|
91
89
|
replacement_file.content = "I'm a replacement"
|
|
92
90
|
page_image.save
|
|
93
|
-
expect(
|
|
94
|
-
expect(
|
|
91
|
+
expect(reloaded_file).to_not include(primary_file)
|
|
92
|
+
expect(reloaded_file).to contain_exactly(a_file, replacement_file)
|
|
95
93
|
expect(reloaded_page_image.primary_file).to eq(replacement_file)
|
|
96
94
|
end
|
|
97
95
|
end
|
|
@@ -19,7 +19,7 @@ describe ActiveFedora::Base do
|
|
|
19
19
|
end
|
|
20
20
|
context "in a typical sitation" do
|
|
21
21
|
specify "it cannot be reused" do
|
|
22
|
-
expect { described_class.create(ghost) }.to raise_error(Ldp::Gone)
|
|
22
|
+
expect { described_class.create(id: ghost) }.to raise_error(Ldp::Gone)
|
|
23
23
|
end
|
|
24
24
|
end
|
|
25
25
|
specify "remove its tombstone" do
|
|
@@ -18,9 +18,9 @@ describe "fedora_solr_sync_issues" do
|
|
|
18
18
|
end
|
|
19
19
|
|
|
20
20
|
let(:parent) { ParentThing.create }
|
|
21
|
-
subject { ChildThing.create parent: parent }
|
|
21
|
+
subject(:child) { ChildThing.create parent: parent }
|
|
22
22
|
|
|
23
|
-
before { Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection,
|
|
23
|
+
before { Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, child.uri).delete }
|
|
24
24
|
|
|
25
25
|
it "does not go into an infinite loop" do
|
|
26
26
|
parent.reload
|
|
@@ -15,24 +15,22 @@ describe "Checking fixity" do
|
|
|
15
15
|
obj = MockAFBase.create
|
|
16
16
|
obj.data.content = "some content"
|
|
17
17
|
obj.save
|
|
18
|
-
obj.data
|
|
18
|
+
obj.data.check_fixity
|
|
19
19
|
end
|
|
20
20
|
|
|
21
21
|
context "with a valid resource" do
|
|
22
|
-
it
|
|
23
|
-
expect(subject.check_fixity).to be true
|
|
24
|
-
end
|
|
22
|
+
it { is_expected.to be true }
|
|
25
23
|
end
|
|
26
24
|
context "when no uri has been set" do
|
|
27
|
-
subject { ActiveFedora::File.new }
|
|
25
|
+
subject(:file) { ActiveFedora::File.new }
|
|
28
26
|
it "raises an error" do
|
|
29
|
-
expect {
|
|
27
|
+
expect { file.check_fixity }.to raise_error(ArgumentError, "You must provide a uri")
|
|
30
28
|
end
|
|
31
29
|
end
|
|
32
30
|
context "with missing resource" do
|
|
33
|
-
subject { ActiveFedora::File.new(ActiveFedora::Base.id_to_uri('123')) }
|
|
31
|
+
subject(:file) { ActiveFedora::File.new(ActiveFedora::Base.id_to_uri('123')) }
|
|
34
32
|
it "raises an error" do
|
|
35
|
-
expect {
|
|
33
|
+
expect { file.check_fixity }.to raise_error(Ldp::NotFound)
|
|
36
34
|
end
|
|
37
35
|
end
|
|
38
36
|
end
|
|
@@ -4,19 +4,20 @@ require 'active_fedora'
|
|
|
4
4
|
require "rexml/document"
|
|
5
5
|
|
|
6
6
|
describe ActiveFedora::File do
|
|
7
|
+
let(:file) { described_class.new }
|
|
7
8
|
describe "#save" do
|
|
8
9
|
context "with new files" do
|
|
9
10
|
context "with a string" do
|
|
10
|
-
before {
|
|
11
|
+
before { file.content = "hello" }
|
|
11
12
|
it "saves" do
|
|
12
|
-
expect(
|
|
13
|
+
expect(file.save).to be true
|
|
13
14
|
end
|
|
14
15
|
end
|
|
15
16
|
|
|
16
17
|
context "with no content" do
|
|
17
|
-
before {
|
|
18
|
+
before { file.content = nil }
|
|
18
19
|
it "does not save" do
|
|
19
|
-
expect(
|
|
20
|
+
expect(file.save).to be false
|
|
20
21
|
end
|
|
21
22
|
end
|
|
22
23
|
end
|
|
@@ -43,9 +44,9 @@ describe ActiveFedora::File do
|
|
|
43
44
|
end
|
|
44
45
|
|
|
45
46
|
it "saves" do
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
expect(
|
|
47
|
+
file.content = ActionDispatch::Http::UploadedFile.new
|
|
48
|
+
file.save
|
|
49
|
+
expect(file).not_to be_new_record
|
|
49
50
|
end
|
|
50
51
|
end
|
|
51
52
|
end
|
|
@@ -53,53 +54,52 @@ describe ActiveFedora::File do
|
|
|
53
54
|
context "with a sub-resource that autocreates" do
|
|
54
55
|
before do
|
|
55
56
|
class MockAFBase < ActiveFedora::Base
|
|
56
|
-
has_subresource "descMetadata", class_name: '
|
|
57
|
+
has_subresource "descMetadata", class_name: 'SampleResource', autocreate: true
|
|
58
|
+
end
|
|
59
|
+
|
|
60
|
+
class SampleResource < ActiveFedora::File
|
|
61
|
+
def content
|
|
62
|
+
'something to save'
|
|
63
|
+
end
|
|
57
64
|
end
|
|
58
65
|
end
|
|
59
66
|
|
|
60
67
|
after do
|
|
68
|
+
Object.send(:remove_const, :SampleResource)
|
|
61
69
|
Object.send(:remove_const, :MockAFBase)
|
|
62
70
|
end
|
|
63
71
|
|
|
64
72
|
let(:test_object) { MockAFBase.create }
|
|
65
73
|
let(:descMetadata) { test_object.descMetadata }
|
|
66
74
|
|
|
67
|
-
describe "
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
describe "#described_by" do
|
|
73
|
-
subject { descMetadata.described_by }
|
|
74
|
-
it { should eq descMetadata.uri + '/fcr:metadata' }
|
|
75
|
+
describe "changed attributes are set" do
|
|
76
|
+
it "marks profile as changed" do
|
|
77
|
+
expect_any_instance_of(SampleResource).to receive(:attribute_will_change!).with(:profile)
|
|
78
|
+
test_object
|
|
79
|
+
end
|
|
75
80
|
end
|
|
76
81
|
|
|
77
|
-
|
|
78
|
-
let(:xml_content) { Nokogiri::XML::Document.parse(descMetadata.content) }
|
|
79
|
-
let(:title) { Nokogiri::XML::Element.new "title", xml_content }
|
|
82
|
+
describe "content_changed? is called" do
|
|
80
83
|
before do
|
|
81
|
-
|
|
82
|
-
xml_content.root.add_child title
|
|
83
|
-
allow(descMetadata).to receive(:before_save)
|
|
84
|
-
descMetadata.content = xml_content.to_s
|
|
85
|
-
descMetadata.save
|
|
84
|
+
allow_any_instance_of(SampleResource).to receive(:content_changed?).and_return(true)
|
|
86
85
|
end
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
subject { found.xpath('//dc/title/text()').first.inner_text }
|
|
91
|
-
it { should eq title.content }
|
|
86
|
+
subject { descMetadata.described_by }
|
|
87
|
+
it { should eq descMetadata.uri + '/fcr:metadata' }
|
|
92
88
|
end
|
|
93
89
|
end
|
|
94
90
|
|
|
95
91
|
context "with a sub-resource" do
|
|
96
92
|
before do
|
|
97
93
|
class MockAFBase < ActiveFedora::Base
|
|
98
|
-
has_subresource "descMetadata", class_name: '
|
|
94
|
+
has_subresource "descMetadata", class_name: 'SampleResource'
|
|
95
|
+
end
|
|
96
|
+
|
|
97
|
+
class SampleResource < ActiveFedora::File
|
|
99
98
|
end
|
|
100
99
|
end
|
|
101
100
|
|
|
102
101
|
after do
|
|
102
|
+
Object.send(:remove_const, :SampleResource)
|
|
103
103
|
Object.send(:remove_const, :MockAFBase)
|
|
104
104
|
end
|
|
105
105
|
|
|
@@ -131,7 +131,7 @@ describe ActiveFedora::File do
|
|
|
131
131
|
end
|
|
132
132
|
|
|
133
133
|
describe "streaming the response" do
|
|
134
|
-
let(:stream_reader) {
|
|
134
|
+
let(:stream_reader) { instance_double(IO) }
|
|
135
135
|
it "streams the response" do
|
|
136
136
|
expect(stream_reader).to receive(:read).at_least(:once)
|
|
137
137
|
test_object.attached_files[path].stream.each { |buff| stream_reader.read(buff) }
|
|
@@ -149,9 +149,7 @@ describe ActiveFedora::File do
|
|
|
149
149
|
end
|
|
150
150
|
context "open ended" do
|
|
151
151
|
let(:range) { 'bytes=0-' }
|
|
152
|
-
it
|
|
153
|
-
expect(subject).to eq 'one1two2threfour'
|
|
154
|
-
end
|
|
152
|
+
it { should eq 'one1two2threfour' }
|
|
155
153
|
end
|
|
156
154
|
context "not starting at the beginning" do
|
|
157
155
|
let(:range) { 'bytes=3-15' }
|
|
@@ -9,17 +9,14 @@ describe ActiveFedora::Config::SolrGenerator do
|
|
|
9
9
|
'.solr_wrapper'
|
|
10
10
|
]}
|
|
11
11
|
|
|
12
|
-
before do
|
|
13
|
-
generator.solr_wrapper_config
|
|
14
|
-
end
|
|
15
|
-
|
|
16
|
-
after do
|
|
17
|
-
files_to_test.each { |file| File.delete(file) if File.exist?(file) }
|
|
18
|
-
end
|
|
19
|
-
|
|
20
12
|
it "creates config files" do
|
|
21
|
-
|
|
22
|
-
|
|
13
|
+
Dir.mktmpdir do |dir|
|
|
14
|
+
Dir.chdir(dir) do
|
|
15
|
+
generator.solr_wrapper_config
|
|
16
|
+
files_to_test.each do |file|
|
|
17
|
+
expect(File).to exist(file), "Expected #{file} to exist"
|
|
18
|
+
end
|
|
19
|
+
end
|
|
23
20
|
end
|
|
24
21
|
end
|
|
25
22
|
end
|
|
@@ -31,18 +31,16 @@ describe ActiveFedora::Associations::HasManyAssociation do
|
|
|
31
31
|
let!(:book) { Book.create }
|
|
32
32
|
let(:library) { Library.new }
|
|
33
33
|
subject { library.books.count }
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
end
|
|
34
|
+
# it excludes the books that aren't associated
|
|
35
|
+
it { is_expected.to eq 0 }
|
|
37
36
|
end
|
|
38
37
|
|
|
39
38
|
context "when the owner is saved with associations" do
|
|
40
39
|
let(:book) { Book.create }
|
|
41
40
|
let!(:library) { Library.create(books: [book]) }
|
|
42
41
|
subject { library.reload; library.books.count }
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
end
|
|
42
|
+
# it excludes the books that are associated
|
|
43
|
+
it { is_expected.to eq 1 }
|
|
46
44
|
end
|
|
47
45
|
|
|
48
46
|
context "when the owner is not saved after checking the count" do
|
|
@@ -406,10 +404,10 @@ describe ActiveFedora::Associations::HasManyAssociation do
|
|
|
406
404
|
library.save
|
|
407
405
|
end
|
|
408
406
|
|
|
409
|
-
subject { library.books(true) }
|
|
407
|
+
subject(:books) { library.books(true) }
|
|
410
408
|
|
|
411
409
|
it "saves the new title" do
|
|
412
|
-
expect(
|
|
410
|
+
expect(books.first.title).to eq ["Better book"]
|
|
413
411
|
end
|
|
414
412
|
end
|
|
415
413
|
end
|