sufia 5.0.0 → 6.0.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -8
- data/Gemfile +3 -12
- data/History.md +0 -36
- data/LICENSE.md +14 -0
- data/README.md +4 -8
- data/SUFIA_VERSION +1 -1
- data/app/assets/javascripts/sufia.js +1 -17
- data/app/assets/javascripts/sufia/batch_edit.js +43 -28
- data/app/assets/javascripts/sufia/edit_metadata.js +9 -14
- data/app/assets/javascripts/sufia/multiForm.js +67 -0
- data/app/assets/javascripts/sufia/permissions.js +92 -35
- data/app/assets/stylesheets/sufia.css.scss +1 -6
- data/app/assets/stylesheets/sufia/_batch-edit.scss +0 -8
- data/app/assets/stylesheets/sufia/_dashboard.scss +1 -15
- data/app/assets/stylesheets/sufia/_file-listing.scss +1 -1
- data/app/assets/stylesheets/sufia/_settings.scss +0 -1
- data/app/controllers/concerns/sufia/batch_edits_controller_behavior.rb +3 -10
- data/app/controllers/concerns/sufia/breadcrumbs.rb +3 -8
- data/app/controllers/concerns/sufia/catalog.rb +1 -1
- data/app/controllers/concerns/sufia/controller.rb +3 -1
- data/app/controllers/concerns/sufia/downloads_controller_behavior.rb +1 -1
- data/app/controllers/concerns/sufia/files_controller/browse_everything.rb +1 -1
- data/app/controllers/concerns/sufia/files_controller_behavior.rb +16 -4
- data/app/controllers/concerns/sufia/homepage_controller.rb +1 -1
- data/app/controllers/concerns/sufia/my_controller_behavior.rb +2 -2
- data/app/controllers/concerns/sufia/transfers_controller_behavior.rb +3 -4
- data/app/controllers/concerns/sufia/users_controller_behavior.rb +2 -7
- data/app/controllers/my/collections_controller.rb +3 -4
- data/app/controllers/my/highlights_controller.rb +2 -2
- data/app/controllers/my/shares_controller.rb +3 -3
- data/app/controllers/single_use_links_controller.rb +5 -9
- data/app/controllers/single_use_links_viewer_controller.rb +4 -4
- data/app/helpers/generic_file_helper.rb +9 -0
- data/app/helpers/sufia/records_helper_behavior.rb +16 -0
- data/app/helpers/sufia/sufia_helper_behavior.rb +0 -11
- data/app/jobs/content_depositor_change_event_job.rb +1 -1
- data/app/jobs/ingest_local_file_job.rb +2 -1
- data/app/models/concerns/sufia/solr_document_behavior.rb +10 -10
- data/app/models/featured_work_list.rb +7 -9
- data/app/presenters/sufia/version_list_presenter.rb +15 -0
- data/app/presenters/sufia/version_presenter.rb +30 -0
- data/app/views/batch/_metadata.html.erb +51 -29
- data/app/views/batch/_more_metadata.html.erb +1 -1
- data/app/views/batch/edit.html.erb +10 -8
- data/app/views/batch_edits/edit.html.erb +13 -9
- data/app/views/collections/_edit_descriptions.html.erb +1 -1
- data/app/views/collections/_form.html.erb +4 -4
- data/app/views/collections/_form_for_select_collection.html.erb +1 -1
- data/app/views/collections/_show_document_list_menu.html.erb +7 -5
- data/app/views/collections/_show_document_list_row.html.erb +2 -2
- data/app/views/collections/edit.html.erb +0 -1
- data/app/views/collections/edit_fields/_description.html.erb +4 -0
- data/app/views/collections/edit_fields/_title.html.erb +3 -0
- data/app/views/collections/show.html.erb +0 -1
- data/app/views/dashboard/_index_partials/_stats.html.erb +3 -3
- data/app/views/generic_files/_descriptions.html.erb +9 -9
- data/app/views/generic_files/_field_form.html.erb +11 -25
- data/app/views/generic_files/_permission.html.erb +6 -4
- data/app/views/generic_files/_permission_form.html.erb +15 -17
- data/app/views/generic_files/_show_details.html.erb +1 -11
- data/app/views/generic_files/_versioning.html.erb +5 -5
- data/app/views/generic_files/edit.html.erb +5 -4
- data/app/views/generic_files/show.html.erb +6 -6
- data/app/views/homepage/_featured_fields.html.erb +2 -2
- data/app/views/homepage/_recent_document.html.erb +1 -1
- data/app/views/layouts/_head_tag_content.html.erb +0 -2
- data/app/views/layouts/error.html.erb +0 -1
- data/app/views/my/_index_partials/_default_group.html.erb +1 -1
- data/app/views/my/_index_partials/_list_files.html.erb +1 -1
- data/app/views/my/index.html.erb +2 -2
- data/app/views/records/_edit_field.html.erb +17 -19
- data/app/views/records/edit_fields/_default.html.erb +10 -12
- data/app/views/records/edit_fields/_description.html.erb +10 -3
- data/app/views/records/edit_fields/_resource_type.html.erb +4 -5
- data/app/views/records/edit_fields/_rights.html.erb +9 -2
- data/app/views/records/edit_fields/_suffix.html.erb +10 -0
- data/app/views/records/edit_fields/_type.html.erb +8 -2
- data/app/views/records/show_fields/_based_near.html.erb +1 -1
- data/app/views/records/show_fields/_creator.html.erb +1 -1
- data/app/views/records/show_fields/_language.html.erb +1 -1
- data/app/views/records/show_fields/_publisher.html.erb +1 -1
- data/app/views/records/show_fields/_resource_type.html.erb +1 -1
- data/app/views/records/show_fields/_subject.html.erb +1 -1
- data/app/views/records/show_fields/_tag.html.erb +1 -1
- data/app/views/single_use_links/new_download.html.erb +2 -2
- data/app/views/users/_profile.html.erb +2 -1
- data/app/views/users/_social_media_info.html.erb +20 -0
- data/app/views/users/_user_info.html.erb +3 -20
- data/app/views/users/edit.html.erb +2 -11
- data/app/views/users/show.html.erb +1 -1
- data/bin/audit_repository +1 -1
- data/config/initializers/sufia_events.rb +4 -4
- data/config/locales/sufia.en.yml +0 -5
- data/config/routes.rb +1 -1
- data/lib/generators/sufia/install_generator.rb +0 -4
- data/lib/generators/sufia/templates/catalog_controller.rb +59 -59
- data/lib/sufia.rb +1 -4
- data/lib/sufia/version.rb +1 -1
- data/spec/actors/generic_file/actor_spec.rb +67 -8
- data/spec/controllers/batch_controller_spec.rb +72 -86
- data/spec/controllers/batch_edits_controller_spec.rb +17 -19
- data/spec/controllers/catalog_controller_spec.rb +16 -24
- data/spec/controllers/collections_controller_spec.rb +47 -74
- data/spec/controllers/downloads_controller_spec.rb +40 -35
- data/spec/controllers/generic_files_controller_spec.rb +363 -428
- data/spec/controllers/homepage_controller_spec.rb +12 -9
- data/spec/controllers/mailbox_controller_spec.rb +1 -4
- data/spec/controllers/my/files_controller_spec.rb +0 -10
- data/spec/controllers/single_use_links_controller_spec.rb +28 -35
- data/spec/controllers/single_use_links_viewer_controller_spec.rb +27 -41
- data/spec/controllers/transfers_controller_spec.rb +6 -6
- data/spec/controllers/users_controller_spec.rb +121 -124
- data/spec/factories/generic_files.rb +9 -17
- data/spec/features/browse_dashboard_files_spec.rb +8 -10
- data/spec/features/browse_files_spec.rb +12 -25
- data/spec/features/catalog_search_spec.rb +49 -49
- data/spec/features/collection_spec.rb +18 -24
- data/spec/features/contact_form_spec.rb +26 -20
- data/spec/features/ingest_upload_files_spec.rb +8 -6
- data/spec/features/ownership_transfer_spec.rb +2 -6
- data/spec/features/proxy_spec.rb +1 -1
- data/spec/features/search_spec.rb +2 -3
- data/spec/features/single_use_links_spec.rb +1 -1
- data/spec/features/users_spec.rb +1 -1
- data/spec/helpers/records_helper_spec.rb +24 -10
- data/spec/jobs/active_fedora_pid_based_job_spec.rb +1 -5
- data/spec/jobs/audit_job_spec.rb +66 -21
- data/spec/jobs/batch_update_job_spec.rb +49 -36
- data/spec/jobs/content_depositor_change_event_job_spec.rb +2 -4
- data/spec/jobs/create_derivatives_job_spec.rb +18 -19
- data/spec/jobs/event_jobs_spec.rb +17 -21
- data/spec/jobs/import_url_job_spec.rb +1 -6
- data/spec/jobs/ingest_local_file_job_spec.rb +0 -4
- data/spec/lib/sufia/breadcrumbs_spec.rb +8 -46
- data/spec/lib/sufia/id_service_spec.rb +8 -3
- data/spec/lib/sufia/user_stat_importer_spec.rb +18 -25
- data/spec/lib/sufia/writable_permissions_spec.rb +0 -4
- data/spec/models/ability_spec.rb +25 -18
- data/spec/models/batch_spec.rb +16 -45
- data/spec/models/characterization_spec.rb +1 -1
- data/spec/models/checksum_audit_log_spec.rb +51 -29
- data/spec/models/collection_spec.rb +0 -5
- data/spec/models/featured_work_list_spec.rb +2 -4
- data/spec/models/file_content_datastream_spec.rb +27 -60
- data/spec/models/file_usage_spec.rb +16 -21
- data/spec/models/fits_datastream_spec.rb +47 -2
- data/spec/models/generic_file/web_form_spec.rb +1 -1
- data/spec/models/generic_file_spec.rb +238 -735
- data/spec/models/local_authority_spec.rb +8 -13
- data/spec/models/proxy_deposit_request_spec.rb +3 -7
- data/spec/models/single_use_link_spec.rb +12 -16
- data/spec/models/solr_document_spec.rb +1 -1
- data/spec/models/trophy_spec.rb +1 -3
- data/spec/models/user_spec.rb +47 -75
- data/spec/presenters/sufia/version_list_presenter_spec.rb +22 -0
- data/spec/presenters/sufia/version_presenter_spec.rb +51 -0
- data/spec/services/generic_file_audit_service_spec.rb +85 -0
- data/spec/services/repository_audit_service_spec.rb +18 -0
- data/spec/spec_helper.rb +26 -7
- data/spec/support/fixture_helpers.rb +2 -4
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +0 -4
- data/spec/views/batch/edit.html.erb_spec.rb +17 -7
- data/spec/views/catalog/index.html.erb_spec.rb +8 -6
- data/spec/views/collections/_form.html.erb_spec.rb +4 -2
- data/spec/views/collections/_show_document_list.erb_spec.rb +31 -0
- data/spec/views/dashboard/index_spec.rb +2 -2
- data/spec/views/generic_file/edit.html.erb_spec.rb +20 -6
- data/spec/views/generic_file/show.html.erb_spec.rb +3 -3
- data/spec/views/users/show.html.erb_spec.rb +1 -1
- data/sufia-models/app/actors/sufia/generic_file/actor.rb +8 -10
- data/sufia-models/app/jobs/active_fedora_pid_based_job.rb +2 -3
- data/sufia-models/app/jobs/audit_job.rb +46 -32
- data/sufia-models/app/jobs/batch_update_job.rb +9 -8
- data/sufia-models/app/jobs/import_url_job.rb +2 -2
- data/sufia-models/app/models/batch.rb +11 -12
- data/sufia-models/app/models/checksum_audit_log.rb +12 -10
- data/sufia-models/app/models/concerns/sufia/ability.rb +4 -6
- data/sufia-models/app/models/concerns/sufia/collection.rb +4 -5
- data/sufia-models/app/models/concerns/sufia/generic_file.rb +3 -86
- data/sufia-models/app/models/concerns/sufia/generic_file/batches.rb +29 -0
- data/sufia-models/app/models/concerns/sufia/generic_file/characterization.rb +3 -3
- data/sufia-models/app/models/concerns/sufia/generic_file/content.rb +13 -0
- data/sufia-models/app/models/concerns/sufia/generic_file/derivatives.rb +5 -5
- data/sufia-models/app/models/concerns/sufia/generic_file/export.rb +4 -0
- data/sufia-models/app/models/concerns/sufia/generic_file/full_text_indexing.rb +2 -2
- data/sufia-models/app/models/concerns/sufia/generic_file/indexing.rb +23 -0
- data/sufia-models/app/models/concerns/sufia/generic_file/metadata.rb +80 -11
- data/sufia-models/app/models/concerns/sufia/generic_file/proxy_deposit.rb +12 -3
- data/sufia-models/app/models/concerns/sufia/generic_file/versions.rb +4 -4
- data/sufia-models/app/models/concerns/sufia/generic_file/web_form.rb +14 -6
- data/sufia-models/app/models/concerns/sufia/model_methods.rb +11 -9
- data/sufia-models/app/models/concerns/sufia/user.rb +11 -33
- data/sufia-models/app/models/datastreams/file_content_datastream.rb +1 -1
- data/sufia-models/app/models/datastreams/fits_datastream.rb +1 -1
- data/sufia-models/app/models/file_usage.rb +3 -3
- data/sufia-models/app/models/local_authority.rb +2 -2
- data/sufia-models/app/models/proxy_deposit_request.rb +1 -1
- data/sufia-models/app/services/sufia/generic_file_audit_service.rb +83 -0
- data/sufia-models/app/services/sufia/id_service.rb +5 -5
- data/sufia-models/app/services/sufia/noid.rb +10 -7
- data/sufia-models/app/services/sufia/repository_audit_service.rb +9 -0
- data/sufia-models/lib/generators/sufia/models/cached_stats_generator.rb +47 -3
- data/sufia-models/lib/generators/sufia/models/install_generator.rb +31 -11
- data/sufia-models/lib/generators/sufia/models/proxies_generator.rb +31 -2
- data/sufia-models/lib/generators/sufia/models/templates/config/sufia.rb +10 -0
- data/sufia-models/lib/generators/sufia/models/upgrade400_generator.rb +33 -2
- data/sufia-models/lib/sufia/models/engine.rb +13 -4
- data/sufia-models/lib/sufia/models/file_content/versions.rb +9 -11
- data/sufia-models/lib/sufia/models/stats/user_stat_importer.rb +5 -9
- data/sufia-models/lib/sufia/models/version.rb +1 -1
- data/sufia-models/lib/sufia/permissions/writable.rb +34 -16
- data/sufia-models/sufia-models.gemspec +4 -2
- data/sufia.gemspec +4 -5
- data/tasks/jetty.rake +0 -26
- data/tasks/sufia-dev.rake +14 -2
- metadata +49 -64
- data/LICENSE +0 -15
- data/app/assets/images/orcid.png +0 -0
- data/app/assets/javascripts/sufia/manage_repeating_fields.js +0 -74
- data/app/assets/stylesheets/sufia/_multi_value_fields.css.scss +0 -67
- data/app/inputs/multi_value_input.rb +0 -84
- data/app/views/records/_rights_modal.html.erb +0 -1
- data/config/initializers/simple_form.rb +0 -167
- data/config/initializers/simple_form_bootstrap.rb +0 -137
- data/config/locales/simple_form.en.yml +0 -31
- data/fedora_conf/conf/development/fedora.fcfg +0 -946
- data/fedora_conf/conf/test/fedora.fcfg +0 -946
- data/spec/models/generic_file/reload_on_save_spec.rb +0 -25
- data/spec/models/generic_file_rdf_datastream_spec.rb +0 -12
- data/spec/models/properties_datastream_spec.rb +0 -41
- data/spec/views/generic_file/_permission_form.html.erb_spec.rb +0 -19
- data/sufia-models/app/models/concerns/sufia/generic_file/audit.rb +0 -116
- data/sufia-models/app/models/concerns/sufia/generic_file/reload_on_save.rb +0 -18
- data/sufia-models/app/models/concerns/sufia/properties_datastream_behavior.rb +0 -32
- data/sufia-models/app/models/datastreams/batch_rdf_datastream.rb +0 -6
- data/sufia-models/app/models/datastreams/generic_file_rdf_datastream.rb +0 -69
- data/sufia-models/app/models/datastreams/paranoid_rights_datastream.rb +0 -22
- data/sufia-models/app/models/datastreams/properties_datastream.rb +0 -4
- data/sufia-models/app/models/sufia/orcid_validator.rb +0 -8
- data/sufia-models/lib/generators/sufia/models/abstract_migration_generator.rb +0 -30
- data/sufia-models/lib/generators/sufia/models/orcid_field_generator.rb +0 -19
- data/sufia-models/lib/generators/sufia/models/templates/migrations/add_orcid_to_users.rb +0 -5
- data/sufia-models/lib/generators/sufia/models/user_stats_generator.rb +0 -31
@@ -1,25 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe Sufia::GenericFile::ReloadOnSave, :type => :model do
|
4
|
-
let(:user) { FactoryGirl.find_or_create(:jill) }
|
5
|
-
let(:file) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
|
6
|
-
|
7
|
-
it 'defaults to not call reload' do
|
8
|
-
expect(file).not_to receive(:reload)
|
9
|
-
file.save
|
10
|
-
end
|
11
|
-
|
12
|
-
it 'can be set to call reload' do
|
13
|
-
file.reload_on_save = true
|
14
|
-
expect(file).to receive(:reload)
|
15
|
-
file.save
|
16
|
-
end
|
17
|
-
|
18
|
-
it 'allows reload to be turned off and on' do
|
19
|
-
file.reload_on_save = true
|
20
|
-
expect(file).to receive(:reload).once
|
21
|
-
file.save
|
22
|
-
file.reload_on_save = false
|
23
|
-
file.save
|
24
|
-
end
|
25
|
-
end
|
@@ -1,12 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe GenericFileRdfDatastream, :type => :model do
|
4
|
-
it "should have bibliographicCitation" do
|
5
|
-
subject.bibliographic_citation = "foo"
|
6
|
-
expect(subject.bibliographic_citation).to eq ["foo"]
|
7
|
-
end
|
8
|
-
it "should have source" do
|
9
|
-
subject.source = "foo"
|
10
|
-
expect(subject.source).to eq ["foo"]
|
11
|
-
end
|
12
|
-
end
|
@@ -1,41 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe PropertiesDatastream, :type => :model do
|
4
|
-
describe "import_url" do
|
5
|
-
before do
|
6
|
-
subject.import_url = 'http://example.com/somefile.txt'
|
7
|
-
end
|
8
|
-
|
9
|
-
it "serializes" do
|
10
|
-
expect(subject.import_url).to eq ['http://example.com/somefile.txt']
|
11
|
-
expect(subject.ng_xml.to_xml).to be_equivalent_to "<?xml version=\"1.0\"?><fields><importUrl>http://example.com/somefile.txt</importUrl></fields>"
|
12
|
-
end
|
13
|
-
end
|
14
|
-
|
15
|
-
describe "proxy_depositor" do
|
16
|
-
before do
|
17
|
-
subject.proxy_depositor = 'kim@example.com'
|
18
|
-
end
|
19
|
-
|
20
|
-
it "serializes proxy_depositor" do
|
21
|
-
expect(subject.proxy_depositor).to eq ['kim@example.com']
|
22
|
-
expect(subject.ng_xml.to_xml).to be_equivalent_to "<?xml version=\"1.0\"?><fields><proxyDepositor>kim@example.com</proxyDepositor></fields>"
|
23
|
-
end
|
24
|
-
end
|
25
|
-
|
26
|
-
describe "to_solr" do
|
27
|
-
let(:doc) {
|
28
|
-
PropertiesDatastream.new(nil, 'properties').tap do |ds|
|
29
|
-
ds.import_url = 'http://example.com/somefile.txt'
|
30
|
-
ds.proxy_depositor = 'kim@example.com'
|
31
|
-
end
|
32
|
-
}
|
33
|
-
subject { doc.to_solr}
|
34
|
-
it "solrizes import_url" do
|
35
|
-
expect(subject['import_url_ssim']).to eq ['http://example.com/somefile.txt']
|
36
|
-
end
|
37
|
-
it "solrizes proxy_depositor" do
|
38
|
-
expect(subject['proxy_depositor_ssim']).to eq ['kim@example.com']
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
@@ -1,19 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe 'generic_files/_permission_form.html.erb', :type => :view do
|
4
|
-
let(:gf) {
|
5
|
-
stub_model(GenericFile, noid: '123',
|
6
|
-
depositor: 'bob',
|
7
|
-
resource_type: ['Dataset'])
|
8
|
-
}
|
9
|
-
|
10
|
-
before do
|
11
|
-
allow(controller).to receive(:current_user).and_return(stub_model(User))
|
12
|
-
end
|
13
|
-
|
14
|
-
it "should draw the permissions form without error" do
|
15
|
-
render partial: 'generic_files/permission_form.html.erb', locals: {gf: gf}
|
16
|
-
expect(rendered).to have_css("input#new_user_name_skel")
|
17
|
-
end
|
18
|
-
|
19
|
-
end
|
@@ -1,116 +0,0 @@
|
|
1
|
-
module Sufia
|
2
|
-
module GenericFile
|
3
|
-
module Audit
|
4
|
-
extend ActiveSupport::Concern
|
5
|
-
|
6
|
-
NO_RUNS = 999
|
7
|
-
|
8
|
-
def audit(force = false)
|
9
|
-
logs = []
|
10
|
-
self.per_version do |ver|
|
11
|
-
logs << audit_each(ver, force)
|
12
|
-
end
|
13
|
-
logs
|
14
|
-
end
|
15
|
-
|
16
|
-
def per_version(&block)
|
17
|
-
self.datastreams.each do |dsid, ds|
|
18
|
-
next if ds == full_text
|
19
|
-
ds.versions.each do |ver|
|
20
|
-
block.call(ver)
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
24
|
-
|
25
|
-
def logs(dsid)
|
26
|
-
ChecksumAuditLog.where(dsid: dsid, pid: self.pid).order('created_at desc, id desc')
|
27
|
-
end
|
28
|
-
|
29
|
-
def audit!
|
30
|
-
audit(true)
|
31
|
-
end
|
32
|
-
|
33
|
-
def audit_stat!
|
34
|
-
audit_stat(true)
|
35
|
-
end
|
36
|
-
|
37
|
-
def audit_stat(force = false)
|
38
|
-
logs = audit(force)
|
39
|
-
audit_results = logs.collect { |result| result["pass"] }
|
40
|
-
|
41
|
-
# check how many non runs we had
|
42
|
-
non_runs = audit_results.reduce(0) { |sum, value| value == NO_RUNS ? sum += 1 : sum }
|
43
|
-
if non_runs == 0
|
44
|
-
result = audit_results.reduce(true) { |sum, value| sum && value }
|
45
|
-
return result
|
46
|
-
elsif non_runs < audit_results.length
|
47
|
-
result = audit_results.reduce(true) { |sum, value| value == NO_RUNS ? sum : sum && value }
|
48
|
-
return 'Some audits have not been run, but the ones run were '+ ((result)? 'passing' : 'failing') + '.'
|
49
|
-
else
|
50
|
-
return 'Audits have not yet been run on this file.'
|
51
|
-
end
|
52
|
-
end
|
53
|
-
|
54
|
-
def audit_each(version, force = false)
|
55
|
-
latest_audit = logs(version.dsid).first
|
56
|
-
return latest_audit unless force || ::GenericFile.needs_audit?(version, latest_audit)
|
57
|
-
|
58
|
-
# Resque.enqueue(AuditJob, version.pid, version.dsid, version.versionID)
|
59
|
-
Sufia.queue.push(AuditJob.new(version.pid, version.dsid, version.versionID))
|
60
|
-
|
61
|
-
# run the find just incase the job has finished already
|
62
|
-
latest_audit = logs(version.dsid).first
|
63
|
-
latest_audit = ChecksumAuditLog.new(pass: NO_RUNS, pid: version.pid, dsid: version.dsid, version: version.versionID) unless latest_audit
|
64
|
-
latest_audit
|
65
|
-
end
|
66
|
-
|
67
|
-
|
68
|
-
module ClassMethods
|
69
|
-
def audit!(version)
|
70
|
-
::GenericFile.audit(version, true)
|
71
|
-
end
|
72
|
-
|
73
|
-
def audit(version, force = false)
|
74
|
-
latest_audit = self.find(version.pid).audit_each( version, force)
|
75
|
-
end
|
76
|
-
|
77
|
-
def needs_audit?(version, latest_audit)
|
78
|
-
if latest_audit and latest_audit.updated_at
|
79
|
-
days_since_last_audit = (DateTime.now - latest_audit.updated_at.to_date).to_i
|
80
|
-
if days_since_last_audit < Sufia.config.max_days_between_audits
|
81
|
-
return false
|
82
|
-
end
|
83
|
-
else
|
84
|
-
logger.warn "***AUDIT*** problem with audit log! Latest Audit is not nil, but updated_at is not set #{latest_audit}" unless latest_audit.nil?
|
85
|
-
end
|
86
|
-
true
|
87
|
-
end
|
88
|
-
|
89
|
-
def audit_everything(force = false)
|
90
|
-
::GenericFile.find_each do |gf|
|
91
|
-
gf.per_version do |ver|
|
92
|
-
::GenericFile.audit(ver, force)
|
93
|
-
end
|
94
|
-
end
|
95
|
-
end
|
96
|
-
|
97
|
-
def audit_everything!
|
98
|
-
::GenericFile.audit_everything(true)
|
99
|
-
end
|
100
|
-
|
101
|
-
def run_audit(version)
|
102
|
-
if version.dsChecksumValid
|
103
|
-
passing = 1
|
104
|
-
ChecksumAuditLog.prune_history(version)
|
105
|
-
else
|
106
|
-
logger.warn "***AUDIT*** Audit failed for #{version.pid} #{version.versionID}"
|
107
|
-
passing = 0
|
108
|
-
end
|
109
|
-
check = ChecksumAuditLog.create!(pass: passing, pid: version.pid,
|
110
|
-
dsid: version.dsid, version: version.versionID)
|
111
|
-
check
|
112
|
-
end
|
113
|
-
end
|
114
|
-
end
|
115
|
-
end
|
116
|
-
end
|
@@ -1,18 +0,0 @@
|
|
1
|
-
# add this in here until we can use a version of Active Fedora that contains this ability
|
2
|
-
module Sufia
|
3
|
-
module GenericFile
|
4
|
-
module ReloadOnSave
|
5
|
-
|
6
|
-
attr_writer :reload_on_save
|
7
|
-
|
8
|
-
def reload_on_save?
|
9
|
-
!!@reload_on_save
|
10
|
-
end
|
11
|
-
|
12
|
-
def refresh
|
13
|
-
self.reload if reload_on_save?
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
18
|
-
|
@@ -1,32 +0,0 @@
|
|
1
|
-
module Sufia
|
2
|
-
module PropertiesDatastreamBehavior
|
3
|
-
extend ActiveSupport::Concern
|
4
|
-
|
5
|
-
included do
|
6
|
-
set_terminology do |t|
|
7
|
-
t.root(path: "fields")
|
8
|
-
# This is where we put the user id of the object depositor -- impacts permissions/access controls
|
9
|
-
t.depositor index_as: [:symbol, :stored_searchable]
|
10
|
-
# This is where we put the relative path of the file if submitted as a folder
|
11
|
-
t.relative_path
|
12
|
-
t.import_url path: 'importUrl', index_as: :symbol
|
13
|
-
t.proxy_depositor path: 'proxyDepositor', index_as: :symbol
|
14
|
-
# This value is set when a user indicates they are depositing this for someone else
|
15
|
-
t.on_behalf_of path: 'onBehalfOf', index_as: :symbol
|
16
|
-
end
|
17
|
-
end
|
18
|
-
|
19
|
-
module ClassMethods
|
20
|
-
def xml_template
|
21
|
-
builder = Nokogiri::XML::Builder.new do |xml|
|
22
|
-
xml.fields
|
23
|
-
end
|
24
|
-
builder.doc
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
def prefix
|
29
|
-
""
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
@@ -1,69 +0,0 @@
|
|
1
|
-
class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
|
2
|
-
property :part_of, predicate: RDF::DC.isPartOf
|
3
|
-
property :resource_type, predicate: RDF::DC.type do |index|
|
4
|
-
index.as :stored_searchable, :facetable
|
5
|
-
end
|
6
|
-
property :title, predicate: RDF::DC.title do |index|
|
7
|
-
index.as :stored_searchable, :facetable
|
8
|
-
end
|
9
|
-
property :creator, predicate: RDF::DC.creator do |index|
|
10
|
-
index.as :stored_searchable, :facetable
|
11
|
-
end
|
12
|
-
property :contributor, predicate: RDF::DC.contributor do |index|
|
13
|
-
index.as :stored_searchable, :facetable
|
14
|
-
end
|
15
|
-
property :description, predicate: RDF::DC.description do |index|
|
16
|
-
index.type :text
|
17
|
-
index.as :stored_searchable
|
18
|
-
end
|
19
|
-
property :tag, predicate: RDF::DC.relation do |index|
|
20
|
-
index.as :stored_searchable, :facetable
|
21
|
-
end
|
22
|
-
property :rights, predicate: RDF::DC.rights do |index|
|
23
|
-
index.as :stored_searchable
|
24
|
-
end
|
25
|
-
property :publisher, predicate: RDF::DC.publisher do |index|
|
26
|
-
index.as :stored_searchable, :facetable
|
27
|
-
end
|
28
|
-
property :date_created, predicate: RDF::DC.created do |index|
|
29
|
-
index.as :stored_searchable
|
30
|
-
end
|
31
|
-
property :date_uploaded, predicate: RDF::DC.dateSubmitted do |index|
|
32
|
-
index.type :date
|
33
|
-
index.as :stored_sortable
|
34
|
-
end
|
35
|
-
property :date_modified, predicate: RDF::DC.modified do |index|
|
36
|
-
index.type :date
|
37
|
-
index.as :stored_sortable
|
38
|
-
end
|
39
|
-
property :subject, predicate: RDF::DC.subject do |index|
|
40
|
-
index.as :stored_searchable, :facetable
|
41
|
-
end
|
42
|
-
property :language, predicate: RDF::DC.language do |index|
|
43
|
-
index.as :stored_searchable, :facetable
|
44
|
-
end
|
45
|
-
property :identifier, predicate: RDF::DC.identifier do |index|
|
46
|
-
index.as :stored_searchable
|
47
|
-
end
|
48
|
-
property :based_near, predicate: RDF::FOAF.based_near do |index|
|
49
|
-
index.as :stored_searchable, :facetable
|
50
|
-
end
|
51
|
-
property :related_url, predicate: RDF::RDFS.seeAlso do |index|
|
52
|
-
index.as :stored_searchable
|
53
|
-
end
|
54
|
-
property :bibliographic_citation, predicate: RDF::DC.bibliographicCitation do |index|
|
55
|
-
index.as :stored_searchable
|
56
|
-
end
|
57
|
-
property :source, predicate: RDF::DC.source do |index|
|
58
|
-
index.as :stored_searchable
|
59
|
-
end
|
60
|
-
|
61
|
-
# TODO: Move this somewhere more appropriate
|
62
|
-
begin
|
63
|
-
LocalAuthority.register_vocabulary(self, "subject", "lc_subjects")
|
64
|
-
LocalAuthority.register_vocabulary(self, "language", "lexvo_languages")
|
65
|
-
LocalAuthority.register_vocabulary(self, "tag", "lc_genres")
|
66
|
-
rescue
|
67
|
-
puts "tables for vocabularies missing"
|
68
|
-
end
|
69
|
-
end
|
@@ -1,22 +0,0 @@
|
|
1
|
-
# subclass built-in Hydra RightsDatastream and build in extra model-level validation
|
2
|
-
class ParanoidRightsDatastream < Hydra::Datastream::RightsMetadata
|
3
|
-
use_terminology Hydra::Datastream::RightsMetadata
|
4
|
-
|
5
|
-
VALIDATIONS = [
|
6
|
-
{key: :edit_users, message: 'Depositor must have edit access', condition: lambda { |obj| !obj.edit_users.include?(obj.depositor) }},
|
7
|
-
{key: :edit_groups, message: 'Public cannot have edit access', condition: lambda { |obj| obj.edit_groups.include?('public') }},
|
8
|
-
{key: :edit_groups, message: 'Registered cannot have edit access', condition: lambda { |obj| obj.edit_groups.include?('registered') }}
|
9
|
-
]
|
10
|
-
|
11
|
-
def validate(object)
|
12
|
-
valid = true
|
13
|
-
VALIDATIONS.each do |validation|
|
14
|
-
if validation[:condition].call(object)
|
15
|
-
object.errors[validation[:key]] ||= []
|
16
|
-
object.errors[validation[:key]] << validation[:message]
|
17
|
-
valid = false
|
18
|
-
end
|
19
|
-
end
|
20
|
-
return valid
|
21
|
-
end
|
22
|
-
end
|
@@ -1,8 +0,0 @@
|
|
1
|
-
module Sufia
|
2
|
-
class OrcidValidator < ActiveModel::Validator
|
3
|
-
def validate(record)
|
4
|
-
return if record.orcid.blank?
|
5
|
-
record.errors.add(:orcid, 'must be a string of 19 characters, e.g., "0000-0000-0000-0000"') unless /\d{4}-\d{4}-\d{4}-\d{4}/.match(record.orcid)
|
6
|
-
end
|
7
|
-
end
|
8
|
-
end
|
@@ -1,30 +0,0 @@
|
|
1
|
-
# -*- encoding : utf-8 -*-
|
2
|
-
require 'rails/generators'
|
3
|
-
require 'rails/generators/migration'
|
4
|
-
|
5
|
-
class Sufia::Models::AbstractMigrationGenerator < Rails::Generators::Base
|
6
|
-
include Rails::Generators::Migration
|
7
|
-
|
8
|
-
# Implement the required interface for Rails::Generators::Migration.
|
9
|
-
# taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
|
10
|
-
def self.next_migration_number(path)
|
11
|
-
if @prev_migration_nr
|
12
|
-
@prev_migration_nr += 1
|
13
|
-
else
|
14
|
-
if last_migration = Dir[File.join(path, '*.rb')].sort.last
|
15
|
-
@prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
|
16
|
-
else
|
17
|
-
@prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
|
18
|
-
end
|
19
|
-
end
|
20
|
-
@prev_migration_nr.to_s
|
21
|
-
end
|
22
|
-
|
23
|
-
protected
|
24
|
-
|
25
|
-
def better_migration_template(file)
|
26
|
-
migration_template "migrations/#{file}", "db/migrate/#{file}"
|
27
|
-
rescue Rails::Generators::Error => e
|
28
|
-
say_status("warning", e.message, :yellow)
|
29
|
-
end
|
30
|
-
end
|
@@ -1,19 +0,0 @@
|
|
1
|
-
require_relative 'abstract_migration_generator'
|
2
|
-
|
3
|
-
class Sufia::Models::OrcidFieldGenerator < Sufia::Models::AbstractMigrationGenerator
|
4
|
-
source_root File.expand_path('../templates', __FILE__)
|
5
|
-
|
6
|
-
desc """
|
7
|
-
This generator adds a field to hold users' ORCIDs to your application:
|
8
|
-
1. Creates a database migration if they do not exist in /db/migrate
|
9
|
-
"""
|
10
|
-
|
11
|
-
def banner
|
12
|
-
say_status("warning", "ADDING ORCID FIELD TO USER MODEL", :yellow)
|
13
|
-
end
|
14
|
-
|
15
|
-
# Setup the database migration
|
16
|
-
def copy_migrations
|
17
|
-
better_migration_template 'add_orcid_to_users.rb'
|
18
|
-
end
|
19
|
-
end
|