active-fedora 10.1.0 → 11.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (208) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.rubocop.yml +6 -7
  4. data/.rubocop_todo.yml +55 -0
  5. data/.solr_wrapper +6 -0
  6. data/.travis.yml +6 -9
  7. data/Gemfile +1 -0
  8. data/History.txt +34 -0
  9. data/README.md +1 -3
  10. data/active-fedora.gemspec +7 -13
  11. data/lib/active_fedora/aggregation/list_source.rb +2 -0
  12. data/lib/active_fedora/associations/association_scope.rb +1 -1
  13. data/lib/active_fedora/associations/builder/aggregation.rb +1 -1
  14. data/lib/active_fedora/associations/builder/association.rb +1 -1
  15. data/lib/active_fedora/associations/builder/orders.rb +11 -3
  16. data/lib/active_fedora/associations/collection_association.rb +5 -5
  17. data/lib/active_fedora/associations/collection_proxy.rb +10 -10
  18. data/lib/active_fedora/associations/contained_finder.rb +2 -2
  19. data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb +1 -1
  20. data/lib/active_fedora/associations/has_many_association.rb +2 -2
  21. data/lib/active_fedora/associations/has_subresource_association.rb +2 -2
  22. data/lib/active_fedora/associations/orders_association.rb +4 -0
  23. data/lib/active_fedora/associations/rdf.rb +2 -0
  24. data/lib/active_fedora/attribute_assignment.rb +0 -1
  25. data/lib/active_fedora/attribute_methods/dirty.rb +1 -1
  26. data/lib/active_fedora/attribute_methods.rb +1 -1
  27. data/lib/active_fedora/attributes.rb +1 -1
  28. data/lib/active_fedora/base.rb +4 -8
  29. data/lib/active_fedora/change_set.rb +6 -2
  30. data/lib/active_fedora/cleaner.rb +1 -1
  31. data/lib/active_fedora/containers/container.rb +1 -1
  32. data/lib/active_fedora/core.rb +33 -30
  33. data/lib/active_fedora/fedora.rb +6 -2
  34. data/lib/active_fedora/fedora_attributes.rb +1 -1
  35. data/lib/active_fedora/file/streaming.rb +1 -1
  36. data/lib/active_fedora/file.rb +2 -1
  37. data/lib/active_fedora/file_configurator.rb +3 -3
  38. data/lib/active_fedora/indexing.rb +1 -18
  39. data/lib/active_fedora/indexing_service.rb +0 -9
  40. data/lib/active_fedora/initializing_connection.rb +1 -1
  41. data/lib/active_fedora/loadable_from_json.rb +12 -1
  42. data/lib/active_fedora/model_classifier.rb +1 -1
  43. data/lib/active_fedora/nested_attributes.rb +2 -2
  44. data/lib/active_fedora/null_logger.rb +10 -0
  45. data/lib/active_fedora/orders/list_node.rb +2 -2
  46. data/lib/active_fedora/orders/ordered_list.rb +8 -4
  47. data/lib/active_fedora/orders/target_proxy.rb +4 -0
  48. data/lib/active_fedora/querying.rb +1 -1
  49. data/lib/active_fedora/railtie.rb +2 -2
  50. data/lib/active_fedora/rake_support.rb +1 -1
  51. data/lib/active_fedora/rdf/field_map_entry.rb +6 -0
  52. data/lib/active_fedora/rdf/persistence.rb +1 -0
  53. data/lib/active_fedora/rdf/value_caster.rb +15 -0
  54. data/lib/active_fedora/rdf.rb +1 -1
  55. data/lib/active_fedora/relation/delegation.rb +4 -0
  56. data/lib/active_fedora/relation/finder_methods.rb +3 -1
  57. data/lib/active_fedora/solr_hit.rb +1 -14
  58. data/lib/active_fedora/solr_query_builder.rb +17 -13
  59. data/lib/active_fedora/version.rb +1 -1
  60. data/lib/active_fedora/with_metadata/metadata_node.rb +2 -1
  61. data/lib/active_fedora.rb +1 -12
  62. data/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml +11 -0
  63. data/lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml +1 -1
  64. data/lib/generators/active_fedora/model/model_generator.rb +1 -1
  65. data/lib/generators/active_fedora/model/templates/model.rb.erb +4 -4
  66. data/lib/tasks/active_fedora_dev.rake +1 -1
  67. data/spec/config_helper.rb +1 -1
  68. data/spec/integration/associations_spec.rb +23 -24
  69. data/spec/integration/attached_files_spec.rb +19 -9
  70. data/spec/integration/attributes_spec.rb +12 -16
  71. data/spec/integration/autosave_association_spec.rb +6 -6
  72. data/spec/integration/base_spec.rb +8 -8
  73. data/spec/integration/basic_contains_association_spec.rb +1 -1
  74. data/spec/integration/clean_connection_spec.rb +1 -1
  75. data/spec/integration/collection_association_spec.rb +2 -5
  76. data/spec/integration/date_time_properties_spec.rb +1 -17
  77. data/spec/integration/direct_container_spec.rb +12 -12
  78. data/spec/integration/directly_contains_one_association_spec.rb +11 -13
  79. data/spec/integration/eradicate_spec.rb +1 -1
  80. data/spec/integration/fedora_solr_sync_spec.rb +2 -2
  81. data/spec/integration/file_fixity_spec.rb +6 -8
  82. data/spec/integration/file_spec.rb +37 -39
  83. data/spec/integration/generators/solr_generator_spec.rb +7 -10
  84. data/spec/integration/has_and_belongs_to_many_associations_spec.rb +7 -7
  85. data/spec/integration/has_many_associations_spec.rb +9 -11
  86. data/spec/integration/indexing_spec.rb +2 -2
  87. data/spec/integration/indirect_container_spec.rb +11 -12
  88. data/spec/integration/json_serialization_spec.rb +4 -4
  89. data/spec/integration/query_result_builder_spec.rb +9 -21
  90. data/spec/integration/rdf_nested_attributes_spec.rb +7 -7
  91. data/spec/integration/relation_delegation_spec.rb +8 -10
  92. data/spec/integration/relation_spec.rb +13 -16
  93. data/spec/integration/scoped_query_spec.rb +3 -3
  94. data/spec/integration/scoping_spec.rb +3 -3
  95. data/spec/integration/solr_hit_spec.rb +4 -15
  96. data/spec/integration/versionable_spec.rb +73 -327
  97. data/spec/integration/with_metadata_spec.rb +1 -1
  98. data/spec/spec_helper.rb +52 -10
  99. data/spec/unit/active_fedora_spec.rb +1 -1
  100. data/spec/unit/aggregation/list_source_spec.rb +37 -37
  101. data/spec/unit/aggregation/ordered_reader_spec.rb +4 -4
  102. data/spec/unit/association_hash_spec.rb +17 -31
  103. data/spec/unit/attached_files_spec.rb +35 -32
  104. data/spec/unit/attributes_spec.rb +25 -25
  105. data/spec/unit/base_active_model_spec.rb +8 -8
  106. data/spec/unit/base_cma_spec.rb +1 -1
  107. data/spec/unit/base_extra_spec.rb +7 -22
  108. data/spec/unit/base_spec.rb +21 -27
  109. data/spec/unit/builder/has_and_belongs_to_many_spec.rb +1 -1
  110. data/spec/unit/callback_spec.rb +2 -2
  111. data/spec/unit/change_set_spec.rb +5 -5
  112. data/spec/unit/checksum_spec.rb +2 -2
  113. data/spec/unit/code_configurator_spec.rb +1 -1
  114. data/spec/unit/core/fedora_id_translator_spec.rb +2 -2
  115. data/spec/unit/core/fedora_uri_translator_spec.rb +2 -2
  116. data/spec/unit/core/logger_spec.rb +18 -0
  117. data/spec/unit/core_spec.rb +68 -32
  118. data/spec/unit/default_model_mapper_spec.rb +6 -6
  119. data/spec/unit/fedora_spec.rb +3 -4
  120. data/spec/unit/file_configurator_spec.rb +96 -96
  121. data/spec/unit/file_path_builder_spec.rb +3 -3
  122. data/spec/unit/file_spec.rb +93 -61
  123. data/spec/unit/files_hash_spec.rb +9 -9
  124. data/spec/unit/filter_spec.rb +3 -3
  125. data/spec/unit/finder_methods_spec.rb +3 -3
  126. data/spec/unit/forbidden_attributes_protection_spec.rb +2 -2
  127. data/spec/unit/has_and_belongs_to_many_association_spec.rb +14 -15
  128. data/spec/unit/has_many_association_spec.rb +28 -13
  129. data/spec/unit/indexers/global_indexer_spec.rb +6 -6
  130. data/spec/unit/indexing_service_spec.rb +5 -5
  131. data/spec/unit/indexing_spec.rb +8 -8
  132. data/spec/unit/inheritance_spec.rb +11 -7
  133. data/spec/unit/loadable_from_json_spec.rb +4 -4
  134. data/spec/unit/logger_spec.rb +1 -1
  135. data/spec/unit/model_classifier_spec.rb +5 -5
  136. data/spec/unit/ordered_spec.rb +144 -147
  137. data/spec/unit/orders/list_node_spec.rb +22 -22
  138. data/spec/unit/orders/ordered_list_spec.rb +96 -96
  139. data/spec/unit/orders/reflection_spec.rb +4 -4
  140. data/spec/unit/pathing_spec.rb +4 -4
  141. data/spec/unit/persistence_spec.rb +28 -28
  142. data/spec/unit/property_spec.rb +2 -2
  143. data/spec/unit/query_spec.rb +12 -12
  144. data/spec/unit/rdf/indexing_service_spec.rb +29 -29
  145. data/spec/unit/readonly_spec.rb +5 -4
  146. data/spec/unit/reflection_spec.rb +3 -3
  147. data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb +9 -9
  148. data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb +9 -9
  149. data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb +9 -9
  150. data/spec/unit/schema_indexing_strategy_spec.rb +5 -5
  151. data/spec/unit/serializers_spec.rb +3 -4
  152. data/spec/unit/solr_config_options_spec.rb +13 -16
  153. data/spec/unit/solr_hit_spec.rb +9 -9
  154. data/spec/unit/solr_service_spec.rb +4 -10
  155. data/spec/unit/sparql_insert_spec.rb +2 -2
  156. data/spec/unit/validations_spec.rb +12 -12
  157. data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb +3 -2
  158. data/spec/unit/with_metadata/metadata_node_spec.rb +3 -2
  159. metadata +30 -130
  160. data/lib/active_fedora/datastreams/nokogiri_datastreams.rb +0 -119
  161. data/lib/active_fedora/datastreams.rb +0 -6
  162. data/lib/active_fedora/nom_datastream.rb +0 -73
  163. data/lib/active_fedora/om_datastream.rb +0 -118
  164. data/lib/active_fedora/profile_indexing_service.rb +0 -11
  165. data/lib/active_fedora/qualified_dublin_core_datastream.rb +0 -158
  166. data/lib/active_fedora/rdf/datastream_indexing.rb +0 -49
  167. data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb +0 -13
  168. data/lib/active_fedora/rdf/rdf_datastream.rb +0 -167
  169. data/lib/active_fedora/rdf/rdfxml_datastream.rb +0 -13
  170. data/lib/active_fedora/solr_instance_loader.rb +0 -47
  171. data/solr/config/_rest_managed.json +0 -3
  172. data/solr/config/admin-extra.html +0 -31
  173. data/solr/config/elevate.xml +0 -36
  174. data/solr/config/mapping-ISOLatin1Accent.txt +0 -246
  175. data/solr/config/protwords.txt +0 -21
  176. data/solr/config/schema.xml +0 -372
  177. data/solr/config/scripts.conf +0 -24
  178. data/solr/config/solrconfig.xml +0 -311
  179. data/solr/config/spellings.txt +0 -2
  180. data/solr/config/stopwords.txt +0 -58
  181. data/solr/config/stopwords_en.txt +0 -58
  182. data/solr/config/synonyms.txt +0 -31
  183. data/solr/config/xslt/example.xsl +0 -132
  184. data/solr/config/xslt/example_atom.xsl +0 -67
  185. data/solr/config/xslt/example_rss.xsl +0 -66
  186. data/solr/config/xslt/luke.xsl +0 -337
  187. data/spec/fixtures/damsObjectModel.xml +0 -38
  188. data/spec/fixtures/dublin_core_rdf_descMetadata.nt +0 -13
  189. data/spec/fixtures/mixed_rdf_descMetadata.nt +0 -7
  190. data/spec/fixtures/mods_articles/mods_article1.xml +0 -98
  191. data/spec/fixtures/solr_rdf_descMetadata.nt +0 -7
  192. data/spec/integration/complex_rdf_datastream_spec.rb +0 -228
  193. data/spec/integration/datastream_rdf_nested_attributes_spec.rb +0 -179
  194. data/spec/integration/ntriples_datastream_spec.rb +0 -203
  195. data/spec/integration/om_datastream_spec.rb +0 -78
  196. data/spec/integration/solr_instance_loader_spec.rb +0 -156
  197. data/spec/samples/hydra-mods_article_datastream.rb +0 -517
  198. data/spec/samples/models/mods_article.rb +0 -9
  199. data/spec/samples/oral_history_sample.xml +0 -38
  200. data/spec/samples/oral_history_xml.xml +0 -35
  201. data/spec/samples/samples.rb +0 -2
  202. data/spec/unit/nom_datastream_spec.rb +0 -60
  203. data/spec/unit/ntriples_datastream_spec.rb +0 -170
  204. data/spec/unit/om_datastream_spec.rb +0 -294
  205. data/spec/unit/qualified_dublin_core_datastream_spec.rb +0 -119
  206. data/spec/unit/rdf_datastream_spec.rb +0 -84
  207. data/spec/unit/rdf_resource_datastream_spec.rb +0 -204
  208. data/spec/unit/rdfxml_datastream_spec.rb +0 -106
