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,33 +0,0 @@
1
- module Ddr::Auth
2
- class LegacyDefaultPermissions < AbstractLegacyPermissions
3
-
4
- def source
5
- default_permissions
6
- end
7
-
8
- def role_type(access)
9
- case access
10
- when "discover"
11
- Roles::VIEWER
12
- when "read"
13
- Roles::VIEWER
14
- when "edit"
15
- Roles::CURATOR
16
- end
17
- end
18
-
19
- def scope
20
- Roles::POLICY_SCOPE
21
- end
22
-
23
- def clear
24
- defaultRights.clear_permissions!
25
- defaultRights.content = defaultRights.to_xml
26
- end
27
-
28
- def inspect
29
- "DEFAULT PERMISSIONS: #{source.inspect}"
30
- end
31
-
32
- end
33
- end
@@ -1,33 +0,0 @@
1
- module Ddr::Auth
2
- class LegacyPermissions < AbstractLegacyPermissions
3
-
4
- def source
5
- permissions
6
- end
7
-
8
- def role_type(access)
9
- case access
10
- when "discover"
11
- Roles::VIEWER
12
- when "read"
13
- Roles::VIEWER
14
- when "edit"
15
- Roles::EDITOR
16
- end
17
- end
18
-
19
- def scope
20
- Roles::RESOURCE_SCOPE
21
- end
22
-
23
- def clear
24
- rightsMetadata.clear_permissions!
25
- rightsMetadata.content = rightsMetadata.to_xml
26
- end
27
-
28
- def inspect
29
- "PERMISSIONS: #{source.map(&:to_hash).inspect}"
30
- end
31
-
32
- end
33
- end
@@ -1,25 +0,0 @@
1
- require "delegate"
2
-
3
- module Ddr::Auth
4
- class LegacyRoles < SimpleDelegator
5
-
6
- def source
7
- adminMetadata.downloader
8
- end
9
-
10
- def to_roles
11
- source.each_with_object(Roles::DetachedRoleSet.new) do |agent, memo|
12
- memo.grant Roles::Role.build(type: Roles::DOWNLOADER, agent: agent, scope: Roles::RESOURCE_SCOPE)
13
- end
14
- end
15
-
16
- def clear
17
- source.clear
18
- end
19
-
20
- def inspect
21
- "DOWNLOADER: #{source.inspect}"
22
- end
23
-
24
- end
25
- end
@@ -1,12 +0,0 @@
1
- module Ddr::Index
2
- module LegacyLicenseFields
3
-
4
- DEFAULT_LICENSE_DESCRIPTION = Field.new :default_license_description, type: :string
5
- DEFAULT_LICENSE_TITLE = Field.new :default_license_title, type: :string
6
- DEFAULT_LICENSE_URL = Field.new :default_license_url, type: :string
7
- LICENSE_DESCRIPTION = Field.new :license_description, type: :string
8
- LICENSE_TITLE = Field.new :license_title, type: :string
9
- LICENSE_URL = Field.new :license_url, type: :string
10
-
11
- end
12
- end
data/lib/ddr/jobs.rb DELETED
@@ -1,12 +0,0 @@
1
- module Ddr
2
- module Jobs
3
- extend ActiveSupport::Autoload
4
-
5
- autoload :FitsFileCharacterization
6
- autoload :FixityCheck
7
- autoload :Job
8
- autoload :Queue
9
- autoload :UpdateIndex
10
-
11
- end
12
- end
@@ -1,13 +0,0 @@
1
- module Ddr::Jobs
2
- class FitsFileCharacterization
3
- extend Job
4
-
5
- @queue = :file_characterization
6
-
7
- def self.perform(pid)
8
- obj = ActiveFedora::Base.find(pid)
9
- Ddr::Models::FileCharacterization.call(obj)
10
- end
11
-
12
- end
13
- end
@@ -1,13 +0,0 @@
1
- module Ddr::Jobs
2
- class FixityCheck
3
- extend Job
4
-
5
- @queue = :fixity
6
-
7
- def self.perform(id)
8
- obj = ActiveFedora::Base.find(id)
9
- obj.fixity_check
10
- end
11
-
12
- end
13
- end
data/lib/ddr/jobs/job.rb DELETED
@@ -1,36 +0,0 @@
1
- require "resque"
2
-
3
- module Ddr::Jobs
4
- module Job
5
-
6
- def self.extended(base)
7
- base.extend ClassMethods
8
- end
9
-
10
- module ClassMethods
11
- # @return [Array<String>] list of object ids queued for this job type.
12
- # @note Assumes that the object_id is the first argument of the .perform method.
13
- def queued_object_ids(**args)
14
- args[:type] = self
15
- __queue__.jobs(**args).map { |job| job["args"].first }
16
- end
17
-
18
- protected
19
-
20
- def method_missing(name, *args, &block)
21
- # If .queue method not defined, do the right thing
22
- if name == :queue
23
- return Resque.queue_from_class(self)
24
- end
25
- super
26
- end
27
-
28
- private
29
-
30
- def __queue__
31
- Queue.new(queue)
32
- end
33
- end
34
-
35
- end
36
- end
@@ -1,27 +0,0 @@
1
- require "resque"
2
-
3
- module Ddr::Jobs
4
- class Queue
5
-
6
- attr_reader :name
7
-
8
- def initialize(name)
9
- @name = name
10
- end
11
-
12
- def size
13
- Resque.size(name)
14
- end
15
-
16
- # @return [Array<Hash>] jobs in the queue, optionally filtered by type,
17
- # start position, and count.
18
- def jobs(type: nil, start: 0, count: nil)
19
- jobs = Resque.peek(name, start, count || size)
20
- if type
21
- jobs.select! { |job| job["class"] == type.to_s }
22
- end
23
- jobs
24
- end
25
-
26
- end
27
- end
@@ -1,13 +0,0 @@
1
- module Ddr::Jobs
2
- class UpdateIndex
3
- extend Job
4
-
5
- @queue = :index
6
-
7
- def self.perform(id)
8
- obj = ActiveFedora::Base.find(id)
9
- obj.update_index
10
- end
11
-
12
- end
13
- end
@@ -1,24 +0,0 @@
1
- module Ddr
2
- module Models
3
- module AccessControllable
4
- extend ActiveSupport::Concern
5
- extend Deprecation
6
-
7
- included do
8
- include Hydra::AccessControls::Permissions
9
- end
10
-
11
- def set_initial_permissions(user_creator = nil)
12
- if user_creator
13
- self.permissions_attributes = [{type: "user", access: "edit", name: user_creator.to_s}]
14
- end
15
- end
16
- deprecation_deprecate :set_initial_permissions
17
-
18
- def copy_permissions_from(other)
19
- self.permissions_attributes = other.permissions.collect { |p| p.to_hash }
20
- end
21
- deprecation_deprecate :copy_permissions_from
22
- end
23
- end
24
- end
@@ -1,63 +0,0 @@
1
- module Ddr
2
- module Models
3
- class StructDiv
4
-
5
- attr_accessor :id, :label, :order, :orderlabel, :type, :fptrs, :divs
6
-
7
- def initialize(structmap_or_div_node)
8
- @id = structmap_or_div_node['ID']
9
- @label = structmap_or_div_node['LABEL']
10
- @order = structmap_or_div_node['ORDER']
11
- @orderlabel = structmap_or_div_node['ORDERLABEL']
12
- @type = structmap_or_div_node['TYPE']
13
- @fptrs = fptr_pids(structmap_or_div_node) if structmap_or_div_node.node_name == "div"
14
- @divs = subdivs(structmap_or_div_node).sort
15
- end
16
-
17
- def <=>(other)
18
- self.order.to_i <=> other.order.to_i
19
- end
20
-
21
- def pids
22
- collect_pids(self)
23
- end
24
-
25
- def docs
26
- query = ActiveFedora::SolrService.construct_query_for_pids(pids)
27
- results = ActiveFedora::SolrService.query(query, rows: 999999)
28
- results.each_with_object({}) do |r, memo|
29
- memo[r["id"]] = ::SolrDocument.new(r)
30
- end
31
- end
32
-
33
- def objects
34
- pids.each_with_object({}) do |pid, memo|
35
- memo[pid] = ActiveFedora::Base.find(pid)
36
- end
37
- end
38
-
39
- def as_json(options={})
40
- super.compact
41
- end
42
-
43
- private
44
-
45
- def fptr_pids(div_node)
46
- div_node.xpath('xmlns:fptr').map { |fptr_node| fptr_node["CONTENTIDS"].gsub('info:fedora/', '') }
47
- end
48
-
49
- def subdivs(structmap_or_div_node)
50
- structmap_or_div_node.xpath('xmlns:div').map { |div_node| Ddr::Models::StructDiv.new(div_node) }
51
- end
52
-
53
- def collect_pids(structdiv)
54
- pids = structdiv.divs.each_with_object([]) do |div, memo|
55
- memo << collect_pids(div)
56
- end
57
- pids << structdiv.fptrs if structdiv.fptrs
58
- pids.flatten
59
- end
60
-
61
- end
62
- end
63
- end
@@ -1,37 +0,0 @@
1
- module Ddr::Auth
2
- RSpec.describe LegacyDefaultPermissions do
3
-
4
- subject { described_class.new(obj) }
5
-
6
- let(:obj) { FactoryGirl.build(:collection) }
7
-
8
- before do
9
- @deprecation_behavior = Deprecation.default_deprecation_behavior
10
- Deprecation.default_deprecation_behavior = :silence
11
- obj.default_permissions = [{access: "edit", type: "group", name: "Editors"},
12
- {access: "discover", type: "group", name: "public"},
13
- {access: "read", type: "person", name: "bob@example.com"}]
14
- end
15
-
16
- after do
17
- Deprecation.default_deprecation_behavior = @deprecation_behavior
18
- end
19
-
20
- it "should convert the default permissions to policy roles" do
21
- expect(subject.to_roles)
22
- .to eq(Roles::DetachedRoleSet.new(
23
- [ Roles::Role.build(type: "Curator", agent: "Editors", scope: "policy"),
24
- Roles::Role.build(type: "Viewer", agent: "public", scope: "policy"),
25
- Roles::Role.build(type: "Viewer", agent: "bob@example.com", scope: "policy")
26
- ]
27
- ))
28
- end
29
-
30
- it "should clear the legacy default permissions" do
31
- expect(obj.default_permissions).not_to be_empty
32
- subject.clear
33
- expect(obj.default_permissions).to be_empty
34
- end
35
-
36
- end
37
- end
@@ -1,37 +0,0 @@
1
- module Ddr::Auth
2
- RSpec.describe LegacyPermissions do
3
-
4
- subject { described_class.new(obj) }
5
-
6
- let(:obj) { FactoryGirl.build(:item) }
7
-
8
- before do
9
- @deprecation_behavior = Deprecation.default_deprecation_behavior
10
- Deprecation.default_deprecation_behavior = :silence
11
- obj.permissions_attributes = [{access: "edit", type: "group", name: "Editors"},
12
- {access: "discover", type: "group", name: "public"},
13
- {access: "read", type: "person", name: "bob@example.com"}]
14
- end
15
-
16
- after do
17
- Deprecation.default_deprecation_behavior = @deprecation_behavior
18
- end
19
-
20
- it "should convert the permissions to resource roles" do
21
- expect(subject.to_roles)
22
- .to eq(Roles::DetachedRoleSet.new(
23
- [ Roles::Role.build(type: "Editor", agent: "Editors", scope: "resource"),
24
- Roles::Role.build(type: "Viewer", agent: "public", scope: "resource"),
25
- Roles::Role.build(type: "Viewer", agent: "bob@example.com", scope: "resource")
26
- ]
27
- ))
28
- end
29
-
30
- it "should clear the legacy permissions" do
31
- expect(obj.permissions).not_to be_empty
32
- subject.clear
33
- expect(obj.permissions).to be_empty
34
- end
35
-
36
- end
37
- end
@@ -1,11 +0,0 @@
1
- require 'spec_helper'
2
-
3
- RSpec.describe ModelsHelper, type: :helper do
4
-
5
- describe 'admin_set_full_name' do
6
- it "should call I18n to translate the slug" do
7
- expect(I18n).to receive(:t).with('ddr.admin_set.foo')
8
- helper.admin_set_full_name('foo')
9
- end
10
- end
11
- end
@@ -1,16 +0,0 @@
1
- require 'spec_helper'
2
-
3
- module Ddr::Jobs
4
- RSpec.describe FitsFileCharacterization, jobs: true, file_characterization: true do
5
-
6
- let(:obj) { double }
7
-
8
- before { allow(ActiveFedora::Base).to receive(:find).with("test:1") { obj } }
9
-
10
- specify {
11
- expect(Ddr::Models::FileCharacterization).to receive(:call).with(obj) { nil }
12
- described_class.perform("test:1")
13
- }
14
-
15
- end
16
- end
@@ -1,22 +0,0 @@
1
- require 'spec_helper'
2
-
3
- module Ddr::Jobs
4
- RSpec.describe FixityCheck do
5
-
6
- it "should use the :fixity queue" do
7
- expect(described_class.queue).to eq(:fixity)
8
- end
9
-
10
- describe ".perform" do
11
- let!(:obj) { double(fixity_check: nil) }
12
- before do
13
- allow(ActiveFedora::Base).to receive(:find).with("test:1") { obj }
14
- end
15
- it "should call `fixity_check` on the object" do
16
- expect(obj).to receive(:fixity_check)
17
- described_class.perform("test:1")
18
- end
19
- end
20
-
21
- end
22
- end