sufia 7.1.0 → 7.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.codeclimate.yml +49 -0
- data/.engine_cart.yml +1 -0
- data/.eslintignore +1 -0
- data/.eslintrc +213 -0
- data/.gitignore +2 -0
- data/.hound.yml +5 -0
- data/.rubocop.yml +27 -17
- data/.rubocop_todo.yml +6 -3
- data/.scss-lint.yml +253 -0
- data/.travis.yml +3 -2
- data/Gemfile +5 -1
- data/README.md +30 -16
- data/app/assets/javascripts/sufia.js +6 -0
- data/app/assets/javascripts/sufia/app.js +13 -5
- data/app/assets/javascripts/sufia/fileupload.js.erb +12 -0
- data/app/assets/javascripts/sufia/initialize.js +3 -0
- data/app/assets/javascripts/sufia/save_work/required_fields.es6 +5 -1
- data/app/assets/javascripts/sufia/save_work/save_work_control.es6 +12 -0
- data/app/assets/javascripts/sufia/trophy.js +14 -14
- data/app/assets/javascripts/sufia/uploader.js +32 -3
- data/app/assets/stylesheets/fileupload/jquery.fileupload-ui.scss +29 -35
- data/app/assets/stylesheets/sufia/_batch-edit.scss +0 -5
- data/app/assets/stylesheets/sufia/_browse_everything_overrides.scss +1 -1
- data/app/assets/stylesheets/sufia/_buttons.scss +6 -1
- data/app/assets/stylesheets/sufia/_catalog.scss +6 -0
- data/app/assets/stylesheets/sufia/_collections.scss +29 -13
- data/app/assets/stylesheets/sufia/_dashboard.scss +27 -19
- data/app/assets/stylesheets/sufia/_file-listing.scss +7 -0
- data/app/assets/stylesheets/sufia/_file_upload.scss +20 -0
- data/app/assets/stylesheets/sufia/_form.scss +30 -0
- data/app/assets/stylesheets/sufia/_home-page.scss +87 -33
- data/app/assets/stylesheets/sufia/_representative-media.scss +4 -0
- data/app/assets/stylesheets/sufia/_styles.scss +0 -23
- data/app/assets/stylesheets/sufia/_sufia.scss +10 -7
- data/app/assets/stylesheets/sufia/_variables.scss +14 -0
- data/app/assets/stylesheets/sufia/_work-show.scss +1 -1
- data/app/assets/stylesheets/sufia/admin.scss +203 -0
- data/app/assets/stylesheets/sufia/widgets.css +288 -0
- data/app/controllers/api/items_controller.rb +1 -1
- data/app/controllers/concerns/sufia/admin/stats_behavior.rb +7 -1
- data/app/controllers/concerns/sufia/batch_edits_controller_behavior.rb +1 -1
- data/app/controllers/concerns/sufia/batch_uploads_controller_behavior.rb +0 -1
- data/app/controllers/concerns/sufia/collections_controller_behavior.rb +1 -1
- data/app/controllers/concerns/sufia/contact_form_controller_behavior.rb +19 -5
- data/app/controllers/concerns/sufia/deny_access_override_behavior.rb +13 -0
- data/app/controllers/concerns/sufia/depositors_controller_behavior.rb +1 -10
- data/app/controllers/concerns/sufia/file_sets_controller_behavior.rb +1 -1
- data/app/controllers/concerns/sufia/homepage_controller_behavior.rb +11 -2
- data/app/controllers/concerns/sufia/my_controller_behavior.rb +7 -16
- data/app/controllers/concerns/sufia/singular_subresource_controller.rb +1 -10
- data/app/controllers/concerns/sufia/transfers_controller_behavior.rb +1 -1
- data/app/controllers/concerns/sufia/users_controller_behavior.rb +2 -25
- data/app/controllers/concerns/sufia/works_controller_behavior.rb +27 -3
- data/app/controllers/content_blocks_controller.rb +12 -2
- data/app/controllers/curation_concerns/file_sets_controller.rb +0 -1
- data/app/controllers/curation_concerns/permissions_controller.rb +8 -16
- data/app/controllers/my/highlights_controller.rb +1 -1
- data/app/controllers/stats_controller.rb +2 -2
- data/app/controllers/sufia/admin/admin_sets_controller.rb +114 -0
- data/app/controllers/sufia/admin/features_controller.rb +13 -0
- data/app/controllers/sufia/admin/stats_controller.rb +5 -0
- data/app/controllers/sufia/admin/strategies_controller.rb +14 -0
- data/app/controllers/sufia/admin_controller.rb +11 -0
- data/app/controllers/sufia/admin_sets_controller.rb +25 -0
- data/app/controllers/sufia/resource_sync_controller.rb +11 -15
- data/app/forms/sufia/forms/admin_set_form.rb +30 -0
- data/app/forms/sufia/forms/batch_edit_form.rb +1 -1
- data/app/forms/sufia/forms/work_form.rb +2 -2
- data/app/helpers/sufia/citations_behaviors/title_behavior.rb +1 -1
- data/app/helpers/sufia/dashboard_helper_behavior.rb +6 -0
- data/app/helpers/sufia/permissions_helper.rb +19 -0
- data/app/helpers/sufia/sufia_helper_behavior.rb +13 -6
- data/app/indexers/sufia/work_indexer.rb +4 -0
- data/app/jobs/attach_files_to_work_job.rb +3 -1
- data/app/jobs/content_depositor_change_event_job.rb +0 -7
- data/app/jobs/content_event_job.rb +0 -7
- data/app/jobs/event_job.rb +1 -11
- data/app/jobs/inherit_permissions_job.rb +24 -0
- data/app/mailers/sufia/contact_mailer.rb +11 -0
- data/app/models/concerns/sufia/ability.rb +12 -1
- data/app/models/concerns/sufia/content_block_behavior.rb +47 -0
- data/app/models/concerns/sufia/solr_document/export.rb +6 -0
- data/app/models/concerns/sufia/solr_document_behavior.rb +4 -0
- data/app/models/concerns/sufia/user.rb +7 -8
- data/app/models/concerns/sufia/with_events.rb +5 -1
- data/app/models/concerns/sufia/works/featured.rb +1 -1
- data/app/models/concerns/sufia/works/trophies.rb +1 -1
- data/app/models/content_block.rb +1 -39
- data/app/models/featured_work_list.rb +0 -1
- data/app/models/file_download_stat.rb +18 -7
- data/app/models/file_view_stat.rb +5 -2
- data/app/models/sufia/contact_form.rb +33 -0
- data/app/models/sufia/feature.rb +5 -0
- data/app/models/sufia/statistic.rb +6 -5
- data/app/presenters/sufia/admin_dashboard_presenter.rb +8 -0
- data/app/presenters/sufia/admin_set_presenter.rb +7 -0
- data/app/presenters/sufia/admin_stats_presenter.rb +0 -4
- data/app/presenters/sufia/collection_presenter.rb +5 -4
- data/app/presenters/sufia/file_set_presenter.rb +16 -3
- data/app/presenters/sufia/file_usage.rb +37 -0
- data/app/presenters/sufia/stats_usage_presenter.rb +43 -0
- data/app/presenters/sufia/trophy_presenter.rb +2 -0
- data/app/presenters/sufia/work_show_presenter.rb +3 -1
- data/app/presenters/sufia/work_usage.rb +30 -0
- data/app/search_builders/collection_search_builder.rb +1 -1
- data/app/search_builders/sufia/admin_set_member_search_builder.rb +12 -0
- data/app/search_builders/sufia/single_admin_set_search_builder.rb +9 -0
- data/app/services/sufia/admin_set_service.rb +22 -0
- data/app/services/sufia/analytics.rb +51 -26
- data/app/services/sufia/collection_size_service.rb +1 -1
- data/app/services/sufia/file_set_csv_service.rb +1 -1
- data/app/services/sufia/statistics/system_stats.rb +0 -6
- data/app/views/_controls.html.erb +8 -4
- data/app/views/_logo.html.erb +1 -1
- data/app/views/_toolbar.html.erb +1 -1
- data/app/views/catalog/_facet_limit.html.erb +2 -2
- data/app/views/catalog/_search_form.html.erb +0 -4
- data/app/views/catalog/_thumbnail_list_collection.html.erb +1 -3
- data/app/views/catalog/index.html.erb +1 -1
- data/app/views/collections/_dashboard_document_list.html.erb +1 -3
- data/app/views/collections/_document_list.html.erb +0 -2
- data/app/views/collections/_form.html.erb +1 -1
- data/app/views/collections/_form_for_select_collection.html.erb +1 -1
- data/app/views/collections/_media_display.html.erb +1 -3
- data/app/views/collections/_show_descriptions.html.erb +1 -1
- data/app/views/collections/_show_document_list.html.erb +3 -1
- data/app/views/collections/_show_document_list_menu.html.erb +12 -12
- data/app/views/collections/_show_document_list_row.html.erb +6 -4
- data/app/views/contact_form/new.html.erb +1 -1
- data/app/views/curation_concerns/base/_attribute_rows.html.erb +12 -10
- data/app/views/curation_concerns/base/_citations.html.erb +2 -2
- data/app/views/curation_concerns/base/_form_files.html.erb +11 -3
- data/app/views/curation_concerns/base/_form_metadata.html.erb +1 -1
- data/app/views/curation_concerns/base/_form_progress.html.erb +2 -2
- data/app/views/curation_concerns/base/_form_relationships.html.erb +8 -0
- data/app/views/curation_concerns/base/_guts4form.html.erb +8 -4
- data/app/views/curation_concerns/base/_items.html.erb +7 -7
- data/app/views/curation_concerns/base/_relationships.html.erb +0 -1
- data/app/views/curation_concerns/base/_show_actions.html.erb +3 -0
- data/app/views/curation_concerns/base/_social_media.html.erb +49 -15
- data/app/views/curation_concerns/file_sets/_actions.html.erb +1 -9
- data/app/views/curation_concerns/file_sets/_groups_description.html.erb +1 -5
- data/app/views/curation_concerns/file_sets/media_display/_default.html.erb +3 -0
- data/app/views/curation_concerns/permissions/confirm_access.html.erb +12 -0
- data/app/views/dashboard/_index_partials/_heading_greetings.html.erb +1 -1
- data/app/views/layouts/admin.html.erb +71 -0
- data/app/views/layouts/{sufia-one-column.html.erb → curation_concerns/1_column.html.erb} +1 -1
- data/app/views/layouts/homepage.html.erb +35 -2
- data/app/views/layouts/sufia-dashboard.html.erb +1 -1
- data/app/views/my/_facet_pagination.html.erb +5 -5
- data/app/views/my/_index_partials/_list_collections.html.erb +1 -3
- data/app/views/my/_scripts.js.erb +1 -2
- data/app/views/my/index.html.erb +3 -3
- data/app/views/records/edit_fields/_description.html.erb +2 -2
- data/app/views/records/edit_fields/_rights.html.erb +3 -2
- data/app/views/records/show_fields/_rights.html.erb +2 -1
- data/app/views/shared/_footer.html.erb +1 -1
- data/app/views/sufia/admin/_menu.html.erb +5 -0
- data/app/views/sufia/admin/_sidebar.html.erb +23 -0
- data/app/views/sufia/admin/admin_sets/_form.html.erb +18 -0
- data/app/views/sufia/admin/admin_sets/_sort_and_per_page.html.erb +5 -0
- data/app/views/sufia/admin/admin_sets/edit.html.erb +9 -0
- data/app/views/sufia/admin/admin_sets/index.html.erb +46 -0
- data/app/views/sufia/admin/admin_sets/new.html.erb +9 -0
- data/app/views/sufia/admin/admin_sets/show.html.erb +43 -0
- data/app/views/sufia/admin/features/index.html.erb +57 -0
- data/app/views/sufia/admin/show.html.erb +36 -0
- data/app/views/{admin → sufia/admin}/stats/_date_form.html.erb +0 -0
- data/app/views/{admin → sufia/admin}/stats/_deposits.html.erb +0 -0
- data/app/views/{admin → sufia/admin}/stats/_new_users.html.erb +0 -0
- data/app/views/{admin → sufia/admin}/stats/_stats_by_date.html.erb +4 -4
- data/app/views/{admin → sufia/admin}/stats/_top_data.html.erb +2 -2
- data/app/views/{admin → sufia/admin}/stats/_works.html.erb +0 -0
- data/app/views/sufia/admin/stats/show.html.erb +7 -0
- data/app/views/sufia/admin_sets/_admin_set.html.erb +25 -0
- data/app/views/sufia/admin_sets/_document_list.html.erb +30 -0
- data/app/views/sufia/admin_sets/_member_document.html.erb +26 -0
- data/app/views/sufia/admin_sets/_search_form.html.erb +12 -0
- data/app/views/sufia/admin_sets/_sort_and_per_page.html.erb +5 -0
- data/app/views/sufia/admin_sets/index.html.erb +2 -0
- data/app/views/sufia/admin_sets/show.html.erb +33 -0
- data/app/views/sufia/contact_mailer/contact.html.erb +5 -0
- data/app/views/sufia/homepage/_explore_collections.html.erb +28 -0
- data/app/views/sufia/homepage/_featured_researcher.html.erb +7 -2
- data/app/views/sufia/homepage/_featured_works.html.erb +1 -1
- data/app/views/sufia/homepage/_home_content.html.erb +21 -3
- data/app/views/sufia/homepage/_marketing.html.erb +1 -1
- data/app/views/sufia/homepage/_recently_uploaded.html.erb +14 -16
- data/app/views/sufia/homepage/index.html.erb +14 -5
- data/app/views/users/_activity_log.html.erb +0 -1
- data/app/views/users/_contributions.html.erb +1 -1
- data/app/views/users/_profile_actions.html.erb +6 -16
- data/app/views/users/_vitals.html.erb +0 -5
- data/app/views/users/index.html.erb +16 -16
- data/config/features.rb +10 -0
- data/config/locales/sufia.en.yml +76 -25
- data/config/routes.rb +16 -17
- data/db/migrate/20160415212015_create_features.rb +10 -0
- data/lib/generators/sufia/install_generator.rb +10 -34
- data/lib/generators/sufia/templates/catalog_controller.rb +7 -6
- data/lib/generators/sufia/templates/config/sufia.rb +7 -0
- data/lib/generators/sufia/work_generator.rb +2 -2
- data/lib/sufia.rb +0 -1
- data/lib/sufia/arkivo/metadata_munger.rb +13 -2
- data/lib/sufia/configuration.rb +5 -0
- data/lib/sufia/controlled_vocabulary/importer/downloader.rb +17 -0
- data/lib/sufia/controlled_vocabulary/importer/language.rb +62 -0
- data/lib/sufia/engine.rb +7 -0
- data/lib/sufia/redis_event_store.rb +2 -2
- data/lib/sufia/resource_sync/resource_list_writer.rb +1 -1
- data/lib/sufia/version.rb +1 -1
- data/solr/config/solrconfig.xml +26 -15
- data/spec/actors/sufia/create_with_files_actor_spec.rb +6 -4
- data/spec/actors/sufia/create_with_remote_files_actor_spec.rb +26 -18
- data/spec/controllers/api/items_controller_spec.rb +32 -22
- data/spec/controllers/api/zotero_controller_spec.rb +2 -2
- data/spec/controllers/batch_edits_controller_spec.rb +5 -6
- data/spec/controllers/catalog_controller_spec.rb +11 -11
- data/spec/controllers/citations_controller_spec.rb +2 -2
- data/spec/controllers/collections_controller_spec.rb +57 -36
- data/spec/controllers/contact_form_controller_spec.rb +6 -6
- data/spec/controllers/content_blocks_controller_spec.rb +8 -8
- data/spec/controllers/curation_concerns/audits_controller_spec.rb +2 -2
- data/spec/controllers/curation_concerns/file_sets_controller_spec.rb +51 -43
- data/spec/controllers/curation_concerns/generic_works_controller_spec.rb +51 -27
- data/spec/controllers/curation_concerns/permissions_controller_spec.rb +24 -0
- data/spec/controllers/depositors_controller_spec.rb +5 -5
- data/spec/controllers/downloads_controller_spec.rb +4 -4
- data/spec/controllers/featured_work_lists_controller_spec.rb +5 -3
- data/spec/controllers/featured_works_controller_spec.rb +9 -9
- data/spec/controllers/mailbox_controller_spec.rb +1 -1
- data/spec/controllers/my/collections_controller_spec.rb +3 -7
- data/spec/controllers/my/highlights_controller_spec.rb +2 -2
- data/spec/controllers/my/shares_controller_spec.rb +2 -2
- data/spec/controllers/my/works_controller_spec.rb +5 -14
- data/spec/controllers/pages_controller_spec.rb +2 -2
- data/spec/controllers/static_controller_spec.rb +2 -2
- data/spec/controllers/stats_controller_spec.rb +8 -8
- data/spec/controllers/sufia/admin/admin_sets_controller_spec.rb +123 -0
- data/spec/controllers/sufia/admin/features_controller_spec.rb +29 -0
- data/spec/controllers/{admin → sufia/admin}/stats_controller_spec.rb +10 -6
- data/spec/controllers/sufia/admin/strategies_controller_spec.rb +30 -0
- data/spec/controllers/sufia/admin_controller_spec.rb +13 -0
- data/spec/controllers/sufia/admin_sets_controller_spec.rb +28 -0
- data/spec/controllers/sufia/batch_uploads_controller_spec.rb +48 -17
- data/spec/controllers/sufia/homepage_controller_spec.rb +21 -0
- data/spec/controllers/sufia/trophies_controller_spec.rb +2 -2
- data/spec/controllers/sufia/uploads_controller_spec.rb +5 -5
- data/spec/controllers/tinymce_assets_controller_spec.rb +5 -5
- data/spec/controllers/transfers_controller_spec.rb +23 -16
- data/spec/controllers/users_controller_spec.rb +21 -69
- data/spec/factories/admin_sets.rb +9 -0
- data/spec/factories/collections_factory.rb +5 -3
- data/spec/factories/generic_works.rb +3 -1
- data/spec/features/admin_admin_set_spec.rb +30 -0
- data/spec/features/browse_dashboard_files_spec.rb +3 -3
- data/spec/features/contact_form_spec.rb +5 -5
- data/spec/features/create_work_spec.rb +1 -1
- data/spec/features/display_dashboard_spec.rb +1 -1
- data/spec/features/ownership_transfer_spec.rb +29 -30
- data/spec/features/search_spec.rb +2 -1
- data/spec/features/user_admin_set_spec.rb +55 -0
- data/spec/features/work_show_spec.rb +13 -3
- data/spec/forms/curation_concerns/generic_work_form_spec.rb +30 -24
- data/spec/forms/sufia/forms/admin_set_form_spec.rb +20 -0
- data/spec/forms/sufia/forms/batch_edit_form_spec.rb +27 -25
- data/spec/forms/sufia/forms/batch_upload_form_spec.rb +29 -26
- data/spec/forms/sufia/forms/collection_form_spec.rb +36 -32
- data/spec/helpers/sufia_helper_spec.rb +17 -28
- data/spec/indexers/sufia/work_indexer_spec.rb +16 -0
- data/spec/javascripts/required_field_spec.js +41 -0
- data/spec/javascripts/save_work_spec.js +9 -0
- data/spec/jobs/attach_files_to_work_job_spec.rb +6 -1
- data/spec/jobs/batch_create_job_spec.rb +8 -6
- data/spec/jobs/content_delete_event_job_spec.rb +6 -18
- data/spec/jobs/content_deposit_event_job_spec.rb +3 -12
- data/spec/jobs/content_depositor_change_event_job_spec.rb +3 -8
- data/spec/jobs/content_new_version_event_job_spec.rb +3 -12
- data/spec/jobs/content_restored_version_event_job_spec.rb +3 -11
- data/spec/jobs/content_update_event_job_spec.rb +13 -79
- data/spec/jobs/file_set_attached_event_job_spec.rb +2 -10
- data/spec/jobs/inherit_permissions_job_spec.rb +96 -0
- data/spec/jobs/user_edit_profile_event_job_spec.rb +3 -7
- data/spec/lib/sufia/analytics_spec.rb +42 -11
- data/spec/lib/sufia/arkivo/actor_spec.rb +4 -4
- data/spec/lib/sufia/arkivo/schema_validator_spec.rb +18 -18
- data/spec/lib/sufia/controlled_vocabulary/importer/language_spec.rb +24 -0
- data/spec/lib/sufia/redis_event_store_spec.rb +8 -0
- data/spec/lib/sufia/resource_sync/capability_list_writer_spec.rb +4 -2
- data/spec/lib/sufia/resource_sync/resource_list_writer_spec.rb +10 -7
- data/spec/models/file_download_stat_spec.rb +35 -12
- data/spec/models/file_view_stat_spec.rb +12 -12
- data/spec/models/flipflop_spec.rb +8 -0
- data/spec/models/generic_work_spec.rb +3 -1
- data/spec/models/solr_document_spec.rb +20 -8
- data/spec/models/sufia/ability_spec.rb +5 -0
- data/spec/models/user_spec.rb +4 -28
- data/spec/models/work_view_stat_spec.rb +26 -17
- data/spec/presenters/sufia/admin_dashboard_presenter_spec.rb +14 -0
- data/spec/presenters/sufia/admin_set_presenter_spec.rb +28 -0
- data/spec/presenters/sufia/admin_stats_presenter_spec.rb +0 -8
- data/spec/presenters/sufia/collection_presenter_spec.rb +21 -16
- data/spec/presenters/sufia/file_set_presenter_spec.rb +44 -1
- data/spec/presenters/sufia/file_usage_spec.rb +49 -55
- data/spec/presenters/sufia/work_show_presenter_spec.rb +12 -2
- data/spec/presenters/sufia/work_usage_spec.rb +37 -36
- data/spec/routing/route_spec.rb +19 -21
- data/spec/search_builder/sufia/my_shares_search_builder_spec.rb +14 -7
- data/spec/search_builder/sufia/single_admin_set_search_builder_spec.rb +17 -0
- data/spec/services/sufia/actor_factory_spec.rb +11 -9
- data/spec/services/sufia/admin_set_service_spec.rb +27 -0
- data/spec/services/sufia/audit_failure_service_spec.rb +1 -1
- data/spec/services/sufia/file_set_csv_service_spec.rb +6 -7
- data/spec/services/sufia/statistics/system_stats_spec.rb +0 -10
- data/spec/services/sufia/user_stat_importer_spec.rb +306 -2
- data/spec/spec_helper.rb +43 -4
- data/spec/support/backport_test_helpers.rb +19 -0
- data/spec/support/selectors.rb +0 -19
- data/spec/test_app_templates/Gemfile.extra +1 -0
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +0 -2
- data/spec/views/_toolbar.html.erb_spec.rb +6 -6
- data/spec/views/catalog/_index_list_default.html.erb_spec.rb +10 -1
- data/spec/views/catalog/_thumbnail_list_collection.html.erb_spec.rb +10 -0
- data/spec/views/citations/work.html.erb_spec.rb +2 -2
- data/spec/views/collections/_form_for_select_collection.html.erb_spec.rb +6 -4
- data/spec/views/collections/_show_document_list.html.erb_spec.rb +1 -0
- data/spec/views/collections/_show_document_list_menu.html.erb_spec.rb +14 -3
- data/spec/views/collections/show.html.erb_spec.rb +7 -2
- data/spec/views/curation_concerns/base/_attribute_rows.html.erb_spec.rb +19 -0
- data/spec/views/curation_concerns/base/_citations.html.erb_spec.rb +2 -2
- data/spec/views/curation_concerns/base/_form.html.erb_spec.rb +2 -0
- data/spec/views/curation_concerns/base/_form_relationships.html.erb_spec.rb +48 -0
- data/spec/views/curation_concerns/base/_items.html.erb_spec.rb +49 -0
- data/spec/views/curation_concerns/base/_relationships.html.erb_spec.rb +2 -30
- data/spec/views/curation_concerns/base/_show_actions.html.erb_spec.rb +69 -0
- data/spec/views/curation_concerns/base/_social_media.html.erb_spec.rb +18 -0
- data/spec/views/curation_concerns/file_sets/_permission_form.html.erb_spec.rb +2 -2
- data/spec/views/curation_concerns/file_sets/_show_actions.html.erb_spec.rb +18 -3
- data/spec/views/curation_concerns/file_sets/media_display/_default.html.erb_spec.rb +26 -0
- data/spec/views/dashboard/index_spec.rb +5 -9
- data/spec/views/my/_list_collections.html.erb_spec.rb +1 -0
- data/spec/views/records/edit_fields/_description.html.erb_spec.rb +66 -0
- data/spec/views/stats_file.html.erb_spec.rb +5 -5
- data/spec/views/sufia/admin/admin_sets/index.html.erb_spec.rb +27 -0
- data/spec/views/{admin/stats/index.html.erb_spec.rb → sufia/admin/stats/show.html.erb_spec.rb} +1 -1
- data/spec/views/sufia/batch_uploads/_form.html.erb_spec.rb +3 -1
- data/spec/views/sufia/homepage/_featured_works.html.erb_spec.rb +9 -7
- data/spec/views/sufia/homepage/{_home_header.html.erb_spec.rb → index.html.erb_spec.rb} +3 -3
- data/spec/views/users/_user_util_links.html.erb_spec.rb +1 -1
- data/spec/views/users/index.html.erb_spec.rb +2 -1
- data/spec/views/users/show.html.erb_spec.rb +5 -1
- data/sufia.gemspec +13 -8
- data/tasks/controlled_vocabularies.rake +9 -0
- data/vendor/assets/stylesheets/sharing_buttons.css +163 -0
- metadata +246 -124
- data/app/assets/images/old_main_tulips.jpg +0 -0
- data/app/assets/javascripts/sufia/fileupload.js +0 -6
- data/app/assets/stylesheets/sufia.scss +0 -10
- data/app/controllers/admin/stats_controller.rb +0 -3
- data/app/controllers/errors_controller.rb +0 -12
- data/app/jobs/user_follow_event_job.rb +0 -21
- data/app/jobs/user_unfollow_event_job.rb +0 -20
- data/app/models/contact_form.rb +0 -28
- data/app/models/follow.rb +0 -12
- data/app/presenters/file_usage.rb +0 -49
- data/app/presenters/sufia/characterization_behavior.rb +0 -80
- data/app/presenters/work_usage.rb +0 -51
- data/app/views/admin/_menu.html.erb +0 -8
- data/app/views/admin/stats/index.html.erb +0 -10
- data/app/views/advanced/_advanced_search_facets.html.erb +0 -1
- data/app/views/advanced/_advanced_search_fields.html.erb +0 -8
- data/app/views/advanced/_advanced_search_form.html.erb +0 -34
- data/app/views/advanced/_advanced_search_help.html.erb +0 -13
- data/app/views/advanced/_facet_layout.html.erb +0 -5
- data/app/views/advanced/_facet_limit.html.erb +0 -7
- data/app/views/advanced/index.html.erb +0 -21
- data/app/views/collections/_search_collection_dashboard_form.html.erb +0 -11
- data/app/views/curation_concerns/base/_relationships_member_rows.html.erb +0 -24
- data/app/views/errors/404.html.erb +0 -8
- data/app/views/layouts/error.html.erb +0 -27
- data/app/views/static/subject_libraries.html.erb +0 -32
- data/app/views/sufia/homepage/_home_header.html.erb +0 -13
- data/app/views/users/_follower_modal.html.erb +0 -32
- data/app/views/users/_following_modal.html.erb +0 -32
- data/db/migrate/20160328222155_acts_as_follower_migration.rb +0 -17
- data/spec/controllers/my_controller_spec.rb +0 -2
- data/spec/jobs/user_follow_event_job_spec.rb +0 -24
- data/spec/jobs/user_unfollow_event_job_spec.rb +0 -25
- data/spec/lib/sufia/user_stat_importer_spec.rb +0 -309
- data/spec/views/catalog/sort_and_per_page.html.erb_spec.rb +0 -33
- data/spec/views/users/_follower_modal.html.erb_spec.rb +0 -46
- data/spec/views/users/_following_modal.html.erb_spec.rb +0 -55
Binary file
|
@@ -1,12 +0,0 @@
|
|
1
|
-
class ErrorsController < ApplicationController
|
2
|
-
def routing
|
3
|
-
render_routing_error("Route not found: /#{params[:error]}")
|
4
|
-
end
|
5
|
-
|
6
|
-
private
|
7
|
-
|
8
|
-
def render_routing_error(exception)
|
9
|
-
logger.error("Rendering 404 page due to exception: #{exception.inspect} - #{exception.backtrace if exception.respond_to? :backtrace}")
|
10
|
-
render '404', layout: "error", status: 404
|
11
|
-
end
|
12
|
-
end
|
@@ -1,21 +0,0 @@
|
|
1
|
-
# Log user following another user to activity streams
|
2
|
-
class UserFollowEventJob < EventJob
|
3
|
-
attr_accessor :followee, :follower
|
4
|
-
|
5
|
-
def perform(follower, followee)
|
6
|
-
@follower = follower
|
7
|
-
@followee = followee
|
8
|
-
super(follower)
|
9
|
-
end
|
10
|
-
|
11
|
-
# log the event to the users event stream
|
12
|
-
def log_user_event(user)
|
13
|
-
super
|
14
|
-
# Fan out the event to followee
|
15
|
-
followee.log_event(event)
|
16
|
-
end
|
17
|
-
|
18
|
-
def action
|
19
|
-
"User #{link_to_profile follower} is now following #{link_to_profile followee}"
|
20
|
-
end
|
21
|
-
end
|
@@ -1,20 +0,0 @@
|
|
1
|
-
# Log user unfollowing another user to activity streams
|
2
|
-
class UserUnfollowEventJob < EventJob
|
3
|
-
attr_accessor :unfollowee, :unfollower
|
4
|
-
|
5
|
-
def perform(unfollower, unfollowee)
|
6
|
-
@unfollower = unfollower
|
7
|
-
@unfollowee = unfollowee
|
8
|
-
super(unfollower)
|
9
|
-
end
|
10
|
-
|
11
|
-
# log the event to the users event stream
|
12
|
-
def log_user_event(_unfollower)
|
13
|
-
super
|
14
|
-
unfollowee.log_event(event)
|
15
|
-
end
|
16
|
-
|
17
|
-
def action
|
18
|
-
"User #{link_to_profile unfollower} has unfollowed #{link_to_profile unfollowee}"
|
19
|
-
end
|
20
|
-
end
|
data/app/models/contact_form.rb
DELETED
@@ -1,28 +0,0 @@
|
|
1
|
-
require 'mail_form'
|
2
|
-
|
3
|
-
class ContactForm < MailForm::Base
|
4
|
-
ISSUE_TYPES = [
|
5
|
-
["Depositing content", "Depositing content"],
|
6
|
-
["Making changes to my content", "Making changes to my content"],
|
7
|
-
["Browsing and searching", "Browsing and searching"],
|
8
|
-
["Reporting a problem", "Reporting a problem"],
|
9
|
-
["General inquiry or request", "General inquiry or request"]
|
10
|
-
].freeze
|
11
|
-
attribute :contact_method, captcha: true
|
12
|
-
attribute :category, validate: true
|
13
|
-
attribute :name, validate: true
|
14
|
-
attribute :email, validate: /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
|
15
|
-
attribute :subject, validate: true
|
16
|
-
attribute :message, validate: true
|
17
|
-
# - can't use this without ActiveRecord::Base validates_inclusion_of :issue_type, in: ISSUE_TYPES
|
18
|
-
|
19
|
-
# Declare the e-mail headers. It accepts anything the mail method
|
20
|
-
# in ActionMailer accepts.
|
21
|
-
def headers
|
22
|
-
{
|
23
|
-
subject: "#{Sufia.config.subject_prefix} #{subject}",
|
24
|
-
to: Sufia.config.contact_email,
|
25
|
-
from: email
|
26
|
-
}
|
27
|
-
end
|
28
|
-
end
|
data/app/models/follow.rb
DELETED
@@ -1,12 +0,0 @@
|
|
1
|
-
class Follow < ActiveRecord::Base
|
2
|
-
extend ActsAsFollower::FollowerLib
|
3
|
-
extend ActsAsFollower::FollowScopes
|
4
|
-
|
5
|
-
# NOTE: Follows belong to the "followable" interface, and also to followers
|
6
|
-
belongs_to :followable, polymorphic: true
|
7
|
-
belongs_to :follower, polymorphic: true
|
8
|
-
|
9
|
-
def block!
|
10
|
-
update_attribute(:blocked, true)
|
11
|
-
end
|
12
|
-
end
|
@@ -1,49 +0,0 @@
|
|
1
|
-
class FileUsage
|
2
|
-
attr_accessor :id, :created, :downloads, :pageviews
|
3
|
-
|
4
|
-
def initialize(id)
|
5
|
-
file = ::FileSet.find(id)
|
6
|
-
user = User.find_by(email: file.depositor)
|
7
|
-
user_id = user ? user.id : nil
|
8
|
-
|
9
|
-
self.id = id
|
10
|
-
self.created = date_for_analytics(file)
|
11
|
-
self.downloads = FileDownloadStat.to_flots FileDownloadStat.statistics(file, created, user_id)
|
12
|
-
self.pageviews = FileViewStat.to_flots FileViewStat.statistics(file, created, user_id)
|
13
|
-
end
|
14
|
-
|
15
|
-
# file.date_uploaded reflects the date the file was uploaded by the user
|
16
|
-
# and therefore (if available) the date that we want to use for the stats
|
17
|
-
# file.create_date reflects the date the file was added to Fedora. On data
|
18
|
-
# migrated from one repository to another the created_date can be later
|
19
|
-
# than the date the file was uploaded.
|
20
|
-
def date_for_analytics(file)
|
21
|
-
earliest = Sufia.config.analytic_start_date
|
22
|
-
date_uploaded = string_to_date file.date_uploaded
|
23
|
-
date_analytics = date_uploaded ? date_uploaded : file.create_date
|
24
|
-
return date_analytics if earliest.blank?
|
25
|
-
earliest > date_analytics ? earliest : date_analytics
|
26
|
-
end
|
27
|
-
|
28
|
-
def string_to_date(date_str)
|
29
|
-
return Time.zone.parse(date_str)
|
30
|
-
rescue ArgumentError, TypeError
|
31
|
-
return nil
|
32
|
-
end
|
33
|
-
|
34
|
-
def total_downloads
|
35
|
-
downloads.reduce(0) { |total, result| total + result[1].to_i }
|
36
|
-
end
|
37
|
-
|
38
|
-
def total_pageviews
|
39
|
-
pageviews.reduce(0) { |total, result| total + result[1].to_i }
|
40
|
-
end
|
41
|
-
|
42
|
-
# Package data for visualization using JQuery Flot
|
43
|
-
def to_flot
|
44
|
-
[
|
45
|
-
{ label: "Pageviews", data: pageviews },
|
46
|
-
{ label: "Downloads", data: downloads }
|
47
|
-
]
|
48
|
-
end
|
49
|
-
end
|
@@ -1,80 +0,0 @@
|
|
1
|
-
module Sufia
|
2
|
-
module CharacterizationBehavior
|
3
|
-
extend ActiveSupport::Concern
|
4
|
-
|
5
|
-
class_methods do
|
6
|
-
def characterization_terms
|
7
|
-
[
|
8
|
-
:byte_order, :compression, :height, :width, :height, :color_space,
|
9
|
-
:profile_name, :profile_version, :orientation, :color_map, :image_producer,
|
10
|
-
:capture_device, :scanning_software, :gps_timestamp, :latitude, :longitude
|
11
|
-
]
|
12
|
-
end
|
13
|
-
end
|
14
|
-
|
15
|
-
included do
|
16
|
-
delegate(*characterization_terms, to: :solr_document)
|
17
|
-
end
|
18
|
-
|
19
|
-
def characterized?
|
20
|
-
!characterization_metadata.values.compact.empty?
|
21
|
-
end
|
22
|
-
|
23
|
-
def characterization_metadata
|
24
|
-
@characterization_metadata ||= build_characterization_metadata
|
25
|
-
end
|
26
|
-
|
27
|
-
# Override this if you want to inject additional characterization metadata
|
28
|
-
# Use a hash of key/value pairs where the value is an Array or String
|
29
|
-
# {
|
30
|
-
# term1: ["value"],
|
31
|
-
# term2: ["value1", "value2"],
|
32
|
-
# term3: "a string"
|
33
|
-
# }
|
34
|
-
def additional_characterization_metadata
|
35
|
-
@additional_characterization_metadata ||= {}
|
36
|
-
end
|
37
|
-
|
38
|
-
def label_for_term(term)
|
39
|
-
term.to_s.titleize
|
40
|
-
end
|
41
|
-
|
42
|
-
# Returns an array of characterization values truncated to 250 characters limited
|
43
|
-
# to the maximum number of configured values.
|
44
|
-
# @param [Symbol] term found in the characterization_metadata hash
|
45
|
-
# @return [Array] of truncated values
|
46
|
-
def primary_characterization_values(term)
|
47
|
-
values = values_for(term)
|
48
|
-
values.slice!(Sufia.config.fits_message_length, (values.length - Sufia.config.fits_message_length))
|
49
|
-
truncate_all(values)
|
50
|
-
end
|
51
|
-
|
52
|
-
# Returns an array of characterization values truncated to 250 characters that are in
|
53
|
-
# excess of the maximum number of configured values.
|
54
|
-
# @param [Symbol] term found in the characterization_metadata hash
|
55
|
-
# @return [Array] of truncated values
|
56
|
-
def secondary_characterization_values(term)
|
57
|
-
values = values_for(term)
|
58
|
-
additional_values = values.slice(Sufia.config.fits_message_length, values.length - Sufia.config.fits_message_length)
|
59
|
-
return [] unless additional_values
|
60
|
-
truncate_all(additional_values)
|
61
|
-
end
|
62
|
-
|
63
|
-
private
|
64
|
-
|
65
|
-
def values_for(term)
|
66
|
-
Array.wrap(characterization_metadata[term])
|
67
|
-
end
|
68
|
-
|
69
|
-
def truncate_all(values)
|
70
|
-
values.map { |v| v.to_s.truncate(250) }
|
71
|
-
end
|
72
|
-
|
73
|
-
def build_characterization_metadata
|
74
|
-
self.class.characterization_terms.each do |term|
|
75
|
-
additional_characterization_metadata[term.to_sym] = send(term)
|
76
|
-
end
|
77
|
-
additional_characterization_metadata
|
78
|
-
end
|
79
|
-
end
|
80
|
-
end
|
@@ -1,51 +0,0 @@
|
|
1
|
-
# class WorkUsage follows the model established by FileUsage
|
2
|
-
# Called by the stats controller, it finds cached work pageview data,
|
3
|
-
# and prepares it for visualization in /app/views/stats/work.html.erb
|
4
|
-
|
5
|
-
class WorkUsage
|
6
|
-
attr_accessor :id, :created, :pageviews, :work
|
7
|
-
|
8
|
-
def initialize(id)
|
9
|
-
@work = CurationConcerns::WorkRelation.new.find(id)
|
10
|
-
user = User.find_by(email: work.depositor)
|
11
|
-
user_id = user ? user.id : nil
|
12
|
-
|
13
|
-
self.id = id
|
14
|
-
self.created = date_for_analytics(work)
|
15
|
-
self.pageviews = WorkViewStat.to_flots WorkViewStat.statistics(work, created, user_id)
|
16
|
-
end
|
17
|
-
|
18
|
-
delegate :to_s, to: :work
|
19
|
-
|
20
|
-
def total_pageviews
|
21
|
-
pageviews.reduce(0) { |total, result| total + result[1].to_i }
|
22
|
-
end
|
23
|
-
|
24
|
-
# Package data for visualization using JQuery Flot
|
25
|
-
def to_flot
|
26
|
-
[
|
27
|
-
{ label: "Pageviews", data: pageviews }
|
28
|
-
]
|
29
|
-
end
|
30
|
-
|
31
|
-
private
|
32
|
-
|
33
|
-
# work.date_uploaded reflects the date the work was uploaded by the user
|
34
|
-
# and therefore (if available) the date that we want to use for the stats
|
35
|
-
# work.create_date reflects the date the work was added to Fedora. On data
|
36
|
-
# migrated from one repository to another the created_date can be later
|
37
|
-
# than the date the work was uploaded.
|
38
|
-
def date_for_analytics(work)
|
39
|
-
earliest = Sufia.config.analytic_start_date
|
40
|
-
date_uploaded = string_to_date work.date_uploaded
|
41
|
-
date_analytics = date_uploaded ? date_uploaded : work.create_date
|
42
|
-
return date_analytics if earliest.blank?
|
43
|
-
earliest > date_analytics ? earliest : date_analytics
|
44
|
-
end
|
45
|
-
|
46
|
-
def string_to_date(date_str)
|
47
|
-
return Time.zone.parse(date_str)
|
48
|
-
rescue ArgumentError, TypeError
|
49
|
-
return nil
|
50
|
-
end
|
51
|
-
end
|
@@ -1,8 +0,0 @@
|
|
1
|
-
<li class="dropdown">
|
2
|
-
<%= link_to sufia.admin_stats_path, role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false } do %>
|
3
|
-
<span class="fa fa-gear"></span> <%= t("sufia.toolbar.admin.menu") %> <span class="caret"></span>
|
4
|
-
<% end %>
|
5
|
-
<ul class="dropdown-menu">
|
6
|
-
<li><%= link_to t("sufia.toolbar.admin.statistics"), sufia.admin_stats_path %></li>
|
7
|
-
</ul>
|
8
|
-
</li>
|
@@ -1,10 +0,0 @@
|
|
1
|
-
<div class="stats">
|
2
|
-
<h1>Statistics for <%= application_name %>
|
3
|
-
<%= Sufia::VERSION %></h1>
|
4
|
-
|
5
|
-
<h2>Total <%= application_name %> Users: <%= @presenter.users_count %> </h2>
|
6
|
-
<hr/>
|
7
|
-
<%= render "admin/stats/stats_by_date" %>
|
8
|
-
<hr/>
|
9
|
-
<%= render "admin/stats/top_data" %>
|
10
|
-
</div>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_facet_partials facet_field_names, partial: 'facet_limit' %>
|
@@ -1,8 +0,0 @@
|
|
1
|
-
<%- search_fields_for_advanced_search.each do |key, field_def| -%>
|
2
|
-
<div class="form-group">
|
3
|
-
<%= label_tag key, "#{field_def.label }:", class: 'control-label col-sm-4' %>
|
4
|
-
<div class="col-sm-8">
|
5
|
-
<%= text_field_tag key, label_tag_default_for(key), class: 'form-control' %>
|
6
|
-
</div>
|
7
|
-
</div>
|
8
|
-
<%- end -%>
|
@@ -1,34 +0,0 @@
|
|
1
|
-
<%= form_tag search_catalog_path, class: 'form-horizontal', method: :get do %>
|
2
|
-
|
3
|
-
<%= render_hash_as_hidden_fields(search_state.params_for_search(advanced_search_context)) %>
|
4
|
-
|
5
|
-
<div class="form-group">
|
6
|
-
<label class="control-label" for='op'>Find items that match</label>
|
7
|
-
<%= select_tag(:op, options_for_select({ all: 'AND', any: 'OR'}.sort, 'all'), class: "") %> of the fields below:
|
8
|
-
</div>
|
9
|
-
|
10
|
-
<div id="advanced_search">
|
11
|
-
<%= render 'advanced/advanced_search_fields' %>
|
12
|
-
</div>
|
13
|
-
|
14
|
-
<% unless (search_context_str = render_search_to_s( advanced_search_context)).blank? %>
|
15
|
-
<div>
|
16
|
-
<p>Within search:</p>
|
17
|
-
<%= search_context_str %>
|
18
|
-
</div>
|
19
|
-
<% end %>
|
20
|
-
|
21
|
-
<div class="form-group">
|
22
|
-
<%= label_tag :sort, "Sort results by: ", class: 'control-label col-sm-4' %>
|
23
|
-
<div class="col-sm-8">
|
24
|
-
<%= select_tag :sort, options_for_select(sort_fields, h(params[:sort])), class: 'form-control' %>
|
25
|
-
</div>
|
26
|
-
</div>
|
27
|
-
|
28
|
-
<div>
|
29
|
-
<%= hidden_field_tag(:search_field, blacklight_config.advanced_search[:url_key]) %>
|
30
|
-
<br />
|
31
|
-
<%= submit_tag 'Search', class: 'btn btn-primary', id: 'advanced_search' %>
|
32
|
-
<%= link_to "Start over", {controller: "advanced", action: "index"}, class:"btn btn-default" %>
|
33
|
-
</div>
|
34
|
-
<% end %>
|
@@ -1,13 +0,0 @@
|
|
1
|
-
<div>
|
2
|
-
<h2>Search tips</h2>
|
3
|
-
<ul class="advanced_help">
|
4
|
-
<li>Select "match all" to require all fields.</li>
|
5
|
-
<li>Select "match any" to find at least one field.</li>
|
6
|
-
<li>Combine keywords and attributes to find specific items.</li>
|
7
|
-
<li>Use quotation marks to search as a phrase.</li>
|
8
|
-
<li>Use "+" before a term to make it required. (Otherwise results matching only some of your terms may be included).</li>
|
9
|
-
<li>Use "-" before a word or phrase to exclude.</li>
|
10
|
-
<li>Use "OR", "AND", and "NOT" to create complex Boolean logic. You can use parentheses in your complex expressions.</li>
|
11
|
-
<li>Truncation and wildcards are not supported - word-stemming is done automatically.</li>
|
12
|
-
</ul>
|
13
|
-
</div>
|
@@ -1,7 +0,0 @@
|
|
1
|
-
<ul>
|
2
|
-
<% display_facet.items.each do |item| -%>
|
3
|
-
<li>
|
4
|
-
<%= check_box_tag "f_inclusive[#{solr_field}][#{item.value.to_sym}]", 1, facet_value_checked?(solr_field, item.value)%> <%= label_tag "f_inclusive_#{solr_field}[#{item.value.to_sym}]", h(item.value) %> (<%= format_num item.hits %>)
|
5
|
-
</li>
|
6
|
-
<% end -%>
|
7
|
-
</ul>
|
@@ -1,21 +0,0 @@
|
|
1
|
-
<% provide :page_title, construct_page_title("More Search Options") %>
|
2
|
-
|
3
|
-
<div class="col-md-6">
|
4
|
-
<h1>More Search Options</h1>
|
5
|
-
<%= render 'advanced_search_form' %>
|
6
|
-
</div>
|
7
|
-
|
8
|
-
<div class="col-md-6">
|
9
|
-
<h2><i class=glyphicon glyphicon-pushpin"></i> Search tips</h2>
|
10
|
-
<ul id="advanced_search_tips">
|
11
|
-
<li><i class="glyphicon glyphicon-chevron-right"></i> Select "match all" to require all fields.</li>
|
12
|
-
<li><i class="glyphicon glyphicon-chevron-right"></i> Select "match any" to find at least one field.</li>
|
13
|
-
<li><i class="glyphicon glyphicon-chevron-right"></i> Combine keywords and attributes to find specific items.</li>
|
14
|
-
<li><i class="glyphicon glyphicon-chevron-right"></i> Use quotation marks to search as a phrase. </li>
|
15
|
-
<li><i class="glyphicon glyphicon-chevron-right"></i> Use "+" before a term to make it required. (Otherwise results matching only some of your terms may be included).</li>
|
16
|
-
<li><i class="glyphicon glyphicon-chevron-right"></i> Use "-" before a word or phrase to exclude. </li>
|
17
|
-
<li><i class="glyphicon glyphicon-chevron-right"></i> Use "OR", "AND", and "NOT" to create complex Boolean logic. You can use parentheses in your complex expressions.</li>
|
18
|
-
<li><i class="glyphicon glyphicon-chevron-right"></i> Truncation and wildcards are not supported - word-stemming is done automatically. </li>
|
19
|
-
<li><i class="glyphicon glyphicon-chevron-right"></i> Truncation and wildcards are not supported - word-stemming is done automatically. </li>
|
20
|
-
</ul>
|
21
|
-
</div>
|
@@ -1,11 +0,0 @@
|
|
1
|
-
<div style="float: right;" >
|
2
|
-
<%= form_for @collection, url: edit_collection_path,
|
3
|
-
method: :get,
|
4
|
-
class: "form-search" do |f| %>
|
5
|
-
<label class="sr-only" for="collection_search">Search Collection <%= @collection.title %></label>
|
6
|
-
<%= text_field_tag :cq, params[:cq], class: "collection-query", placeholder: "Search Collection", size: '30', type: "search", id: "collection_search" %>
|
7
|
-
<%= hidden_field_tag :sort, params[:sort], id: 'collection_sort' %>
|
8
|
-
<%= render_hash_as_hidden_fields(search_state.params_for_search.except(:cq, :sort, :qt, :page)) %>
|
9
|
-
<button type="submit" class="btn btn-primary" id="collection_submit"><i class="glyphicon glyphicon-search"></i> Go</button>
|
10
|
-
<% end %>
|
11
|
-
</div>
|