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.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.rubocop.yml +6 -7
- data/.rubocop_todo.yml +55 -0
- data/.solr_wrapper +6 -0
- data/.travis.yml +6 -9
- data/Gemfile +1 -0
- data/History.txt +34 -0
- data/README.md +1 -3
- data/active-fedora.gemspec +7 -13
- data/lib/active_fedora/aggregation/list_source.rb +2 -0
- data/lib/active_fedora/associations/association_scope.rb +1 -1
- data/lib/active_fedora/associations/builder/aggregation.rb +1 -1
- data/lib/active_fedora/associations/builder/association.rb +1 -1
- data/lib/active_fedora/associations/builder/orders.rb +11 -3
- data/lib/active_fedora/associations/collection_association.rb +5 -5
- data/lib/active_fedora/associations/collection_proxy.rb +10 -10
- data/lib/active_fedora/associations/contained_finder.rb +2 -2
- data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb +1 -1
- data/lib/active_fedora/associations/has_many_association.rb +2 -2
- data/lib/active_fedora/associations/has_subresource_association.rb +2 -2
- data/lib/active_fedora/associations/orders_association.rb +4 -0
- data/lib/active_fedora/associations/rdf.rb +2 -0
- data/lib/active_fedora/attribute_assignment.rb +0 -1
- data/lib/active_fedora/attribute_methods/dirty.rb +1 -1
- data/lib/active_fedora/attribute_methods.rb +1 -1
- data/lib/active_fedora/attributes.rb +1 -1
- data/lib/active_fedora/base.rb +4 -8
- data/lib/active_fedora/change_set.rb +6 -2
- data/lib/active_fedora/cleaner.rb +1 -1
- data/lib/active_fedora/containers/container.rb +1 -1
- data/lib/active_fedora/core.rb +33 -30
- data/lib/active_fedora/fedora.rb +6 -2
- data/lib/active_fedora/fedora_attributes.rb +1 -1
- data/lib/active_fedora/file/streaming.rb +1 -1
- data/lib/active_fedora/file.rb +2 -1
- data/lib/active_fedora/file_configurator.rb +3 -3
- data/lib/active_fedora/indexing.rb +1 -18
- data/lib/active_fedora/indexing_service.rb +0 -9
- data/lib/active_fedora/initializing_connection.rb +1 -1
- data/lib/active_fedora/loadable_from_json.rb +12 -1
- data/lib/active_fedora/model_classifier.rb +1 -1
- data/lib/active_fedora/nested_attributes.rb +2 -2
- data/lib/active_fedora/null_logger.rb +10 -0
- data/lib/active_fedora/orders/list_node.rb +2 -2
- data/lib/active_fedora/orders/ordered_list.rb +8 -4
- data/lib/active_fedora/orders/target_proxy.rb +4 -0
- 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/field_map_entry.rb +6 -0
- data/lib/active_fedora/rdf/persistence.rb +1 -0
- data/lib/active_fedora/rdf/value_caster.rb +15 -0
- data/lib/active_fedora/rdf.rb +1 -1
- data/lib/active_fedora/relation/delegation.rb +4 -0
- data/lib/active_fedora/relation/finder_methods.rb +3 -1
- data/lib/active_fedora/solr_hit.rb +1 -14
- data/lib/active_fedora/solr_query_builder.rb +17 -13
- data/lib/active_fedora/version.rb +1 -1
- data/lib/active_fedora/with_metadata/metadata_node.rb +2 -1
- data/lib/active_fedora.rb +1 -12
- 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/lib/generators/active_fedora/model/model_generator.rb +1 -1
- data/lib/generators/active_fedora/model/templates/model.rb.erb +4 -4
- data/lib/tasks/active_fedora_dev.rake +1 -1
- data/spec/config_helper.rb +1 -1
- data/spec/integration/associations_spec.rb +23 -24
- data/spec/integration/attached_files_spec.rb +19 -9
- data/spec/integration/attributes_spec.rb +12 -16
- data/spec/integration/autosave_association_spec.rb +6 -6
- data/spec/integration/base_spec.rb +8 -8
- data/spec/integration/basic_contains_association_spec.rb +1 -1
- data/spec/integration/clean_connection_spec.rb +1 -1
- data/spec/integration/collection_association_spec.rb +2 -5
- data/spec/integration/date_time_properties_spec.rb +1 -17
- data/spec/integration/direct_container_spec.rb +12 -12
- 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 +37 -39
- data/spec/integration/generators/solr_generator_spec.rb +7 -10
- data/spec/integration/has_and_belongs_to_many_associations_spec.rb +7 -7
- data/spec/integration/has_many_associations_spec.rb +9 -11
- data/spec/integration/indexing_spec.rb +2 -2
- data/spec/integration/indirect_container_spec.rb +11 -12
- 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 +7 -7
- data/spec/integration/relation_delegation_spec.rb +8 -10
- data/spec/integration/relation_spec.rb +13 -16
- data/spec/integration/scoped_query_spec.rb +3 -3
- data/spec/integration/scoping_spec.rb +3 -3
- data/spec/integration/solr_hit_spec.rb +4 -15
- data/spec/integration/versionable_spec.rb +73 -327
- data/spec/integration/with_metadata_spec.rb +1 -1
- 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 +21 -27
- data/spec/unit/builder/has_and_belongs_to_many_spec.rb +1 -1
- 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/fedora_id_translator_spec.rb +2 -2
- data/spec/unit/core/fedora_uri_translator_spec.rb +2 -2
- data/spec/unit/core/logger_spec.rb +18 -0
- data/spec/unit/core_spec.rb +68 -32
- data/spec/unit/default_model_mapper_spec.rb +6 -6
- data/spec/unit/fedora_spec.rb +3 -4
- data/spec/unit/file_configurator_spec.rb +96 -96
- data/spec/unit/file_path_builder_spec.rb +3 -3
- data/spec/unit/file_spec.rb +93 -61
- data/spec/unit/files_hash_spec.rb +9 -9
- data/spec/unit/filter_spec.rb +3 -3
- data/spec/unit/finder_methods_spec.rb +3 -3
- data/spec/unit/forbidden_attributes_protection_spec.rb +2 -2
- data/spec/unit/has_and_belongs_to_many_association_spec.rb +14 -15
- 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 +8 -8
- 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 +144 -147
- data/spec/unit/orders/list_node_spec.rb +22 -22
- 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 +12 -12
- data/spec/unit/rdf/indexing_service_spec.rb +29 -29
- 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 +12 -12
- 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 +30 -130
- 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/profile_indexing_service.rb +0 -11
- 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 -167
- data/lib/active_fedora/rdf/rdfxml_datastream.rb +0 -13
- data/lib/active_fedora/solr_instance_loader.rb +0 -47
- 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 -228
- data/spec/integration/datastream_rdf_nested_attributes_spec.rb +0 -179
- data/spec/integration/ntriples_datastream_spec.rb +0 -203
- data/spec/integration/om_datastream_spec.rb +0 -78
- data/spec/integration/solr_instance_loader_spec.rb +0 -156
- data/spec/samples/hydra-mods_article_datastream.rb +0 -517
- 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 -170
- 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 -204
- data/spec/unit/rdfxml_datastream_spec.rb +0 -106
data/spec/unit/indexing_spec.rb
CHANGED
|
@@ -25,16 +25,16 @@ describe ActiveFedora::Indexing do
|
|
|
25
25
|
Object.send(:remove_const, :SpecNode)
|
|
26
26
|
end
|
|
27
27
|
|
|
28
|
-
subject { SpecNode.new }
|
|
28
|
+
subject(:node) { SpecNode.new }
|
|
29
29
|
|
|
30
30
|
describe "#create_needs_index?" do
|
|
31
31
|
subject { SpecNode.new.send(:create_needs_index?) }
|
|
32
|
-
it {
|
|
32
|
+
it { is_expected.to be true }
|
|
33
33
|
end
|
|
34
34
|
|
|
35
35
|
describe "#update_needs_index?" do
|
|
36
36
|
subject { SpecNode.new.send(:update_needs_index?) }
|
|
37
|
-
it {
|
|
37
|
+
it { is_expected.to be true }
|
|
38
38
|
end
|
|
39
39
|
end
|
|
40
40
|
|
|
@@ -55,10 +55,10 @@ describe ActiveFedora::Indexing do
|
|
|
55
55
|
|
|
56
56
|
let(:test_object) { SpecNode.new(title: ['first title'], abstract: 'The abstract') }
|
|
57
57
|
|
|
58
|
-
subject { test_object.to_solr }
|
|
58
|
+
subject(:solr_doc) { test_object.to_solr }
|
|
59
59
|
|
|
60
60
|
it "indexs the rdf properties" do
|
|
61
|
-
expect(
|
|
61
|
+
expect(solr_doc).to include('title_tesim' => ['first title'], 'abstract_ssi' => 'The abstract')
|
|
62
62
|
end
|
|
63
63
|
|
|
64
64
|
it "adds id, system_create_date, system_modified_date from object attributes" do
|
|
@@ -72,15 +72,15 @@ describe ActiveFedora::Indexing do
|
|
|
72
72
|
end
|
|
73
73
|
|
|
74
74
|
context "with attached files" do
|
|
75
|
-
let(:mock1) {
|
|
76
|
-
let(:mock2) {
|
|
75
|
+
let(:mock1) { instance_double(ActiveFedora::File) }
|
|
76
|
+
let(:mock2) { instance_double(ActiveFedora::File) }
|
|
77
77
|
|
|
78
78
|
it "calls .to_solr on all datastreams, passing the resulting document to solr" do
|
|
79
79
|
expect(mock1).to receive(:to_solr).and_return("one" => "title one")
|
|
80
80
|
expect(mock2).to receive(:to_solr).and_return("two" => "title two")
|
|
81
81
|
|
|
82
82
|
allow(test_object).to receive(:declared_attached_files).and_return(ds1: mock1, ds2: mock2)
|
|
83
|
-
expect(
|
|
83
|
+
expect(solr_doc).to include('one' => 'title one', 'two' => 'title two')
|
|
84
84
|
end
|
|
85
85
|
end
|
|
86
86
|
end
|
|
@@ -2,28 +2,32 @@ require 'spec_helper'
|
|
|
2
2
|
|
|
3
3
|
describe ActiveFedora::Base do
|
|
4
4
|
before do
|
|
5
|
-
class MyDS < ActiveFedora::
|
|
5
|
+
class MyDS < ActiveFedora::File
|
|
6
6
|
end
|
|
7
|
+
|
|
8
|
+
class MySample < ActiveFedora::File
|
|
9
|
+
end
|
|
10
|
+
|
|
7
11
|
class Foo < ActiveFedora::Base
|
|
8
12
|
has_subresource 'foostream', class_name: 'MyDS'
|
|
9
|
-
has_subresource 'dcstream', class_name: '
|
|
13
|
+
has_subresource 'dcstream', class_name: 'MySample'
|
|
10
14
|
end
|
|
15
|
+
|
|
11
16
|
class Bar < ActiveFedora::Base
|
|
12
17
|
has_subresource 'barstream', class_name: 'MyDS'
|
|
13
18
|
end
|
|
14
19
|
end
|
|
20
|
+
let(:f) { Foo.new }
|
|
21
|
+
subject(:attached_files) { f.attached_files }
|
|
15
22
|
|
|
16
23
|
it "doesn't overwrite stream specs" do
|
|
17
|
-
|
|
18
|
-
expect(f.attached_files.size).to eq 2
|
|
19
|
-
streams = f.attached_files.values.map { |x| x.class.to_s }.sort
|
|
20
|
-
expect(streams.pop).to eq "MyDS"
|
|
21
|
-
expect(streams.pop).to eq "ActiveFedora::QualifiedDublinCoreDatastream"
|
|
24
|
+
expect(attached_files.values).to match_array [MyDS, MySample]
|
|
22
25
|
end
|
|
23
26
|
|
|
24
27
|
after do
|
|
25
28
|
Object.send(:remove_const, :Bar)
|
|
26
29
|
Object.send(:remove_const, :Foo)
|
|
27
30
|
Object.send(:remove_const, :MyDS)
|
|
31
|
+
Object.send(:remove_const, :MySample)
|
|
28
32
|
end
|
|
29
33
|
end
|
|
@@ -23,17 +23,17 @@ describe ActiveFedora::LoadableFromJson::SolrBackedResource do
|
|
|
23
23
|
|
|
24
24
|
describe "#query" do
|
|
25
25
|
describe "a known relationship" do
|
|
26
|
-
subject { resource.query(predicate: ::RDF::Vocab::DC.extent) }
|
|
26
|
+
subject(:resources) { resource.query(predicate: ::RDF::Vocab::DC.extent) }
|
|
27
27
|
|
|
28
28
|
it "is enumerable" do
|
|
29
|
-
expect(
|
|
29
|
+
expect(resources.map(&:object)).to eq [RDF::URI('http://example.org/123')]
|
|
30
30
|
end
|
|
31
31
|
end
|
|
32
32
|
|
|
33
33
|
describe "a unknown relationship" do
|
|
34
|
-
subject { resource.query(predicate: ::RDF::Vocab::DC.accrualPeriodicity) }
|
|
34
|
+
subject(:resources) { resource.query(predicate: ::RDF::Vocab::DC.accrualPeriodicity) }
|
|
35
35
|
it "raises an error" do
|
|
36
|
-
expect {
|
|
36
|
+
expect { resources }.to raise_error "Unable to find reflection for http://purl.org/dc/terms/accrualPeriodicity in Foo"
|
|
37
37
|
end
|
|
38
38
|
end
|
|
39
39
|
end
|
data/spec/unit/logger_spec.rb
CHANGED
|
@@ -11,11 +11,11 @@ describe ActiveFedora::ModelClassifier do
|
|
|
11
11
|
end
|
|
12
12
|
|
|
13
13
|
let(:class_names) { ["ParentClass::SiblingClass", "ParentClass::OtherSiblingClass", "ParentClass::SubclassClass", "ParentClass::NoSuchClass"] }
|
|
14
|
-
subject { described_class.new class_names }
|
|
14
|
+
subject(:classifier) { described_class.new class_names }
|
|
15
15
|
|
|
16
16
|
describe ".class_from_string" do
|
|
17
17
|
it "returns class constants based on strings" do
|
|
18
|
-
expect(described_class.class_from_string("
|
|
18
|
+
expect(described_class.class_from_string("String")).to eq String
|
|
19
19
|
expect(described_class.class_from_string("ActiveFedora::RDF::IndexingService")).to eq ActiveFedora::RDF::IndexingService
|
|
20
20
|
expect(described_class.class_from_string("IndexingService", ActiveFedora::RDF)).to eq ActiveFedora::RDF::IndexingService
|
|
21
21
|
end
|
|
@@ -33,17 +33,17 @@ describe ActiveFedora::ModelClassifier do
|
|
|
33
33
|
|
|
34
34
|
describe '#models' do
|
|
35
35
|
it 'converts class names to classes' do
|
|
36
|
-
expect(
|
|
36
|
+
expect(classifier.models).to match_array [ParentClass::SiblingClass, ParentClass::OtherSiblingClass, ParentClass::SubclassClass]
|
|
37
37
|
end
|
|
38
38
|
end
|
|
39
39
|
|
|
40
40
|
describe '#best_model' do
|
|
41
41
|
it 'selects the most specific matching model' do
|
|
42
|
-
expect(
|
|
42
|
+
expect(classifier.best_model(default: nil)).to eq ParentClass::SubclassClass
|
|
43
43
|
end
|
|
44
44
|
|
|
45
45
|
it 'filters models to subclasses of the default' do
|
|
46
|
-
expect(
|
|
46
|
+
expect(classifier.best_model(default: ActiveFedora::Base)).to eq ActiveFedora::Base
|
|
47
47
|
end
|
|
48
48
|
end
|
|
49
49
|
end
|
data/spec/unit/ordered_spec.rb
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
require 'spec_helper'
|
|
2
2
|
|
|
3
3
|
describe ActiveFedora::Orders do
|
|
4
|
-
subject { Image.new }
|
|
4
|
+
subject(:image) { Image.new }
|
|
5
5
|
before do
|
|
6
6
|
class Member < ActiveFedora::Base
|
|
7
7
|
end
|
|
@@ -19,9 +19,9 @@ describe ActiveFedora::Orders do
|
|
|
19
19
|
describe "<<" do
|
|
20
20
|
it "does not accept base objects" do
|
|
21
21
|
member = Member.new
|
|
22
|
-
expect {
|
|
23
|
-
expect(
|
|
24
|
-
expect(
|
|
22
|
+
expect { image.ordered_member_proxies << member }.to raise_error ActiveFedora::AssociationTypeMismatch
|
|
23
|
+
expect(image).not_to be_changed
|
|
24
|
+
expect(image.list_source).not_to be_changed
|
|
25
25
|
end
|
|
26
26
|
end
|
|
27
27
|
|
|
@@ -58,67 +58,57 @@ describe ActiveFedora::Orders do
|
|
|
58
58
|
end
|
|
59
59
|
end
|
|
60
60
|
|
|
61
|
-
it "can load from solr" do
|
|
62
|
-
member = Member.new
|
|
63
|
-
subject.ordered_members << member
|
|
64
|
-
subject.save!
|
|
65
|
-
solr_doc = ActiveFedora::SolrService.query("id:#{subject.id}").first
|
|
66
|
-
|
|
67
|
-
allow(Deprecation).to receive(:warn)
|
|
68
|
-
expect { ActiveFedora::Base.load_instance_from_solr(subject.id, solr_doc) }.not_to raise_error
|
|
69
|
-
end
|
|
70
|
-
|
|
71
61
|
describe "#ordered_members" do
|
|
72
62
|
describe "<<" do
|
|
73
63
|
it "appends" do
|
|
74
64
|
member = Member.new
|
|
75
|
-
|
|
76
|
-
expect(
|
|
77
|
-
expect(
|
|
78
|
-
expect(
|
|
79
|
-
expect(
|
|
80
|
-
|
|
81
|
-
expect(
|
|
82
|
-
expect(
|
|
65
|
+
image.save!
|
|
66
|
+
expect(image.ordered_members << member).to eq [member]
|
|
67
|
+
expect(image.ordered_members).to eq [member]
|
|
68
|
+
expect(image.members).to eq [member]
|
|
69
|
+
expect(image.ordered_member_proxies.to_a.length).to eq 1
|
|
70
|
+
image.save!
|
|
71
|
+
expect(image.head).not_to be_blank
|
|
72
|
+
expect(image.reload.head).not_to be_blank
|
|
83
73
|
end
|
|
84
74
|
it "maintains member associations" do
|
|
85
75
|
member = Member.create
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
expect(
|
|
76
|
+
image.ordered_members << member
|
|
77
|
+
image.save
|
|
78
|
+
image.reload
|
|
79
|
+
expect(image.members).to eq [member]
|
|
90
80
|
end
|
|
91
81
|
end
|
|
92
82
|
describe "#=" do
|
|
93
83
|
it "sets ordered members" do
|
|
94
84
|
member = Member.new
|
|
95
85
|
member_2 = Member.new
|
|
96
|
-
|
|
97
|
-
expect(
|
|
98
|
-
|
|
99
|
-
expect(
|
|
86
|
+
image.ordered_members << member
|
|
87
|
+
expect(image.ordered_members).to eq [member]
|
|
88
|
+
image.ordered_members = [member_2, member_2]
|
|
89
|
+
expect(image.ordered_members).to eq [member_2, member_2]
|
|
100
90
|
# Removing from ordering is not the same as removing from aggregation.
|
|
101
|
-
expect(
|
|
91
|
+
expect(image.members).to contain_exactly member, member_2
|
|
102
92
|
end
|
|
103
93
|
end
|
|
104
94
|
describe "+=" do
|
|
105
95
|
it "appends ordered members" do
|
|
106
96
|
member = Member.new
|
|
107
97
|
member_2 = Member.new
|
|
108
|
-
|
|
109
|
-
expect(
|
|
110
|
-
expect(
|
|
111
|
-
expect(
|
|
98
|
+
image.ordered_members << member
|
|
99
|
+
expect(image.ordered_members += [member, member_2]).to eq [member, member, member_2]
|
|
100
|
+
expect(image.ordered_members).to eq [member, member, member_2]
|
|
101
|
+
expect(image.ordered_member_proxies.map(&:target)).to eq [member, member, member_2]
|
|
112
102
|
end
|
|
113
103
|
end
|
|
114
104
|
describe "#delete_at" do
|
|
115
105
|
it "deletes that position" do
|
|
116
106
|
member = Member.new
|
|
117
107
|
member_2 = Member.new
|
|
118
|
-
|
|
108
|
+
image.ordered_members += [member, member_2]
|
|
119
109
|
|
|
120
|
-
expect(
|
|
121
|
-
expect(
|
|
110
|
+
expect(image.ordered_members.delete_at(0)).to eq member
|
|
111
|
+
expect(image.ordered_members).to eq [member_2]
|
|
122
112
|
end
|
|
123
113
|
end
|
|
124
114
|
|
|
@@ -126,21 +116,27 @@ describe ActiveFedora::Orders do
|
|
|
126
116
|
let(:member) { Member.create }
|
|
127
117
|
let(:member_2) { Member.create }
|
|
128
118
|
before do
|
|
129
|
-
|
|
130
|
-
|
|
119
|
+
image.ordered_members += [member, member_2, member]
|
|
120
|
+
image.save!
|
|
131
121
|
end
|
|
132
122
|
|
|
133
123
|
context "with an object found in the list" do
|
|
134
124
|
it "deletes all occurences of the object" do
|
|
135
|
-
expect(
|
|
136
|
-
expect(
|
|
125
|
+
expect(image.ordered_members.delete(member)).to eq member
|
|
126
|
+
expect(image.ordered_members.to_a).to eq [member_2]
|
|
127
|
+
end
|
|
128
|
+
it "can delete all" do
|
|
129
|
+
expect(image.ordered_members.delete(member)).to eq member
|
|
130
|
+
expect(image.ordered_members.delete(member_2)).to eq member_2
|
|
131
|
+
image.save!
|
|
132
|
+
expect(image.reload.ordered_members.to_a).to eq []
|
|
137
133
|
end
|
|
138
134
|
end
|
|
139
135
|
|
|
140
136
|
context "with an object not found in the list" do
|
|
141
137
|
it "returns nil" do
|
|
142
|
-
expect(
|
|
143
|
-
expect(
|
|
138
|
+
expect(image.ordered_members.delete(Member.create)).to be_nil
|
|
139
|
+
expect(image.ordered_members.to_a).to eq [member, member_2, member]
|
|
144
140
|
end
|
|
145
141
|
end
|
|
146
142
|
end
|
|
@@ -149,29 +145,29 @@ describe ActiveFedora::Orders do
|
|
|
149
145
|
it "adds at a given position" do
|
|
150
146
|
member = Member.new
|
|
151
147
|
member_2 = Member.new
|
|
152
|
-
|
|
148
|
+
image.ordered_members += [member, member_2]
|
|
153
149
|
|
|
154
|
-
|
|
155
|
-
expect(
|
|
150
|
+
image.ordered_members.insert_at(0, member_2)
|
|
151
|
+
expect(image.ordered_members).to eq [member_2, member, member_2]
|
|
156
152
|
end
|
|
157
153
|
it "adds a proxy_in statement" do
|
|
158
154
|
member = Member.new
|
|
159
155
|
member_2 = Member.new
|
|
160
|
-
|
|
156
|
+
image.ordered_members += [member, member_2]
|
|
161
157
|
|
|
162
|
-
|
|
163
|
-
expect(
|
|
158
|
+
image.ordered_members.insert_at(0, member_2)
|
|
159
|
+
expect(image.ordered_member_proxies.map(&:proxy_in).uniq).to eq [image]
|
|
164
160
|
end
|
|
165
161
|
end
|
|
166
162
|
describe "lazy loading" do
|
|
167
163
|
it "does not instantiate every record on append" do
|
|
168
164
|
member = Member.new
|
|
169
165
|
member_2 = Member.new
|
|
170
|
-
|
|
171
|
-
|
|
166
|
+
image.ordered_members += [member, member_2]
|
|
167
|
+
image.save
|
|
172
168
|
allow(ActiveFedora::Base).to receive(:find).and_call_original
|
|
173
169
|
|
|
174
|
-
reloaded =
|
|
170
|
+
reloaded = image.class.find(image.id)
|
|
175
171
|
reloaded.ordered_members << member
|
|
176
172
|
|
|
177
173
|
expect(ActiveFedora::Base).not_to have_received(:find).with(member_2.id)
|
|
@@ -179,11 +175,11 @@ describe ActiveFedora::Orders do
|
|
|
179
175
|
it "does not instantiate every record on #insert_at" do
|
|
180
176
|
member = Member.new
|
|
181
177
|
member_2 = Member.new
|
|
182
|
-
|
|
183
|
-
|
|
178
|
+
image.ordered_members += [member, member_2]
|
|
179
|
+
image.save
|
|
184
180
|
allow(ActiveFedora::Base).to receive(:find).and_call_original
|
|
185
181
|
|
|
186
|
-
reloaded =
|
|
182
|
+
reloaded = image.class.find(image.id)
|
|
187
183
|
reloaded.ordered_members.insert_at(0, member)
|
|
188
184
|
|
|
189
185
|
expect(ActiveFedora::Base).not_to have_received(:find).with(member_2.id)
|
|
@@ -193,178 +189,179 @@ describe ActiveFedora::Orders do
|
|
|
193
189
|
describe "append_target" do
|
|
194
190
|
it "doesn't add all members" do
|
|
195
191
|
member = Member.new
|
|
196
|
-
|
|
197
|
-
expect(
|
|
192
|
+
image.members << member
|
|
193
|
+
expect(image.ordered_members).to eq []
|
|
198
194
|
end
|
|
199
195
|
it "can handle adding many objects" do
|
|
200
196
|
member = Member.new
|
|
201
197
|
60.times do
|
|
202
|
-
|
|
198
|
+
image.ordered_member_proxies.append_target member
|
|
203
199
|
end
|
|
204
|
-
expect(
|
|
200
|
+
expect(image.ordered_member_proxies.to_a.length).to eq 60
|
|
205
201
|
end
|
|
206
202
|
it "can't add items not accepted by indirect container" do
|
|
207
203
|
bad_class = BadClass.new
|
|
208
|
-
expect {
|
|
204
|
+
expect { image.ordered_member_proxies.append_target bad_class }.to raise_error ActiveFedora::AssociationTypeMismatch
|
|
209
205
|
end
|
|
210
206
|
it "adds a member if it doesn't exist in members" do
|
|
211
207
|
member = Member.new
|
|
212
|
-
|
|
213
|
-
expect(
|
|
214
|
-
expect(
|
|
208
|
+
image.ordered_member_proxies.append_target member
|
|
209
|
+
expect(image.members).to eq [member]
|
|
210
|
+
expect(image.ordered_members).to eq [member]
|
|
215
211
|
end
|
|
216
212
|
it "doesn't add a member twice" do
|
|
217
213
|
member = Member.new
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
expect(
|
|
221
|
-
expect(
|
|
214
|
+
image.ordered_member_proxies.append_target member
|
|
215
|
+
image.ordered_member_proxies.append_target member
|
|
216
|
+
expect(image.members).to eq [member]
|
|
217
|
+
expect(image.ordered_members).to eq [member, member]
|
|
222
218
|
end
|
|
223
219
|
it "survives persistence" do
|
|
224
220
|
member = Member.new
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
expect(
|
|
230
|
-
expect(
|
|
231
|
-
expect(
|
|
232
|
-
expect(
|
|
221
|
+
image.ordered_member_proxies.append_target member
|
|
222
|
+
image.ordered_member_proxies.append_target member
|
|
223
|
+
image.save
|
|
224
|
+
image.reload
|
|
225
|
+
expect(image.ordered_members).to eq [member, member]
|
|
226
|
+
expect(image.ordered_member_ids).to eq [member.id, member.id]
|
|
227
|
+
expect(image.list_source.resource.query([nil, ::RDF::Vocab::ORE.proxyIn, image.resource.rdf_subject]).to_a.length).to eq 2
|
|
228
|
+
expect(image.head_ids).to eq image.list_source.head_id
|
|
229
|
+
expect(image.tail_ids).to eq image.list_source.tail_id
|
|
233
230
|
end
|
|
234
231
|
it "can add already persisted items" do
|
|
235
232
|
member = Member.create
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
expect(
|
|
233
|
+
image.ordered_member_proxies.append_target member
|
|
234
|
+
image.save
|
|
235
|
+
image.reload
|
|
236
|
+
expect(image.ordered_members).to eq [member]
|
|
240
237
|
end
|
|
241
238
|
it "can append to a pre-persisted item" do
|
|
242
239
|
member = Member.new
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
240
|
+
image.ordered_member_proxies.append_target member
|
|
241
|
+
image.save
|
|
242
|
+
image.reload
|
|
246
243
|
member_2 = Member.new
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
expect(
|
|
244
|
+
image.ordered_member_proxies.append_target member_2
|
|
245
|
+
image.save
|
|
246
|
+
image.reload
|
|
247
|
+
expect(image.ordered_members).to eq [member, member_2]
|
|
251
248
|
end
|
|
252
249
|
end
|
|
253
250
|
describe "insert_target_at" do
|
|
254
251
|
it "can add between items" do
|
|
255
252
|
member = Member.new
|
|
256
253
|
member2 = Member.new
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
expect(
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
expect(
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
expect(
|
|
254
|
+
image.ordered_member_proxies.append_target member
|
|
255
|
+
image.ordered_member_proxies.append_target member
|
|
256
|
+
image.ordered_member_proxies.insert_target_at(1, member2)
|
|
257
|
+
expect(image.ordered_members).to eq [member, member2, member]
|
|
258
|
+
image.save
|
|
259
|
+
image.reload
|
|
260
|
+
expect(image.ordered_members).to eq [member, member2, member]
|
|
261
|
+
image.ordered_member_proxies.insert_target_at(2, member2)
|
|
262
|
+
image.save
|
|
263
|
+
image.reload
|
|
264
|
+
expect(image.ordered_members).to eq [member, member2, member2, member]
|
|
268
265
|
end
|
|
269
266
|
end
|
|
270
267
|
describe "insert_target_id_at" do
|
|
271
268
|
it "can add between items" do
|
|
272
269
|
member = Member.create
|
|
273
270
|
member2 = Member.create
|
|
274
|
-
|
|
271
|
+
image.ordered_members += [member, member2]
|
|
275
272
|
|
|
276
273
|
allow(ActiveFedora::Base).to receive(:find).and_call_original
|
|
277
|
-
|
|
274
|
+
image.ordered_member_proxies.insert_target_id_at(1, member2.id)
|
|
278
275
|
expect(ActiveFedora::Base).not_to have_received(:find).with(member2.id)
|
|
279
|
-
expect(
|
|
276
|
+
expect(image.ordered_members).to eq [member, member2, member2]
|
|
280
277
|
expect(ActiveFedora::Base).to have_received(:find).with(member2.id)
|
|
281
278
|
end
|
|
282
279
|
context "when given a nil id" do
|
|
283
280
|
it "raises an ArgumentError" do
|
|
284
|
-
expect {
|
|
281
|
+
expect { image.ordered_member_proxies.insert_target_id_at(0, nil) }.to raise_error ArgumentError, "ID can not be nil"
|
|
285
282
|
end
|
|
286
283
|
end
|
|
287
284
|
context "when given an ID not in members" do
|
|
288
285
|
it "raises an ArgumentError" do
|
|
289
|
-
expect {
|
|
286
|
+
expect { image.ordered_member_proxies.insert_target_id_at(0, "test") }.to raise_error "test is not a part of members"
|
|
290
287
|
end
|
|
291
288
|
end
|
|
292
289
|
end
|
|
293
290
|
describe "-=" do
|
|
294
291
|
it "can remove proxies" do
|
|
295
292
|
member = Member.new
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
expect(
|
|
299
|
-
expect(
|
|
293
|
+
image.ordered_member_proxies.append_target member
|
|
294
|
+
image.ordered_member_proxies -= [image.ordered_member_proxies.last]
|
|
295
|
+
expect(image.ordered_members).to eq []
|
|
296
|
+
expect(image.list_source.resource.statements.to_a.length).to eq 1
|
|
300
297
|
end
|
|
301
298
|
it "can remove proxies in the middle" do
|
|
302
299
|
member = Member.new
|
|
303
300
|
member_2 = Member.new
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
expect(
|
|
301
|
+
image.ordered_member_proxies.append_target member
|
|
302
|
+
image.ordered_member_proxies.append_target member_2
|
|
303
|
+
image.ordered_member_proxies.append_target member
|
|
304
|
+
image.ordered_member_proxies -= [image.ordered_member_proxies[1]]
|
|
305
|
+
expect(image.ordered_members).to eq [member, member]
|
|
309
306
|
end
|
|
310
307
|
it "can remove proxies post-create" do
|
|
311
308
|
member = Member.new
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
expect(
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
expect(
|
|
309
|
+
image.ordered_member_proxies.append_target member
|
|
310
|
+
image.ordered_member_proxies.append_target member
|
|
311
|
+
image.ordered_member_proxies.append_target member
|
|
312
|
+
image.save
|
|
313
|
+
image.reload
|
|
314
|
+
image.ordered_member_proxies -= [image.ordered_member_proxies[1]]
|
|
315
|
+
expect(image.ordered_members).to eq [member, member]
|
|
316
|
+
image.save
|
|
317
|
+
image.reload
|
|
318
|
+
expect(image.ordered_members).to eq [member, member]
|
|
322
319
|
# THIS NEEDS TO PASS - can't delete fragment URI resources via sparql
|
|
323
320
|
# update?
|
|
324
321
|
# Blocked by https://jira.duraspace.org/browse/FCREPO-1764
|
|
325
|
-
# expect(
|
|
322
|
+
# expect(image.list_source.resource.subjects.to_a.length).to eq 5
|
|
326
323
|
end
|
|
327
324
|
end
|
|
328
325
|
describe ".delete_at" do
|
|
329
326
|
it "can remove in the middle" do
|
|
330
327
|
member = Member.new
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
expect(
|
|
328
|
+
image.ordered_member_proxies.append_target member
|
|
329
|
+
image.ordered_member_proxies.append_target member
|
|
330
|
+
image.ordered_member_proxies.append_target member
|
|
331
|
+
image.ordered_member_proxies.delete_at(1)
|
|
332
|
+
expect(image.ordered_members).to eq [member, member]
|
|
336
333
|
end
|
|
337
334
|
it "returns the node" do
|
|
338
335
|
member = Member.new
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
second_node =
|
|
342
|
-
expect(
|
|
336
|
+
image.ordered_members << member
|
|
337
|
+
image.ordered_members << member
|
|
338
|
+
second_node = image.ordered_member_proxies[1]
|
|
339
|
+
expect(image.ordered_member_proxies.delete_at(1)).to eq second_node
|
|
343
340
|
end
|
|
344
341
|
context "when the node doesn't exist" do
|
|
345
342
|
it "returns nil" do
|
|
346
|
-
expect(
|
|
343
|
+
expect(image.ordered_member_proxies.delete_at(0)).to eq nil
|
|
347
344
|
end
|
|
348
345
|
end
|
|
349
346
|
it "doesn't do anything if passed a bad value" do
|
|
350
347
|
member = Member.new
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
expect(
|
|
348
|
+
image.ordered_member_proxies.append_target member
|
|
349
|
+
image.ordered_member_proxies.append_target member
|
|
350
|
+
image.ordered_member_proxies.append_target member
|
|
351
|
+
image.ordered_member_proxies.delete_at(3)
|
|
352
|
+
image.ordered_member_proxies.delete_at(nil)
|
|
353
|
+
expect(image.ordered_members).to eq [member, member, member]
|
|
357
354
|
end
|
|
358
355
|
it "can persist a deletion" do
|
|
359
356
|
member = Member.new
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
expect(
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
expect(
|
|
357
|
+
image.ordered_member_proxies.append_target member
|
|
358
|
+
image.ordered_member_proxies.append_target member
|
|
359
|
+
image.ordered_member_proxies.append_target member
|
|
360
|
+
expect(image.ordered_members).to eq [member, member, member]
|
|
361
|
+
image.ordered_member_proxies.delete_at(1)
|
|
362
|
+
image.save
|
|
363
|
+
image.reload
|
|
364
|
+
expect(image.ordered_members).to eq [member, member]
|
|
368
365
|
end
|
|
369
366
|
end
|
|
370
367
|
end
|