active-fedora 10.2.1 → 11.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (161) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.rubocop.yml +6 -7
  4. data/.rubocop_todo.yml +55 -0
  5. data/active-fedora.gemspec +6 -10
  6. data/lib/active_fedora/aggregation/list_source.rb +2 -0
  7. data/lib/active_fedora/associations/association_scope.rb +1 -1
  8. data/lib/active_fedora/associations/builder/aggregation.rb +1 -1
  9. data/lib/active_fedora/associations/builder/association.rb +1 -1
  10. data/lib/active_fedora/associations/builder/orders.rb +11 -3
  11. data/lib/active_fedora/associations/collection_association.rb +3 -3
  12. data/lib/active_fedora/associations/contained_finder.rb +2 -2
  13. data/lib/active_fedora/associations/has_many_association.rb +2 -2
  14. data/lib/active_fedora/associations/orders_association.rb +4 -0
  15. data/lib/active_fedora/associations/rdf.rb +2 -0
  16. data/lib/active_fedora/attribute_assignment.rb +0 -1
  17. data/lib/active_fedora/attribute_methods/dirty.rb +1 -1
  18. data/lib/active_fedora/attributes.rb +1 -1
  19. data/lib/active_fedora/base.rb +4 -8
  20. data/lib/active_fedora/change_set.rb +6 -2
  21. data/lib/active_fedora/core.rb +22 -27
  22. data/lib/active_fedora/fedora_attributes.rb +1 -1
  23. data/lib/active_fedora/file/streaming.rb +1 -1
  24. data/lib/active_fedora/indexing.rb +0 -17
  25. data/lib/active_fedora/indexing_service.rb +0 -9
  26. data/lib/active_fedora/loadable_from_json.rb +12 -1
  27. data/lib/active_fedora/nested_attributes.rb +2 -2
  28. data/lib/active_fedora/orders/list_node.rb +2 -2
  29. data/lib/active_fedora/orders/ordered_list.rb +7 -3
  30. data/lib/active_fedora/orders/target_proxy.rb +4 -0
  31. data/lib/active_fedora/querying.rb +1 -1
  32. data/lib/active_fedora/railtie.rb +2 -2
  33. data/lib/active_fedora/rdf/persistence.rb +1 -0
  34. data/lib/active_fedora/rdf.rb +0 -1
  35. data/lib/active_fedora/relation/delegation.rb +4 -0
  36. data/lib/active_fedora/solr_hit.rb +0 -13
  37. data/lib/active_fedora/solr_query_builder.rb +17 -13
  38. data/lib/active_fedora/version.rb +1 -1
  39. data/lib/active_fedora.rb +0 -12
  40. data/lib/generators/active_fedora/model/model_generator.rb +1 -1
  41. data/lib/generators/active_fedora/model/templates/model.rb.erb +4 -4
  42. data/lib/tasks/active_fedora_dev.rake +1 -1
  43. data/spec/config_helper.rb +1 -1
  44. data/spec/integration/associations_spec.rb +23 -24
  45. data/spec/integration/attached_files_spec.rb +18 -8
  46. data/spec/integration/attributes_spec.rb +12 -16
  47. data/spec/integration/autosave_association_spec.rb +6 -6
  48. data/spec/integration/base_spec.rb +3 -3
  49. data/spec/integration/basic_contains_association_spec.rb +1 -1
  50. data/spec/integration/clean_connection_spec.rb +1 -1
  51. data/spec/integration/collection_association_spec.rb +2 -5
  52. data/spec/integration/date_time_properties_spec.rb +1 -17
  53. data/spec/integration/direct_container_spec.rb +12 -12
  54. data/spec/integration/directly_contains_one_association_spec.rb +11 -13
  55. data/spec/integration/fedora_solr_sync_spec.rb +2 -2
  56. data/spec/integration/file_fixity_spec.rb +6 -8
  57. data/spec/integration/file_spec.rb +32 -34
  58. data/spec/integration/has_and_belongs_to_many_associations_spec.rb +5 -5
  59. data/spec/integration/has_many_associations_spec.rb +9 -11
  60. data/spec/integration/indexing_spec.rb +2 -2
  61. data/spec/integration/indirect_container_spec.rb +11 -12
  62. data/spec/integration/json_serialization_spec.rb +4 -4
  63. data/spec/integration/query_result_builder_spec.rb +9 -21
  64. data/spec/integration/rdf_nested_attributes_spec.rb +7 -7
  65. data/spec/integration/relation_delegation_spec.rb +8 -10
  66. data/spec/integration/relation_spec.rb +13 -16
  67. data/spec/integration/scoped_query_spec.rb +3 -3
  68. data/spec/integration/solr_hit_spec.rb +4 -15
  69. data/spec/integration/versionable_spec.rb +73 -327
  70. data/spec/integration/with_metadata_spec.rb +1 -1
  71. data/spec/spec_helper.rb +52 -10
  72. data/spec/unit/active_fedora_spec.rb +1 -1
  73. data/spec/unit/aggregation/list_source_spec.rb +37 -37
  74. data/spec/unit/aggregation/ordered_reader_spec.rb +4 -4
  75. data/spec/unit/association_hash_spec.rb +17 -31
  76. data/spec/unit/attached_files_spec.rb +35 -32
  77. data/spec/unit/attributes_spec.rb +25 -25
  78. data/spec/unit/base_active_model_spec.rb +8 -8
  79. data/spec/unit/base_cma_spec.rb +1 -1
  80. data/spec/unit/base_extra_spec.rb +7 -22
  81. data/spec/unit/base_spec.rb +16 -23
  82. data/spec/unit/callback_spec.rb +2 -2
  83. data/spec/unit/change_set_spec.rb +5 -5
  84. data/spec/unit/checksum_spec.rb +2 -2
  85. data/spec/unit/code_configurator_spec.rb +1 -1
  86. data/spec/unit/core_spec.rb +62 -26
  87. data/spec/unit/default_model_mapper_spec.rb +6 -6
  88. data/spec/unit/fedora_spec.rb +3 -4
  89. data/spec/unit/file_configurator_spec.rb +96 -96
  90. data/spec/unit/file_path_builder_spec.rb +1 -1
  91. data/spec/unit/file_spec.rb +61 -61
  92. data/spec/unit/files_hash_spec.rb +9 -9
  93. data/spec/unit/filter_spec.rb +3 -3
  94. data/spec/unit/finder_methods_spec.rb +3 -3
  95. data/spec/unit/forbidden_attributes_protection_spec.rb +2 -2
  96. data/spec/unit/has_and_belongs_to_many_association_spec.rb +14 -15
  97. data/spec/unit/has_many_association_spec.rb +26 -11
  98. data/spec/unit/indexers/global_indexer_spec.rb +6 -6
  99. data/spec/unit/indexing_service_spec.rb +5 -5
  100. data/spec/unit/indexing_spec.rb +6 -6
  101. data/spec/unit/inheritance_spec.rb +11 -7
  102. data/spec/unit/loadable_from_json_spec.rb +4 -4
  103. data/spec/unit/logger_spec.rb +1 -1
  104. data/spec/unit/model_classifier_spec.rb +5 -5
  105. data/spec/unit/ordered_spec.rb +144 -147
  106. data/spec/unit/orders/list_node_spec.rb +21 -21
  107. data/spec/unit/orders/ordered_list_spec.rb +96 -96
  108. data/spec/unit/orders/reflection_spec.rb +4 -4
  109. data/spec/unit/pathing_spec.rb +4 -4
  110. data/spec/unit/persistence_spec.rb +28 -28
  111. data/spec/unit/property_spec.rb +2 -2
  112. data/spec/unit/query_spec.rb +6 -6
  113. data/spec/unit/rdf/indexing_service_spec.rb +29 -29
  114. data/spec/unit/readonly_spec.rb +5 -4
  115. data/spec/unit/reflection_spec.rb +3 -3
  116. data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb +9 -9
  117. data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb +9 -9
  118. data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb +9 -9
  119. data/spec/unit/schema_indexing_strategy_spec.rb +5 -5
  120. data/spec/unit/serializers_spec.rb +3 -4
  121. data/spec/unit/solr_config_options_spec.rb +13 -16
  122. data/spec/unit/solr_hit_spec.rb +9 -9
  123. data/spec/unit/solr_service_spec.rb +4 -10
  124. data/spec/unit/sparql_insert_spec.rb +2 -2
  125. data/spec/unit/validations_spec.rb +9 -9
  126. data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb +3 -2
  127. data/spec/unit/with_metadata/metadata_node_spec.rb +3 -2
  128. metadata +17 -91
  129. data/lib/active_fedora/datastreams/nokogiri_datastreams.rb +0 -119
  130. data/lib/active_fedora/datastreams.rb +0 -6
  131. data/lib/active_fedora/nom_datastream.rb +0 -73
  132. data/lib/active_fedora/om_datastream.rb +0 -118
  133. data/lib/active_fedora/profile_indexing_service.rb +0 -11
  134. data/lib/active_fedora/qualified_dublin_core_datastream.rb +0 -158
  135. data/lib/active_fedora/rdf/datastream_indexing.rb +0 -49
  136. data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb +0 -13
  137. data/lib/active_fedora/rdf/rdf_datastream.rb +0 -167
  138. data/lib/active_fedora/rdf/rdfxml_datastream.rb +0 -13
  139. data/lib/active_fedora/solr_instance_loader.rb +0 -47
  140. data/spec/fixtures/damsObjectModel.xml +0 -38
  141. data/spec/fixtures/dublin_core_rdf_descMetadata.nt +0 -13
  142. data/spec/fixtures/mixed_rdf_descMetadata.nt +0 -7
  143. data/spec/fixtures/mods_articles/mods_article1.xml +0 -98
  144. data/spec/fixtures/solr_rdf_descMetadata.nt +0 -7
  145. data/spec/integration/complex_rdf_datastream_spec.rb +0 -228
  146. data/spec/integration/datastream_rdf_nested_attributes_spec.rb +0 -179
  147. data/spec/integration/ntriples_datastream_spec.rb +0 -203
  148. data/spec/integration/om_datastream_spec.rb +0 -78
  149. data/spec/integration/solr_instance_loader_spec.rb +0 -156
  150. data/spec/samples/hydra-mods_article_datastream.rb +0 -517
  151. data/spec/samples/models/mods_article.rb +0 -9
  152. data/spec/samples/oral_history_sample.xml +0 -38
  153. data/spec/samples/oral_history_xml.xml +0 -35
  154. data/spec/samples/samples.rb +0 -2
  155. data/spec/unit/nom_datastream_spec.rb +0 -60
  156. data/spec/unit/ntriples_datastream_spec.rb +0 -170
  157. data/spec/unit/om_datastream_spec.rb +0 -294
  158. data/spec/unit/qualified_dublin_core_datastream_spec.rb +0 -119
  159. data/spec/unit/rdf_datastream_spec.rb +0 -84
  160. data/spec/unit/rdf_resource_datastream_spec.rb +0 -204
  161. data/spec/unit/rdfxml_datastream_spec.rb +0 -106
