blacklight-spotlight 0.4.1 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +22 -8
- data/Rakefile +40 -39
- data/app/assets/javascripts/spotlight/blacklight_configuration.js +16 -0
- data/app/assets/javascripts/spotlight/blocks/resources_block.js +3 -1
- data/app/assets/stylesheets/spotlight/_blacklight_configuration.scss +2 -2
- data/app/assets/stylesheets/spotlight/_blacklight_overrides.scss +24 -0
- data/app/assets/stylesheets/spotlight/_header.scss +150 -47
- data/app/assets/stylesheets/spotlight/_pages.scss +62 -11
- data/app/assets/stylesheets/spotlight/_report_a_problem.scss +1 -0
- data/app/assets/stylesheets/spotlight/_spotlight.scss +1 -0
- data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb +28 -21
- data/app/controllers/spotlight/about_pages_controller.rb +25 -14
- data/app/controllers/spotlight/appearances_controller.rb +34 -30
- data/app/controllers/spotlight/application_controller.rb +2 -1
- data/app/controllers/spotlight/attachments_controller.rb +9 -7
- data/app/controllers/spotlight/browse_controller.rb +13 -9
- data/app/controllers/spotlight/catalog_controller.rb +179 -161
- data/app/controllers/spotlight/concerns/application_controller.rb +22 -20
- data/app/controllers/spotlight/concerns/catalog_search_context.rb +44 -0
- data/app/controllers/spotlight/confirmations_controller.rb +5 -2
- data/app/controllers/spotlight/contact_forms_controller.rb +13 -7
- data/app/controllers/spotlight/contacts_controller.rb +13 -4
- data/app/controllers/spotlight/custom_fields_controller.rb +48 -40
- data/app/controllers/spotlight/dashboards_controller.rb +17 -8
- data/app/controllers/spotlight/default_controller.rb +3 -1
- data/app/controllers/spotlight/exhibits_controller.rb +69 -62
- data/app/controllers/spotlight/feature_pages_controller.rb +21 -11
- data/app/controllers/spotlight/home_pages_controller.rb +6 -5
- data/app/controllers/spotlight/lock_controller.rb +3 -1
- data/app/controllers/spotlight/metadata_configurations_controller.rb +49 -0
- data/app/controllers/spotlight/pages_controller.rb +28 -18
- data/app/controllers/spotlight/resources/upload_controller.rb +53 -46
- data/app/controllers/spotlight/resources_controller.rb +9 -5
- data/app/controllers/spotlight/roles_controller.rb +26 -22
- data/app/controllers/spotlight/search_configurations_controller.rb +66 -0
- data/app/controllers/spotlight/searches_controller.rb +91 -82
- data/app/controllers/spotlight/solr_controller.rb +20 -13
- data/app/controllers/spotlight/tags_controller.rb +5 -3
- data/app/controllers/spotlight/versions_controller.rb +15 -12
- data/app/controllers/spotlight/view_configurations_controller.rb +17 -0
- data/app/helpers/spotlight/application_helper.rb +44 -32
- data/app/helpers/spotlight/browse_helper.rb +13 -1
- data/app/helpers/spotlight/crud_link_helpers.rb +22 -14
- data/app/helpers/spotlight/jcrop_helper.rb +4 -2
- data/app/helpers/spotlight/main_app_helpers.rb +45 -41
- data/app/helpers/spotlight/navbar_helper.rb +6 -0
- data/app/helpers/spotlight/pages_helper.rb +23 -15
- data/app/helpers/spotlight/roles_helper.rb +10 -4
- data/app/helpers/spotlight/search_configurations_helper.rb +22 -0
- data/app/helpers/spotlight/title_helper.rb +16 -13
- data/app/jobs/spotlight/add_uploads_from_csv.rb +13 -9
- data/app/jobs/spotlight/reindex_job.rb +9 -9
- data/app/jobs/spotlight/rename_sidecar_field_job.rb +3 -0
- data/app/mailers/spotlight/confirmation_mailer.rb +2 -0
- data/app/mailers/spotlight/indexing_complete_mailer.rb +4 -2
- data/app/models/ability.rb +3 -0
- data/app/models/concerns/spotlight/ar_light.rb +49 -25
- data/app/models/concerns/spotlight/blacklight_configuration_defaults.rb +25 -10
- data/app/models/concerns/spotlight/exhibit_analytics.rb +28 -0
- data/app/models/concerns/spotlight/image_derivatives.rb +25 -26
- data/app/models/concerns/spotlight/resources/open_graph.rb +23 -19
- data/app/models/concerns/spotlight/resources/web.rb +25 -24
- data/app/models/concerns/spotlight/solr_document.rb +40 -34
- data/app/models/concerns/spotlight/solr_document/active_model_concern.rb +29 -40
- data/app/models/concerns/spotlight/solr_document/atomic_updates.rb +22 -18
- data/app/models/concerns/spotlight/solr_document/finder.rb +23 -18
- data/app/models/concerns/spotlight/solr_document/spotlight_images.rb +43 -39
- data/app/models/concerns/spotlight/solr_document/uploaded_resource.rb +41 -29
- data/app/models/concerns/spotlight/user.rb +25 -19
- data/app/models/sir_trevor_rails/blocks/browse_block.rb +36 -30
- data/app/models/sir_trevor_rails/blocks/featured_pages_block.rb +24 -18
- data/app/models/sir_trevor_rails/blocks/oembed_block.rb +8 -4
- data/app/models/sir_trevor_rails/blocks/search_results_block.rb +29 -23
- data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb +43 -42
- data/app/models/sir_trevor_rails/blocks/solr_documents_carousel_block.rb +16 -12
- data/app/models/sir_trevor_rails/blocks/solr_documents_embed_block.rb +7 -3
- data/app/models/sir_trevor_rails/blocks/solr_documents_features_block.rb +7 -3
- data/app/models/sir_trevor_rails/blocks/solr_documents_grid_block.rb +7 -3
- data/app/models/sir_trevor_rails/blocks/textable.rb +18 -18
- data/app/models/spotlight/ability.rb +32 -33
- data/app/models/spotlight/about_page.rb +3 -1
- data/app/models/spotlight/analytics/ga.rb +46 -27
- data/app/models/spotlight/attachment.rb +3 -1
- data/app/models/spotlight/blacklight_configuration.rb +146 -68
- data/app/models/spotlight/contact.rb +35 -30
- data/app/models/spotlight/contact_email.rb +6 -3
- data/app/models/spotlight/contact_form.rb +4 -3
- data/app/models/spotlight/custom_field.rb +41 -33
- data/app/models/spotlight/exhibit.rb +104 -130
- data/app/models/spotlight/feature_page.rb +9 -7
- data/app/models/spotlight/featured_image.rb +10 -10
- data/app/models/spotlight/field_metadata.rb +46 -0
- data/app/models/spotlight/home_page.rb +8 -5
- data/app/models/spotlight/lock.rb +4 -3
- data/app/models/spotlight/main_navigation.rb +9 -3
- data/app/models/spotlight/masthead.rb +17 -16
- data/app/models/spotlight/page.rb +16 -16
- data/app/models/spotlight/resource.rb +69 -22
- data/app/models/spotlight/resources/csv_upload.rb +8 -4
- data/app/models/spotlight/resources/upload.rb +68 -57
- data/app/models/spotlight/role.rb +30 -34
- data/app/models/spotlight/search.rb +74 -63
- data/app/models/spotlight/solr_document_sidecar.rb +17 -15
- data/app/serializers/spotlight/exhibit_export_serializer.rb +65 -29
- data/app/serializers/spotlight/page_representer.rb +10 -6
- data/app/uploaders/spotlight/attachment_uploader.rb +4 -6
- data/app/uploaders/spotlight/avatar_uploader.rb +4 -3
- data/app/uploaders/spotlight/featured_image_uploader.rb +15 -14
- data/app/uploaders/spotlight/item_uploader.rb +3 -1
- data/app/uploaders/spotlight/masthead_uploader.rb +4 -2
- data/app/views/catalog/_search_form.html.erb +24 -0
- data/app/views/shared/_browse_navbar.html.erb +1 -1
- data/app/views/shared/_exhibit_navbar.html.erb +1 -1
- data/app/views/spotlight/appearances/edit.html.erb +13 -45
- data/app/views/spotlight/catalog/_edit_default.html.erb +1 -1
- data/app/views/spotlight/custom_fields/_form.html.erb +1 -1
- data/app/views/spotlight/exhibits/edit.html.erb +4 -4
- data/app/views/spotlight/home_pages/_empty.html.erb +1 -3
- data/app/views/spotlight/home_pages/_page_options.html.erb +1 -1
- data/app/views/spotlight/{blacklight_configurations → metadata_configurations}/_metadata_field.html.erb +0 -0
- data/app/views/spotlight/{blacklight_configurations/edit_metadata_fields.html.erb → metadata_configurations/edit.html.erb} +1 -1
- data/app/views/spotlight/pages/show.html.erb +2 -2
- data/app/views/spotlight/search_configurations/_default_per_page.html.erb +5 -0
- data/app/views/spotlight/search_configurations/_document_index_view_types.html.erb +7 -0
- data/app/views/spotlight/search_configurations/_facets.html.erb +38 -0
- data/app/views/spotlight/search_configurations/_search_fields.html.erb +58 -0
- data/app/views/spotlight/search_configurations/_sort.html.erb +53 -0
- data/app/views/spotlight/search_configurations/edit.html.erb +46 -0
- data/app/views/spotlight/searches/_search.html.erb +1 -1
- data/app/views/spotlight/shared/_admin_sidebar.html.erb +0 -2
- data/app/views/spotlight/shared/_curation_sidebar.html.erb +2 -3
- data/app/views/spotlight/shared/_report_a_problem.html.erb +2 -2
- data/app/views/spotlight/sir_trevor/blocks/_oembed_block.html.erb +5 -1
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb +7 -5
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb +2 -2
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb +7 -5
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb +2 -2
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb +14 -9
- data/config/locales/spotlight.en.yml +94 -49
- data/config/routes.rb +11 -20
- data/db/migrate/20150410180014_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +15 -0
- data/db/migrate/20150410180015_add_missing_taggable_index.acts_as_taggable_on_engine.rb +10 -0
- data/db/migrate/20150410180016_change_collation_for_tag_names.acts_as_taggable_on_engine.rb +10 -0
- data/db/migrate/20150713160101_change_spotlight_searches_to_published.rb +5 -0
- data/db/migrate/20151016092343_remove_searchable_from_exhibit.rb +20 -0
- data/lib/blacklight/spotlight.rb +1 -1
- data/lib/generators/spotlight/install_generator.rb +27 -25
- data/lib/generators/spotlight/templates/catalog_controller.rb +7 -5
- data/lib/generators/spotlight/templates/jetty.rake +8 -2
- data/lib/generators/spotlight/templates/spotlight_helper.rb +3 -1
- data/lib/spotlight.rb +4 -2
- data/lib/spotlight/base.rb +21 -14
- data/lib/spotlight/catalog.rb +10 -9
- data/lib/spotlight/catalog/access_controls_enforcement.rb +30 -15
- data/lib/spotlight/config.rb +4 -2
- data/lib/spotlight/controller.rb +12 -11
- data/lib/spotlight/engine.rb +30 -22
- data/lib/spotlight/rails/routes.rb +7 -4
- data/lib/spotlight/version.rb +2 -1
- data/lib/tasks/spotlight_tasks.rake +56 -50
- data/spec/controllers/application_controller_spec.rb +13 -13
- data/spec/controllers/spotlight/about_pages_controller_spec.rb +63 -59
- data/spec/controllers/spotlight/appearances_controller_spec.rb +29 -24
- data/spec/controllers/spotlight/application_controller_spec.rb +3 -3
- data/spec/controllers/spotlight/attachments_controller_spec.rb +10 -10
- data/spec/controllers/spotlight/browse_controller_spec.rb +23 -25
- data/spec/controllers/spotlight/catalog_controller_spec.rb +82 -87
- data/spec/controllers/spotlight/confirmations_controller_spec.rb +13 -11
- data/spec/controllers/spotlight/contact_forms_controller_spec.rb +17 -12
- data/spec/controllers/spotlight/contacts_controller_spec.rb +36 -36
- data/spec/controllers/spotlight/custom_fields_controller_spec.rb +26 -26
- data/spec/controllers/spotlight/dashboards_controller_spec.rb +14 -14
- data/spec/controllers/spotlight/exhibits_controller_spec.rb +59 -54
- data/spec/controllers/spotlight/feature_pages_controller_spec.rb +59 -59
- data/spec/controllers/spotlight/home_pages_controller_spec.rb +28 -29
- data/spec/controllers/spotlight/metadata_configurations_controller_spec.rb +84 -0
- data/spec/controllers/spotlight/resources/upload_controller_spec.rb +42 -33
- data/spec/controllers/spotlight/resources_controller_spec.rb +25 -29
- data/spec/controllers/spotlight/roles_controller_spec.rb +37 -19
- data/spec/controllers/spotlight/search_configurations_controller_spec.rb +125 -0
- data/spec/controllers/spotlight/searches_controller_spec.rb +84 -63
- data/spec/controllers/spotlight/solr_controller_spec.rb +13 -14
- data/spec/controllers/spotlight/tags_controller_spec.rb +16 -16
- data/spec/controllers/spotlight/versions_controller_spec.rb +15 -18
- data/spec/controllers/spotlight/view_configurations_controller_spec.rb +31 -0
- data/spec/factories/contacts.rb +1 -3
- data/spec/factories/custom_fields.rb +2 -4
- data/spec/factories/exhibits.rb +4 -2
- data/spec/factories/pages.rb +8 -11
- data/spec/factories/resources.rb +4 -4
- data/spec/factories/searches.rb +10 -13
- data/spec/factories/tags.rb +0 -3
- data/spec/factories/users.rb +2 -4
- data/spec/features/about_page_spec.rb +19 -19
- data/spec/features/add_contacts_spec.rb +34 -34
- data/spec/features/add_custom_field_metadata_spec.rb +24 -26
- data/spec/features/add_item_bookmarklet_spec.rb +12 -12
- data/spec/features/browse_category_admin_spec.rb +39 -39
- data/spec/features/catalog_spec.rb +9 -10
- data/spec/features/confirm_email_spec.rb +10 -10
- data/spec/features/create_exhibit_spec.rb +18 -15
- data/spec/features/create_page_spec.rb +8 -8
- data/spec/features/curator_items.rb +3 -3
- data/spec/features/dashboard_spec.rb +15 -16
- data/spec/features/edit_contact_spec.rb +8 -10
- data/spec/features/edit_search_fields_spec.rb +79 -0
- data/spec/features/exhibits/add_tags_spec.rb +15 -16
- data/spec/features/exhibits/administration_spec.rb +25 -25
- data/spec/features/exhibits/custom_metadata_fields_spec.rb +41 -43
- data/spec/features/exhibits/edit_metadata_fields_spec.rb +19 -19
- data/spec/features/feature_page_spec.rb +49 -48
- data/spec/features/home_page_spec.rb +38 -38
- data/spec/features/import_exhibit_spec.rb +23 -20
- data/spec/features/item_admin_spec.rb +28 -29
- data/spec/features/javascript/about_page_admin_spec.rb +9 -9
- data/spec/features/javascript/block_controls_spec.rb +16 -18
- data/spec/features/javascript/blocks/featured_browse_categories_block_spec.rb +11 -12
- data/spec/features/javascript/blocks/featured_pages_block_spec.rb +12 -13
- data/spec/features/javascript/blocks/search_result_block_spec.rb +17 -17
- data/spec/features/javascript/blocks/solr_documents_block_spec.rb +67 -65
- data/spec/features/javascript/edit_in_place_spec.rb +30 -56
- data/spec/features/javascript/feature_page_admin_spec.rb +73 -59
- data/spec/features/javascript/home_page_edit_spec.rb +6 -6
- data/spec/features/javascript/metadata_admin_spec.rb +15 -15
- data/spec/features/javascript/multi_image_select_spec.rb +17 -18
- data/spec/features/javascript/preview_block_spec.rb +11 -12
- data/spec/features/javascript/rule_block_spec.rb +7 -7
- data/spec/features/javascript/search_config_admin_spec.rb +144 -0
- data/spec/features/javascript/search_context_spec.rb +41 -42
- data/spec/features/main_navigation_spec.rb +22 -22
- data/spec/features/metadata_admin_spec.rb +8 -8
- data/spec/features/multiple_exhibits_spec.rb +15 -17
- data/spec/features/report_a_problem_spec.rb +23 -17
- data/spec/features/site_masthead_spec.rb +46 -46
- data/spec/features/slideshow_spec.rb +8 -9
- data/spec/features/tags_admin_spec.rb +11 -11
- data/spec/features/upload_non_repository_item_spec.rb +32 -32
- data/spec/features/user_admin_spec.rb +7 -7
- data/spec/helpers/spotlight/application_helper_spec.rb +63 -56
- data/spec/helpers/spotlight/browse_helper_spec.rb +6 -6
- data/spec/helpers/spotlight/crud_link_helpers_spec.rb +58 -52
- data/spec/helpers/spotlight/main_app_helpers_spec.rb +44 -24
- data/spec/helpers/spotlight/navbar_helper_spec.rb +4 -4
- data/spec/helpers/spotlight/pages_helper_spec.rb +56 -37
- data/spec/helpers/spotlight/roles_helper_spec.rb +3 -3
- data/spec/helpers/spotlight/search_configurations_helper_spec.rb +24 -0
- data/spec/helpers/spotlight/title_helper_spec.rb +33 -35
- data/spec/jobs/spotlight/reindex_job_spec.rb +6 -6
- data/spec/jobs/spotlight/rename_sidecar_field_job_spec.rb +7 -7
- data/spec/lib/spotlight/catalog/access_controls_enforcement_spec.rb +41 -26
- data/spec/lib/spotlight/controller_spec.rb +10 -10
- data/spec/lib/spotlight/routes_spec.rb +4 -4
- data/spec/mailers/spotlight/indexing_complete_mailer_spec.rb +13 -13
- data/spec/models/sir_trevor_rails/blocks/solr_documents_block_spec.rb +8 -8
- data/spec/models/{spotlight/sir_trevor_blocks → sir_trevor_rails/blocks}/textable_spec.rb +7 -8
- data/spec/models/solr_document_spec.rb +49 -50
- data/spec/models/spotlight/ability_spec.rb +17 -20
- data/spec/models/spotlight/about_page_spec.rb +6 -6
- data/spec/models/spotlight/analytics/ga_spec.rb +2 -2
- data/spec/models/spotlight/blacklight_configuration_spec.rb +196 -133
- data/spec/models/spotlight/contact_email_spec.rb +28 -24
- data/spec/models/spotlight/contact_spec.rb +6 -7
- data/spec/models/spotlight/custom_field_spec.rb +51 -52
- data/spec/models/spotlight/exhibit_spec.rb +102 -60
- data/spec/models/spotlight/feature_page_spec.rb +32 -32
- data/spec/models/spotlight/featured_image_spec.rb +5 -5
- data/spec/models/spotlight/field_metadata_spec.rb +78 -0
- data/spec/models/spotlight/home_page_spec.rb +11 -20
- data/spec/models/spotlight/{spotlight_image_derivatives_spec.rb → image_derivatives_spec.rb} +2 -2
- data/spec/models/spotlight/main_navigation_spec.rb +7 -9
- data/spec/models/spotlight/masthead_spec.rb +6 -6
- data/spec/models/spotlight/page_spec.rb +26 -29
- data/spec/models/spotlight/resource_spec.rb +56 -26
- data/spec/models/spotlight/resources/open_graph_spec.rb +16 -18
- data/spec/models/spotlight/resources/upload_spec.rb +32 -35
- data/spec/models/spotlight/resources/web_spec.rb +9 -11
- data/spec/models/spotlight/role_spec.rb +20 -20
- data/spec/models/spotlight/search_spec.rb +32 -15
- data/spec/models/spotlight/solr_document/atomic_updates_spec.rb +34 -0
- data/spec/models/spotlight/{solr_document_images_spec.rb → solr_document/spotlight_images_spec.rb} +18 -10
- data/spec/models/spotlight/solr_document/uploaded_resource_spec.rb +52 -0
- data/spec/models/spotlight/solr_document_sidecar_spec.rb +3 -4
- data/spec/routing/spotlight/exhibit_catalog_spec.rb +5 -5
- data/spec/routing/spotlight/pages_routing_spec.rb +24 -25
- data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb +88 -68
- data/spec/spec_helper.rb +13 -22
- data/spec/support/features/test_features_helpers.rb +50 -46
- data/spec/support/views/test_view_helpers.rb +1 -1
- data/spec/test_app_templates/Gemfile.extra +0 -1
- data/spec/test_app_templates/carrierwave.rb +2 -2
- data/spec/test_app_templates/catalog_controller.rb +42 -42
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +20 -11
- data/spec/test_app_templates/spotlight_test.rake +3 -3
- data/spec/uploaders/spotlight/item_uploader_spec.rb +68 -0
- data/spec/views/_user_util_links.html.erb_spec.rb +14 -14
- data/spec/views/shared/_analytics.html.erb_spec.rb +4 -6
- data/spec/views/shared/_exhibit_masthead.html.erb_spec.rb +19 -20
- data/spec/views/shared/_exhibit_navbar.html.erb_spec.rb +129 -131
- data/spec/views/shared/_footer.html.erb_spec.rb +6 -7
- data/spec/views/shared/_header_navbar.html.erb_spec.rb +5 -5
- data/spec/views/spotlight/about_pages/_empty.html.erb_spec.rb +4 -4
- data/spec/views/spotlight/about_pages/_sidebar.html.erb_spec.rb +9 -11
- data/spec/views/spotlight/about_pages/index.html.erb_spec.rb +31 -28
- data/spec/views/spotlight/browse/_search.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/browse/_sort_and_per_page.html.erb_spec.rb +10 -12
- data/spec/views/spotlight/browse/index.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/browse/show.html.erb_spec.rb +19 -20
- data/spec/views/spotlight/catalog/_edit_default.html.erb_spec.rb +7 -7
- data/spec/views/spotlight/catalog/admin.html.erb_spec.rb +7 -7
- data/spec/views/spotlight/catalog/edit.html.erb_spec.rb +3 -6
- data/spec/views/spotlight/catalog/new.html.erb_spec.rb +8 -10
- data/spec/views/spotlight/contacts/edit.html.erb_spec.rb +8 -8
- data/spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb +22 -22
- data/spec/views/spotlight/exhibits/edit.html.erb_spec.rb +7 -8
- data/spec/views/spotlight/feature_pages/_empty.html.erb_spec.rb +5 -5
- data/spec/views/spotlight/feature_pages/_sidebar.html.erb_spec.rb +24 -26
- data/spec/views/spotlight/home_pages/_empty.html.erb_spec.rb +13 -9
- data/spec/views/spotlight/home_pages/_sidebar.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb +26 -0
- data/spec/views/spotlight/metadata_configurations/edit.html.erb_spec.rb +22 -0
- data/spec/views/spotlight/pages/edit.html.erb_spec.rb +16 -16
- data/spec/views/spotlight/pages/index.html.erb_spec.rb +19 -17
- data/spec/views/spotlight/pages/new.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/pages/show.html.erb_spec.rb +27 -28
- data/spec/views/spotlight/roles/index.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/search_configurations/_search_fields.html.erb_spec.rb +54 -0
- data/spec/views/spotlight/search_configurations/_sort.html.erb_spec.rb +28 -0
- data/spec/views/spotlight/searches/_search.html.erb_spec.rb +20 -10
- data/spec/views/spotlight/searches/edit.html.erb_spec.rb +12 -11
- data/spec/views/spotlight/searches/index.html.erb_spec.rb +12 -7
- data/spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb +7 -8
- data/spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb +4 -4
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb +38 -0
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb +7 -8
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb +18 -13
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb +14 -12
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb +11 -12
- data/spec/views/spotlight/tags/index.html.erb_spec.rb +9 -9
- metadata +167 -83
- data/app/controllers/spotlight/blacklight_configurations_controller.rb +0 -101
- data/app/controllers/spotlight/resources/csv_controller.rb +0 -23
- data/app/forms/spotlight/appearance.rb +0 -86
- data/app/helpers/spotlight/attachments_helper.rb +0 -4
- data/app/helpers/spotlight/blacklight_configurations_helper.rb +0 -15
- data/app/jobs/spotlight/set_default_thumbnail_job.rb +0 -16
- data/app/models/spotlight/resources/csv.rb +0 -80
- data/app/uploaders/spotlight/csv_uploader.rb +0 -15
- data/app/views/spotlight/blacklight_configurations/edit_facet_fields.html.erb +0 -47
- data/app/views/spotlight/blacklight_configurations/edit_sort_fields.html.erb +0 -65
- data/app/views/spotlight/resources/csv/_form.html.erb +0 -17
- data/app/views/spotlight/resources/csv/new.html.erb +0 -3
- data/spec/controllers/spotlight/blacklight_configurations_controller_spec.rb +0 -167
- data/spec/features/edit_sort_fields_spec.rb +0 -42
- data/spec/features/exhibits/edit_facet_fields_spec.rb +0 -37
- data/spec/features/javascript/facet_admin_spec.rb +0 -36
- data/spec/features/search_facets_admin_spec.rb +0 -19
- data/spec/features/update_appearance_spec.rb +0 -58
- data/spec/helpers/spotlight/blacklight_configurations_helper_spec.rb +0 -12
- data/spec/models/spotlight/appearance_spec.rb +0 -33
- data/spec/models/spotlight/resources/csv_spec.rb +0 -101
- data/spec/models/spotlight/solr_document_atomic_updates_spec.rb +0 -29
- data/spec/models/spotlight/solr_document_uploaded_resource_spec.rb +0 -45
- data/spec/uploaders/item_uploader_spec.rb +0 -62
- data/spec/views/spotlight/blacklight_configuration/_metadata_field.html.erb_spec.rb +0 -27
- data/spec/views/spotlight/blacklight_configuration/edit_metadata_fields.html.erb_spec.rb +0 -23
- data/spec/views/spotlight/blacklight_configuration/edit_sort_fields.html.erb_spec.rb +0 -19
@@ -1,30 +1,30 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spotlight::FeaturePage, :
|
3
|
+
describe Spotlight::FeaturePage, type: :model do
|
4
4
|
let(:exhibit) { FactoryGirl.create(:exhibit) }
|
5
|
-
describe
|
5
|
+
describe 'default_scope' do
|
6
6
|
let!(:page1) { FactoryGirl.create(:feature_page, weight: 5, exhibit: exhibit) }
|
7
7
|
let!(:page2) { FactoryGirl.create(:feature_page, weight: 1, exhibit: exhibit) }
|
8
8
|
let!(:page3) { FactoryGirl.create(:feature_page, weight: 10, exhibit: exhibit) }
|
9
|
-
it
|
10
|
-
expect(
|
9
|
+
it 'orders by weight' do
|
10
|
+
expect(described_class.all.map(&:weight)).to eq [1, 5, 10]
|
11
11
|
end
|
12
12
|
end
|
13
13
|
|
14
|
-
describe
|
15
|
-
let(:parent)
|
16
|
-
let!(:child) { FactoryGirl.create(:feature_page, parent_page: parent, exhibit: exhibit
|
17
|
-
let!(:unpublished_parent)
|
18
|
-
let!(:unpublished_child) { FactoryGirl.create(:feature_page, parent_page: unpublished_parent, published: false, exhibit: exhibit
|
14
|
+
describe 'display_sidebar?' do
|
15
|
+
let(:parent) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
|
16
|
+
let!(:child) { FactoryGirl.create(:feature_page, parent_page: parent, exhibit: exhibit) }
|
17
|
+
let!(:unpublished_parent) { FactoryGirl.create(:feature_page, published: false, exhibit: exhibit) }
|
18
|
+
let!(:unpublished_child) { FactoryGirl.create(:feature_page, parent_page: unpublished_parent, published: false, exhibit: exhibit) }
|
19
19
|
before { unpublished_parent.display_sidebar = false }
|
20
|
-
it
|
20
|
+
it 'is set to true if the page has a published child' do
|
21
21
|
expect(parent.display_sidebar?).to be_truthy
|
22
22
|
end
|
23
|
-
it
|
23
|
+
it 'is set to true on the parent of published child pages' do
|
24
24
|
parent.display_sidebar = false
|
25
25
|
expect(parent.display_sidebar?).to be_truthy
|
26
26
|
end
|
27
|
-
it
|
27
|
+
it 'is set to true when publishing a child page' do
|
28
28
|
expect(unpublished_parent.display_sidebar?).to be_falsey
|
29
29
|
unpublished_parent.published = true
|
30
30
|
unpublished_child.published = true
|
@@ -33,44 +33,44 @@ describe Spotlight::FeaturePage, :type => :model do
|
|
33
33
|
end
|
34
34
|
end
|
35
35
|
|
36
|
-
describe
|
36
|
+
describe 'weight' do
|
37
37
|
let(:good_weight) { FactoryGirl.build(:feature_page, weight: 10, exhibit: exhibit) }
|
38
|
-
let(:low_weight)
|
39
|
-
let(:high_weight) { FactoryGirl.build(:feature_page, weight:
|
40
|
-
it
|
41
|
-
expect(
|
38
|
+
let(:low_weight) { FactoryGirl.build(:feature_page, weight: -1, exhibit: exhibit) }
|
39
|
+
let(:high_weight) { FactoryGirl.build(:feature_page, weight: 51, exhibit: exhibit) }
|
40
|
+
it 'defaults to 50' do
|
41
|
+
expect(described_class.new.weight).to eq 50
|
42
42
|
end
|
43
|
-
it
|
43
|
+
it 'validates when in the 0 to 50 range' do
|
44
44
|
expect(good_weight).to be_valid
|
45
45
|
expect(good_weight.weight).to eq 10
|
46
46
|
end
|
47
|
-
it
|
48
|
-
expect(low_weight
|
47
|
+
it 'raises an error when outside of the 0 to 50 range' do
|
48
|
+
expect(low_weight).to_not be_valid
|
49
49
|
expect(high_weight).to_not be_valid
|
50
50
|
end
|
51
|
-
it
|
52
|
-
stub_const(
|
51
|
+
it 'settable valid maximum' do
|
52
|
+
stub_const('Spotlight::Page::MAX_PAGES', 51)
|
53
53
|
expect(high_weight).to be_valid
|
54
54
|
end
|
55
55
|
end
|
56
56
|
|
57
|
-
it {is_expected.to be_feature_page}
|
58
|
-
it {is_expected.not_to be_about_page}
|
57
|
+
it { is_expected.to be_feature_page }
|
58
|
+
it { is_expected.not_to be_about_page }
|
59
59
|
|
60
|
-
describe
|
61
|
-
let(:parent)
|
62
|
-
let!(:child1) { FactoryGirl.create(:feature_page, parent_page: parent, exhibit: exhibit
|
63
|
-
let!(:child2) { FactoryGirl.create(:feature_page, parent_page: parent, exhibit: exhibit
|
64
|
-
it
|
60
|
+
describe 'relationships' do
|
61
|
+
let(:parent) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
|
62
|
+
let!(:child1) { FactoryGirl.create(:feature_page, parent_page: parent, exhibit: exhibit) }
|
63
|
+
let!(:child2) { FactoryGirl.create(:feature_page, parent_page: parent, exhibit: exhibit) }
|
64
|
+
it 'child pages should have a parent_page' do
|
65
65
|
[child1, child2].each do |child|
|
66
|
-
|
66
|
+
expect(child.parent_page).to eq parent
|
67
67
|
end
|
68
68
|
end
|
69
|
-
it
|
69
|
+
it 'parent pages should have child_pages' do
|
70
70
|
expect(parent.child_pages.length).to eq 2
|
71
71
|
expect(parent.child_pages.map(&:id)).to eq [child1.id, child2.id]
|
72
72
|
end
|
73
|
-
it
|
73
|
+
it 'defines top_level_page? properly' do
|
74
74
|
expect(parent.top_level_page?).to be_truthy
|
75
75
|
expect(child1.top_level_page?).to be_falsey
|
76
76
|
expect(child2.top_level_page?).to be_falsey
|
@@ -1,15 +1,15 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
describe Spotlight::FeaturedImage do
|
4
|
-
context
|
4
|
+
context 'with an uploaded resource' do
|
5
5
|
subject { described_class.new }
|
6
6
|
let(:document) { double(uploaded_resource?: true) }
|
7
7
|
|
8
|
-
it
|
9
|
-
allow(document).to receive_message_chain(:uploaded_resource, :url, file: File.open(File.join(FIXTURES_PATH,
|
8
|
+
it 'replaces the remote_image_url fragment with the local path to the file' do
|
9
|
+
allow(document).to receive_message_chain(:uploaded_resource, :url, file: File.open(File.join(FIXTURES_PATH, 'avatar.png')))
|
10
10
|
allow(subject).to receive(:document).and_return(document)
|
11
11
|
|
12
|
-
subject.remote_image_url =
|
12
|
+
subject.remote_image_url = '/some/path'
|
13
13
|
expect(subject.remote_image_url).to be_nil
|
14
14
|
|
15
15
|
subject.validate
|
@@ -17,4 +17,4 @@ describe Spotlight::FeaturedImage do
|
|
17
17
|
expect(subject.image.filename).to eq 'avatar.png'
|
18
18
|
end
|
19
19
|
end
|
20
|
-
end
|
20
|
+
end
|
@@ -0,0 +1,78 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Spotlight::FieldMetadata do
|
4
|
+
let(:repository) { double }
|
5
|
+
let(:blacklight_config) do
|
6
|
+
Blacklight::Configuration.new do |config|
|
7
|
+
config.add_facet_field 'a'
|
8
|
+
config.add_facet_field 'b'
|
9
|
+
config.add_facet_field 'c'
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
let(:luke_response) do
|
14
|
+
{
|
15
|
+
fields: {
|
16
|
+
a: {
|
17
|
+
distinct: 100,
|
18
|
+
topTerms: %w(q w e)
|
19
|
+
},
|
20
|
+
b: {
|
21
|
+
distinct: 50,
|
22
|
+
topTerms: %w(r t y)
|
23
|
+
},
|
24
|
+
c: {
|
25
|
+
distinct: 3,
|
26
|
+
topTerms: [7, 8, 9]
|
27
|
+
}
|
28
|
+
}
|
29
|
+
}.with_indifferent_access
|
30
|
+
end
|
31
|
+
|
32
|
+
let(:facet_response) do
|
33
|
+
{
|
34
|
+
facet_counts: {
|
35
|
+
facet_queries: {
|
36
|
+
'a:[* TO *]' => 5,
|
37
|
+
'b:[* TO *]' => 10,
|
38
|
+
'c:[* TO *]' => 15
|
39
|
+
}
|
40
|
+
}
|
41
|
+
}.with_indifferent_access
|
42
|
+
end
|
43
|
+
|
44
|
+
subject { described_class.new(repository, blacklight_config) }
|
45
|
+
|
46
|
+
before do
|
47
|
+
allow(repository).to receive(:send_and_receive).with('admin/luke', hash_including(fl: '*')).and_return(luke_response)
|
48
|
+
allow(repository).to receive(:search).with(hash_including('facet' => true)).and_return(facet_response)
|
49
|
+
end
|
50
|
+
|
51
|
+
describe '#field' do
|
52
|
+
it 'has a document count' do
|
53
|
+
expect(subject.field('a')[:document_count]).to eq 5
|
54
|
+
expect(subject.field('b')[:document_count]).to eq 10
|
55
|
+
expect(subject.field('c')[:document_count]).to eq 15
|
56
|
+
end
|
57
|
+
|
58
|
+
it 'has a value count' do
|
59
|
+
expect(subject.field('a')[:value_count]).to eq 100
|
60
|
+
expect(subject.field('b')[:value_count]).to eq 50
|
61
|
+
expect(subject.field('c')[:value_count]).to eq 3
|
62
|
+
end
|
63
|
+
|
64
|
+
it 'gets a list of top terms' do
|
65
|
+
expect(subject.field('a')[:terms]).to match_array %w(q w e)
|
66
|
+
expect(subject.field('b')[:terms]).to match_array %w(r t y)
|
67
|
+
expect(subject.field('c')[:terms]).to match_array [7, 8, 9]
|
68
|
+
end
|
69
|
+
|
70
|
+
context 'for a missing field' do
|
71
|
+
it 'has reasonable default values' do
|
72
|
+
expect(subject.field('d')[:document_count]).to eq 0
|
73
|
+
expect(subject.field('d')[:value_count]).to eq 0
|
74
|
+
expect(subject.field('d')[:terms]).to be_empty
|
75
|
+
end
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|
@@ -1,22 +1,22 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spotlight::HomePage, :
|
3
|
+
describe Spotlight::HomePage, type: :model do
|
4
4
|
let(:home_page) { FactoryGirl.create(:home_page) }
|
5
|
-
it {is_expected.not_to be_feature_page}
|
6
|
-
it {is_expected.not_to be_about_page}
|
7
|
-
it
|
5
|
+
it { is_expected.not_to be_feature_page }
|
6
|
+
it { is_expected.not_to be_about_page }
|
7
|
+
it 'displays the sidebar' do
|
8
8
|
expect(home_page.display_sidebar?).to be_truthy
|
9
9
|
end
|
10
|
-
it
|
10
|
+
it 'is published' do
|
11
11
|
expect(home_page.published).to be_truthy
|
12
12
|
end
|
13
|
-
describe
|
14
|
-
it
|
15
|
-
expect(home_page.title).to eq
|
13
|
+
describe 'title' do
|
14
|
+
it 'includes default text' do
|
15
|
+
expect(home_page.title).to eq described_class.default_title_text
|
16
16
|
end
|
17
17
|
end
|
18
|
-
describe
|
19
|
-
it
|
18
|
+
describe 'should_display_title?' do
|
19
|
+
it 'returns the display_title attribute' do
|
20
20
|
home_page.display_title = true
|
21
21
|
expect(home_page.should_display_title?).to be_truthy
|
22
22
|
home_page.display_title = false
|
@@ -24,18 +24,9 @@ describe Spotlight::HomePage, :type => :model do
|
|
24
24
|
end
|
25
25
|
end
|
26
26
|
describe 'display_sidebar?' do
|
27
|
-
|
28
|
-
it 'should be false when the page disabled the display_sidebar' do
|
27
|
+
it 'is false when the page disabled the display_sidebar' do
|
29
28
|
home_page.display_sidebar = false
|
30
29
|
expect(home_page.display_sidebar?).to be_falsey
|
31
30
|
end
|
32
|
-
it 'should be true when the exhibit is searchable' do
|
33
|
-
home_page.exhibit.searchable = true
|
34
|
-
expect(home_page.display_sidebar?).to be_truthy
|
35
|
-
end
|
36
|
-
it 'should be false when the exhibit is not searchable' do
|
37
|
-
home_page.exhibit.searchable = false
|
38
|
-
expect(home_page.display_sidebar?).to be_falsey
|
39
|
-
end
|
40
31
|
end
|
41
32
|
end
|
data/spec/models/spotlight/{spotlight_image_derivatives_spec.rb → image_derivatives_spec.rb}
RENAMED
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require 'spec_helper'
|
2
2
|
|
3
3
|
class TestSpotlightImageDerivatives
|
4
4
|
include Spotlight::ImageDerivatives
|
@@ -7,7 +7,7 @@ end
|
|
7
7
|
describe Spotlight::ImageDerivatives do
|
8
8
|
let(:subject) { TestSpotlightImageDerivatives.new }
|
9
9
|
describe '#spotlight_image_derivatives' do
|
10
|
-
it '
|
10
|
+
it 'includes default derivatives' do
|
11
11
|
expect(subject.spotlight_image_derivatives.length).to eq 3
|
12
12
|
expect(subject.spotlight_image_derivatives.map do |d|
|
13
13
|
d[:field]
|
@@ -1,21 +1,19 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spotlight::MainNavigation, :
|
3
|
+
describe Spotlight::MainNavigation, type: :model do
|
4
4
|
before do
|
5
5
|
subject.exhibit = FactoryGirl.create(:exhibit)
|
6
6
|
end
|
7
7
|
|
8
|
-
it
|
8
|
+
it 'has a default_label' do
|
9
9
|
subject.nav_type = :curated_features
|
10
|
-
expect(subject.default_label).to eq
|
10
|
+
expect(subject.default_label).to eq 'Curated Features'
|
11
11
|
end
|
12
12
|
|
13
|
-
it
|
13
|
+
it 'returns the use the default label in the absence of a label' do
|
14
14
|
expect(subject.label).to be_blank
|
15
15
|
expect(subject.label_or_default).to eq subject.default_label
|
16
|
-
subject.label =
|
17
|
-
expect(subject.label_or_default).to eq
|
16
|
+
subject.label = 'something else'
|
17
|
+
expect(subject.label_or_default).to eq 'something else'
|
18
18
|
end
|
19
|
-
|
20
|
-
|
21
|
-
end
|
19
|
+
end
|
@@ -1,22 +1,22 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spotlight::Masthead, :
|
3
|
+
describe Spotlight::Masthead, type: :model do
|
4
4
|
describe '#masthead_exists?' do
|
5
|
-
let(:masthead) { stub_model(
|
5
|
+
let(:masthead) { stub_model(described_class) }
|
6
6
|
let(:image) { OpenStruct.new }
|
7
|
-
it '
|
7
|
+
it 'returns false when the masthead is set to not display' do
|
8
8
|
expect(masthead.display?).to be_falsey
|
9
9
|
end
|
10
|
-
it '
|
10
|
+
it 'returns false when the cropped image is not present' do
|
11
11
|
masthead.display = true
|
12
12
|
expect(masthead.display?).to be_falsey
|
13
13
|
end
|
14
|
-
it '
|
14
|
+
it 'returns false when the cropped image is present but the masthead is set to not display' do
|
15
15
|
allow(masthead).to receive(:image).and_return(image)
|
16
16
|
allow(image).to receive(:cropped).and_return([0])
|
17
17
|
expect(masthead.display?).to be_falsey
|
18
18
|
end
|
19
|
-
it '
|
19
|
+
it 'returns true when the cropped image is present and the masthead is set to display' do
|
20
20
|
masthead.display = true
|
21
21
|
expect(masthead).to receive(:image).and_return(image)
|
22
22
|
expect(image).to receive(:cropped).and_return([0])
|
@@ -1,80 +1,77 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spotlight::Page, :
|
4
|
-
|
3
|
+
describe Spotlight::Page, type: :model do
|
5
4
|
let(:exhibit) { FactoryGirl.create(:exhibit) }
|
6
|
-
let!(:parent_page) {
|
7
|
-
let!(:child_page) {
|
5
|
+
let!(:parent_page) { Spotlight::FeaturePage.create! exhibit: exhibit, published: true }
|
6
|
+
let!(:child_page) { Spotlight::FeaturePage.create! exhibit: exhibit, published: false, parent_page: parent_page }
|
8
7
|
|
9
|
-
describe
|
10
|
-
it
|
11
|
-
expect(
|
8
|
+
describe '.at_top_level' do
|
9
|
+
it 'scopes results to only top level pages' do
|
10
|
+
expect(described_class.at_top_level).to_not include child_page
|
12
11
|
end
|
13
12
|
end
|
14
13
|
|
15
|
-
describe
|
16
|
-
it
|
17
|
-
expect(
|
14
|
+
describe '.published' do
|
15
|
+
it 'scopes results to only published pages' do
|
16
|
+
expect(described_class.at_top_level).to_not include child_page
|
18
17
|
end
|
19
18
|
end
|
20
19
|
|
21
|
-
describe
|
22
|
-
it
|
20
|
+
describe '#top_level_page?' do
|
21
|
+
it 'checks if the page is a top-level page' do
|
23
22
|
expect(parent_page).to be_a_top_level_page
|
24
23
|
expect(child_page).not_to be_a_top_level_page
|
25
24
|
end
|
26
25
|
end
|
27
26
|
|
28
|
-
describe
|
29
|
-
it
|
27
|
+
describe '#top_level_page_or_self' do
|
28
|
+
it 'fetches the top level page' do
|
30
29
|
expect(child_page.top_level_page_or_self).to be parent_page
|
31
30
|
end
|
32
31
|
|
33
|
-
it
|
32
|
+
it 'is the same object if the page is a top level page' do
|
34
33
|
expect(parent_page.top_level_page_or_self).to be parent_page
|
35
|
-
|
36
34
|
end
|
37
35
|
end
|
38
|
-
describe
|
39
|
-
it
|
36
|
+
describe '.display_sidebar' do
|
37
|
+
it 'is set to true by default' do
|
40
38
|
expect(parent_page.display_sidebar?).to be_truthy
|
41
39
|
end
|
42
40
|
end
|
43
|
-
describe
|
41
|
+
describe 'should_display_title?' do
|
44
42
|
let(:page) { FactoryGirl.create(:feature_page) }
|
45
|
-
it
|
43
|
+
it 'returns if the title is present or not' do
|
46
44
|
expect(page.title).not_to be_blank
|
47
45
|
expect(page.should_display_title?).to be_truthy
|
48
|
-
page.title =
|
46
|
+
page.title = ''
|
49
47
|
expect(page.should_display_title?).to be_falsey
|
50
48
|
end
|
51
49
|
end
|
52
50
|
|
53
|
-
describe
|
51
|
+
describe '#content=' do
|
54
52
|
let(:page) { FactoryGirl.create(:feature_page) }
|
55
53
|
|
56
|
-
it
|
54
|
+
it 'works with a serialized JSON array' do
|
57
55
|
page.content = [].to_json
|
58
56
|
expect(page.content).to be_a_kind_of SirTrevorRails::BlockArray
|
59
57
|
end
|
60
|
-
it
|
58
|
+
it 'works with an array' do
|
61
59
|
page.content = []
|
62
60
|
expect(page.content).to be_a_kind_of SirTrevorRails::BlockArray
|
63
61
|
end
|
64
62
|
end
|
65
63
|
|
66
|
-
describe
|
64
|
+
describe '#content?' do
|
67
65
|
let(:page) { FactoryGirl.create(:feature_page) }
|
68
66
|
|
69
|
-
it
|
67
|
+
it 'does not have content when the page is empty' do
|
70
68
|
page.content = []
|
71
69
|
expect(page).not_to have_content
|
72
70
|
end
|
73
71
|
|
74
|
-
it
|
75
|
-
page.content = [{type: 'rule'}]
|
72
|
+
it 'has content when the page has a widget' do
|
73
|
+
page.content = [{ type: 'rule' }]
|
76
74
|
expect(page).to have_content
|
77
75
|
end
|
78
|
-
|
79
76
|
end
|
80
77
|
end
|