sufia 4.0.0.beta2 → 4.0.0.beta3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +3 -0
- data/README.md +6 -4
- data/SUFIA_VERSION +1 -1
- data/app/assets/images/folder.png +0 -0
- data/app/assets/javascripts/sufia.js +5 -0
- data/app/assets/javascripts/sufia/app.js +1 -0
- data/app/assets/javascripts/sufia/batch_select_all.js +1 -2
- data/app/assets/javascripts/sufia/dashboard_actions.js +13 -0
- data/app/assets/javascripts/sufia/editor.js +1 -1
- data/app/assets/javascripts/sufia/ga_events.js +10 -0
- data/app/assets/javascripts/sufia/search.js +67 -0
- data/app/assets/stylesheets/dashboard.css.scss +15 -1
- data/app/assets/stylesheets/sufia.css.scss +12 -0
- data/app/controllers/authorities_controller.rb +4 -4
- data/app/controllers/batch_controller.rb +4 -4
- data/app/controllers/collections_controller.rb +44 -0
- data/{lib → app/controllers/concerns}/sufia/batch_edits_controller_behavior.rb +1 -1
- data/app/controllers/concerns/sufia/catalog.rb +9 -45
- data/{lib → app/controllers/concerns}/sufia/controller.rb +11 -21
- data/app/controllers/concerns/sufia/dashboard_controller_behavior.rb +34 -6
- data/{lib → app/controllers/concerns}/sufia/downloads_controller_behavior.rb +0 -0
- data/app/controllers/concerns/sufia/files_controller/browse_everything.rb +35 -0
- data/{lib → app/controllers/concerns}/sufia/files_controller/local_ingest_behavior.rb +19 -7
- data/{lib → app/controllers/concerns}/sufia/files_controller/upload_complete_behavior.rb +1 -1
- data/app/controllers/concerns/sufia/files_controller_behavior.rb +219 -0
- data/app/controllers/concerns/sufia/homepage_controller.rb +41 -0
- data/app/controllers/concerns/sufia/users_controller_behavior.rb +3 -2
- data/app/controllers/dashboard/collections_controller.rb +19 -0
- data/app/controllers/dashboard/files_controller.rb +13 -0
- data/app/controllers/dashboard/highlights_controller.rb +20 -0
- data/app/controllers/dashboard/lists_controller.rb +13 -0
- data/app/controllers/dashboard/shares_controller.rb +19 -0
- data/app/controllers/directory_controller.rb +8 -8
- data/app/controllers/featured_work_lists_controller.rb +1 -1
- data/app/controllers/homepage_controller.rb +4 -0
- data/app/controllers/single_use_links_controller.rb +6 -6
- data/app/controllers/single_use_links_viewer_controller.rb +6 -6
- data/app/controllers/static_controller.rb +4 -3
- data/app/helpers/batch_edits_helper.rb +3 -6
- data/app/helpers/content_block_helper.rb +7 -2
- data/app/helpers/generic_file_helper.rb +33 -39
- data/app/helpers/records_helper.rb +4 -0
- data/app/helpers/sufia/blacklight_override.rb +11 -0
- data/app/helpers/sufia/records_helper_behavior.rb +38 -0
- data/app/helpers/sufia/sufia_helper_behavior.rb +109 -0
- data/{sufia-models/lib/sufia/models → app/models/concerns/sufia}/solr_document_behavior.rb +6 -1
- data/app/models/contact_form.rb +13 -13
- data/app/uploaders/tinymce_asset_uploader.rb +2 -2
- data/app/views/_controls.html.erb +1 -1
- data/app/views/_flash_msg.html.erb +2 -8
- data/app/views/_ga.html.erb +4 -0
- data/app/views/_user_util_links.html.erb +7 -7
- data/app/views/advanced/_advanced_search_facets.html.erb +1 -1
- data/app/views/advanced/_advanced_search_fields.html.erb +2 -2
- data/app/views/advanced/_advanced_search_form.html.erb +12 -12
- data/app/views/batch/_metadata.html.erb +12 -12
- data/app/views/batch/_more_metadata.html.erb +1 -2
- data/app/views/batch/edit.html.erb +5 -5
- data/app/views/batch_edits/_check_all.html.erb +1 -1
- data/app/views/batch_edits/_delete_selected.html.erb +2 -3
- data/app/views/batch_edits/edit.html.erb +20 -21
- data/app/views/catalog/_bookmark_control.html.erb +7 -8
- data/app/views/catalog/_constraints_element.html.erb +2 -2
- data/app/views/catalog/_delete_partials/_default.html.erb +9 -12
- data/app/views/catalog/_document.html.erb +5 -5
- data/app/views/catalog/_document_list.html.erb +2 -2
- data/app/views/catalog/_edit_partials/_default.html.erb +6 -9
- data/app/views/catalog/_edit_partials/_default_details.html.erb +2 -4
- data/app/views/catalog/_email_form.html.erb +1 -1
- data/app/views/catalog/_facet_limit.html.erb +6 -7
- data/app/views/catalog/_facet_selected.html.erb +3 -3
- data/app/views/catalog/_folder_control.html.erb +7 -8
- data/app/views/catalog/_index_default.html.erb +2 -2
- data/app/views/catalog/_index_header_default.html.erb +20 -0
- data/app/views/catalog/_index_partials/_default_group.html.erb +1 -1
- data/app/views/catalog/_index_partials/_list_files.html.erb +5 -2
- data/app/views/catalog/_refworks_form.html.erb +2 -2
- data/app/views/catalog/_results_pagination.html.erb +1 -1
- data/app/views/catalog/_search_form.html.erb +24 -9
- data/app/views/catalog/_show_default.html.erb +2 -2
- data/app/views/catalog/_show_partials/_default.html.erb +4 -5
- data/app/views/catalog/_show_partials/_default_details.html.erb +5 -5
- data/app/views/catalog/_show_partials/_facets.html.erb +7 -7
- data/app/views/catalog/_show_tools.html.erb +6 -6
- data/app/views/catalog/_sms_form.html.erb +1 -1
- data/app/views/catalog/_sort_and_per_page.html.erb +8 -14
- data/app/views/catalog/citation.html.erb +1 -1
- data/app/views/catalog/email.erb +1 -1
- data/app/views/catalog/index.html.erb +16 -27
- data/app/views/catalog/recent.js.erb +1 -1
- data/app/views/catalog/show.html.erb +2 -2
- data/app/views/catalog/sms.erb +1 -1
- data/app/views/collections/_action_menu.html.erb +24 -0
- data/app/views/collections/_batch_edits_actions.html.erb +3 -0
- data/app/views/collections/_button_for_creating_empty_collection.html.erb +3 -0
- data/app/views/collections/_dashboard_document_list.html.erb +6 -0
- data/app/views/collections/_document_list.html.erb +10 -0
- data/app/views/collections/_edit_actions.html.erb +5 -0
- data/app/views/collections/_edit_descriptions.html.erb +20 -0
- data/app/views/collections/_form.html.erb +24 -0
- data/app/views/collections/_form_for_select_collection.html.erb +34 -0
- data/app/views/collections/_media_display.html.erb +1 -0
- data/app/views/collections/_paginate.html.erb +6 -0
- data/app/views/collections/_search_collection_dashboard_form.html.erb +10 -0
- data/app/views/collections/_show_actions.html.erb +7 -0
- data/app/views/collections/_show_descriptions.html.erb +8 -0
- data/app/views/collections/_show_fields.html.erb +0 -0
- data/app/views/collections/_single_item_action_fields.html.erb +6 -0
- data/app/views/collections/_sort_and_per_page.html.erb +29 -0
- data/app/views/collections/_view_type_group.html.erb +13 -0
- data/app/views/collections/edit.html.erb +30 -0
- data/app/views/collections/show.html.erb +32 -0
- data/app/views/contact_form/new.html.erb +13 -13
- data/app/views/dashboard/_action_menu.html.erb +29 -0
- data/app/views/dashboard/_collection_action_menu.html.erb +15 -0
- data/app/views/dashboard/_document_list.html.erb +1 -1
- data/app/views/dashboard/_facet_limit.html.erb +2 -2
- data/app/views/dashboard/_facet_pagination.html.erb +12 -12
- data/app/views/dashboard/_facet_selected.html.erb +2 -2
- data/app/views/dashboard/_facets.html.erb +2 -0
- data/app/views/dashboard/_index_partials/_default_group.html.erb +9 -2
- data/app/views/dashboard/_index_partials/_list_collections.html.erb +45 -0
- data/app/views/dashboard/_index_partials/_list_files.html.erb +5 -25
- data/app/views/dashboard/_results_pagination.html.erb +1 -1
- data/app/views/dashboard/_search_form.html.erb +2 -2
- data/app/views/dashboard/_show_partials/_default.html.erb +3 -3
- data/app/views/dashboard/_show_partials/_default_details.html.erb +5 -5
- data/app/views/dashboard/_show_partials/_facets.html.erb +6 -6
- data/app/views/dashboard/_sort_and_per_page.html.erb +24 -8
- data/app/views/dashboard/facet.html.erb +3 -3
- data/app/views/dashboard/index.html.erb +18 -41
- data/app/views/dashboard/lists/index.html.erb +59 -0
- data/app/views/generic_files/_breadcrumbs.html.erb +4 -4
- data/app/views/generic_files/_descriptions.html.erb +4 -4
- data/app/views/generic_files/_field_form.html.erb +5 -5
- data/app/views/generic_files/_flot_stats.js.erb +120 -0
- data/app/views/generic_files/_media_display.html.erb +14 -4
- data/app/views/generic_files/_permission.html.erb +3 -3
- data/app/views/generic_files/_permission_form.html.erb +20 -21
- data/app/views/generic_files/_show_actions.html.erb +13 -10
- data/app/views/generic_files/_show_details.html.erb +16 -9
- data/app/views/generic_files/_versioning.html.erb +3 -3
- data/app/views/generic_files/edit.html.erb +7 -7
- data/app/views/generic_files/edit_fields/_default.html.erb +3 -4
- data/app/views/generic_files/edit_fields/_description.html.erb +3 -4
- data/app/views/generic_files/edit_fields/_resource_type.html.erb +1 -3
- data/app/views/generic_files/edit_fields/_rights.html.erb +3 -5
- data/app/views/generic_files/edit_fields/_suffix.html.erb +1 -1
- data/app/views/generic_files/show.html.erb +3 -3
- data/app/views/generic_files/stats.html.erb +8 -124
- data/app/views/generic_files/upload/_alerts.html.erb +2 -4
- data/app/views/generic_files/upload/_form.html.erb +1 -1
- data/app/views/generic_files/upload/_local_file_import_chooser.html.erb +1 -1
- data/app/views/generic_files/upload/_tos_checkbox.html.erb +1 -1
- data/app/views/homepage/_featured.html.erb +3 -1
- data/app/views/{catalog → homepage}/_featured_researcher.html.erb +0 -0
- data/app/views/{catalog → homepage}/_home.html.erb +1 -0
- data/app/views/{catalog → homepage}/_home_content.html.erb +4 -4
- data/app/views/homepage/_home_header.html.erb +12 -0
- data/app/views/homepage/_marketing.html.erb +4 -0
- data/app/views/{catalog → homepage}/_recent_document.html.erb +10 -5
- data/app/views/homepage/_recents.html.erb +15 -0
- data/app/views/homepage/_sortable_featured.html.erb +3 -1
- data/app/views/{catalog → homepage}/_tagcloud.html.erb +0 -0
- data/app/views/homepage/index.html.erb +1 -0
- data/app/views/kaminari/blacklight/_first_page.html.erb +1 -1
- data/app/views/kaminari/blacklight/_last_page.html.erb +1 -1
- data/app/views/kaminari/blacklight/_next_page.html.erb +1 -1
- data/app/views/kaminari/blacklight/_page.html.erb +1 -1
- data/app/views/kaminari/blacklight/_prev_page.html.erb +1 -1
- data/app/views/layouts/_head_tag_content.html.erb +1 -1
- data/app/views/layouts/error.html.erb +2 -2
- data/app/views/layouts/homepage.html.erb +4 -4
- data/app/views/layouts/sufia-dashboard.html.erb +7 -7
- data/app/views/layouts/sufia-one-column.html.erb +4 -4
- data/app/views/layouts/sufia-two-column.html.erb +7 -7
- data/app/views/mailbox/index.html.erb +2 -2
- data/app/views/pages/show.html.erb +1 -0
- data/app/views/records/_edit_field.html.erb +18 -0
- data/app/views/records/edit_fields/_description.html.erb +10 -0
- data/app/views/records/edit_fields/_resource_type.html.erb +7 -0
- data/app/views/records/edit_fields/_rights.html.erb +6 -0
- data/app/views/records/edit_fields/_suffix.html.erb +9 -0
- data/app/views/records/edit_fields/_type.html.erb +13 -0
- data/app/views/single_use_links/new_download.html.erb +1 -1
- data/app/views/users/_activity.html.erb +1 -1
- data/app/views/users/_contributions.html.erb +3 -1
- data/app/views/users/_left_sidebar.html.erb +1 -1
- data/app/views/users/_notify_link.html.erb +2 -2
- data/app/views/users/_profile.html.erb +2 -2
- data/app/views/users/_search_form.html.erb +3 -3
- data/app/views/users/edit.html.erb +15 -15
- data/app/views/users/index.html.erb +3 -3
- data/app/views/users/notifications_number.js.erb +1 -1
- data/config/locales/sufia.en.yml +13 -2
- data/config/routes.rb +56 -20
- data/db/seeds.rb +2 -2
- data/lib/generators/sufia/sufia_generator.rb +14 -4
- data/lib/generators/sufia/templates/catalog_controller.rb +98 -97
- data/lib/generators/sufia/templates/sufia_helper.rb +5 -0
- data/lib/sufia.rb +4 -0
- data/spec/{models/generic_file/actions_spec.rb → actors/generic_file/actor_spec.rb} +2 -2
- data/spec/controllers/authorities_controller_spec.rb +7 -7
- data/spec/controllers/batch_controller_spec.rb +22 -23
- data/spec/controllers/batch_edits_controller_spec.rb +4 -4
- data/spec/controllers/catalog_controller_spec.rb +27 -37
- data/spec/controllers/collections_controller_spec.rb +179 -0
- data/spec/controllers/dashboard/collections_controller_spec.rb +71 -0
- data/spec/controllers/dashboard/files_controller_spec.rb +71 -0
- data/spec/controllers/dashboard/highlights_controller_spec.rb +66 -0
- data/spec/controllers/dashboard/shares_controller_spec.rb +78 -0
- data/spec/controllers/dashboard_controller_spec.rb +0 -47
- data/spec/controllers/downloads_controller_spec.rb +10 -11
- data/spec/controllers/generic_files_controller_spec.rb +147 -118
- data/spec/controllers/homepage_controller_spec.rb +57 -0
- data/spec/controllers/mailbox_controller_spec.rb +3 -3
- data/spec/controllers/single_use_links_viewer_controller_spec.rb +3 -3
- data/spec/factories/generic_files.rb +4 -0
- data/spec/factories/users.rb +0 -1
- data/spec/features/browse_dashboard_files_spec.rb +5 -1
- data/spec/features/collection_spec.rb +232 -0
- data/spec/features/display_dashboard_spec.rb +1 -0
- data/spec/features/notifications_spec.rb +1 -1
- data/spec/features/search_spec.rb +22 -0
- data/spec/features/single_use_links_spec.rb +2 -2
- data/spec/features/users_spec.rb +1 -1
- data/spec/fixtures/charter.docx +0 -0
- data/spec/helpers/records_helper_spec.rb +61 -0
- data/spec/helpers/sufia_helper_spec.rb +40 -2
- data/spec/{models → jobs}/active_fedora_pid_based_job_spec.rb +0 -0
- data/spec/{models → jobs}/audit_job_spec.rb +0 -2
- data/spec/{models → jobs}/batch_update_job_spec.rb +2 -2
- data/spec/jobs/characterize_job_spec.rb +25 -0
- data/spec/jobs/create_derivatives_job_spec.rb +186 -0
- data/spec/{models → jobs}/event_jobs_spec.rb +0 -1
- data/spec/jobs/import_url_job_spec.rb +36 -14
- data/spec/jobs/ingest_local_file_job_spec.rb +2 -2
- data/spec/lib/sufia/analytics_spec.rb +29 -0
- data/spec/lib/sufia/upload_complete_behavior_spec.rb +1 -1
- data/spec/models/batch_spec.rb +3 -9
- data/spec/models/checksum_audit_log_spec.rb +5 -6
- data/spec/models/collection_spec.rb +24 -0
- data/spec/models/download_spec.rb +21 -0
- data/spec/models/featured_work_list_spec.rb +0 -1
- data/spec/models/file_content_datastream_spec.rb +8 -14
- data/spec/models/file_usage_spec.rb +91 -0
- data/spec/models/fits_datastream_spec.rb +1 -1
- data/spec/models/generic_file/web_form_spec.rb +2 -2
- data/spec/models/generic_file_rdf_datastream_spec.rb +12 -0
- data/spec/models/generic_file_spec.rb +150 -168
- data/spec/models/local_authority_spec.rb +9 -9
- data/spec/models/{pageview.rb → pageview_spec.rb} +0 -0
- data/spec/models/single_use_link_spec.rb +32 -35
- data/spec/routing/route_spec.rb +19 -3
- data/spec/spec_helper.rb +28 -6
- data/spec/support/features/session_helpers.rb +5 -6
- data/spec/support/lib/generators/test_app_generator.rb +6 -0
- data/spec/views/generic_file/edit.html.erb_spec.rb +4 -4
- data/spec/views/generic_file/show.html.erb_spec.rb +45 -17
- data/spec/views/generic_file/stats.html.erb_spec.rb +26 -7
- data/sufia-models/app/actors/sufia/generic_file/actor.rb +98 -0
- data/sufia-models/app/models/batch.rb +3 -3
- data/sufia-models/app/models/checksum_audit_log.rb +3 -3
- data/sufia-models/app/models/collection.rb +41 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file.rb +33 -43
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/accessible_attributes.rb +3 -3
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/audit.rb +12 -18
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/characterization.rb +1 -8
- data/sufia-models/app/models/concerns/sufia/generic_file/derivatives.rb +26 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/export.rb +13 -13
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/featured.rb +0 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/metadata.rb +0 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/mime_types.rb +15 -1
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/permissions.rb +5 -1
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/reload_on_save.rb +0 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/trophies.rb +0 -0
- data/sufia-models/app/models/concerns/sufia/generic_file/versions.rb +16 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/virus_check.rb +2 -3
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/web_form.rb +9 -2
- data/sufia-models/app/models/concerns/sufia/properties_datastream_behavior.rb +3 -4
- data/sufia-models/app/models/concerns/sufia/user.rb +2 -2
- data/sufia-models/app/models/datastreams/fits_datastream.rb +137 -136
- data/sufia-models/app/models/datastreams/generic_file_rdf_datastream.rb +6 -0
- data/sufia-models/app/models/datastreams/paranoid_rights_datastream.rb +3 -3
- data/sufia-models/app/models/file_usage.rb +53 -0
- data/sufia-models/app/models/follow.rb +2 -4
- data/sufia-models/app/models/geo_names_resource.rb +5 -7
- data/sufia-models/app/models/local_authority.rb +14 -14
- data/sufia-models/app/models/single_use_link.rb +1 -1
- data/sufia-models/app/models/sufia/download.rb +9 -0
- data/sufia-models/app/models/trophy.rb +1 -1
- data/sufia-models/app/services/sufia/{usage_statistics.rb → analytics.rb} +1 -24
- data/sufia-models/app/services/sufia/id_service.rb +2 -2
- data/sufia-models/lib/generators/sufia/models/install_generator.rb +5 -2
- data/sufia-models/lib/generators/sufia/models/templates/config/setup_mail.rb +1 -1
- data/sufia-models/lib/generators/sufia/models/templates/config/sufia.rb +5 -3
- data/sufia-models/lib/generators/sufia/models/templates/migrations/acts_as_follower_migration.rb +6 -6
- data/sufia-models/lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb +2 -3
- data/sufia-models/lib/generators/sufia/models/templates/migrations/create_local_authorities.rb +20 -20
- data/sufia-models/lib/sufia/ability.rb +1 -1
- data/sufia-models/lib/sufia/models/engine.rb +3 -9
- data/sufia-models/lib/sufia/models/file_content/versions.rb +3 -3
- data/sufia-models/lib/sufia/models/jobs/active_fedora_pid_based_job.rb +6 -2
- data/sufia-models/lib/sufia/models/jobs/batch_update_job.rb +6 -10
- data/sufia-models/lib/sufia/models/jobs/characterize_job.rb +1 -13
- data/sufia-models/lib/sufia/models/jobs/create_derivatives_job.rb +14 -0
- data/sufia-models/lib/sufia/models/jobs/import_url_job.rb +27 -23
- data/sufia-models/lib/tasks/sufia-models_tasks.rake +1 -1
- data/sufia-models/sufia-models.gemspec +1 -1
- data/sufia.gemspec +7 -2
- data/tasks/jetty.rake +4 -4
- data/tasks/release.rake +8 -8
- data/tasks/sufia-db.rake +4 -4
- data/tasks/sufia-dev.rake +11 -5
- metadata +226 -95
- data/app/helpers/sufia_helper.rb +0 -93
- data/app/views/catalog/_bookmark_form.html.erb +0 -8
- data/app/views/catalog/_home_header.html.erb +0 -15
- data/app/views/catalog/_recents.html.erb +0 -17
- data/app/views/dashboard/_index_partials/_thumbnail_display.html.erb +0 -9
- data/app/views/layouts/_homepage_sidebar2.html.erb +0 -14
- data/lib/sufia/files_controller_behavior.rb +0 -253
- data/spec/helpers/generic_file_helper_spec.rb +0 -28
- data/spec/lib/sufia/usage_statistics_spec.rb +0 -75
- data/spec/models/characterize_job_spec.rb +0 -93
- data/spec/models/transcode_audio_job_spec.rb +0 -85
- data/spec/models/transcode_video_job_spec.rb +0 -31
- data/spec/views/dashboard/index_partials/_thumbnail_display.html.erb_spec.rb +0 -22
- data/sufia-models/lib/sufia/models/generic_file/actions.rb +0 -50
- data/sufia-models/lib/sufia/models/generic_file/derivatives.rb +0 -31
- data/sufia-models/lib/sufia/models/generic_file/thumbnail.rb +0 -37
- data/sufia-models/lib/sufia/models/generic_file/versions.rb +0 -16
- data/sufia-models/lib/sufia/models/jobs/transcode_audio_job.rb +0 -15
- data/sufia-models/lib/sufia/models/jobs/transcode_video_job.rb +0 -15
@@ -0,0 +1,98 @@
|
|
1
|
+
module Sufia::GenericFile
|
2
|
+
# Actions are decoupled from controller logic so that they may be called from a controller or a background job.
|
3
|
+
class Actor
|
4
|
+
|
5
|
+
attr_reader :generic_file, :user
|
6
|
+
|
7
|
+
def initialize(generic_file, user)
|
8
|
+
@generic_file = generic_file
|
9
|
+
@user = user
|
10
|
+
end
|
11
|
+
|
12
|
+
# in order to avoid two saves in a row, create_metadata does not save the file by default.
|
13
|
+
# it is typically used in conjunction with create_content, which does do a save.
|
14
|
+
# If you want to save when using create_metadata, you can do this:
|
15
|
+
# create_metadata(batch_id) { |gf| gf.save }
|
16
|
+
def create_metadata(batch_id)
|
17
|
+
generic_file.apply_depositor_metadata(user)
|
18
|
+
generic_file.date_uploaded = Date.today
|
19
|
+
generic_file.date_modified = Date.today
|
20
|
+
generic_file.creator = user.name
|
21
|
+
|
22
|
+
if batch_id
|
23
|
+
generic_file.add_relationship("isPartOf", "info:fedora/#{Sufia::Noid.namespaceize(batch_id)}")
|
24
|
+
else
|
25
|
+
logger.warn "unable to find batch to attach to"
|
26
|
+
end
|
27
|
+
yield(generic_file) if block_given?
|
28
|
+
end
|
29
|
+
|
30
|
+
def create_content(file, file_name, dsid)
|
31
|
+
generic_file.add_file(file, dsid, file_name)
|
32
|
+
save_characterize_and_record_committer do
|
33
|
+
if Sufia.config.respond_to?(:after_create_content)
|
34
|
+
Sufia.config.after_create_content.call(generic_file, user)
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
def revert_content(revision_id, datastream_id)
|
40
|
+
revision = generic_file.content.get_version(revision_id)
|
41
|
+
generic_file.add_file(revision.content, datastream_id, revision.label)
|
42
|
+
save_characterize_and_record_committer
|
43
|
+
end
|
44
|
+
|
45
|
+
def update_content(file, datastream_id)
|
46
|
+
generic_file.add_file(file, datastream_id, file.original_filename)
|
47
|
+
save_characterize_and_record_committer
|
48
|
+
end
|
49
|
+
|
50
|
+
def update_metadata(attributes, visibility)
|
51
|
+
generic_file.attributes = generic_file.sanitize_attributes(attributes)
|
52
|
+
generic_file.visibility = visibility
|
53
|
+
generic_file.date_modified = DateTime.now
|
54
|
+
save_and_record_committer
|
55
|
+
end
|
56
|
+
|
57
|
+
# Takes an optional block and executes the block if the save was successful.
|
58
|
+
def save_characterize_and_record_committer
|
59
|
+
save_and_record_committer { push_characterize_job }.tap do |val|
|
60
|
+
yield if block_given? && val
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
# Takes an optional block and executes the block if the save was successful.
|
65
|
+
def save_and_record_committer
|
66
|
+
save_tries = 0
|
67
|
+
begin
|
68
|
+
return false unless generic_file.save
|
69
|
+
rescue RSolr::Error::Http => error
|
70
|
+
logger.warn "Sufia::GenericFile::Actor::save_and_record_committer Caught RSOLR error #{error.inspect}"
|
71
|
+
save_tries+=1
|
72
|
+
# fail for good if the tries is greater than 3
|
73
|
+
raise error if save_tries >=3
|
74
|
+
sleep 0.01
|
75
|
+
retry
|
76
|
+
end
|
77
|
+
yield if block_given?
|
78
|
+
generic_file.record_version_committer(user)
|
79
|
+
true
|
80
|
+
end
|
81
|
+
|
82
|
+
def push_characterize_job
|
83
|
+
Sufia.queue.push(CharacterizeJob.new(@generic_file.pid))
|
84
|
+
end
|
85
|
+
|
86
|
+
class << self
|
87
|
+
def virus_check(file)
|
88
|
+
path = file.is_a?(String) ? file : file.path
|
89
|
+
unless defined?(ClamAV)
|
90
|
+
logger.warn "Virus checking disabled, #{path} not checked"
|
91
|
+
return
|
92
|
+
end
|
93
|
+
scan_result = ClamAV.instance.scanfile(path)
|
94
|
+
raise Sufia::VirusFoundError.new("A virus was found in #{path}: #{scan_result}") unless scan_result == 0
|
95
|
+
end
|
96
|
+
end
|
97
|
+
end
|
98
|
+
end
|
@@ -3,10 +3,10 @@ class Batch < ActiveFedora::Base
|
|
3
3
|
include Sufia::ModelMethods
|
4
4
|
include Sufia::Noid
|
5
5
|
|
6
|
-
has_metadata :
|
6
|
+
has_metadata name: "descMetadata", type: BatchRdfDatastream
|
7
7
|
|
8
|
-
belongs_to :user, :
|
9
|
-
has_many :generic_files, :
|
8
|
+
belongs_to :user, property: "creator"
|
9
|
+
has_many :generic_files, property: :is_part_of
|
10
10
|
|
11
11
|
has_attributes :title, :creator, :part, :status, datastream: :descMetadata, multiple: true
|
12
12
|
|
@@ -1,9 +1,9 @@
|
|
1
1
|
class ChecksumAuditLog < ActiveRecord::Base
|
2
2
|
|
3
3
|
def ChecksumAuditLog.get_audit_log(version)
|
4
|
-
ChecksumAuditLog.find_or_create_by_pid_and_dsid_and_version(:
|
5
|
-
:
|
6
|
-
:
|
4
|
+
ChecksumAuditLog.find_or_create_by_pid_and_dsid_and_version(pid: version.pid,
|
5
|
+
dsid: version.dsid,
|
6
|
+
version: version.versionID)
|
7
7
|
end
|
8
8
|
|
9
9
|
def ChecksumAuditLog.prune_history(version)
|
@@ -0,0 +1,41 @@
|
|
1
|
+
class Collection < ActiveFedora::Base
|
2
|
+
include Hydra::Collection
|
3
|
+
include Sufia::ModelMethods
|
4
|
+
include Sufia::Noid
|
5
|
+
include Sufia::GenericFile::Permissions
|
6
|
+
include Sufia::GenericFile::WebForm # provides initialize_fields method
|
7
|
+
|
8
|
+
before_save :update_permissions
|
9
|
+
validates :title, presence: true
|
10
|
+
|
11
|
+
has_metadata "properties", type: PropertiesDatastream
|
12
|
+
|
13
|
+
def terms_for_display
|
14
|
+
[:title, :creator, :description, :date_modified, :date_uploaded]
|
15
|
+
end
|
16
|
+
|
17
|
+
def terms_for_editing
|
18
|
+
terms_for_display - [:date_modified, :date_uploaded]
|
19
|
+
end
|
20
|
+
|
21
|
+
# Test to see if the given field is required
|
22
|
+
# @param [Symbol] key a field
|
23
|
+
# @return [Boolean] is it required or not
|
24
|
+
def required?(key)
|
25
|
+
self.class.validators_on(key).any?{|v| v.kind_of? ActiveModel::Validations::PresenceValidator}
|
26
|
+
end
|
27
|
+
|
28
|
+
def to_param
|
29
|
+
noid
|
30
|
+
end
|
31
|
+
|
32
|
+
def to_solr(solr_doc={}, opts={})
|
33
|
+
super(solr_doc, opts)
|
34
|
+
solr_doc[Solrizer.solr_name("noid", Sufia::GenericFile.noid_indexer)] = noid
|
35
|
+
return solr_doc
|
36
|
+
end
|
37
|
+
|
38
|
+
def update_permissions
|
39
|
+
self.visibility = "open"
|
40
|
+
end
|
41
|
+
end
|
@@ -3,21 +3,9 @@ module Sufia
|
|
3
3
|
|
4
4
|
module GenericFile
|
5
5
|
extend ActiveSupport::Concern
|
6
|
-
extend ActiveSupport::Autoload
|
7
|
-
autoload :Actions, 'sufia/models/generic_file/actions'
|
8
|
-
autoload :Permissions, 'sufia/models/generic_file/permissions'
|
9
|
-
autoload :WebForm, 'sufia/models/generic_file/web_form'
|
10
|
-
autoload :AccessibleAttributes, 'sufia/models/generic_file/accessible_attributes'
|
11
|
-
autoload :Trophies, 'sufia/models/generic_file/trophies'
|
12
|
-
autoload :Featured, 'sufia/models/generic_file/featured'
|
13
|
-
autoload :Metadata, 'sufia/models/generic_file/metadata'
|
14
|
-
autoload :Versions, 'sufia/models/generic_file/versions'
|
15
|
-
autoload :VirusCheck, 'sufia/models/generic_file/virus_check'
|
16
|
-
autoload :ReloadOnSave, 'sufia/models/generic_file/reload_on_save'
|
17
6
|
include Sufia::ModelMethods
|
18
7
|
include Sufia::Noid
|
19
8
|
include Sufia::GenericFile::MimeTypes
|
20
|
-
include Sufia::GenericFile::Thumbnail
|
21
9
|
include Sufia::GenericFile::Export
|
22
10
|
include Sufia::GenericFile::Characterization
|
23
11
|
include Sufia::GenericFile::Audit
|
@@ -30,13 +18,14 @@ module Sufia
|
|
30
18
|
include Sufia::GenericFile::Versions
|
31
19
|
include Sufia::GenericFile::VirusCheck
|
32
20
|
include Sufia::GenericFile::ReloadOnSave
|
21
|
+
include Hydra::Collections::Collectible
|
33
22
|
|
34
23
|
included do
|
35
|
-
belongs_to :batch, :
|
24
|
+
belongs_to :batch, property: :is_part_of
|
36
25
|
|
37
|
-
around_save :
|
26
|
+
around_save :retry_warming
|
38
27
|
|
39
|
-
attr_accessible *(
|
28
|
+
attr_accessible *(terms_for_display + [:part_of, :permissions])
|
40
29
|
end
|
41
30
|
|
42
31
|
def persistent_url
|
@@ -44,34 +33,34 @@ module Sufia
|
|
44
33
|
end
|
45
34
|
|
46
35
|
def retry_warming
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
36
|
+
save_tries = 0
|
37
|
+
conflict_tries = 0
|
38
|
+
begin
|
39
|
+
yield
|
40
|
+
rescue RSolr::Error::Http => error
|
41
|
+
save_tries += 1
|
42
|
+
logger.warn "Retry Solr caught RSOLR error on #{self.pid}: #{error.inspect}"
|
43
|
+
# fail for good if the tries is greater than 3
|
44
|
+
raise if save_tries >=3
|
45
|
+
sleep 0.01
|
46
|
+
retry
|
47
|
+
rescue ActiveResource::ResourceConflict => error
|
48
|
+
conflict_tries += 1
|
49
|
+
logger.warn "Retry caught Active Resource Conflict #{self.pid}: #{error.inspect}"
|
50
|
+
raise if conflict_tries >=10
|
51
|
+
sleep 0.01
|
52
|
+
retry
|
53
|
+
rescue => error
|
54
|
+
if error.to_s.downcase.include? "conflict"
|
59
55
|
conflict_tries += 1
|
60
56
|
logger.warn "Retry caught Active Resource Conflict #{self.pid}: #{error.inspect}"
|
61
57
|
raise if conflict_tries >=10
|
62
58
|
sleep 0.01
|
63
59
|
retry
|
64
|
-
|
65
|
-
|
66
|
-
conflict_tries += 1
|
67
|
-
logger.warn "Retry caught Active Resource Conflict #{self.pid}: #{error.inspect}"
|
68
|
-
raise if conflict_tries >=10
|
69
|
-
sleep 0.01
|
70
|
-
retry
|
71
|
-
else
|
72
|
-
raise
|
73
|
-
end
|
60
|
+
else
|
61
|
+
raise
|
74
62
|
end
|
63
|
+
end
|
75
64
|
end
|
76
65
|
|
77
66
|
# Get the files with a sibling relationship (belongs_to :batch)
|
@@ -99,12 +88,13 @@ module Sufia
|
|
99
88
|
end
|
100
89
|
|
101
90
|
def to_solr(solr_doc={}, opts={})
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
91
|
+
super(solr_doc, opts).tap do |solr_doc|
|
92
|
+
solr_doc[Solrizer.solr_name('label')] = self.label
|
93
|
+
solr_doc[Solrizer.solr_name('noid', Sufia::GenericFile.noid_indexer)] = noid
|
94
|
+
solr_doc[Solrizer.solr_name('file_format')] = file_format
|
95
|
+
solr_doc[Solrizer.solr_name('file_format', :facetable)] = file_format
|
96
|
+
solr_doc = index_collection_pids(solr_doc)
|
97
|
+
end
|
108
98
|
end
|
109
99
|
|
110
100
|
# Redefine this for more intuitive keys in Redis
|
@@ -41,7 +41,7 @@ module Sufia
|
|
41
41
|
# attr_accessor :name, :credit_rating
|
42
42
|
#
|
43
43
|
# attr_accessible :name
|
44
|
-
# attr_accessible :name, :credit_rating, :
|
44
|
+
# attr_accessible :name, :credit_rating, as: :admin
|
45
45
|
#
|
46
46
|
# def assign_attributes(values, options = {})
|
47
47
|
# sanitize_for_mass_assignment(values, options[:as]).each do |k, v|
|
@@ -53,7 +53,7 @@ module Sufia
|
|
53
53
|
# When using the :default role:
|
54
54
|
#
|
55
55
|
# customer = Customer.new
|
56
|
-
# customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", :
|
56
|
+
# customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", last_login: 1.day.ago }, as: :default)
|
57
57
|
# customer.name # => "David"
|
58
58
|
# customer.credit_rating # => nil
|
59
59
|
#
|
@@ -63,7 +63,7 @@ module Sufia
|
|
63
63
|
# And using the :admin role:
|
64
64
|
#
|
65
65
|
# customer = Customer.new
|
66
|
-
# customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", :
|
66
|
+
# customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", last_login: 1.day.ago }, as: :admin)
|
67
67
|
# customer.name # => "David"
|
68
68
|
# customer.credit_rating # => "Excellent"
|
69
69
|
#
|
@@ -24,7 +24,7 @@ module Sufia
|
|
24
24
|
end
|
25
25
|
|
26
26
|
def logs(dsid)
|
27
|
-
ChecksumAuditLog.where(:dsid
|
27
|
+
ChecksumAuditLog.where(dsid: dsid, pid: self.pid).order('created_at desc, id desc')
|
28
28
|
end
|
29
29
|
|
30
30
|
def audit!
|
@@ -40,19 +40,18 @@ module Sufia
|
|
40
40
|
audit_results = logs.collect { |result| result["pass"] }
|
41
41
|
|
42
42
|
# check how many non runs we had
|
43
|
-
non_runs =audit_results.reduce(0) { |sum, value|
|
44
|
-
if
|
45
|
-
result =audit_results.reduce(true) { |sum, value| sum && value }
|
43
|
+
non_runs = audit_results.reduce(0) { |sum, value| value == NO_RUNS ? sum += 1 : sum }
|
44
|
+
if non_runs == 0
|
45
|
+
result = audit_results.reduce(true) { |sum, value| sum && value }
|
46
46
|
return result
|
47
|
-
elsif
|
48
|
-
result =audit_results.reduce(true) { |sum, value|
|
47
|
+
elsif non_runs < audit_results.length
|
48
|
+
result = audit_results.reduce(true) { |sum, value| value == NO_RUNS ? sum : sum && value }
|
49
49
|
return 'Some audits have not been run, but the ones run were '+ ((result)? 'passing' : 'failing') + '.'
|
50
50
|
else
|
51
51
|
return 'Audits have not yet been run on this file.'
|
52
52
|
end
|
53
53
|
end
|
54
54
|
|
55
|
-
|
56
55
|
module ClassMethods
|
57
56
|
def audit!(version)
|
58
57
|
::GenericFile.audit(version, true)
|
@@ -68,24 +67,20 @@ module Sufia
|
|
68
67
|
|
69
68
|
# run the find just incase the job has finished already
|
70
69
|
latest_audit = self.find(version.pid).logs(version.dsid).first
|
71
|
-
latest_audit = ChecksumAuditLog.new(:
|
72
|
-
|
70
|
+
latest_audit = ChecksumAuditLog.new(pass: NO_RUNS, pid: version.pid, dsid: version.dsid, version: version.versionID) unless latest_audit
|
71
|
+
latest_audit
|
73
72
|
end
|
74
73
|
|
75
74
|
def needs_audit?(version, latest_audit)
|
76
75
|
if latest_audit and latest_audit.updated_at
|
77
|
-
#logger.debug "***AUDIT*** last audit = #{latest_audit.updated_at.to_date}"
|
78
76
|
days_since_last_audit = (DateTime.now - latest_audit.updated_at.to_date).to_i
|
79
|
-
#logger.debug "***AUDIT*** days since last audit: #{days_since_last_audit}"
|
80
77
|
if days_since_last_audit < Sufia.config.max_days_between_audits
|
81
|
-
#logger.debug "***AUDIT*** No audit needed for #{version.pid} #{version.versionID} (#{latest_audit.updated_at})"
|
82
78
|
return false
|
83
79
|
end
|
84
80
|
else
|
85
81
|
logger.warn "***AUDIT*** problem with audit log! Latest Audit is not nil, but updated_at is not set #{latest_audit}" unless latest_audit.nil?
|
86
82
|
end
|
87
|
-
|
88
|
-
return true
|
83
|
+
true
|
89
84
|
end
|
90
85
|
|
91
86
|
def audit_everything(force = false)
|
@@ -102,16 +97,15 @@ module Sufia
|
|
102
97
|
|
103
98
|
def run_audit(version)
|
104
99
|
if version.dsChecksumValid
|
105
|
-
#logger.info "***AUDIT*** Audit passed for #{version.pid} #{version.versionID}"
|
106
100
|
passing = 1
|
107
101
|
ChecksumAuditLog.prune_history(version)
|
108
102
|
else
|
109
103
|
logger.warn "***AUDIT*** Audit failed for #{version.pid} #{version.versionID}"
|
110
104
|
passing = 0
|
111
105
|
end
|
112
|
-
check = ChecksumAuditLog.create!(:
|
113
|
-
:
|
114
|
-
|
106
|
+
check = ChecksumAuditLog.create!(pass: passing, pid: version.pid,
|
107
|
+
dsid: version.dsid, version: version.versionID)
|
108
|
+
check
|
115
109
|
end
|
116
110
|
end
|
117
111
|
end
|
data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/characterization.rb
RENAMED
@@ -3,7 +3,7 @@ module Sufia
|
|
3
3
|
module Characterization
|
4
4
|
extend ActiveSupport::Concern
|
5
5
|
included do
|
6
|
-
has_metadata "characterization", :
|
6
|
+
has_metadata "characterization", type: FitsDatastream
|
7
7
|
has_attributes :mime_type, datastream: :characterization, multiple: false
|
8
8
|
has_attributes :format_label, :file_size, :last_modified,
|
9
9
|
:filename, :original_checksum, :rights_basis,
|
@@ -40,12 +40,6 @@ module Sufia
|
|
40
40
|
characterization.sample_rate.blank? ? characterization.video_sample_rate : characterization.sample_rate
|
41
41
|
end
|
42
42
|
|
43
|
-
def characterize_if_changed
|
44
|
-
content_changed = self.content.changed?
|
45
|
-
yield
|
46
|
-
Sufia.queue.push(CharacterizeJob.new(self.pid)) if content_changed
|
47
|
-
end
|
48
|
-
|
49
43
|
## Extract the metadata from the content datastream and record it in the characterization datastream
|
50
44
|
def characterize
|
51
45
|
self.characterization.ng_xml = self.content.extract_metadata
|
@@ -89,7 +83,6 @@ module Sufia
|
|
89
83
|
h
|
90
84
|
end
|
91
85
|
|
92
|
-
|
93
86
|
end
|
94
87
|
end
|
95
88
|
end
|
@@ -0,0 +1,26 @@
|
|
1
|
+
module Sufia
|
2
|
+
module GenericFile
|
3
|
+
module Derivatives
|
4
|
+
extend ActiveSupport::Concern
|
5
|
+
|
6
|
+
included do
|
7
|
+
include Hydra::Derivatives
|
8
|
+
|
9
|
+
makes_derivatives do |obj|
|
10
|
+
case obj.mime_type
|
11
|
+
when *pdf_mime_types
|
12
|
+
obj.transform_datastream :content, { thumbnail: { format: 'jpg', size: '338x493', datastream: 'thumbnail' } }
|
13
|
+
when *office_document_mime_types
|
14
|
+
obj.transform_datastream :content, { thumbnail: { format: 'jpg', size: '200x150>', datastream: 'thumbnail' } }, processor: :document
|
15
|
+
when *audio_mime_types
|
16
|
+
obj.transform_datastream :content, { mp3: { format: 'mp3', datastream: 'mp3' }, ogg: { format: 'ogg', datastream: 'ogg' } }, processor: :audio
|
17
|
+
when *video_mime_types
|
18
|
+
obj.transform_datastream :content, { webm: { format: 'webm', datastream: 'webm' }, mp4: { format: 'mp4', datastream: 'mp4' }, thumbnail: { format: 'jpg', datastream: 'thumbnail' } }, processor: :video
|
19
|
+
when *image_mime_types
|
20
|
+
obj.transform_datastream :content, { thumbnail: { format: 'jpg', size: '200x150>', datastream: 'thumbnail' } }
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|