blacklight-spotlight 3.0.0.rc3 → 3.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/images/blacklight/close.svg +1 -0
- data/app/assets/images/blacklight/zoom_in.svg +1 -0
- data/app/assets/images/blacklight/zoom_out.svg +1 -0
- data/app/assets/javascripts/spotlight/admin/blocks/uploaded_items_block.js +8 -1
- data/app/assets/javascripts/spotlight/admin/catalog_edit.js +13 -47
- data/app/assets/javascripts/spotlight/admin/exhibit_tag_autocomplete.js +37 -0
- data/app/assets/javascripts/spotlight/admin/{reindex_monitor.js → progress_monitor.js} +26 -4
- data/app/assets/javascripts/spotlight/admin/sir-trevor/locales.js +1 -1
- data/app/assets/javascripts/spotlight/user/zpr_links.js.erb +29 -14
- data/app/assets/stylesheets/spotlight/_browse.scss +8 -0
- data/app/assets/stylesheets/spotlight/_catalog.scss +30 -4
- data/app/assets/stylesheets/spotlight/_exhibit_admin.scss +9 -0
- data/app/assets/stylesheets/spotlight/_modals.scss +3 -0
- data/app/assets/stylesheets/spotlight/_nestable.scss +8 -0
- data/app/assets/stylesheets/spotlight/_spotlight.scss +2 -0
- data/app/assets/stylesheets/spotlight/_view_larger.scss +22 -0
- data/app/assets/stylesheets/spotlight/browse_group_categories_block.scss +23 -0
- data/app/assets/stylesheets/spotlight/typeahead.css +23 -23
- data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb +4 -2
- data/app/controllers/concerns/spotlight/base.rb +1 -1
- data/app/controllers/concerns/spotlight/catalog.rb +7 -1
- data/app/controllers/spotlight/browse_controller.rb +9 -15
- data/app/controllers/spotlight/bulk_actions_controller.rb +62 -0
- data/app/controllers/spotlight/bulk_updates_controller.rb +67 -0
- data/app/controllers/spotlight/catalog_controller.rb +16 -13
- data/app/controllers/spotlight/dashboards_controller.rb +5 -4
- data/app/controllers/spotlight/exhibits_controller.rb +1 -1
- data/app/controllers/spotlight/featured_images_controller.rb +1 -1
- data/app/controllers/spotlight/job_trackers_controller.rb +17 -0
- data/app/controllers/spotlight/pages_controller.rb +6 -7
- data/app/controllers/spotlight/tags_controller.rb +39 -5
- data/app/helpers/spotlight/application_helper.rb +20 -1
- data/app/helpers/spotlight/job_trackers_helper.rb +31 -0
- data/app/helpers/spotlight/main_app_helpers.rb +3 -4
- data/app/helpers/spotlight/meta_helper.rb +2 -2
- data/app/helpers/spotlight/pages_helper.rb +1 -8
- data/app/helpers/spotlight/roles_helper.rb +1 -1
- data/app/helpers/spotlight/searches_helper.rb +1 -1
- data/app/jobs/concerns/spotlight/gather_documents.rb +35 -0
- data/app/jobs/concerns/spotlight/job_tracking.rb +64 -0
- data/app/jobs/concerns/spotlight/limit_concurrency.rb +33 -0
- data/app/jobs/spotlight/add_tags_job.rb +31 -0
- data/app/jobs/spotlight/add_uploads_from_csv.rb +4 -3
- data/app/jobs/spotlight/application_job.rb +8 -0
- data/app/jobs/spotlight/change_visibility_job.rb +33 -0
- data/app/jobs/spotlight/cleanup_job_trackers_job.rb +13 -0
- data/app/jobs/spotlight/default_thumbnail_job.rb +1 -3
- data/app/jobs/spotlight/process_bulk_updates_csv_job.rb +82 -0
- data/app/jobs/spotlight/reindex_exhibit_job.rb +39 -0
- data/app/jobs/spotlight/reindex_job.rb +64 -44
- data/app/jobs/spotlight/remove_tags_job.rb +31 -0
- data/app/jobs/spotlight/rename_sidecar_field_job.rb +3 -2
- data/app/jobs/spotlight/rename_tags_job.rb +33 -0
- data/app/jobs/spotlight/update_job_trackers_job.rb +20 -0
- data/app/models/concerns/spotlight/browse_category_search_builder.rb +59 -0
- data/app/models/concerns/spotlight/exhibit_analytics.rb +2 -6
- data/app/models/concerns/spotlight/exhibit_documents.rb +2 -2
- data/app/models/concerns/spotlight/resources/web.rb +1 -1
- data/app/models/concerns/spotlight/search_builder.rb +11 -0
- data/app/models/concerns/spotlight/solr_document.rb +1 -1
- data/app/models/concerns/spotlight/solr_document/atomic_updates.rb +2 -2
- data/app/models/concerns/spotlight/user.rb +7 -2
- data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb +9 -0
- data/app/models/sir_trevor_rails/blocks/uploaded_items_block.rb +4 -0
- data/app/models/spotlight/ability.rb +6 -2
- data/app/models/spotlight/attachment.rb +1 -1
- data/app/models/spotlight/background_job_progress.rb +96 -0
- data/app/models/spotlight/blacklight_configuration.rb +26 -6
- data/app/models/spotlight/bulk_update.rb +8 -0
- data/app/models/spotlight/event.rb +13 -0
- data/app/models/spotlight/exhibit.rb +5 -14
- data/app/models/spotlight/feature_page.rb +0 -2
- data/app/models/spotlight/featured_image.rb +40 -1
- data/app/models/spotlight/field_metadata.rb +4 -8
- data/app/models/spotlight/job_tracker.rb +114 -0
- data/app/models/spotlight/page.rb +1 -3
- data/app/models/spotlight/page_configurations.rb +10 -9
- data/app/models/spotlight/resource.rb +28 -62
- data/app/models/spotlight/resources/iiif_harvester.rb +12 -3
- data/app/models/spotlight/resources/iiif_manifest.rb +3 -1
- data/app/models/spotlight/resources/iiif_service.rb +9 -2
- data/app/models/spotlight/resources/json_upload.rb +12 -0
- data/app/models/spotlight/resources/upload.rb +25 -2
- data/app/models/spotlight/role.rb +1 -2
- data/app/models/spotlight/solr_document_sidecar.rb +2 -1
- data/app/presenters/spotlight/iiif_manifest_presenter.rb +2 -2
- data/app/services/spotlight/bulk_updates_csv_template_service.rb +93 -0
- data/app/services/spotlight/etl.rb +7 -0
- data/app/services/spotlight/etl/context.rb +52 -0
- data/app/services/spotlight/etl/executor.rb +192 -0
- data/app/services/spotlight/etl/loaders.rb +12 -0
- data/app/services/spotlight/etl/pipeline.rb +81 -0
- data/app/services/spotlight/etl/solr_loader.rb +96 -0
- data/app/services/spotlight/etl/sources.rb +25 -0
- data/app/services/spotlight/etl/step.rb +82 -0
- data/app/services/spotlight/etl/transforms.rb +64 -0
- data/app/services/spotlight/iiif_resource_resolver.rb +1 -1
- data/app/services/spotlight/validity_checker.rb +5 -5
- data/app/uploaders/spotlight/bulk_updates_uploader.rb +7 -0
- data/app/uploaders/spotlight/featured_image_uploader.rb +1 -1
- data/app/views/catalog/_add_tags.html.erb +28 -0
- data/app/views/catalog/_bulk_actions.html.erb +12 -0
- data/app/views/catalog/_change_visibility.html.erb +35 -0
- data/app/views/catalog/_curator_actions.html.erb +3 -0
- data/app/views/catalog/_remove_tags.html.erb +37 -0
- data/app/views/catalog/_save_search.html.erb +1 -1
- data/app/views/spotlight/about_pages/_sidebar.html.erb +2 -2
- data/app/views/spotlight/browse/_search.html.erb +3 -3
- data/app/views/spotlight/browse/_search_box.html.erb +9 -9
- data/app/views/spotlight/browse/_search_title.html.erb +1 -1
- data/app/views/spotlight/bulk_updates/_download.html.erb +23 -0
- data/app/views/spotlight/bulk_updates/_overview.html.erb +1 -0
- data/app/views/spotlight/bulk_updates/_progress_panel.html.erb +19 -0
- data/app/views/spotlight/bulk_updates/_upload.html.erb +12 -0
- data/app/views/spotlight/bulk_updates/edit.html.erb +37 -0
- data/app/views/spotlight/catalog/_admin_header.html.erb +1 -1
- data/app/views/spotlight/catalog/_admin_index_header_default.html.erb +1 -1
- data/app/views/spotlight/catalog/_admin_thumbnail_default.html.erb +3 -2
- data/app/views/spotlight/catalog/_edit_default.html.erb +2 -2
- data/app/views/spotlight/catalog/_reindex_progress_panel.html.erb +1 -1
- data/app/views/spotlight/catalog/index.iiif_json.jbuilder +1 -1
- data/app/views/spotlight/custom_fields/_form.html.erb +1 -1
- data/app/views/spotlight/custom_search_fields/_form.html.erb +1 -1
- data/app/views/spotlight/dashboards/_reindexing_activity.html.erb +6 -6
- data/app/views/spotlight/exhibits/_exhibit_card.html.erb +1 -1
- data/app/views/spotlight/feature_pages/_sidebar.html.erb +1 -1
- data/app/views/spotlight/featured_images/_form.html.erb +1 -1
- data/app/views/spotlight/job_trackers/show.html.erb +79 -0
- data/app/views/spotlight/metadata_configurations/_metadata_field.html.erb +2 -2
- data/app/views/spotlight/pages/_form.html.erb +2 -2
- data/app/views/spotlight/pages/_order_pages.html.erb +2 -2
- data/app/views/spotlight/pages/_view_type_group.html.erb +3 -3
- data/app/views/spotlight/pages/show.html.erb +1 -1
- data/app/views/spotlight/resources/_form.html.erb +1 -1
- data/app/views/spotlight/resources/csv_upload/_form.html.erb +1 -1
- data/app/views/spotlight/resources/iiif/_form.html.erb +1 -1
- data/app/views/spotlight/resources/json_upload/_form.html.erb +2 -2
- data/app/views/spotlight/resources/upload/_form.html.erb +1 -1
- data/app/views/spotlight/search_configurations/_document_index_view_types.html.erb +2 -2
- data/app/views/spotlight/searches/_form.html.erb +2 -2
- data/app/views/spotlight/shared/_curation_sidebar.html.erb +3 -0
- data/app/views/spotlight/shared/_locale_picker.html.erb +1 -1
- data/app/views/spotlight/sir_trevor/blocks/_browse_group_categories_block.html.erb +7 -6
- data/app/views/spotlight/sir_trevor/blocks/_search_results_block.html.erb +1 -1
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb +8 -8
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb +7 -7
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb +9 -7
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb +5 -5
- data/app/views/spotlight/sir_trevor/blocks/_uploaded_items_block.html.erb +4 -0
- data/app/views/spotlight/tags/_tag.html.erb +24 -0
- data/app/views/spotlight/tags/index.html.erb +12 -16
- data/app/views/spotlight/translations/show.yaml.yamlbuilder +6 -0
- data/config/i18n-tasks.yml +1 -0
- data/config/locales/spotlight.ar.yml +11 -1
- data/config/locales/spotlight.en.yml +170 -10
- data/config/routes.rb +29 -1
- data/db/migrate/20210122082032_create_job_trackers.rb +22 -0
- data/db/migrate/20210126123041_create_events.rb +15 -0
- data/db/migrate/20210305070001_remove_class_from_sirtrevor_image_blocks.rb +20 -0
- data/db/migrate/20210305171150_create_bulk_updates.rb +9 -0
- data/db/migrate/20210308090000_migrate_caption_values_for_title_key.rb +29 -0
- data/db/migrate/20210506070809_add_indexes_for_featured_images.rb +9 -0
- data/lib/generators/spotlight/install_generator.rb +2 -2
- data/lib/generators/spotlight/scaffold_resource_generator.rb +5 -13
- data/lib/generators/spotlight/templates/config/initializers/riiif.rb +7 -5
- data/lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb +1 -1
- data/lib/generators/spotlight/templates/solr/config/schema.xml +1 -1
- data/lib/migration/iiif.rb +3 -3
- data/lib/spotlight/engine.rb +22 -1
- data/lib/spotlight/version.rb +1 -1
- data/spec/controllers/spotlight/browse_controller_spec.rb +0 -6
- data/spec/controllers/spotlight/bulk_actions_controller_spec.rb +124 -0
- data/spec/controllers/spotlight/bulk_updates_controller_spec.rb +77 -0
- data/spec/controllers/spotlight/catalog_controller_spec.rb +15 -13
- data/spec/controllers/spotlight/featured_images_controller_spec.rb +3 -3
- data/spec/controllers/spotlight/job_trackers_controller_spec.rb +37 -0
- data/spec/controllers/spotlight/tags_controller_spec.rb +5 -1
- data/spec/examples.txt +1502 -1437
- data/spec/factories/bulk_updates.rb +15 -0
- data/spec/factories/exhibits.rb +4 -0
- data/spec/factories/job_trackers.rb +11 -0
- data/spec/factories/users.rb +27 -8
- data/spec/features/add_items_spec.rb +10 -5
- data/spec/features/bulk_actions_spec.rb +72 -0
- data/spec/features/catalog_spec.rb +1 -0
- data/spec/features/import_exhibit_spec.rb +5 -1
- data/spec/features/javascript/blocks/solr_documents_block_spec.rb +4 -4
- data/spec/features/javascript/blocks/uploaded_items_block_spec.rb +27 -1
- data/spec/features/javascript/reindex_monitor_spec.rb +1 -1
- data/spec/features/site_users_management_spec.rb +5 -5
- data/spec/fixtures/bulk-update-template.csv +57 -0
- data/spec/fixtures/updated-bulk-update-template-w-tags.csv +4 -0
- data/spec/fixtures/updated-bulk-update-template.csv +4 -0
- data/spec/helpers/spotlight/application_helper_spec.rb +5 -6
- data/spec/helpers/spotlight/pages_helper_spec.rb +8 -15
- data/spec/helpers/spotlight/roles_helper_spec.rb +1 -1
- data/spec/i18n_spec.rb +1 -0
- data/spec/jobs/spotlight/add_tags_job_spec.rb +34 -0
- data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb +4 -1
- data/spec/jobs/spotlight/change_visibility_job_spec.rb +30 -0
- data/spec/jobs/spotlight/process_bulk_updates_csv_job_spec.rb +78 -0
- data/spec/jobs/spotlight/reindex_exhibit_job_spec.rb +43 -0
- data/spec/jobs/spotlight/reindex_job_spec.rb +34 -60
- data/spec/jobs/spotlight/remove_tags_job_spec.rb +39 -0
- data/spec/lib/migration/iiif_spec.rb +1 -1
- data/spec/models/spotlight/ability_spec.rb +27 -0
- data/spec/models/spotlight/background_job_progress_spec.rb +137 -0
- data/spec/models/spotlight/blacklight_configuration_spec.rb +22 -17
- data/spec/models/spotlight/browse_category_search_builder_spec.rb +49 -0
- data/spec/models/spotlight/exhibit_spec.rb +4 -58
- data/spec/models/spotlight/featured_image_spec.rb +13 -1
- data/spec/models/spotlight/resource_spec.rb +89 -87
- data/spec/models/spotlight/resources/iiif_harvester_spec.rb +9 -10
- data/spec/models/spotlight/solr_document/atomic_updates_spec.rb +10 -0
- data/spec/models/spotlight/solr_document_sidecar_spec.rb +1 -0
- data/spec/presenters/spotlight/iiif_manifest_presenter_spec.rb +1 -1
- data/spec/services/spotlight/bulk_updates_csv_template_service_spec.rb +26 -0
- data/spec/services/spotlight/etl/context_spec.rb +66 -0
- data/spec/services/spotlight/etl/executor_spec.rb +149 -0
- data/spec/services/spotlight/etl/pipeline_spec.rb +22 -0
- data/spec/services/spotlight/etl/solr_loader_spec.rb +76 -0
- data/spec/services/spotlight/etl/step_spec.rb +70 -0
- data/spec/spec_helper.rb +2 -5
- data/spec/test_app_templates/Gemfile.extra +1 -0
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +1 -1
- data/spec/uploaders/spotlight/featured_image_uploader_spec.rb +2 -2
- data/spec/views/spotlight/catalog/_edit_default.html.erb_spec.rb +1 -1
- data/spec/views/spotlight/dashboards/_reindexing_activity.html.erb_spec.rb +24 -19
- data/spec/views/spotlight/job_trackers/show.html.erb_spec.rb +65 -0
- data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb +3 -4
- data/spec/views/spotlight/sir_trevor/blocks/_browse_block.html.erb_spec.rb +1 -1
- data/spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb +1 -1
- data/spec/views/spotlight/sir_trevor/blocks/_link_to_search_block.html.erb_spec.rb +1 -1
- data/spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb +1 -1
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb +8 -4
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb +7 -2
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb +8 -5
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb +3 -2
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb +9 -4
- data/spec/views/spotlight/tags/index.html.erb_spec.rb +5 -2
- metadata +143 -34
- data/app/assets/images/blacklight/add_circle.svg +0 -1
- data/app/assets/images/blacklight/custom_fullscreen.svg +0 -1
- data/app/assets/images/blacklight/remove_circle.svg +0 -1
- data/app/assets/images/blacklight/resize_small.svg +0 -1
- data/app/models/concerns/spotlight/resources/open_graph.rb +0 -36
- data/app/models/spotlight/reindex_progress.rb +0 -78
- data/app/models/spotlight/reindexing_log_entry.rb +0 -42
- data/app/services/spotlight/resources/iiif_builder.rb +0 -19
- data/app/services/spotlight/solr_document_builder.rb +0 -77
- data/app/services/spotlight/upload_solr_document_builder.rb +0 -57
- data/spec/factories/reindexing_log_entries.rb +0 -54
- data/spec/models/spotlight/reindex_progress_spec.rb +0 -122
- data/spec/models/spotlight/reindexing_log_entry_spec.rb +0 -129
- data/spec/models/spotlight/resources/open_graph_spec.rb +0 -65
- data/spec/services/spotlight/solr_document_builder_spec.rb +0 -66
@@ -1,129 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
describe Spotlight::ReindexingLogEntry, type: :model do
|
4
|
-
subject { FactoryBot.build(:reindexing_log_entry) }
|
5
|
-
|
6
|
-
describe 'scope' do
|
7
|
-
before do
|
8
|
-
(0..10).to_a.each { FactoryBot.create(:recent_reindexing_log_entry) }
|
9
|
-
FactoryBot.create(:unstarted_reindexing_log_entry)
|
10
|
-
(0..10).to_a.each { FactoryBot.create(:recent_reindexing_log_entry) }
|
11
|
-
end
|
12
|
-
|
13
|
-
let(:sorted_log_entry_list) do
|
14
|
-
unstarted_entries = described_class.where(start_time: nil).to_a
|
15
|
-
started_entries = described_class.where.not(start_time: nil).to_a.sort_by(&:start_time).reverse
|
16
|
-
unstarted_entries + started_entries # null start times should be first
|
17
|
-
end
|
18
|
-
|
19
|
-
context 'default' do
|
20
|
-
it 'sorts by start_time in descending order' do
|
21
|
-
default_log_entry_list = described_class.all.to_a
|
22
|
-
expect(default_log_entry_list).to eq sorted_log_entry_list
|
23
|
-
end
|
24
|
-
end
|
25
|
-
|
26
|
-
context 'recent' do
|
27
|
-
it 'returns the most recent 5 entries (sorted by start_time descending)' do
|
28
|
-
recent_log_entry_list = described_class.recent.to_a
|
29
|
-
expect(recent_log_entry_list).to eq sorted_log_entry_list[0..4]
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
describe '#duration' do
|
35
|
-
context 'when end_time is present' do
|
36
|
-
it 'is calculated as difference between end_time and start_time' do
|
37
|
-
expect(subject.duration).to eq 300
|
38
|
-
end
|
39
|
-
end
|
40
|
-
|
41
|
-
context 'when end_time is not present' do
|
42
|
-
subject { FactoryBot.build(:in_progress_reindexing_log_entry) }
|
43
|
-
|
44
|
-
it 'is nil' do
|
45
|
-
expect(subject.duration).to be nil
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
49
|
-
|
50
|
-
describe 'state updating methods' do
|
51
|
-
describe '#in_progress!' do
|
52
|
-
subject { FactoryBot.build(:unstarted_reindexing_log_entry) }
|
53
|
-
|
54
|
-
context 'executes normally' do
|
55
|
-
it 'sets start_time and job_status' do
|
56
|
-
lower_time_bound = Time.zone.now
|
57
|
-
subject.in_progress!
|
58
|
-
upper_time_bound = Time.zone.now
|
59
|
-
|
60
|
-
expect(subject.start_time).to be_between(lower_time_bound, upper_time_bound)
|
61
|
-
expect(subject.job_status).to eq 'in_progress'
|
62
|
-
end
|
63
|
-
end
|
64
|
-
|
65
|
-
context 'encounters an unexpected error' do
|
66
|
-
it "traps the exception and logs an error so that the caller doesn't have to deal with it" do
|
67
|
-
expect(subject).to receive(:'start_time=').and_raise StandardError.new # try to blow up the in_progress! call
|
68
|
-
expect(Rails.logger).to receive(:error) do |arg|
|
69
|
-
expect(arg).to match(/^unexpected error updating log entry to :in_progress from \[".*reindexing_log_entry.rb/)
|
70
|
-
end
|
71
|
-
|
72
|
-
expect { subject.in_progress! }.not_to raise_error
|
73
|
-
end
|
74
|
-
end
|
75
|
-
end
|
76
|
-
|
77
|
-
describe '#succeeded!' do
|
78
|
-
subject { FactoryBot.build(:in_progress_reindexing_log_entry) }
|
79
|
-
|
80
|
-
context 'executes normally' do
|
81
|
-
it 'sets end_time and job_status' do
|
82
|
-
lower_time_bound = Time.zone.now
|
83
|
-
subject.succeeded!
|
84
|
-
upper_time_bound = Time.zone.now
|
85
|
-
|
86
|
-
expect(subject.end_time).to be_between(lower_time_bound, upper_time_bound)
|
87
|
-
expect(subject.job_status).to eq 'succeeded'
|
88
|
-
end
|
89
|
-
end
|
90
|
-
|
91
|
-
context 'encounters an unexpected error' do
|
92
|
-
it "traps the exception and logs an error so that the caller doesn't have to deal with it" do
|
93
|
-
expect(subject).to receive(:'end_time=').and_raise StandardError.new # try to blow up the succeeded! call
|
94
|
-
expect(Rails.logger).to receive(:error) do |arg|
|
95
|
-
expect(arg).to match(/^unexpected error updating log entry to :succeeded from \[".*reindexing_log_entry.rb/)
|
96
|
-
end
|
97
|
-
|
98
|
-
expect { subject.succeeded! }.not_to raise_error
|
99
|
-
end
|
100
|
-
end
|
101
|
-
end
|
102
|
-
|
103
|
-
describe '#failed!' do
|
104
|
-
subject { FactoryBot.build(:in_progress_reindexing_log_entry) }
|
105
|
-
|
106
|
-
context 'executes normally' do
|
107
|
-
it 'sets end_time and job_status' do
|
108
|
-
lower_time_bound = Time.zone.now
|
109
|
-
subject.failed!
|
110
|
-
upper_time_bound = Time.zone.now
|
111
|
-
|
112
|
-
expect(subject.end_time).to be_between(lower_time_bound, upper_time_bound)
|
113
|
-
expect(subject.job_status).to eq 'failed'
|
114
|
-
end
|
115
|
-
end
|
116
|
-
|
117
|
-
context 'encounters an unexpected error' do
|
118
|
-
it "traps the exception and logs an error so that the caller doesn't have to deal with it" do
|
119
|
-
expect(subject).to receive(:'end_time=').and_raise StandardError.new # try to blow up the failed! call
|
120
|
-
expect(Rails.logger).to receive(:error) do |arg|
|
121
|
-
expect(arg).to match(/^unexpected error updating log entry to :failed from \[".*reindexing_log_entry.rb/)
|
122
|
-
end
|
123
|
-
|
124
|
-
expect { subject.failed! }.not_to raise_error
|
125
|
-
end
|
126
|
-
end
|
127
|
-
end
|
128
|
-
end
|
129
|
-
end
|
@@ -1,65 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
describe Spotlight::Resources::OpenGraph, type: :model do
|
4
|
-
class TestDocBuilder < Spotlight::SolrDocumentBuilder
|
5
|
-
def to_solr
|
6
|
-
super.merge(resource.opengraph_properties)
|
7
|
-
end
|
8
|
-
end
|
9
|
-
|
10
|
-
class TestResource < Spotlight::Resource
|
11
|
-
self.document_builder_class = TestDocBuilder
|
12
|
-
include Spotlight::Resources::OpenGraph
|
13
|
-
end
|
14
|
-
|
15
|
-
subject { TestResource.new url: 'info:url' }
|
16
|
-
|
17
|
-
let(:exhibit) { double(solr_data: {}, blacklight_config: Blacklight::Configuration.new) }
|
18
|
-
|
19
|
-
describe '#to_solr' do
|
20
|
-
before do
|
21
|
-
allow(subject).to receive_messages id: 15, opengraph_properties: {}, exhibit: exhibit, persisted?: true
|
22
|
-
end
|
23
|
-
|
24
|
-
let(:solr_doc) { subject.document_builder.to_solr }
|
25
|
-
|
26
|
-
it 'includes this record id' do
|
27
|
-
expect(solr_doc).to include spotlight_resource_id_ssim: subject.to_global_id.to_s
|
28
|
-
end
|
29
|
-
|
30
|
-
it 'includes opengraph properties' do
|
31
|
-
allow(subject).to receive_messages opengraph_properties: { a: 1, b: 2 }
|
32
|
-
|
33
|
-
expect(solr_doc).to include a: 1, b: 2
|
34
|
-
end
|
35
|
-
end
|
36
|
-
|
37
|
-
describe '#opengraph_properties' do
|
38
|
-
it 'maps opengraph properties to solr fields' do
|
39
|
-
allow(subject).to receive_messages opengraph: { 'og_title' => 'title', 'og_description' => 'description' }
|
40
|
-
expect(subject.opengraph_properties).to include 'og_title_tesim' => 'title', 'og_description_tesim' => 'description'
|
41
|
-
end
|
42
|
-
end
|
43
|
-
|
44
|
-
describe '#opengraph' do
|
45
|
-
let(:body) do
|
46
|
-
Nokogiri::HTML.parse <<-EOF
|
47
|
-
<html><head>
|
48
|
-
<meta property="og:title" content="The Ground Truth: The Human Cost of War"/>
|
49
|
-
<meta property="og:description" content="The Ground Truth: The Human Cost of War is our soldiers' perspective of the Iraq War"/>
|
50
|
-
<meta property="og:type" content="video.movie"/>
|
51
|
-
<meta property="og:site_name" content="Internet Archive"/>
|
52
|
-
<meta property="og:video" content="https://archive.org/download/Ground_Truth/GroundTruth1_bb_512kb.mp4"/>
|
53
|
-
<meta property="og:video:width" content="320"/>
|
54
|
-
<meta property="og:video:height" content="240"/>
|
55
|
-
</head></html>
|
56
|
-
EOF
|
57
|
-
end
|
58
|
-
|
59
|
-
it 'extracts opengraph <meta> tags' do
|
60
|
-
allow(subject).to receive_messages(body: body)
|
61
|
-
expect(subject.opengraph).to include 'og:title', 'og:description', 'og:type', 'og:type', 'og:site_name', 'og:video', 'og:video:width', 'og:video:height'
|
62
|
-
expect(subject.opengraph['og:title']).to eq 'The Ground Truth: The Human Cost of War'
|
63
|
-
end
|
64
|
-
end
|
65
|
-
end
|
@@ -1,66 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
describe Spotlight::SolrDocumentBuilder do
|
4
|
-
let(:exhibit) { FactoryBot.create(:exhibit) }
|
5
|
-
let(:doc_builder) { described_class.new(resource) }
|
6
|
-
let(:resource) { Spotlight::Resource.new }
|
7
|
-
|
8
|
-
describe '#to_solr' do
|
9
|
-
subject { doc_builder.send(:to_solr) }
|
10
|
-
|
11
|
-
before do
|
12
|
-
allow(resource).to receive(:exhibit).and_return(exhibit)
|
13
|
-
allow(resource).to receive_messages(type: 'Spotlight::Resource::Something', id: 15, persisted?: true)
|
14
|
-
end
|
15
|
-
|
16
|
-
it 'includes a reference to the resource' do
|
17
|
-
expect(subject).to include spotlight_resource_id_ssim: resource.to_global_id.to_s
|
18
|
-
end
|
19
|
-
end
|
20
|
-
|
21
|
-
describe '#documents_to_index' do
|
22
|
-
context 'when the document belongs to more than one exhibit' do
|
23
|
-
subject { resource.document_builder }
|
24
|
-
|
25
|
-
let(:doc) { SolrDocument.new(id: 'abc123') }
|
26
|
-
let(:resource) { FactoryBot.create(:resource) }
|
27
|
-
let(:resource_alt) { FactoryBot.create(:resource) }
|
28
|
-
|
29
|
-
before do
|
30
|
-
allow(Spotlight::Engine.config).to receive(:filter_resources_by_exhibit).and_return(true)
|
31
|
-
allow(resource.document_builder).to receive(:to_solr).and_return(id: 'abc123')
|
32
|
-
allow(resource_alt.document_builder).to receive(:to_solr).and_return(id: 'abc123')
|
33
|
-
resource_alt.document_builder.documents_to_index.first
|
34
|
-
end
|
35
|
-
|
36
|
-
it 'has filter data for both exhibits' do
|
37
|
-
result = resource.document_builder.documents_to_index.first
|
38
|
-
expect(result).to include "spotlight_exhibit_slug_#{resource.exhibit.slug}_bsi"
|
39
|
-
expect(result).to include "spotlight_exhibit_slug_#{resource_alt.exhibit.slug}_bsi"
|
40
|
-
end
|
41
|
-
|
42
|
-
it 'has a field with both exhibit slugs listed' do
|
43
|
-
result = resource.document_builder.documents_to_index.first
|
44
|
-
expect(result).to include 'spotlight_exhibit_slugs_ssim' => match_array([resource.exhibit.slug, resource_alt.exhibit.slug])
|
45
|
-
end
|
46
|
-
|
47
|
-
it 'creates a sidecar resource for the document' do
|
48
|
-
resource.document_builder.documents_to_index.first
|
49
|
-
|
50
|
-
expect(Spotlight::SolrDocumentSidecar.where(document_id: 'abc123', document_type: 'SolrDocument').size).to eq 2
|
51
|
-
sidecar = resource.solr_document_sidecars.find_by(document_id: 'abc123', document_type: 'SolrDocument')
|
52
|
-
expect(sidecar.exhibit).to eq resource.exhibit
|
53
|
-
expect(sidecar.resource).to eq resource
|
54
|
-
end
|
55
|
-
|
56
|
-
context 'without a persisted resource' do
|
57
|
-
let(:resource) { FactoryBot.build(:resource, exhibit: exhibit) }
|
58
|
-
|
59
|
-
it 'does not implicitly persist the resource' do
|
60
|
-
resource.document_builder.documents_to_index.first
|
61
|
-
expect(resource).not_to be_persisted
|
62
|
-
end
|
63
|
-
end
|
64
|
-
end
|
65
|
-
end
|
66
|
-
end
|