ddr-models 2.6.2 → 2.7.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (146) hide show
  1. checksums.yaml +4 -4
  2. data/.ruby-version +1 -1
  3. data/.travis.yml +1 -1
  4. data/Gemfile +2 -3
  5. data/app/models/collection.rb +11 -3
  6. data/app/models/component.rb +54 -4
  7. data/app/models/item.rb +1 -2
  8. data/config/initializers/active_fedora_base.rb +8 -5
  9. data/config/initializers/rubydora_monkey_patch.rb +11 -0
  10. data/config/initializers/subscriptions.rb +16 -9
  11. data/config/locales/ddr-models.en.yml +3 -0
  12. data/ddr-models.gemspec +3 -2
  13. data/lib/ddr/actions/virus_check.rb +10 -16
  14. data/lib/ddr/auth.rb +0 -8
  15. data/lib/ddr/datastreams.rb +13 -2
  16. data/lib/ddr/datastreams/administrative_metadata_datastream.rb +9 -0
  17. data/lib/ddr/datastreams/content_datastream.rb +5 -0
  18. data/lib/ddr/datastreams/datastream_behavior.rb +60 -15
  19. data/lib/ddr/datastreams/delete_external_files.rb +29 -0
  20. data/lib/ddr/datastreams/descriptive_metadata_datastream.rb +33 -33
  21. data/lib/ddr/datastreams/external_file_datastream.rb +69 -0
  22. data/lib/ddr/datastreams/fits_datastream.rb +15 -5
  23. data/lib/ddr/datastreams/intermediate_file_datastream.rb +5 -0
  24. data/lib/ddr/datastreams/metadata_datastream.rb +15 -17
  25. data/lib/ddr/datastreams/multires_image_datastream.rb +5 -0
  26. data/lib/ddr/derivatives.rb +1 -0
  27. data/lib/ddr/derivatives/ptif_generator.rb +5 -1
  28. data/lib/ddr/derivatives/update_derivatives.rb +23 -0
  29. data/lib/ddr/events/deletion_event.rb +5 -9
  30. data/lib/ddr/events/event.rb +7 -9
  31. data/lib/ddr/events/ingestion_event.rb +5 -9
  32. data/lib/ddr/events/update_event.rb +12 -5
  33. data/lib/ddr/index.rb +0 -1
  34. data/lib/ddr/index/csv_query_result.rb +10 -2
  35. data/lib/ddr/index/fields.rb +10 -9
  36. data/lib/ddr/index/filter.rb +1 -0
  37. data/lib/ddr/managers/derivatives_manager.rb +84 -98
  38. data/lib/ddr/managers/technical_metadata_manager.rb +20 -5
  39. data/lib/ddr/models.rb +24 -24
  40. data/lib/ddr/models/base.rb +98 -74
  41. data/lib/ddr/models/cache.rb +20 -0
  42. data/lib/ddr/models/engine.rb +4 -6
  43. data/lib/ddr/models/file_management.rb +57 -152
  44. data/lib/ddr/models/fixity_checkable.rb +0 -5
  45. data/lib/ddr/models/has_admin_metadata.rb +4 -2
  46. data/lib/ddr/models/has_children.rb +35 -1
  47. data/lib/ddr/models/has_content.rb +3 -33
  48. data/lib/ddr/models/has_intermediate_file.rb +18 -0
  49. data/lib/ddr/models/has_multires_image.rb +12 -15
  50. data/lib/ddr/models/has_struct_metadata.rb +2 -38
  51. data/lib/ddr/models/indexing.rb +160 -163
  52. data/lib/ddr/models/permanent_id.rb +26 -49
  53. data/lib/ddr/models/solr_document.rb +21 -19
  54. data/lib/ddr/models/structure.rb +168 -41
  55. data/lib/ddr/models/structures/agent.rb +49 -0
  56. data/lib/ddr/models/structures/div.rb +64 -0
  57. data/lib/ddr/models/structures/f_locat.rb +54 -0
  58. data/lib/ddr/models/structures/file.rb +52 -0
  59. data/lib/ddr/models/structures/file_grp.rb +35 -0
  60. data/lib/ddr/models/structures/file_sec.rb +22 -0
  61. data/lib/ddr/models/structures/fptr.rb +31 -0
  62. data/lib/ddr/models/structures/mets_hdr.rb +37 -0
  63. data/lib/ddr/models/structures/mptr.rb +49 -0
  64. data/lib/ddr/models/structures/struct_map.rb +40 -0
  65. data/lib/ddr/models/version.rb +1 -1
  66. data/lib/ddr/notifications.rb +10 -12
  67. data/lib/ddr/utils.rb +29 -16
  68. data/lib/ddr/vocab.rb +15 -17
  69. data/lib/ddr/vocab/asset.rb +29 -19
  70. data/lib/ddr/vocab/contact.rb +5 -7
  71. data/lib/ddr/vocab/display.rb +6 -8
  72. data/lib/ddr/vocab/duke_terms.rb +8 -10
  73. data/lib/ddr/vocab/rdf_vocabulary_parser.rb +37 -39
  74. data/lib/ddr/vocab/roles.rb +17 -19
  75. data/lib/ddr/vocab/vocabulary.rb +26 -26
  76. data/spec/datastreams/external_file_datastream_spec.rb +37 -0
  77. data/spec/derivatives/png_generator_spec.rb +21 -25
  78. data/spec/derivatives/ptif_generator_spec.rb +22 -26
  79. data/spec/dummy/config/environments/test.rb +1 -1
  80. data/spec/dummy/db/schema.rb +23 -23
  81. data/spec/factories/structure_factories.rb +8 -2
  82. data/spec/fixtures/imageA.jpg +0 -0
  83. data/spec/fixtures/imageB.jpg +0 -0
  84. data/spec/index/csv_query_result_spec.rb +3 -3
  85. data/spec/index/fields_spec.rb +7 -6
  86. data/spec/managers/derivatives_manager_spec.rb +105 -112
  87. data/spec/managers/technical_metadata_manager_spec.rb +22 -18
  88. data/spec/models/active_fedora_base_spec.rb +0 -106
  89. data/spec/models/active_fedora_datastream_spec.rb +33 -2
  90. data/spec/models/attachment_spec.rb +0 -2
  91. data/spec/models/cache_spec.rb +32 -0
  92. data/spec/models/collection_spec.rb +43 -19
  93. data/spec/models/component_spec.rb +41 -51
  94. data/spec/models/descriptive_metadata_datastream_spec.rb +99 -87
  95. data/spec/models/events_spec.rb +50 -69
  96. data/spec/models/file_management_spec.rb +79 -187
  97. data/spec/models/has_children_spec.rb +54 -3
  98. data/spec/models/has_struct_metadata_spec.rb +32 -38
  99. data/spec/models/indexing_spec.rb +11 -6
  100. data/spec/models/item_spec.rb +21 -7
  101. data/spec/models/permanent_id_spec.rb +1 -5
  102. data/spec/models/solr_document_spec.rb +13 -41
  103. data/spec/models/structure_spec.rb +85 -16
  104. data/spec/models/structures/agent_spec.rb +30 -0
  105. data/spec/models/structures/div_spec.rb +26 -0
  106. data/spec/models/structures/f_locat_spec.rb +78 -0
  107. data/spec/models/structures/file_grp_spec.rb +23 -0
  108. data/spec/models/structures/file_sec_spec.rb +22 -0
  109. data/spec/models/structures/file_spec.rb +60 -0
  110. data/spec/models/structures/fptr_spec.rb +23 -0
  111. data/spec/models/structures/mets_hdr_spec.rb +26 -0
  112. data/spec/models/structures/mptr_spec.rb +25 -0
  113. data/spec/models/structures/struct_map_spec.rb +24 -0
  114. data/spec/models/target_spec.rb +0 -2
  115. data/spec/spec_helper.rb +4 -9
  116. data/spec/support/shared_examples_for_ddr_models.rb +96 -156
  117. data/spec/support/shared_examples_for_has_content.rb +56 -30
  118. data/spec/support/shared_examples_for_has_intermediate_spec.rb +28 -0
  119. data/spec/support/shared_examples_for_non_collection_models.rb +5 -0
  120. data/spec/support/structural_metadata_helper.rb +230 -59
  121. data/spec/utils_spec.rb +0 -2
  122. metadata +86 -44
  123. data/app/helpers/models_helper.rb +0 -10
  124. data/lib/ddr/auth/legacy/abstract_legacy_permissions.rb +0 -17
  125. data/lib/ddr/auth/legacy/legacy_authorization.rb +0 -44
  126. data/lib/ddr/auth/legacy/legacy_default_permissions.rb +0 -33
  127. data/lib/ddr/auth/legacy/legacy_permissions.rb +0 -33
  128. data/lib/ddr/auth/legacy/legacy_roles.rb +0 -25
  129. data/lib/ddr/index/legacy_license_fields.rb +0 -12
  130. data/lib/ddr/jobs.rb +0 -12
  131. data/lib/ddr/jobs/fits_file_characterization.rb +0 -13
  132. data/lib/ddr/jobs/fixity_check.rb +0 -13
  133. data/lib/ddr/jobs/job.rb +0 -36
  134. data/lib/ddr/jobs/queue.rb +0 -27
  135. data/lib/ddr/jobs/update_index.rb +0 -13
  136. data/lib/ddr/models/access_controllable.rb +0 -24
  137. data/lib/ddr/models/struct_div.rb +0 -63
  138. data/spec/auth/legacy_default_permissions_spec.rb +0 -37
  139. data/spec/auth/legacy_permissions_spec.rb +0 -37
  140. data/spec/helpers/models_helper_spec.rb +0 -11
  141. data/spec/jobs/fits_file_characterization_spec.rb +0 -16
  142. data/spec/jobs/fixity_check_spec.rb +0 -22
  143. data/spec/jobs/job_spec.rb +0 -40
  144. data/spec/jobs/update_index_spec.rb +0 -22
  145. data/spec/models/struct_div_spec.rb +0 -70
  146. data/spec/support/shared_examples_for_access_controllables.rb +0 -6