@@ -2,28 +2,28 @@ require 'spec_helper'
2
2
 
3
3
  describe ActiveFedora::RDF::IndexingService do
4
4
  before do
5
- class MyDatastream < ActiveFedora::NtriplesRDFDatastream
5
+ class MyObj < ActiveFedora::Base
6
6
  property :created, predicate: ::RDF::Vocab::DC.created
7
7
  property :title, predicate: ::RDF::Vocab::DC.title
8
8
  property :publisher, predicate: ::RDF::Vocab::DC.publisher
9
- property :based_near, predicate: ::RDF::FOAF.based_near
10
- property :related_url, predicate: ::RDF::RDFS.seeAlso
9
+ property :based_near, predicate: ::RDF::Vocab::FOAF.based_near
10
+ property :related_url, predicate: ::RDF::Vocab::RDFS.seeAlso
11
11
  property :rights, predicate: ::RDF::Vocab::DC.rights
12
12
  end
13
13
  end
14
14
 
15
15
  after do
16
- Object.send(:remove_const, :MyDatastream)
16
+ Object.send(:remove_const, :MyObj)
17
17
  end
18
18
 
19
19
  let(:f2) do
20
- MyDatastream.new.tap do |obj|
21
- obj.created = Date.parse("2012-03-04")
22
- obj.title = "Of Mice and Men, The Sequel"
23
- obj.publisher = "Bob's Blogtastic Publishing"
20
+ MyObj.new.tap do |obj|
21
+ obj.created = [Date.parse("2012-03-04")]
22
+ obj.title = ["Of Mice and Men, The Sequel"]
23
+ obj.publisher = ["Bob's Blogtastic Publishing"]
24
24
  obj.based_near = ["Tacoma, WA", "Renton, WA"]