@@ -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,33 +19,33 @@ 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
- it { should be_valid }
25
+ it { is_expected.to 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
 
38
38
  describe "required terms" do
39
- it { should be_required(:fubar) }
40
- it { should_not be_required(:swank) }
39
+ it { is_expected.to be_required(:fubar) }
40
+ it { is_expected.to_not be_required(:swank) }
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
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active-fedora
3
3
  version: !ruby/object:Gem::Version
4
- version: 10.1.0
4
+ version: 11.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Zumwalt
@@ -10,28 +10,28 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2016-07-29 00:00:00.000000000 Z
13
+ date: 2017-01-13 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rsolr
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - "~>"
20
- - !ruby/object:Gem::Version
21
- version: '1.0'
22
19
  - - ">="
23
20
  - !ruby/object:Gem::Version
24
- version: 1.0.10
21
+ version: 1.1.2
22
+ - - "<"
23
+ - !ruby/object:Gem::Version
24
+ version: '3'
25
25
  type: :runtime
26
26
  prerelease: false
27
27
  version_requirements: !ruby/object:Gem::Requirement
28
28
  requirements:
29
- - - "~>"
30
- - !ruby/object:Gem::Version
31
- version: '1.0'
32
29
  - - ">="
33
30
  - !ruby/object:Gem::Version
34
- version: 1.0.10
31
+ version: 1.1.2
32
+ - - "<"
33
+ - !ruby/object:Gem::Version
34
+ version: '3'
35
35
  - !ruby/object:Gem::Dependency
36
36
  name: solrizer
37
37
  requirement: !ruby/object:Gem::Requirement
@@ -46,34 +46,6 @@ dependencies:
46
46
  - - "~>"
47
47
  - !ruby/object:Gem::Version
48
48
  version: '3.4'
49
- - !ruby/object:Gem::Dependency
50
- name: om
51
- requirement: !ruby/object:Gem::Requirement
52
- requirements:
53
- - - "~>"
54
- - !ruby/object:Gem::Version
55
- version: '3.1'
56
- type: :runtime
57
- prerelease: false
58
- version_requirements: !ruby/object:Gem::Requirement
59
- requirements:
60
- - - "~>"
61
- - !ruby/object:Gem::Version
62
- version: '3.1'
63
- - !ruby/object:Gem::Dependency
64
- name: nom-xml
65
- requirement: !ruby/object:Gem::Requirement
66
- requirements:
67
- - - ">="
68
- - !ruby/object:Gem::Version
69
- version: 0.5.1
70
- type: :runtime
71
- prerelease: false
72
- version_requirements: !ruby/object:Gem::Requirement
73
- requirements:
74
- - - ">="
75
- - !ruby/object:Gem::Version
76
- version: 0.5.1
77
49
  - !ruby/object:Gem::Dependency
78
50
  name: activesupport
79
51
  requirement: !ruby/object:Gem::Requirement
@@ -120,42 +92,14 @@ dependencies:
120
92
  requirements:
121
93
  - - "~>"
122
94
  - !ruby/object:Gem::Version
123
- version: 0.7.1
95
+ version: 0.11.0
124
96
  type: :runtime
125
97
  prerelease: false
126
98
  version_requirements: !ruby/object:Gem::Requirement
127
99
  requirements:
128
100
  - - "~>"
129
101
  - !ruby/object:Gem::Version
130
- version: 0.7.1
131
- - !ruby/object:Gem::Dependency
132
- name: rdf-rdfxml
133
- requirement: !ruby/object:Gem::Requirement
134
- requirements:
135
- - - "~>"
136
- - !ruby/object:Gem::Version
137
- version: '1.1'
138
- type: :runtime
139
- prerelease: false
140
- version_requirements: !ruby/object:Gem::Requirement
141
- requirements:
142
- - - "~>"
143
- - !ruby/object:Gem::Version
144
- version: '1.1'
145
- - !ruby/object:Gem::Dependency
146
- name: linkeddata
147
- requirement: !ruby/object:Gem::Requirement
148
- requirements:
149
- - - ">="
150
- - !ruby/object:Gem::Version
151
- version: '0'
152
- type: :runtime
153
- prerelease: false
154
- version_requirements: !ruby/object:Gem::Requirement
155
- requirements:
156
- - - ">="
157
- - !ruby/object:Gem::Version
158
- version: '0'
102
+ version: 0.11.0
159
103
  - !ruby/object:Gem::Dependency
160
104
  name: deprecation
161
105
  requirement: !ruby/object:Gem::Requirement
@@ -176,14 +120,14 @@ dependencies:
176
120
  requirements:
177
121
  - - "~>"
178
122
  - !ruby/object:Gem::Version
179
- version: 0.5.0
123
+ version: 0.6.0
180
124
  type: :runtime
181
125
  prerelease: false
182
126
  version_requirements: !ruby/object:Gem::Requirement
183
127
  requirements:
184
128
  - - "~>"
185
129
  - !ruby/object:Gem::Version
186
- version: 0.5.0
130
+ version: 0.6.0
187
131
  - !ruby/object:Gem::Dependency
188
132
  name: rails
189
133
  requirement: !ruby/object:Gem::Requirement
@@ -230,30 +174,30 @@ dependencies:
230
174
  name: rake
231
175
  requirement: !ruby/object:Gem::Requirement
232
176
  requirements:
233
- - - "~>"
177
+ - - ">="
234
178
  - !ruby/object:Gem::Version
235
- version: '10.0'
179
+ version: '0'
236
180
  type: :development
237
181
  prerelease: false
238
182
  version_requirements: !ruby/object:Gem::Requirement
239
183
  requirements:
240
- - - "~>"
184
+ - - ">="
241
185
  - !ruby/object:Gem::Version
242
- version: '10.0'
186
+ version: '0'
243
187
  - !ruby/object:Gem::Dependency
244
188
  name: solr_wrapper
245
189
  requirement: !ruby/object:Gem::Requirement
246
190
  requirements:
247
191
  - - "~>"
248
192
  - !ruby/object:Gem::Version
249
- version: '0.4'
193
+ version: '0.15'
250
194
  type: :development
251
195
  prerelease: false
252
196
  version_requirements: !ruby/object:Gem::Requirement
253
197
  requirements:
254
198
  - - "~>"
255
199
  - !ruby/object:Gem::Version
256
- version: '0.4'
200
+ version: '0.15'
257
201
  - !ruby/object:Gem::Dependency
258
202
  name: fcrepo_wrapper
259
203
  requirement: !ruby/object:Gem::Requirement
@@ -330,28 +274,28 @@ dependencies:
330
274
  requirements:
331
275
  - - "~>"
332
276
  - !ruby/object:Gem::Version
333
- version: 0.38.0
277
+ version: 0.42.0
334
278
  type: :development
335
279
  prerelease: false
336
280
  version_requirements: !ruby/object:Gem::Requirement
337
281
  requirements:
338
282
  - - "~>"
339
283
  - !ruby/object:Gem::Version
340
- version: 0.38.0
284
+ version: 0.42.0
341
285
  - !ruby/object:Gem::Dependency
342
286
  name: rubocop-rspec
343
287
  requirement: !ruby/object:Gem::Requirement
344
288
  requirements:
345
289
  - - "~>"
346
290
  - !ruby/object:Gem::Version
347
- version: '1.4'
291
+ version: 1.8.0
348
292
  type: :development
349
293
  prerelease: false
350
294
  version_requirements: !ruby/object:Gem::Requirement
351
295
  requirements:
352
296
  - - "~>"
353
297
  - !ruby/object:Gem::Version
354
- version: '1.4'
298
+ version: 1.8.0
355
299
  description: ActiveFedora provides for creating and managing objects in the Fedora
356
300
  Repository Architecture.
357
301
  email:
@@ -367,6 +311,8 @@ files:
367
311
  - ".mailmap"
368
312
  - ".rspec"
369
313
  - ".rubocop.yml"
314
+ - ".rubocop_todo.yml"
315
+ - ".solr_wrapper"
370
316
  - ".travis.yml"
371
317
  - CONTRIBUTING.md
372
318
  - CONTRIBUTORS.md
@@ -457,8 +403,6 @@ files:
457
403
  - lib/active_fedora/core.rb
458
404
  - lib/active_fedora/core/fedora_id_translator.rb
459
405
  - lib/active_fedora/core/fedora_uri_translator.rb
460
- - lib/active_fedora/datastreams.rb
461
- - lib/active_fedora/datastreams/nokogiri_datastreams.rb
462
406
  - lib/active_fedora/default_model_mapper.rb
463
407
  - lib/active_fedora/delegated_attribute.rb
464
408
  - lib/active_fedora/errors.rb
@@ -492,9 +436,8 @@ files:
492
436
  - lib/active_fedora/log_subscriber.rb
493
437
  - lib/active_fedora/model_classifier.rb
494
438
  - lib/active_fedora/nested_attributes.rb
495
- - lib/active_fedora/nom_datastream.rb
439
+ - lib/active_fedora/null_logger.rb
496
440
  - lib/active_fedora/null_relation.rb
497
- - lib/active_fedora/om_datastream.rb
498
441
  - lib/active_fedora/orders.rb
499
442
  - lib/active_fedora/orders/collection_proxy.rb
500
443
  - lib/active_fedora/orders/list_node.rb
@@ -502,24 +445,19 @@ files:
502
445
  - lib/active_fedora/orders/target_proxy.rb
503
446
  - lib/active_fedora/pathing.rb
504
447
  - lib/active_fedora/persistence.rb
505
- - lib/active_fedora/profile_indexing_service.rb
506
448
  - lib/active_fedora/property.rb
507
- - lib/active_fedora/qualified_dublin_core_datastream.rb
508
449
  - lib/active_fedora/query_result_builder.rb
509
450
  - lib/active_fedora/querying.rb
510
451
  - lib/active_fedora/railtie.rb
511
452
  - lib/active_fedora/rake_support.rb
512
453
  - lib/active_fedora/rdf.rb
513
- - lib/active_fedora/rdf/datastream_indexing.rb
514
454
  - lib/active_fedora/rdf/fcrepo.rb
515
455
  - lib/active_fedora/rdf/field_map.rb
516
456
  - lib/active_fedora/rdf/field_map_entry.rb
517
457
  - lib/active_fedora/rdf/indexing_service.rb
518
- - lib/active_fedora/rdf/ntriples_rdf_datastream.rb
519
458
  - lib/active_fedora/rdf/persistence.rb
520
459
  - lib/active_fedora/rdf/project_hydra.rb
521
- - lib/active_fedora/rdf/rdf_datastream.rb
522
- - lib/active_fedora/rdf/rdfxml_datastream.rb
460
+ - lib/active_fedora/rdf/value_caster.rb
523
461
  - lib/active_fedora/reflection.rb
524
462
  - lib/active_fedora/relation.rb
525
463
  - lib/active_fedora/relation/calculations.rb
@@ -540,7 +478,6 @@ files:
540
478
  - lib/active_fedora/scoping/named.rb
541
479
  - lib/active_fedora/serialization.rb
542
480
  - lib/active_fedora/solr_hit.rb
543
- - lib/active_fedora/solr_instance_loader.rb
544
481
  - lib/active_fedora/solr_query_builder.rb
545
482
  - lib/active_fedora/solr_service.rb
546
483
  - lib/active_fedora/sparql_insert.rb
@@ -594,37 +531,16 @@ files:
594
531
  - script/console
595
532
  - script/destroy
596
533
  - script/generate
597
- - solr/config/_rest_managed.json
598
- - solr/config/admin-extra.html
599
- - solr/config/elevate.xml
600
- - solr/config/mapping-ISOLatin1Accent.txt
601
- - solr/config/protwords.txt
602
- - solr/config/schema.xml
603
- - solr/config/scripts.conf
604
- - solr/config/solrconfig.xml
605
- - solr/config/spellings.txt
606
- - solr/config/stopwords.txt
607
- - solr/config/stopwords_en.txt
608
- - solr/config/synonyms.txt
609
- - solr/config/xslt/example.xsl
610
- - solr/config/xslt/example_atom.xsl
611
- - solr/config/xslt/example_rss.xsl
612
- - solr/config/xslt/luke.xsl
613
534
  - spec/config_helper.rb
614
- - spec/fixtures/damsObjectModel.xml
615
535
  - spec/fixtures/dino.jpg
616
536
  - spec/fixtures/dino_jpg_no_file_ext
617
- - spec/fixtures/dublin_core_rdf_descMetadata.nt
618
537
  - spec/fixtures/minivan.jpg
619
- - spec/fixtures/mixed_rdf_descMetadata.nt
620
- - spec/fixtures/mods_articles/mods_article1.xml
621
538
  - spec/fixtures/rails_root/config/fake_fedora.yml
622
539
  - spec/fixtures/rails_root/config/fedora.yml
623
540
  - spec/fixtures/rails_root/config/solr.yml
624
541
  - spec/fixtures/rails_root/config/solr_mappings.yml
625
542
  - spec/fixtures/rails_root/config/solr_mappings_af_0.1.yml
626
543
  - spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml
627
- - spec/fixtures/solr_rdf_descMetadata.nt
628
544
  - spec/integration/associations/rdf_spec.rb
629
545
  - spec/integration/associations_spec.rb
630
546
  - spec/integration/attached_files_spec.rb
@@ -636,8 +552,6 @@ files:
636
552
  - spec/integration/caching_spec.rb
637
553
  - spec/integration/clean_connection_spec.rb
638
554
  - spec/integration/collection_association_spec.rb
639
- - spec/integration/complex_rdf_datastream_spec.rb
640
- - spec/integration/datastream_rdf_nested_attributes_spec.rb
641
555
  - spec/integration/date_time_properties_spec.rb
642
556
  - spec/integration/delete_all_spec.rb
643
557
  - spec/integration/direct_container_spec.rb
@@ -658,8 +572,6 @@ files:
658
572
  - spec/integration/marshal_spec.rb
659
573
  - spec/integration/nested_attribute_spec.rb
660
574
  - spec/integration/nested_hash_resources_spec.rb
661
- - spec/integration/ntriples_datastream_spec.rb
662
- - spec/integration/om_datastream_spec.rb
663
575
  - spec/integration/persistence_spec.rb
664
576
  - spec/integration/query_result_builder_spec.rb
665
577
  - spec/integration/rdf_nested_attributes_spec.rb
@@ -668,15 +580,9 @@ files:
668
580
  - spec/integration/scoped_query_spec.rb
669
581
  - spec/integration/scoping_spec.rb
670
582
  - spec/integration/solr_hit_spec.rb
671
- - spec/integration/solr_instance_loader_spec.rb
672
583
  - spec/integration/versionable_spec.rb
673
584
  - spec/integration/with_metadata_spec.rb
674
585
  - spec/rcov.opts
675
- - spec/samples/hydra-mods_article_datastream.rb
676
- - spec/samples/models/mods_article.rb
677
- - spec/samples/oral_history_sample.xml
678
- - spec/samples/oral_history_xml.xml
679
- - spec/samples/samples.rb
680
586
  - spec/spec.opts
681
587
  - spec/spec_helper.rb
682
588
  - spec/support/an_active_model.rb
@@ -699,6 +605,7 @@ files:
699
605
  - spec/unit/config_spec.rb
700
606
  - spec/unit/core/fedora_id_translator_spec.rb
701
607
  - spec/unit/core/fedora_uri_translator_spec.rb
608
+ - spec/unit/core/logger_spec.rb
702
609
  - spec/unit/core_spec.rb
703
610
  - spec/unit/default_model_mapper_spec.rb
704
611
  - spec/unit/fedora_spec.rb
@@ -721,9 +628,6 @@ files:
721
628
  - spec/unit/loadable_from_json_spec.rb
722
629
  - spec/unit/logger_spec.rb
723
630
  - spec/unit/model_classifier_spec.rb
724
- - spec/unit/nom_datastream_spec.rb
725
- - spec/unit/ntriples_datastream_spec.rb
726
- - spec/unit/om_datastream_spec.rb
727
631
  - spec/unit/ordered_spec.rb
728
632
  - spec/unit/orders/list_node_spec.rb
729
633
  - spec/unit/orders/ordered_list_spec.rb
@@ -732,15 +636,11 @@ files:
732
636
  - spec/unit/persistence_spec.rb
733
637
  - spec/unit/property_predicate_spec.rb
734
638
  - spec/unit/property_spec.rb
735
- - spec/unit/qualified_dublin_core_datastream_spec.rb
736
639
  - spec/unit/query_result_builder_spec.rb
737
640
  - spec/unit/query_spec.rb
738
641
  - spec/unit/querying_spec.rb
739
642
  - spec/unit/rdf/indexing_service_spec.rb
740
- - spec/unit/rdf_datastream_spec.rb
741
- - spec/unit/rdf_resource_datastream_spec.rb
742
643
  - spec/unit/rdf_vocab_spec.rb
743
- - spec/unit/rdfxml_datastream_spec.rb
744
644
  - spec/unit/readonly_spec.rb
745
645
  - spec/unit/reflection_spec.rb
746
646
  - spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb
@@ -777,7 +677,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
777
677
  version: '0'
778
678
  requirements: []
779
679
  rubyforge_project:
780
- rubygems_version: 2.5.1
680
+ rubygems_version: 2.6.8
781
681
  signing_key:
782
682
  specification_version: 4
783
683
  summary: A convenience libary for manipulating documents in the Fedora Repository.