@@ -1,40 +0,0 @@
1
- module Ddr::Jobs
2
- RSpec.describe Job do
3
-
4
- before(:all) do
5
- class TestJob
6
- extend Job
7
-
8
- @queue = :test
9
-
10
- def perform(object_id)
11
- puts object_id
12
- end
13
- end
14
- end
15
-
16
- after(:all) do
17
- Ddr::Jobs.send(:remove_const, :TestJob)
18
- end
19
-
20
- let(:queued) do
21
- [{"class"=>"Ddr::Jobs::TestJob", "args"=>["test-1"]},
22
- {"class"=>"Ddr::Jobs::OtherJob", "args"=>["test-2"]},
23
- {"class"=>"Ddr::Jobs::TestJob", "args"=>["test-3"]},
24
- ]
25
- end
26
-
27
- before(:each) do
28
- allow(Resque).to receive(:size).with(:test) { 3 }
29
- allow(Resque).to receive(:peek).with(:test, 0, 3) { queued }
30
- end
31
-
32
- describe ".queued_object_ids" do
33
- it "returns the list of object_ids for queued jobs of this type" do
34
- expect(TestJob.queued_object_ids)
35
- .to contain_exactly("test-1", "test-3")
36
- end
37
- end
38
-
39
- end
40
- end
@@ -1,22 +0,0 @@
1
- require 'spec_helper'
2
-
3
- module Ddr::Jobs
4
- RSpec.describe UpdateIndex do
5
-
6
- it "should use the :index queue" do
7
- expect(described_class.queue).to eq(:index)
8
- end
9
-
10
- describe ".perform" do
11
- let!(:obj) { double(update_index: nil) }
12
- before do
13
- allow(ActiveFedora::Base).to receive(:find).with("test:1") { obj }
14
- end
15
- it "should call `update_index` on the object" do
16
- expect(obj).to receive(:update_index)
17
- described_class.perform("test:1")
18
- end
19
- end
20
-
21
- end
22
- end
@@ -1,70 +0,0 @@
1
- require 'spec_helper'
2
- require 'support/structural_metadata_helper'
3
-
4
- module Ddr
5
- module Models
6
- RSpec.describe StructDiv, type: :model, structural_metadata: true do
7
-
8
- let(:structmap_node) { nested_structure_document.xpath('//xmlns:structMap').first }
9
- let(:struct_div) { described_class.new(structmap_node) }
10
-
11
- describe "#initialize" do
12
- it "should create the correct object" do
13
- expect(struct_div.divs.size).to eq(2)
14
- expect(struct_div.divs.first.label).to eq("Front")
15
- expect(struct_div.divs.first.divs).to be_empty
16
- expect(struct_div.divs.first.fptrs).to eq([ "test:5" ])
17
- expect(struct_div.divs.last.label).to eq("Back")
18
- expect(struct_div.divs.last.divs.size).to eq(2)
19
- expect(struct_div.divs.last.fptrs).to be_empty
20
- expect(struct_div.divs.last.divs.first.label).to eq("Top")
21
- expect(struct_div.divs.last.divs.first.divs).to be_empty
22
- expect(struct_div.divs.last.divs.first.fptrs).to eq([ "test:7" ])
23
- expect(struct_div.divs.last.divs.last.label).to eq("Bottom")
24
- expect(struct_div.divs.last.divs.last.divs).to be_empty
25
- expect(struct_div.divs.last.divs.last.fptrs).to eq([ "test:6" ])
26
- end
27
- end
28
-
29
- describe "#pids" do
30
- context "top level" do
31
- it "should return all pids in the structMap" do
32
- expect(struct_div.pids).to match_array([ 'test:5', 'test:6', 'test:7' ])
33
- end
34
- end
35
- end
36
-
37
- describe "#docs" do
38
- let(:solr_response) { [ { 'id'=>'test:5' }, { 'id'=>'test:6' }, { 'id'=>'test:7'} ] }
39
- before do
40
- allow(ActiveFedora::SolrService).to receive(:query) { solr_response }
41
- end
42
- it "should return a hash of Solr documents" do
43
- results = struct_div.docs
44
- expect(results.keys).to match_array([ 'test:5', 'test:6', 'test:7' ])
45
- results.keys.each do |key|
46
- expect(results[key]).to be_a(SolrDocument)
47
- expect(results[key].id).to eq(key)
48
- end
49
- end
50
- end
51
-
52
- describe "#objects" do
53
- let(:repo_objects) { [ Component.new(pid: 'test:5'), Component.new(pid: 'test:6'), Component.new(pid: 'test:7') ] }
54
- before do
55
- allow(ActiveFedora::Base).to receive(:find).with('test:5') { repo_objects[0] }
56
- allow(ActiveFedora::Base).to receive(:find).with('test:6') { repo_objects[1] }
57
- allow(ActiveFedora::Base).to receive(:find).with('test:7') { repo_objects[2] }
58
- end
59
- it "should return a hash of Active Fedora objects" do
60
- results = struct_div.objects
61
- expect(results.keys).to match_array([ 'test:5', 'test:6', 'test:7' ])
62
- expect(results['test:5']).to eq(repo_objects[0])
63
- expect(results['test:6']).to eq(repo_objects[1])
64
- expect(results['test:7']).to eq(repo_objects[2])
65
- end
66
- end
67
-
68
- end
69
- end
70
- end
@@ -1,6 +0,0 @@
1
- RSpec.shared_examples "an access controllable object" do
2
- it "should have a rightsMetadata datastream" do
3
- expect(subject.datastreams.keys).to include("rightsMetadata")
4
- expect(subject.datastreams["rightsMetadata"]).to be_kind_of(Hydra::Datastream::RightsMetadata)
5
- end
6
- end