25
- obj.related_url = "http://example.org/blogtastic/"
26
- obj.rights = "Totally open, y'all"
25
+ obj.related_url = ["http://example.org/blogtastic/"]
26
+ obj.rights = ["Totally open, y'all"]
27
27
  end
28
28
  end
29
29
 
@@ -51,33 +51,33 @@ describe ActiveFedora::RDF::IndexingService do
51
51
  end
52
52
 
53
53
  before do
54
- allow(MyDatastream).to receive(:index_config).and_return(index_config)
54
+ allow(MyObj).to receive(:index_config).and_return(index_config)
55
55
  end
56
56
 
57
57
  let(:indexer) { described_class.new(f2) }
58
58
 
59
59
  describe "#generate_solr_document" do
60
- subject { indexer.generate_solr_document(lambda { |key| "solr_rdf__#{key}" }) }
60
+ let(:solr_obj) { indexer.generate_solr_document(lambda { |key| "solr_rdf__#{key}" }) }
61
61
  it "returns the right fields" do
62
- expect(subject.keys).to include(ActiveFedora.index_field_mapper.solr_name("solr_rdf__related_url", type: :string),
63
- ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", type: :string),
64
- ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :sortable),
65
- ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :facetable),
66
- ActiveFedora.index_field_mapper.solr_name("solr_rdf__created", :sortable, type: :date),
67
- ActiveFedora.index_field_mapper.solr_name("solr_rdf__created", :displayable),
68
- ActiveFedora.index_field_mapper.solr_name("solr_rdf__title", type: :string),
69
- ActiveFedora.index_field_mapper.solr_name("solr_rdf__title", :sortable),
70
- ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string),
71
- ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable))
62
+ expect(solr_obj.keys).to include(ActiveFedora.index_field_mapper.solr_name("solr_rdf__related_url", type: :string),
63
+ ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", type: :string),
64
+ ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :sortable),
65
+ ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :facetable),
66
+ ActiveFedora.index_field_mapper.solr_name("solr_rdf__created", :sortable, type: :date),
67
+ ActiveFedora.index_field_mapper.solr_name("solr_rdf__created", :displayable),
68
+ ActiveFedora.index_field_mapper.solr_name("solr_rdf__title", type: :string),
69
+ ActiveFedora.index_field_mapper.solr_name("solr_rdf__title", :sortable),
70
+ ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string),
71
+ ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable))
72
72
  end
73
73
 
74
74
  it "returns the right values" do
75
- expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__related_url", type: :string)]).to eq ["http://example.org/blogtastic/"]
76
- expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string)]).to eq ["Tacoma, WA", "Renton, WA"]
77
- expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable)]).to eq ["Tacoma, WA", "Renton, WA"]
78
- expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", type: :string)]).to eq ["Bob's Blogtastic Publishing"]
79
- expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :sortable)]).to eq "Bob's Blogtastic Publishing"
80
- expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :facetable)]).to eq ["Bob's Blogtastic Publishing"]
75
+ expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__related_url", type: :string)]).to eq ["http://example.org/blogtastic/"]
76
+ expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string)]).to contain_exactly "Tacoma, WA", "Renton, WA"
77
+ expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable)]).to contain_exactly "Tacoma, WA", "Renton, WA"
78
+ expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", type: :string)]).to eq ["Bob's Blogtastic Publishing"]
79
+ expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :sortable)]).to eq "Bob's Blogtastic Publishing"
80
+ expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :facetable)]).to eq ["Bob's Blogtastic Publishing"]
81
81
  end
82
82
  end
83
83
 
@@ -90,7 +90,7 @@ describe ActiveFedora::RDF::IndexingService do
90
90
 
91
91
  it "returns the right values" do
