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.
- checksums.yaml +4 -4
- data/.ruby-version +1 -1
- data/.travis.yml +1 -1
- data/Gemfile +2 -3
- data/app/models/collection.rb +11 -3
- data/app/models/component.rb +54 -4
- data/app/models/item.rb +1 -2
- data/config/initializers/active_fedora_base.rb +8 -5
- data/config/initializers/rubydora_monkey_patch.rb +11 -0
- data/config/initializers/subscriptions.rb +16 -9
- data/config/locales/ddr-models.en.yml +3 -0
- data/ddr-models.gemspec +3 -2
- data/lib/ddr/actions/virus_check.rb +10 -16
- data/lib/ddr/auth.rb +0 -8
- data/lib/ddr/datastreams.rb +13 -2
- data/lib/ddr/datastreams/administrative_metadata_datastream.rb +9 -0
- data/lib/ddr/datastreams/content_datastream.rb +5 -0
- data/lib/ddr/datastreams/datastream_behavior.rb +60 -15
- data/lib/ddr/datastreams/delete_external_files.rb +29 -0
- data/lib/ddr/datastreams/descriptive_metadata_datastream.rb +33 -33
- data/lib/ddr/datastreams/external_file_datastream.rb +69 -0
- data/lib/ddr/datastreams/fits_datastream.rb +15 -5
- data/lib/ddr/datastreams/intermediate_file_datastream.rb +5 -0
- data/lib/ddr/datastreams/metadata_datastream.rb +15 -17
- data/lib/ddr/datastreams/multires_image_datastream.rb +5 -0
- data/lib/ddr/derivatives.rb +1 -0
- data/lib/ddr/derivatives/ptif_generator.rb +5 -1
- data/lib/ddr/derivatives/update_derivatives.rb +23 -0
- data/lib/ddr/events/deletion_event.rb +5 -9
- data/lib/ddr/events/event.rb +7 -9
- data/lib/ddr/events/ingestion_event.rb +5 -9
- data/lib/ddr/events/update_event.rb +12 -5
- data/lib/ddr/index.rb +0 -1
- data/lib/ddr/index/csv_query_result.rb +10 -2
- data/lib/ddr/index/fields.rb +10 -9
- data/lib/ddr/index/filter.rb +1 -0
- data/lib/ddr/managers/derivatives_manager.rb +84 -98
- data/lib/ddr/managers/technical_metadata_manager.rb +20 -5
- data/lib/ddr/models.rb +24 -24
- data/lib/ddr/models/base.rb +98 -74
- data/lib/ddr/models/cache.rb +20 -0
- data/lib/ddr/models/engine.rb +4 -6
- data/lib/ddr/models/file_management.rb +57 -152
- data/lib/ddr/models/fixity_checkable.rb +0 -5
- data/lib/ddr/models/has_admin_metadata.rb +4 -2
- data/lib/ddr/models/has_children.rb +35 -1
- data/lib/ddr/models/has_content.rb +3 -33
- data/lib/ddr/models/has_intermediate_file.rb +18 -0
- data/lib/ddr/models/has_multires_image.rb +12 -15
- data/lib/ddr/models/has_struct_metadata.rb +2 -38
- data/lib/ddr/models/indexing.rb +160 -163
- data/lib/ddr/models/permanent_id.rb +26 -49
- data/lib/ddr/models/solr_document.rb +21 -19
- data/lib/ddr/models/structure.rb +168 -41
- data/lib/ddr/models/structures/agent.rb +49 -0
- data/lib/ddr/models/structures/div.rb +64 -0
- data/lib/ddr/models/structures/f_locat.rb +54 -0
- data/lib/ddr/models/structures/file.rb +52 -0
- data/lib/ddr/models/structures/file_grp.rb +35 -0
- data/lib/ddr/models/structures/file_sec.rb +22 -0
- data/lib/ddr/models/structures/fptr.rb +31 -0
- data/lib/ddr/models/structures/mets_hdr.rb +37 -0
- data/lib/ddr/models/structures/mptr.rb +49 -0
- data/lib/ddr/models/structures/struct_map.rb +40 -0
- data/lib/ddr/models/version.rb +1 -1
- data/lib/ddr/notifications.rb +10 -12
- data/lib/ddr/utils.rb +29 -16
- data/lib/ddr/vocab.rb +15 -17
- data/lib/ddr/vocab/asset.rb +29 -19
- data/lib/ddr/vocab/contact.rb +5 -7
- data/lib/ddr/vocab/display.rb +6 -8
- data/lib/ddr/vocab/duke_terms.rb +8 -10
- data/lib/ddr/vocab/rdf_vocabulary_parser.rb +37 -39
- data/lib/ddr/vocab/roles.rb +17 -19
- data/lib/ddr/vocab/vocabulary.rb +26 -26
- data/spec/datastreams/external_file_datastream_spec.rb +37 -0
- data/spec/derivatives/png_generator_spec.rb +21 -25
- data/spec/derivatives/ptif_generator_spec.rb +22 -26
- data/spec/dummy/config/environments/test.rb +1 -1
- data/spec/dummy/db/schema.rb +23 -23
- data/spec/factories/structure_factories.rb +8 -2
- data/spec/fixtures/imageA.jpg +0 -0
- data/spec/fixtures/imageB.jpg +0 -0
- data/spec/index/csv_query_result_spec.rb +3 -3
- data/spec/index/fields_spec.rb +7 -6
- data/spec/managers/derivatives_manager_spec.rb +105 -112
- data/spec/managers/technical_metadata_manager_spec.rb +22 -18
- data/spec/models/active_fedora_base_spec.rb +0 -106
- data/spec/models/active_fedora_datastream_spec.rb +33 -2
- data/spec/models/attachment_spec.rb +0 -2
- data/spec/models/cache_spec.rb +32 -0
- data/spec/models/collection_spec.rb +43 -19
- data/spec/models/component_spec.rb +41 -51
- data/spec/models/descriptive_metadata_datastream_spec.rb +99 -87
- data/spec/models/events_spec.rb +50 -69
- data/spec/models/file_management_spec.rb +79 -187
- data/spec/models/has_children_spec.rb +54 -3
- data/spec/models/has_struct_metadata_spec.rb +32 -38
- data/spec/models/indexing_spec.rb +11 -6
- data/spec/models/item_spec.rb +21 -7
- data/spec/models/permanent_id_spec.rb +1 -5
- data/spec/models/solr_document_spec.rb +13 -41
- data/spec/models/structure_spec.rb +85 -16
- data/spec/models/structures/agent_spec.rb +30 -0
- data/spec/models/structures/div_spec.rb +26 -0
- data/spec/models/structures/f_locat_spec.rb +78 -0
- data/spec/models/structures/file_grp_spec.rb +23 -0
- data/spec/models/structures/file_sec_spec.rb +22 -0
- data/spec/models/structures/file_spec.rb +60 -0
- data/spec/models/structures/fptr_spec.rb +23 -0
- data/spec/models/structures/mets_hdr_spec.rb +26 -0
- data/spec/models/structures/mptr_spec.rb +25 -0
- data/spec/models/structures/struct_map_spec.rb +24 -0
- data/spec/models/target_spec.rb +0 -2
- data/spec/spec_helper.rb +4 -9
- data/spec/support/shared_examples_for_ddr_models.rb +96 -156
- data/spec/support/shared_examples_for_has_content.rb +56 -30
- data/spec/support/shared_examples_for_has_intermediate_spec.rb +28 -0
- data/spec/support/shared_examples_for_non_collection_models.rb +5 -0
- data/spec/support/structural_metadata_helper.rb +230 -59
- data/spec/utils_spec.rb +0 -2
- metadata +86 -44
- data/app/helpers/models_helper.rb +0 -10
- data/lib/ddr/auth/legacy/abstract_legacy_permissions.rb +0 -17
- data/lib/ddr/auth/legacy/legacy_authorization.rb +0 -44
- data/lib/ddr/auth/legacy/legacy_default_permissions.rb +0 -33
- data/lib/ddr/auth/legacy/legacy_permissions.rb +0 -33
- data/lib/ddr/auth/legacy/legacy_roles.rb +0 -25
- data/lib/ddr/index/legacy_license_fields.rb +0 -12
- data/lib/ddr/jobs.rb +0 -12
- data/lib/ddr/jobs/fits_file_characterization.rb +0 -13
- data/lib/ddr/jobs/fixity_check.rb +0 -13
- data/lib/ddr/jobs/job.rb +0 -36
- data/lib/ddr/jobs/queue.rb +0 -27
- data/lib/ddr/jobs/update_index.rb +0 -13
- data/lib/ddr/models/access_controllable.rb +0 -24
- data/lib/ddr/models/struct_div.rb +0 -63
- data/spec/auth/legacy_default_permissions_spec.rb +0 -37
- data/spec/auth/legacy_permissions_spec.rb +0 -37
- data/spec/helpers/models_helper_spec.rb +0 -11
- data/spec/jobs/fits_file_characterization_spec.rb +0 -16
- data/spec/jobs/fixity_check_spec.rb +0 -22
- data/spec/jobs/job_spec.rb +0 -40
- data/spec/jobs/update_index_spec.rb +0 -22
- data/spec/models/struct_div_spec.rb +0 -70
- data/spec/support/shared_examples_for_access_controllables.rb +0 -6
@@ -0,0 +1,54 @@
|
|
1
|
+
module Ddr::Models::Structures
|
2
|
+
#
|
3
|
+
# Wraps a Nokogiri (XML) 'FLocat' node
|
4
|
+
#
|
5
|
+
class FLocat < SimpleDelegator
|
6
|
+
|
7
|
+
def id
|
8
|
+
self['ID']
|
9
|
+
end
|
10
|
+
|
11
|
+
def loctype
|
12
|
+
self['LOCTYPE']
|
13
|
+
end
|
14
|
+
|
15
|
+
def otherloctype
|
16
|
+
self['OTHERLOCTYPE']
|
17
|
+
end
|
18
|
+
|
19
|
+
def use
|
20
|
+
self['USE']
|
21
|
+
end
|
22
|
+
|
23
|
+
def href
|
24
|
+
self['xlink:href']
|
25
|
+
end
|
26
|
+
|
27
|
+
def ark?
|
28
|
+
loctype == 'ARK'
|
29
|
+
end
|
30
|
+
|
31
|
+
def ark
|
32
|
+
href if ark?
|
33
|
+
end
|
34
|
+
|
35
|
+
def effective_use
|
36
|
+
use ? use : File.new(parent).effective_use
|
37
|
+
end
|
38
|
+
|
39
|
+
def repo_id
|
40
|
+
SolrDocument.find_by_permanent_id(ark).id if ark?
|
41
|
+
end
|
42
|
+
|
43
|
+
def self.build(args)
|
44
|
+
node = Nokogiri::XML::Node.new('FLocat', args[:document])
|
45
|
+
node['ID'] = args[:id] if args[:id]
|
46
|
+
node['LOCTYPE'] = args[:loctype] if args[:loctype]
|
47
|
+
node['OTHERLOCTYPE'] = args[:otherloctype] if args[:otherloctype]
|
48
|
+
node['USE'] = args[:use] if args[:use]
|
49
|
+
node['xlink:href'] = args[:href] if args[:href]
|
50
|
+
node
|
51
|
+
end
|
52
|
+
|
53
|
+
end
|
54
|
+
end
|
@@ -0,0 +1,52 @@
|
|
1
|
+
module Ddr::Models::Structures
|
2
|
+
#
|
3
|
+
# Wraps a Nokogiri (XML) 'file' node
|
4
|
+
#
|
5
|
+
class File < SimpleDelegator
|
6
|
+
|
7
|
+
def id
|
8
|
+
self['ID']
|
9
|
+
end
|
10
|
+
|
11
|
+
def use
|
12
|
+
self['USE']
|
13
|
+
end
|
14
|
+
|
15
|
+
def files
|
16
|
+
xpath('xmlns:file').map { |node| File.new(node) }
|
17
|
+
end
|
18
|
+
|
19
|
+
def flocats
|
20
|
+
xpath('xmlns:FLocat').map { |node| FLocat.new(node) }
|
21
|
+
end
|
22
|
+
|
23
|
+
def effective_use
|
24
|
+
if use
|
25
|
+
use
|
26
|
+
else
|
27
|
+
case parent.name
|
28
|
+
when "file"
|
29
|
+
File.new(parent).effective_use
|
30
|
+
when "fileGrp"
|
31
|
+
FileGrp.new(parent).effective_use
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
def repo_ids
|
37
|
+
flocats.map(&:repo_id)
|
38
|
+
end
|
39
|
+
|
40
|
+
def self.build(args)
|
41
|
+
node = Nokogiri::XML::Node.new('file', args[:document])
|
42
|
+
node['ID'] = args[:id] if args[:id]
|
43
|
+
node['USE'] = args[:use] if args[:use]
|
44
|
+
node
|
45
|
+
end
|
46
|
+
|
47
|
+
def self.find(structure, fileid)
|
48
|
+
structure.files[fileid]
|
49
|
+
end
|
50
|
+
|
51
|
+
end
|
52
|
+
end
|
@@ -0,0 +1,35 @@
|
|
1
|
+
module Ddr::Models::Structures
|
2
|
+
#
|
3
|
+
# Wraps a Nokogiri (XML) 'fileGrp' node
|
4
|
+
#
|
5
|
+
class FileGrp < SimpleDelegator
|
6
|
+
|
7
|
+
def id
|
8
|
+
self['ID']
|
9
|
+
end
|
10
|
+
|
11
|
+
def use
|
12
|
+
self['USE']
|
13
|
+
end
|
14
|
+
|
15
|
+
def filegrps
|
16
|
+
xpath('xmlns:filegrp').map { |node| FileGrp.new(node) }
|
17
|
+
end
|
18
|
+
|
19
|
+
def files
|
20
|
+
xpath('xmlns:file').map { |node| File.new(node) }
|
21
|
+
end
|
22
|
+
|
23
|
+
def effective_use
|
24
|
+
use
|
25
|
+
end
|
26
|
+
|
27
|
+
def self.build(args)
|
28
|
+
node = Nokogiri::XML::Node.new('fileGrp', args[:document])
|
29
|
+
node['ID'] = args[:id] if args[:id]
|
30
|
+
node['USE'] = args[:use] if args[:use]
|
31
|
+
node
|
32
|
+
end
|
33
|
+
|
34
|
+
end
|
35
|
+
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
module Ddr::Models::Structures
|
2
|
+
#
|
3
|
+
# Wraps a Nokogiri (XML) 'fileSec' node
|
4
|
+
#
|
5
|
+
class FileSec < SimpleDelegator
|
6
|
+
|
7
|
+
def id
|
8
|
+
self['ID']
|
9
|
+
end
|
10
|
+
|
11
|
+
def filegrps
|
12
|
+
xpath('xmlns:fileGrp').map { |node| FileGrp.new(node) }
|
13
|
+
end
|
14
|
+
|
15
|
+
def self.build(args)
|
16
|
+
node = Nokogiri::XML::Node.new('fileSec', args[:document])
|
17
|
+
node['ID'] = args[:id] if args[:id]
|
18
|
+
node
|
19
|
+
end
|
20
|
+
|
21
|
+
end
|
22
|
+
end
|
@@ -0,0 +1,31 @@
|
|
1
|
+
module Ddr::Models::Structures
|
2
|
+
#
|
3
|
+
# Wraps a Nokogiri (XML) 'fptr' node
|
4
|
+
#
|
5
|
+
class Fptr < SimpleDelegator
|
6
|
+
|
7
|
+
def id
|
8
|
+
self['ID']
|
9
|
+
end
|
10
|
+
|
11
|
+
def fileid
|
12
|
+
self['FILEID']
|
13
|
+
end
|
14
|
+
|
15
|
+
def dereferenced_hash
|
16
|
+
structure = Ddr::Models::Structure.new(document)
|
17
|
+
file = File.find(structure, fileid)
|
18
|
+
repo_id = file.repo_ids.first
|
19
|
+
use = file.flocats.first.effective_use
|
20
|
+
{ id: id, repo_id: repo_id, use: use }.compact
|
21
|
+
end
|
22
|
+
|
23
|
+
def self.build(args)
|
24
|
+
node = Nokogiri::XML::Node.new('fptr', args[:document])
|
25
|
+
node['ID'] = args[:id] if args[:id]
|
26
|
+
node['FILEID'] = args[:fileid] if args[:fileid]
|
27
|
+
node
|
28
|
+
end
|
29
|
+
|
30
|
+
end
|
31
|
+
end
|
@@ -0,0 +1,37 @@
|
|
1
|
+
module Ddr::Models::Structures
|
2
|
+
#
|
3
|
+
# Wraps a Nokogiri (XML) 'metsHdr' node
|
4
|
+
#
|
5
|
+
class MetsHdr < SimpleDelegator
|
6
|
+
|
7
|
+
def id
|
8
|
+
self['ID']
|
9
|
+
end
|
10
|
+
|
11
|
+
def createdate
|
12
|
+
self['CREATEDATE']
|
13
|
+
end
|
14
|
+
|
15
|
+
def lastmoddate
|
16
|
+
self['LASTMODDATE']
|
17
|
+
end
|
18
|
+
|
19
|
+
def recordstatus
|
20
|
+
self['RECORDSTATUS']
|
21
|
+
end
|
22
|
+
|
23
|
+
def agents
|
24
|
+
xpath('xmlns:agent').map { |node| Agent.new(node) }
|
25
|
+
end
|
26
|
+
|
27
|
+
def self.build(args)
|
28
|
+
node = Nokogiri::XML::Node.new('metsHdr', args[:document])
|
29
|
+
node['ID'] = args[:id] if args[:id]
|
30
|
+
node['CREATEDATE'] = args[:createdate] if args[:createdate]
|
31
|
+
node['LASTMODDATE'] = args[:lastmoddate] if args[:lastmoddate]
|
32
|
+
node['RECORDSTATUS'] = args[:recordstatus] if args[:recordstatus]
|
33
|
+
node
|
34
|
+
end
|
35
|
+
|
36
|
+
end
|
37
|
+
end
|
@@ -0,0 +1,49 @@
|
|
1
|
+
module Ddr::Models::Structures
|
2
|
+
#
|
3
|
+
# Wraps a Nokogiri (XML) 'mptr' node
|
4
|
+
#
|
5
|
+
class Mptr < SimpleDelegator
|
6
|
+
|
7
|
+
def id
|
8
|
+
self['ID']
|
9
|
+
end
|
10
|
+
|
11
|
+
def loctype
|
12
|
+
self['LOCTYPE']
|
13
|
+
end
|
14
|
+
|
15
|
+
def otherloctype
|
16
|
+
self['OTHERLOCTYPE']
|
17
|
+
end
|
18
|
+
|
19
|
+
def href
|
20
|
+
self['xlink:href']
|
21
|
+
end
|
22
|
+
|
23
|
+
def ark?
|
24
|
+
loctype == 'ARK'
|
25
|
+
end
|
26
|
+
|
27
|
+
def ark
|
28
|
+
href if ark?
|
29
|
+
end
|
30
|
+
|
31
|
+
def repo_id
|
32
|
+
SolrDocument.find_by_permanent_id(ark).id if ark?
|
33
|
+
end
|
34
|
+
|
35
|
+
def dereferenced_hash
|
36
|
+
{ id: id, repo_id: repo_id }.compact
|
37
|
+
end
|
38
|
+
|
39
|
+
def self.build(args)
|
40
|
+
node = Nokogiri::XML::Node.new('mptr', args[:document])
|
41
|
+
node['ID'] = args[:id] if args[:id]
|
42
|
+
node['LOCTYPE'] = args[:loctype] if args[:loctype]
|
43
|
+
node['OTHERLOCTYPE'] = args[:otherloctype] if args[:otherloctype]
|
44
|
+
node['xlink:href'] = args[:href] if args[:href]
|
45
|
+
node
|
46
|
+
end
|
47
|
+
|
48
|
+
end
|
49
|
+
end
|
@@ -0,0 +1,40 @@
|
|
1
|
+
module Ddr::Models::Structures
|
2
|
+
#
|
3
|
+
# Wraps a Nokogiri (XML) 'structMap' node
|
4
|
+
#
|
5
|
+
class StructMap < SimpleDelegator
|
6
|
+
|
7
|
+
def id
|
8
|
+
self['ID']
|
9
|
+
end
|
10
|
+
|
11
|
+
def label
|
12
|
+
self['LABEL']
|
13
|
+
end
|
14
|
+
|
15
|
+
def type
|
16
|
+
self['TYPE']
|
17
|
+
end
|
18
|
+
|
19
|
+
def divs
|
20
|
+
xpath('xmlns:div').map { |node| Div.new(node) }
|
21
|
+
end
|
22
|
+
|
23
|
+
def dereferenced_hash
|
24
|
+
contents = []
|
25
|
+
contents.concat(divs.map { |div| div.dereferenced_hash }) unless divs.empty?
|
26
|
+
dh = { id: id, label: label, type: type }.compact
|
27
|
+
dh[:contents] = contents unless contents.empty?
|
28
|
+
dh
|
29
|
+
end
|
30
|
+
|
31
|
+
def self.build(args)
|
32
|
+
node = Nokogiri::XML::Node.new('structMap', args[:document])
|
33
|
+
node['ID'] = args[:id] if args[:id]
|
34
|
+
node['LABEL'] = args[:label] if args[:label]
|
35
|
+
node['TYPE'] = args[:type] if args[:type]
|
36
|
+
node
|
37
|
+
end
|
38
|
+
|
39
|
+
end
|
40
|
+
end
|
data/lib/ddr/models/version.rb
CHANGED
data/lib/ddr/notifications.rb
CHANGED
@@ -1,16 +1,14 @@
|
|
1
|
-
module Ddr
|
2
|
-
module Notifications
|
1
|
+
module Ddr::Notifications
|
3
2
|
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
def self.notify_event(type, args={})
|
11
|
-
name = "#{type}.events.ddr"
|
12
|
-
ActiveSupport::Notifications.instrument(name, args)
|
13
|
-
end
|
3
|
+
FIXITY_CHECK = "fixity_check.events.ddr"
|
4
|
+
VIRUS_CHECK = "virus_check.events.ddr"
|
5
|
+
CREATION = "creation.events.ddr"
|
6
|
+
UPDATE = "update.events.ddr"
|
7
|
+
DELETION = "deletion.events.ddr"
|
14
8
|
|
9
|
+
def self.notify_event(type, args={})
|
10
|
+
name = "#{type}.events.ddr"
|
11
|
+
ActiveSupport::Notifications.instrument(name, args)
|
15
12
|
end
|
13
|
+
|
16
14
|
end
|
data/lib/ddr/utils.rb
CHANGED
@@ -2,8 +2,6 @@ require 'openssl'
|
|
2
2
|
|
3
3
|
module Ddr::Utils
|
4
4
|
|
5
|
-
DEFAULT_MIME_TYPE = "application/octet-stream"
|
6
|
-
|
7
5
|
def self.digest content, algorithm
|
8
6
|
raise TypeError, "Algorithm must be a string: #{algorithm.inspect}" unless algorithm.is_a?(String)
|
9
7
|
digest_class = OpenSSL::Digest.const_get(algorithm.sub("-", "").to_sym)
|
@@ -14,38 +12,41 @@ module Ddr::Utils
|
|
14
12
|
|
15
13
|
# Return a mime type for the file, using the file_name if necessary
|
16
14
|
# file can be a File object or file path (String)
|
17
|
-
#
|
15
|
+
# @return [String] the mime type or default
|
18
16
|
def self.mime_type_for(file, file_name=nil)
|
19
17
|
return file.content_type if file.respond_to?(:content_type) # E.g., Rails uploaded file
|
20
18
|
path = file_name || file_path(file) rescue nil
|
21
19
|
mime_types = MIME::Types.of(path) rescue [] # MIME::Types.of blows up on nil
|
22
|
-
mime_types.empty? ?
|
20
|
+
mime_types.empty? ? Ddr::Models.default_mime_type : mime_types.first.content_type
|
23
21
|
end
|
24
22
|
|
25
|
-
def self.file_or_path?
|
23
|
+
def self.file_or_path?(file)
|
26
24
|
file_path(file)
|
27
25
|
rescue ArgumentError
|
28
26
|
false
|
29
27
|
end
|
30
28
|
|
31
|
-
def self.file_path?
|
29
|
+
def self.file_path?(file)
|
32
30
|
# length is a sanity check
|
33
|
-
file.is_a?(String) && (file.length < 1024) && File.
|
31
|
+
file.is_a?(String) && (file.length < 1024) && File.exist?(file)
|
34
32
|
end
|
35
33
|
|
36
|
-
def self.file_path
|
34
|
+
def self.file_path(file)
|
37
35
|
if file.respond_to?(:path)
|
38
36
|
File.absolute_path(file.path)
|
39
37
|
elsif file_path?(file)
|
40
38
|
file
|
41
39
|
else
|
42
|
-
raise ArgumentError, "
|
40
|
+
raise ArgumentError, "Argument is neither a File nor a path to an existing file."
|
43
41
|
end
|
44
42
|
end
|
45
43
|
|
46
|
-
def self.file_name_for
|
47
|
-
|
48
|
-
|
44
|
+
def self.file_name_for(file)
|
45
|
+
if file.respond_to?(:original_filename) && file.original_filename.present?
|
46
|
+
file.original_filename
|
47
|
+
else
|
48
|
+
File.basename file_path(file)
|
49
|
+
end
|
49
50
|
end
|
50
51
|
|
51
52
|
def self.file_uri?(uri)
|
@@ -53,7 +54,7 @@ module Ddr::Utils
|
|
53
54
|
URI.parse(uri).scheme == "file"
|
54
55
|
end
|
55
56
|
|
56
|
-
def self.sanitize_filename
|
57
|
+
def self.sanitize_filename(file_name)
|
57
58
|
return unless file_name
|
58
59
|
raise ArgumentError, "file_name argument must be a string" unless file_name.is_a?(String)
|
59
60
|
raise ArgumentError, "file_name argument must not include path" if file_name.include?(File::SEPARATOR)
|
@@ -63,15 +64,23 @@ module Ddr::Utils
|
|
63
64
|
# Return file path for URI string
|
64
65
|
# Should reverse .path_to_uri
|
65
66
|
# "file:/path/to/file" => "/path/to/file"
|
66
|
-
|
67
|
-
|
67
|
+
# @param uri [String] The URI string to pathify
|
68
|
+
# @return [String] the file path
|
69
|
+
def self.path_from_uri(uri_string)
|
70
|
+
uri = URI.parse(uri_string)
|
71
|
+
unless uri.scheme == "file"
|
72
|
+
raise ArgumentError, "URI does not have the file: scheme."
|
73
|
+
end
|
74
|
+
URI.unescape(uri.path)
|
68
75
|
end
|
69
76
|
|
70
77
|
# Return URI string for file path
|
71
78
|
# Should reverse .path_from_uri
|
72
79
|
# "/path/to/file" => "file:/path/to/file"
|
80
|
+
# @param path [String] the file path
|
81
|
+
# @return [String] the file: URI string
|
73
82
|
def self.path_to_uri(path)
|
74
|
-
uri = URI.parse
|
83
|
+
uri = URI.parse URI.escape(path)
|
75
84
|
uri.scheme = "file"
|
76
85
|
uri.to_s
|
77
86
|
end
|
@@ -169,4 +178,8 @@ module Ddr::Utils
|
|
169
178
|
dts.map { |dt| solr_date(dt) }
|
170
179
|
end
|
171
180
|
|
181
|
+
class << self
|
182
|
+
alias_method :file_name, :file_name_for
|
183
|
+
end
|
184
|
+
|
172
185
|
end
|