92
92
  expect(fields["related_url"].values).to eq ["http://example.org/blogtastic/"]
93
- expect(fields["based_near"].values).to eq ["Tacoma, WA", "Renton, WA"]
93
+ expect(fields["based_near"].values).to contain_exactly "Tacoma, WA", "Renton, WA"
94
94
  end
95
95
 
96
96
  it "returns the right type information" do
@@ -1,23 +1,24 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  describe ActiveFedora::Base do
4
+ subject(:object) { described_class.new }
4
5
  it { is_expected.not_to be_readonly }
5
6
 
6
7
  describe "#readonly!" do
7
8
  it "makes the object readonly" do
8
- expect { subject.readonly! }.to change { subject.readonly? }.from(false).to(true)
9
+ expect { object.readonly! }.to change { object.readonly? }.from(false).to(true)
9
10
  end
10
11
  end
11
12
 
12
13
  context "a readonly record" do
13
- before { subject.readonly! }
14
+ before { object.readonly! }
14
15
 
15
16
  it "does not be destroyable" do
16
- expect { subject.destroy }.to raise_error ActiveFedora::ReadOnlyRecord
17
+ expect { object.destroy }.to raise_error ActiveFedora::ReadOnlyRecord
17
18
  end
18
19
 
19
20
  it "does not be mutable" do
20
- expect { subject.save }.to raise_error ActiveFedora::ReadOnlyRecord
21
+ expect { object.save }.to raise_error ActiveFedora::ReadOnlyRecord
21
22
  end
22
23
  end
23
24
  end
@@ -4,14 +4,14 @@ describe ActiveFedora::Reflection::AssociationReflection do
4
4
  describe "#derive_foreign_key" do
5
5
  let(:name) { 'dummy' }
6
6
  let(:options) { { inverse_of: :default_permissions } }
7
- let(:active_fedora) { double }
7
+ let(:active_fedora) { instance_double(ActiveFedora::Base) }
8
8
  subject { instance.send :derive_foreign_key }
9
9
 
10
10
  context "when a has_many" do
11
11
  let(:instance) { ActiveFedora::Reflection::HasManyReflection.new(name, nil, options, active_fedora) }
12
12
 
13
13
  context "and the inverse is a collection association" do
14
- let(:inverse) { double(collection?: true) }
14
+ let(:inverse) { instance_double(ActiveFedora::Reflection::HasAndBelongsToManyReflection, collection?: true) }
15
15
  before { allow(instance).to receive(:inverse_of).and_return(inverse) }
16
16
  it { is_expected.to eq 'default_permission_ids' }
17
17
  end
@@ -28,7 +28,7 @@ describe ActiveFedora::Reflection::AssociationReflection do
28
28
  after { Object.send(:remove_const, :Dummy) }
29
29
  let(:name) { 'dummy' }
30
30
  let(:options) { { as: 'foothing' } }
31
- let(:active_fedora) { double }
31
+ let(:active_fedora) { instance_double(ActiveFedora::Base) }
32
32
  subject { instance.send :automatic_inverse_of }
33
33
 
34
34
  context "when a has_many" do
@@ -3,30 +3,30 @@ require 'ostruct'
3
3
  require "active_fedora/rspec_matchers/belong_to_associated_active_fedora_object_matcher"
4
4
 
5
5
  describe RSpec::Matchers, ".belong_to_associated_active_fedora_object" do
6
- subject { OpenStruct.new(id: id) }
6
+ let(:open_struct) { OpenStruct.new(id: id) }
7
7
  let(:id) { 123 }
8
8
  let(:object1) { Object.new }
9
9
  let(:object2) { Object.new }
10
10
  let(:association) { :association }
11
11
 
12
12
  it 'matches when association is properly stored in fedora' do
13
- expect(subject.class).to receive(:find).with(id).and_return(subject)
14
- expect(subject).to receive(association).and_return(object1)
15
- expect(subject).to belong_to_associated_active_fedora_object(association).with_object(object1)
13
+ expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
14
+ expect(open_struct).to receive(association).and_return(object1)
15
+ expect(open_struct).to belong_to_associated_active_fedora_object(association).with_object(object1)
16
16
  end
17
17
 
18
18
  it 'does not match when association is different' do
19
- expect(subject.class).to receive(:find).with(id).and_return(subject)
20
- expect(subject).to receive(association).and_return(object1)
19
+ expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
20
+ expect(open_struct).to receive(association).and_return(object1)
21
21
  expect {
22
- expect(subject).to belong_to_associated_active_fedora_object(association).with_object(object2)
22
+ expect(open_struct).to belong_to_associated_active_fedora_object(association).with_object(object2)
23
23
  }.to raise_error RSpec::Expectations::ExpectationNotMetError,
24
- /expected #{subject.class} ID=#{id} association: #{association.inspect}/
24
+ /expected #{open_struct.class} ID=#{id} association: #{association.inspect}/
25
25
  end
26
26
 
27
27
  it 'requires :with_object option' do
28
28
  expect {
29
- expect(subject).to belong_to_associated_active_fedora_object(association)
29
+ expect(open_struct).to belong_to_associated_active_fedora_object(association)
30
30
  }.to(
31
31
  raise_error(
32
32
  ArgumentError,
@@ -3,7 +3,7 @@ require 'ostruct'
3
3
  require "active_fedora/rspec_matchers/have_many_associated_active_fedora_objects_matcher"
4
4
 
5
5
  describe RSpec::Matchers, ".have_many_associated_active_fedora_objects" do
6
- subject { OpenStruct.new(id: id) }
6
+ let(:open_struct) { OpenStruct.new(id: id) }
7
7
  let(:id) { 123 }
8
8
  let(:object1) { Object.new }
9
9
  let(:object2) { Object.new }
@@ -11,23 +11,23 @@ describe RSpec::Matchers, ".have_many_associated_active_fedora_objects" do
11
11
  let(:association) { :association }
12
12
 
13
13
  it 'matches when association is properly stored in fedora' do
14
- expect(subject.class).to receive(:find).with(id).and_return(subject)
15
- expect(subject).to receive(association).and_return([object1, object2])
16
- expect(subject).to have_many_associated_active_fedora_objects(association).with_objects([object1, object2])
14
+ expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
15
+ expect(open_struct).to receive(association).and_return([object1, object2])
16
+ expect(open_struct).to have_many_associated_active_fedora_objects(association).with_objects([object1, object2])
17
17
  end
18
18
 
19
19
  it 'does not match when association is different' do
20
- expect(subject.class).to receive(:find).with(id).and_return(subject)
21
- expect(subject).to receive(association).and_return([object1, object3])
20
+ expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
21
+ expect(open_struct).to receive(association).and_return([object1, object3])
22
22
  expect {
23
- expect(subject).to have_many_associated_active_fedora_objects(association).with_objects([object1, object2])
23
+ expect(open_struct).to have_many_associated_active_fedora_objects(association).with_objects([object1, object2])
24
24
  }.to raise_error RSpec::Expectations::ExpectationNotMetError,
25
- /expected #{subject.class} ID=#{id} association: #{association.inspect}/
25
+ /expected #{open_struct.class} ID=#{id} association: #{association.inspect}/
26
26
  end
27
27
 
28
28
  it 'requires :with_objects option' do
29
29
  expect {
30
- expect(subject).to have_many_associated_active_fedora_objects(association)
30
+ expect(open_struct).to have_many_associated_active_fedora_objects(association)
31
31
  }.to(
32
32
  raise_error(
33
33
  ArgumentError,
@@ -3,7 +3,7 @@ require 'ostruct'
3
3
  require "active_fedora/rspec_matchers/have_predicate_matcher"
4
4
 
5
5
  describe RSpec::Matchers, ".have_predicate" do
6
- subject { OpenStruct.new(id: id) }
6
+ let(:open_struct) { OpenStruct.new(id: id) }
7
7
  let(:id) { 123 }
8
8
  let(:object1) { Object.new }
9
9
  let(:object2) { Object.new }
@@ -11,23 +11,23 @@ describe RSpec::Matchers, ".have_predicate" do
11
11
  let(:predicate) { :predicate }
12
12
 
13
13
  it 'matches when relationship is "what we have in Fedora"' do
14
- expect(subject.class).to receive(:find).with(id).and_return(subject)
15
- expect(subject).to receive(:relationships).with(predicate).and_return([object1, object2])
16
- expect(subject).to have_predicate(predicate).with_objects([object1, object2])
14
+ expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
15
+ expect(open_struct).to receive(:relationships).with(predicate).and_return([object1, object2])
16
+ expect(open_struct).to have_predicate(predicate).with_objects([object1, object2])
17
17
  end
18
18
 
19
19
  it 'does not match when relationship is different' do
20
- expect(subject.class).to receive(:find).with(id).and_return(subject)
21
- expect(subject).to receive(:relationships).with(predicate).and_return([object1, object3])
20
+ expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
21
+ expect(open_struct).to receive(:relationships).with(predicate).and_return([object1, object3])
22
22
  expect {
23
- expect(subject).to have_predicate(predicate).with_objects([object1, object2])
23
+ expect(open_struct).to have_predicate(predicate).with_objects([object1, object2])
24
24
  }.to raise_error RSpec::Expectations::ExpectationNotMetError,
25
- /expected #{subject.class} ID=#{id} relationship: #{predicate.inspect}/
25
+ /expected #{open_struct.class} ID=#{id} relationship: #{predicate.inspect}/
26
26
  end
27
27
 
28
28
  it 'requires :with_objects option' do
29
29
  expect {
30
- expect(subject).to have_predicate(predicate)
30
+ expect(open_struct).to have_predicate(predicate)
31
31
  }.to(
32
32
  raise_error(
33
33
  ArgumentError,
@@ -1,7 +1,7 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  RSpec.describe ActiveFedora::SchemaIndexingStrategy do
4
- subject { described_class.new(property_indexer_factory) }
4
+ subject(:index_strategy) { described_class.new(property_indexer_factory) }
5
5
 
6
6
  describe "#apply" do
7
7
  let(:property) do
@@ -40,9 +40,9 @@ RSpec.describe ActiveFedora::SchemaIndexingStrategy do
40
40
  end
41
41
  let(:index_types) {}
42
42
  context "with no index types" do
43
- subject { described_class.new }
43
+ subject(:index_strategy) { described_class.new }
44
44
  it "does not try to index it" do
45
- subject.apply(object, property)
45
+ index_strategy.apply(object, property)
46
46
 
47
47
  expect(object).to have_received(:property).with(property.name, property.to_h)
48
48
  expect(index_configuration).not_to have_received(:as)
@@ -51,7 +51,7 @@ RSpec.describe ActiveFedora::SchemaIndexingStrategy do
51
51
  context "with one index type" do
52
52
  let(:index_types) { :symbol }
53
53
  it "applies that one" do
54
- subject.apply(object, property)
54
+ index_strategy.apply(object, property)
55
55
 
56
56
  expect(index_configuration).to have_received(:as).with(:symbol)
57
57
  end
@@ -59,7 +59,7 @@ RSpec.describe ActiveFedora::SchemaIndexingStrategy do
59
59
  context "with multiple index types" do
60
60
  let(:index_types) { [:symbol, :stored_searchable] }
61
61
  it "applies all of them" do
62
- subject.apply(object, property)
62
+ index_strategy.apply(object, property)
63
63
 
64
64
  expect(index_configuration).to have_received(:as).with(:symbol, :stored_searchable)
65
65
  end
@@ -1,7 +1,6 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  describe ActiveFedora::Attributes::Serializers do
4
- subject { ActiveFedora::Base }
5
4
  describe "deserialize_dates_from_form" do
6
5
  before do
7
6
  class Foo < ActiveFedora::Base
@@ -11,10 +10,10 @@ describe ActiveFedora::Attributes::Serializers do
11
10
  after do
12
11
  Object.send(:remove_const, :Foo)
13
12
  end
14
- subject { Foo.new }
13
+ subject(:serializer) { Foo.new }
15
14
  it "deserializes dates" do
16
- subject.attributes = { 'birthday(1i)' => '2012', 'birthday(2i)' => '10', 'birthday(3i)' => '31' }
17
- expect(subject.birthday).to eq '2012-10-31'
15
+ serializer.attributes = { 'birthday(1i)' => '2012', 'birthday(2i)' => '10', 'birthday(3i)' => '31' }
16
+ expect(serializer.birthday).to eq '2012-10-31'
18
17
  end
19
18
  end
20
19
  end
@@ -8,9 +8,7 @@ describe ActiveFedora do
8
8
  end
9
9
  end
10
10
 
11
- before(:each) do
12
- @test_object = ActiveFedora::Base.new
13
- end
11
+ subject(:test_object) { ActiveFedora::Base.new }
14
12
 
15
13
  describe ".id_field" do
16
14
  let(:field) { "MY_SAMPLE_ID".freeze }
@@ -19,15 +17,15 @@ describe ActiveFedora do
19
17
  end
20
18
 
21
19
  it "is used by ActiveFedora::Base.to_solr" do
22
- allow(@test_object).to receive(:id).and_return('changeme:123')
23
- expect(@test_object.to_solr[field.to_sym]).to eq 'changeme:123'
24
- expect(@test_object.to_solr[:id]).to be_nil
20
+ allow(test_object).to receive(:id).and_return('changeme:123')
21
+ expect(test_object.to_solr[field.to_sym]).to eq 'changeme:123'
22
+ expect(test_object.to_solr[:id]).to be_nil
25
23
  end
26
24
 
27
25
  it "is used by ActiveFedora::Base#search_with_conditions" do
28
26
  mock_response = double("SolrResponse")
29
27
  expect(ActiveFedora::SolrService).to receive(:query)
30
- .with("_query_:\"{!field f=has_model_ssim}SolrSpecModel::Basic\" AND " \
28
+ .with("_query_:\"{!raw f=has_model_ssim}SolrSpecModel::Basic\" AND " \
31
29
  "_query_:\"{!field f=#{field}}changeme:30\"",
32
30
  sort: ["#{described_class.index_field_mapper.solr_name('system_create', :stored_sortable, type: :date)} asc"])
33
31
  .and_return(mock_response)
@@ -43,17 +41,16 @@ describe ActiveFedora do
43
41
  end
44
42
 
45
43
  it "prevents Base.save from calling update_index if false" do
46
- dirty_ds = ActiveFedora::QualifiedDublinCoreDatastream.new
47
- @test_object.attached_files['ds1'] = dirty_ds
48
- allow(@test_object).to receive(:datastreams).and_return(ds1: dirty_ds)
49
- expect(@test_object).to receive(:update_index).never
50
- expect(@test_object).to receive(:refresh)
51
- @test_object.save
44
+ allow(test_object).to receive(:new_record?).and_return(false)
45
+ expect(test_object).to receive(:update_index).never
46
+ expect(test_object).to receive(:refresh)
47
+ test_object.save
52
48
  end
49
+
53
50
  it "prevents Base.delete from deleting the corresponding Solr document if false" do
54
- expect(ActiveFedora::SolrService.instance.conn).to receive(:delete).with(@test_object.id).never
55
- expect(@test_object).to receive(:delete)
56
- @test_object.delete
51
+ expect(ActiveFedora::SolrService.instance.conn).to receive(:delete).with(test_object.id).never
52
+ expect(test_object).to receive(:delete)
53
+ test_object.delete
57
54
  end
58
55
  end
59
56
  end
@@ -9,50 +9,50 @@ describe ActiveFedora::SolrHit do
9
9
  end
10
10
  end
11
11
 
12
- subject { described_class.new "id" => "my:_ID1_", ActiveFedora.index_field_mapper.solr_name("has_model", :symbol) => ["AudioRecord"] }
12
+ subject(:solr_hit) { described_class.new "id" => "my:_ID1_", ActiveFedora.index_field_mapper.solr_name("has_model", :symbol) => ["AudioRecord"] }
13
13
 
14
14
  describe "#reify" do
15
15
  it "uses .find to instantiate objects" do
16
16
  expect(AudioRecord).to receive(:find).with("my:_ID1_", cast: true)
17
- subject.reify
17
+ solr_hit.reify
18
18
  end
19
19
  end
20
20
 
21
21
  describe "#id" do
22
22
  it "extracts the id from the solr hit" do
23
- expect(subject.id).to eq "my:_ID1_"
23
+ expect(solr_hit.id).to eq "my:_ID1_"
24
24
  end
25
25
  end
26
26
 
27
27
  describe "#rdf_uri" do
28
28
  it "provides an RDF URI for the solr hit" do
29
- expect(subject.rdf_uri).to eq ::RDF::URI.new(ActiveFedora::Base.id_to_uri("my:_ID1_"))
29
+ expect(solr_hit.rdf_uri).to eq ::RDF::URI.new(ActiveFedora::Base.id_to_uri("my:_ID1_"))
30
30
  end
31
31
  end
32
32
 
33
33
  describe "#model" do
34
34
  it "selects the appropriate model for the solr result" do
35
- expect(subject.model).to eq AudioRecord
35
+ expect(solr_hit.model).to eq AudioRecord
36
36
  end
37
37
  end
38
38
 
39
39
  describe "#models" do
40
40
  it "provides all the relevant models for the solr result" do
41
- expect(subject.models).to match_array [AudioRecord]
41
+ expect(solr_hit.models).to match_array [AudioRecord]
42
42
  end
43
43
  end
44
44
 
45
45
  describe "#model?" do
46
46
  it 'is true if the object has the given model' do
47
- expect(subject.model?(AudioRecord)).to eq true
47
+ expect(solr_hit.model?(AudioRecord)).to eq true
48
48
  end
49
49
 
50
50
  it 'is true if the object has an ancestor of the given model' do
51
- expect(subject.model?(ActiveFedora::Base)).to eq true
51
+ expect(solr_hit.model?(ActiveFedora::Base)).to eq true
52
52
  end
53
53
 
54
54
  it 'is false if the given model is not in the ancestor tree for the models' do
55
- expect(subject.model?(String)).to eq false
55
+ expect(solr_hit.model?(String)).to eq false
56
56
  end
57
57
  end
58
58
  end
@@ -9,6 +9,8 @@ describe ActiveFedora::SolrService do
9
9
  described_class.reset!
10
10
  end
11
11
 
12
+ let(:mock_conn) { instance_double(RSolr::Client) }
13
+
12
14
  describe '#conn' do
13
15
  it "takes a n-arg constructor and configure for localhost" do
14
16
  expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr')
@@ -21,10 +23,9 @@ describe ActiveFedora::SolrService do
21
23
  end
22
24
 
23
25
  describe '#conn=' do
24
- let(:new_connection) { double }
25
26
  it 'is settable' do
26
- described_class.instance.conn = new_connection
27
- expect(described_class.instance.conn).to eq new_connection
27
+ described_class.instance.conn = mock_conn
28
+ expect(described_class.instance.conn).to eq mock_conn
28
29
  end
29
30
  end
30
31
 
@@ -44,14 +45,12 @@ describe ActiveFedora::SolrService do
44
45
 
45
46
  describe "#get" do
46
47
  it "calls solr" do
47
- mock_conn = double("Connection")
48
48
  stub_result = double("Result")
49
49
  expect(mock_conn).to receive(:get).with('select', params: { q: 'querytext', qt: 'standard' }).and_return(stub_result)
50
50
  allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
51
51
  expect(described_class.get('querytext')).to eq stub_result
52
52
  end
53
53
  it "uses select_path" do
54
- mock_conn = double("Connection")
55
54
  stub_result = double("Result")
56
55
  expect(mock_conn).to receive(:get).with('select_test', params: { q: 'querytext', qt: 'standard' }).and_return(stub_result)
57
56
  expect(described_class).to receive(:select_path).and_return('select_test')
@@ -65,7 +64,6 @@ describe ActiveFedora::SolrService do
65
64
  let(:docs) { [doc] }
66
65
 
67
66
  it "wraps the solr response documents in Solr hits" do
68
- mock_conn = double("Connection")
69
67
  stub_result = { 'response' => { 'docs' => docs } }
70
68
  expect(mock_conn).to receive(:get).with('select', params: { q: 'querytext', qt: 'standard' }).and_return(stub_result)
71
69
  allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
@@ -77,14 +75,12 @@ describe ActiveFedora::SolrService do
77
75
 
78
76
  describe ".count" do
79
77
  it "returns a count of matching records" do
80
- mock_conn = double("Connection")
81
78
  stub_result = { 'response' => { 'numFound' => '7' } }
82
79
  expect(mock_conn).to receive(:get).with('select', params: { rows: 0, q: 'querytext', qt: 'standard' }).and_return(stub_result)
83
80
  allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
84
81
  expect(described_class.count('querytext')).to eq 7
85
82
  end
86
83
  it "accepts query args" do
87
- mock_conn = double("Connection")
88
84
  stub_result = { 'response' => { 'numFound' => '7' } }
89
85
  expect(mock_conn).to receive(:get).with('select', params: { rows: 0, q: 'querytext', qt: 'standard', fq: 'filter' }).and_return(stub_result)
90
86
  allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
@@ -104,7 +100,6 @@ describe ActiveFedora::SolrService do
104
100
 
105
101
  describe ".add" do
106
102
  it "calls solr" do
107
- mock_conn = double("Connection")
108
103
  doc = { 'id' => '1234' }
109
104
  expect(mock_conn).to receive(:add).with(doc, params: {})
110
105
  allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
@@ -114,7 +109,6 @@ describe ActiveFedora::SolrService do
114
109
 
115
110
  describe ".commit" do
116
111
  it "calls solr" do
117
- mock_conn = double("Connection")
118
112
  expect(mock_conn).to receive(:commit)
119
113
  allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
120
114
  described_class.commit
@@ -2,7 +2,7 @@ require 'spec_helper'
2
2
 
3
3
  describe ActiveFedora::SparqlInsert do
4
4
  let(:change_set) { ActiveFedora::ChangeSet.new(base, base.resource, base.changed_attributes.keys) }
5
- subject { described_class.new(change_set.changes) }
5
+ subject(:sparql_insert) { described_class.new(change_set.changes) }
6
6
 
7
7
  context "with a changed object" do
8
8
  before do
@@ -25,7 +25,7 @@ describe ActiveFedora::SparqlInsert do
25
25
  let(:base) { Book.create }
26
26
 
27
27
  it "returns the string" do
28
- expect(subject.build).to eq "DELETE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . }\n WHERE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . } ;\nDELETE { <> <http://purl.org/dc/terms/title> ?change . }\n WHERE { <> <http://purl.org/dc/terms/title> ?change . } ;\nINSERT { \n<> <info:fedora/fedora-system:def/relations-external#hasConstituent> <#{ActiveFedora.fedora.host}/test/foo> .\n<> <http://purl.org/dc/terms/title> \"bar\" .\n}\n WHERE { }"
28
+ expect(sparql_insert.build).to eq "DELETE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . }\n WHERE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . } ;\nDELETE { <> <http://purl.org/dc/terms/title> ?change . }\n WHERE { <> <http://purl.org/dc/terms/title> ?change . } ;\nINSERT { \n<> <info:fedora/fedora-system:def/relations-external#hasConstituent> <#{ActiveFedora.fedora.host}/test/foo> .\n<> <http://purl.org/dc/terms/title> \"bar\" .\n}\n WHERE { }"
29
29
  end
30
30
  end
31
31
  end
@@ -11,7 +11,7 @@ describe ActiveFedora::Base do
11
11
  end
12
12
  end
13
13
 
14
- subject { ValidationStub.new }
14
+ subject(:validation_stub) { ValidationStub.new }
15
15
 
16
16
  after :all do
17
17
  Object.send(:remove_const, :ValidationStub)
@@ -19,19 +19,19 @@ describe ActiveFedora::Base do
19
19
 
20
20
  describe "a valid object" do
21
21
  before do
22
- subject.attributes = { fubar: ['here'], swank: 'long enough' }
22
+ validation_stub.attributes = { fubar: ['here'], swank: 'long enough' }
23
23
  end
24
24
 
25
25
  it { should be_valid }
26
26
  end
27
27
  describe "an invalid object" do
28
28
  before do
29
- subject.attributes = { swank: 'smal' }
29
+ validation_stub.attributes = { swank: 'smal' }
30
30
  end
31
31
  it "has errors" do
32
- expect(subject).to_not be_valid
33
- expect(subject.errors[:fubar]).to eq ["can't be blank"]
34
- expect(subject.errors[:swank]).to eq ["is too short (minimum is 5 characters)"]
32
+ expect(validation_stub).to_not be_valid
33
+ expect(validation_stub.errors[:fubar]).to eq ["can't be blank"]
34
+ expect(validation_stub.errors[:swank]).to eq ["is too short (minimum is 5 characters)"]
35
35
  end
36
36
  end
37
37
 
@@ -41,11 +41,11 @@ describe ActiveFedora::Base do
41
41
  end
42
42
 
43
43
  describe "#save!" do
44
- before { allow(subject).to receive(:_create_record) } # prevent saving to Fedora/Solr
44
+ before { allow(validation_stub).to receive(:_create_record) } # prevent saving to Fedora/Solr
45
45
 
46
46
  it "validates only once" do
47
- expect(subject).to receive(:perform_validations).once.and_return(true)
48
- subject.save!
47
+ expect(validation_stub).to receive(:perform_validations).once.and_return(true)
48
+ validation_stub.save!
49
49
  end
50
50
  end
51
51
  end
@@ -1,7 +1,8 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  describe ActiveFedora::WithMetadata::DefaultMetadataClassFactory do
4
- let(:parent) { double("Parent") }
4
+ let(:parent) { class_double(ActiveFedora::File) }
5
+ let(:object) { described_class.new }
5
6
 
6
7
  describe "default class attributes" do
7
8
  its(:metadata_base_class) { is_expected.to eq(ActiveFedora::WithMetadata::MetadataNode) }
@@ -22,7 +23,7 @@ describe ActiveFedora::WithMetadata::DefaultMetadataClassFactory do
22
23
  to: :metadata_node)
23
24
  expect(parent).to receive(:delegate).with(:byte_order, :byte_order=, :byte_order_changed?, to: :metadata_node)
24
25
  expect(parent).to receive(:delegate).with(:file_hash, :file_hash=, :file_hash_changed?, to: :metadata_node)
25
- subject.class.build(parent)
26
+ object.class.build(parent)
26
27
  end
27
28
  end
28
29
  end
@@ -24,7 +24,8 @@ describe ActiveFedora::WithMetadata::MetadataNode do
24
24
  end
25
25
 
26
26
  describe "changes_for_update" do
27
- subject { node.send(:changes_for_update) }
27
+ let(:changes_for_update) { node.send(:changes_for_update) }
28
+ subject { changes_for_update }
28
29
 
29
30
  context "when type is not set" do
30
31
  it { is_expected.to eq({}) }
@@ -36,7 +37,7 @@ describe ActiveFedora::WithMetadata::MetadataNode do
36
37
  end
37
38
 
38
39
  it "is expected to have the rdf type statement" do
39
- expect(subject[::RDF.type]).to be_kind_of RDF::Queryable::Enumerator
40
+ expect(changes_for_update[::RDF.type]).to be_present
40
41
  end
41
42
  end
42
43
  end