blacklight-spotlight 3.0.0.alpha.9 → 3.0.0.alpha.10

data/config/locales/spotlight.ar.yml

@@ -1,40 +1,59 @@
+---
 ar:
-  activemodel:
-    attributes:
-      spotlight/contact_form:
-        email: البريد الإلكتروني
-        message: الرسالة
-        name: الاسم
   helpers:
     action:
       cancel: إلغاء
     submit:
       contact_form:
-        create: إرسال
-        created: .نشكرك على رسالتك. لقد تم إرسال ملاحظاتك واقتراحاتك
+        create: ارسل
+        created: شكراً. لقد تم إرسال ملاحظاتك واقتراحاتك.
   spotlight:
     about_pages:
       contacts:
-        header: عنوان فرعي
-    header_links:
-      contact: ملاحظات واقتراحات
-    shared:
-      report_a_problem:
-        honeypot_field_explanation: .تجاهل هذا المربع النصي، فهو يُستخدم فقط لكشف المحتالين. إذا كتبت أي شيء في هذا المربع النصي، فلن يتم إرسال رسالتك
-        title: عنوان
+        header: جهات الاتصال
+    breadcrumb:
+      label: مسار التنقل
     browse:
       search:
         item_count:
-          one: "%{count} مادة"
-          other: "%{count} مواد"
+          one: 1 عنصر
+          few: "%{count} عناصر"
+          many: "%{count} عناصر"
+          other: "%{count} عناصر"
+          two: عنصرين
+          zero: لا يوجد
       search_box:
-        label: البحث في فئة التصفح الحالية
-        placeholder: ...بحث
+        label: ابحث في فئة التصفح الحالية
+        placeholder: بحث...
         reset: مسح استعلام البحث
-        submit: البحث في فئة التصفح
+        submit: ابحث في فئة التصفح
         success:
-          expand_html: يمكنك <a href="%{expand_search_url}">البحث في كل مواد المعرض عن "%{browse_query}"</a>.
-          result_number_html: طابق استعلام البحث <strong> %{search_size} من %{parent_search_count} مادة</strong> .في هذه الفئة
+          expand_html: يمكنك ايضاً <a href="%{expand_search_url}">البحث في كل مواد المعرض عن "%{browse_query}"</a>.
+          result_number_html: طابق استعلام البحث <strong> %{search_size} من %{parent_search_count} عنصر</strong> في هذه الفئة.
         zero_results:
-          expand_html: <a href="%{clear_search_url}"> امسح استعلام المسح </a> أو حاول <a href="%{expand_search_url}">.البحث في كل المواد المعروضة لاستعلام البحث "%{browse_query}"</a>
-          result_number: .لم يتطابق بحثك مع أي مادة في هذه الفئة
+          expand_html: تستطيع أن <a href="%{clear_search_url}"> تمسح استعلام البحث </a> أو محاولة <a href="%{expand_search_url}"> البحث في كل المواد المعروضة لاستعلام البحث ل"%{browse_query}"</a>
+          result_number: لم يتطابق بحثك مع أي عنصر في هذه الفئة.
+    header_links:
+      contact: ملاحظات واقتراحات
+    shared:
+      report_a_problem:
+        honeypot_field_explanation: تجاهل هذا المربع النصي، فهو يُستخدم فقط لكشف المحتالين. إذا كتبت أي شيء في هذا المربع النصي، فلن يتم إرسال رسالتك.
+        title: تواصل معنا
+    sir_trevor:
+      blocks:
+        browse_block:
+          items:
+            one: 1 عنصر
+            few: "%{count} عناصر"
+            many: "%{count} عناصر"
+            other: "%{count} عناصر"
+            two: عنصرين
+            zero: لا يوجد
+        link_to_search_block:
+          items:
+            one: 1 عنصر
+            few: "%{count} عناصر"
+            many: "%{count} عناصر"
+            other: "%{count} عناصر"
+            two: عنصرين
+            zero: لا يوجد

data/config/locales/spotlight.en.yml

@@ -433,59 +433,6 @@ en:
             label: Title
       tags:
         all: All
-      translations:
-        browse_categories:
-          default_language_column_label: English language title
-          description_label: Description
-          label: Browse categories
-          translation_column_label: "%{language} translation"
-        general:
-          basic_settings:
-            description: Description
-            label: Basic Settings
-            subtitle: Subtitle
-            title: Title
-          label: General
-          main_menu:
-            about: About
-            browse: Browse
-            curated_features: Curated Features
-            home: Home
-            label: Main Menu
-        metadata:
-          exhibit_specific_fields:
-            label: Exhibit-Specific Fields
-          label: Metadata field labels
-        pages:
-          about_pages:
-            label: About Pages
-          destroy: Delete
-          destroy_are_you_sure: Are you sure you want to delete this page? If you delete this page all content, including any existing translations you have made in it, will be lost.
-          edit: Edit
-          feature_pages:
-            label: Feature Pages
-          help_html: Before exhibit visitors can view translated pages you must create, edit, and publish each page translation. When you create a translated page, a copy of the default language version of the page is made to serve as the initial translated page. You can then edit that translated page to replace the page title and any text fields with translated text. A translated page will not be visible to exhibit visitors until you publish it.  To replace a translated page with a current copy of the default language version of the page, use the <i>Recreate</i> action.
-          home_page:
-            label: Home Page
-          label: Pages
-          new: Create one now.
-          no_translated_page: No translated page.
-          recreate: Recreate
-          recreate_are_you_sure: Are you sure you want to recreate this page? If you recreate this page all content, including any existing translations you have made, will be replaced with the content of the English version of the page.
-          table_header:
-            actions: Actions
-            default_published: Published
-            language_published: Published
-            last_updated: "%{language} title / Last update"
-        search_fields:
-          facet_fields:
-            label: Facet Fields
-          field_based_search_fields:
-            label: Field-Based Search Fields
-          label: Search field labels
-          sort_fields:
-            label: Sort Fields
-        title: Translations
     exhibits_admin_invitation_mailer:
       invitation_instructions:
         accept: Accept invitation
@@ -808,6 +755,71 @@ en:
           count: Items tagged
     topbar:
       label: Utilities
+    translations:
+      browse_categories:
+        default_language_column_label: English language title
+        description_label: Description
+        label: Browse categories
+        subtitle_label: Subtitle
+        translation_column_label: "%{language} translation"
+      edit:
+        title: Translations
+      general:
+        basic_settings:
+          description: Description
+          label: Basic Settings
+          subtitle: Subtitle
+          title: Title
+        label: General
+        main_menu:
+          about: About
+          browse: Browse
+          curated_features: Curated Features
+          home: Home
+          label: Main Menu
+      import:
+        description: You can import and export Rails-based YAML files containing the translated label values for the currently selected language for use in internationalization tools such as Transifex and i18n-tools. This feature does not include importing or exporting translations for Pages.
+        export_current_locale: Export %{language}
+        export_default_locale: Export %{language}
+        export_label: Export a YAML file
+        header: Import and export translations
+        import_label: Import a YAML file
+        import_submit: Import translations
+      metadata:
+        exhibit_specific_fields:
+          label: Exhibit-Specific Fields
+        label: Metadata field labels
+      page:
+        destroy: Delete
+        destroy_are_you_sure: Are you sure you want to delete this page? If you delete this page all content, including any existing translations you have made in it, will be lost.
+        edit: Edit
+        new: Create one now.
+        no_translated_page: No translated page.
+        recreate: Recreate
+        recreate_are_you_sure: Are you sure you want to recreate this page? If you recreate this page all content, including any existing translations you have made, will be replaced with the content of the English version of the page.
+      pages:
+        about_pages:
+          label: About Pages
+        feature_pages:
+          label: Feature Pages
+        help_html: Before exhibit visitors can view translated pages you must create, edit, and publish each page translation. When you create a translated page, a copy of the default language version of the page is made to serve as the initial translated page. You can then edit that translated page to replace the page title and any text fields with translated text. A translated page will not be visible to exhibit visitors until you publish it.  To replace a translated page with a current copy of the default language version of the page, use the <i>Recreate</i> action.
+        home_page:
+          label: Home Page
+        label: Pages
+      pages_table:
+        header:
+          actions: Actions
+          default_published: Published
+          language_published: Published
+          last_updated: "%{language} title / Last update"
+      search_fields:
+        facet_fields:
+          label: Facet Fields
+        field_based_search_fields:
+          label: Field-Based Search Fields
+        label: Search field labels
+        sort_fields:
+          label: Sort Fields
     versions:
       redo: Redo changes
       undo: Undo changes

data/config/routes.rb

@@ -143,7 +143,12 @@ Spotlight::Engine.routes.draw do
       end
     end
     post 'solr/update' => 'solr#update'
-    resource :translations, only: %i[edit update]
+    resource :translations, only: %i[edit update show] do
+      collection do
+        post 'import'
+        patch 'import'
+      end
+    end
   end
 
   get '/:exhibit_id' => 'home_pages#show', as: :exhibit_root

data/db/migrate/20200403161512_add_subtitle_to_searches.rb

@@ -0,0 +1,7 @@
+class AddSubtitleToSearches < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spotlight_searches do |t|
+      t.string :subtitle
+    end
+  end
+end

data/lib/spotlight/engine.rb

@@ -160,6 +160,7 @@ module Spotlight
 
     # Configure the CarrierWave file storage mechanism
     config.uploader_storage = :file
+    config.featured_image_masthead_size = [1800, 180]
     config.featured_image_thumb_size = [400, 300]
     config.featured_image_square_size = [400, 400]
     config.contact_square_size = [70, 70]
@@ -214,6 +215,25 @@ module Spotlight
     # add could add an available locale which could break things if unexpected.
     config.i18n.available_locales = config.i18n_locales.keys
 
+    # Copy of JbuilderHandler tweaked to spit out YAML for translation exports
+    class TranslationYamlHandler
+      cattr_accessor :default_format
+      self.default_format = :yaml
+
+      def self.call(template, source = nil)
+        source ||= template.source
+        # this juggling is required to keep line numbers right in the error
+        %{__already_defined = defined?(json); json||=JbuilderTemplate.new(self); #{source}
+          json.attributes!.to_yaml unless (__already_defined && __already_defined != "method")}
+      end
+    end
+
+    initializer :yamlbuilder do
+      ActiveSupport.on_load :action_view do
+        ActionView::Template.register_template_handler :yamlbuilder, TranslationYamlHandler
+      end
+    end
+
     # Query parameters for autocomplete requests
     config.autocomplete_search_field = 'autocomplete'
     config.default_autocomplete_params = { qf: 'id^1000 full_title_tesim^100 id_ng full_title_ng',

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '3.0.0.alpha.9'
+  VERSION = '3.0.0.alpha.10'
 end

data/spec/controllers/spotlight/home_pages_controller_spec.rb

@@ -41,7 +41,7 @@ describe Spotlight::HomePagesController, type: :controller, versioning: true do
       it 'redirects to the feature page index action' do
         put :update, params: { id: page, exhibit_id: page.exhibit.id, home_page: valid_attributes }
         page.reload
-        expect(response).to redirect_to(exhibit_home_page_path(page.exhibit, page))
+        expect(response).to redirect_to(exhibit_home_page_path(page.exhibit))
         expect(flash[:notice]).to have_link 'Undo changes'
       end
     end

data/spec/controllers/spotlight/translations_controller_spec.rb

@@ -2,10 +2,9 @@
 
 describe Spotlight::TranslationsController do
   routes { Spotlight::Engine.routes }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   describe '#edit' do
-    let(:exhibit) { FactoryBot.create(:exhibit) }
-
     context 'when not signed in' do
       it 'is not successful' do
         get :edit, params: { exhibit_id: exhibit }
@@ -78,4 +77,56 @@ describe Spotlight::TranslationsController do
       end
     end
   end
+
+  describe '#show' do
+    render_views
+    before do
+      sign_in user
+      FactoryBot.create(:translation, exhibit: exhibit, locale: 'es', key: "#{exhibit.slug}.title", value: 'Titulo')
+    end
+
+    let(:user) { FactoryBot.create(:site_admin) }
+
+    it 'provides a YML dump of the default language translations' do
+      get :show, params: { exhibit_id: exhibit, format: 'yaml' }
+      expect(response).to be_successful
+      translations = YAML.safe_load(response.body).with_indifferent_access
+
+      expect(translations).to include :en
+      expect(translations[:en]).to include :blacklight, :spotlight, exhibit.slug
+    end
+
+    it 'provides a YML dump of the requested language translations' do
+      get :show, params: { exhibit_id: exhibit, format: 'yaml', locale: 'es' }
+      expect(response).to be_successful
+      translations = YAML.safe_load(response.body).with_indifferent_access
+
+      expect(translations).to include :es
+      expect(translations[:es]).to include :blacklight, :spotlight, exhibit.slug
+      expect(translations[:es][exhibit.slug]).to include title: 'Titulo', subtitle: nil
+    end
+  end
+
+  describe '#import' do
+    before { sign_in user }
+
+    let(:user) { FactoryBot.create(:site_admin) }
+
+    it 'is successful' do
+      f = Tempfile.new('foo')
+      begin
+        f.write({ en: { exhibit.slug => { title: 'Imported title' } } }.deep_stringify_keys.to_yaml)
+        f.rewind
+        file = Rack::Test::UploadedFile.new(f.path, 'text/plain')
+        patch :import, params: { exhibit_id: exhibit, file: file }
+      ensure
+        f.close
+        f.unlink
+      end
+      expect(response).to be_redirect
+      assigns[:exhibit].tap do |saved|
+        expect(saved.title).to eq 'Imported title'
+      end
+    end
+  end
 end

data/spec/factories/featured_images.rb

@@ -6,6 +6,10 @@ FactoryBot.define do
     iiif_tilesource { 'https://exhibits-stage.stanford.edu/images/78' }
   end
 
+  factory :temporary_image, class: 'Spotlight::TemporaryImage' do
+    image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
+  end
+
   factory :masthead, class: 'Spotlight::Masthead' do
     image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
   end

data/spec/features/exhibits/translation_editing_spec.rb

@@ -330,7 +330,7 @@ describe 'Translation editing', type: :feature do
 
     it 'has a title and description for every browse category' do
       within '#browse' do
-        expect(page).to have_css('input[type="text"]', count: 2)
+        expect(page).to have_css('input[type="text"]', count: 4)
         expect(page).to have_css('textarea', count: 2)
 
         expect(page).to have_field 'All Exhibit Items'
@@ -407,7 +407,7 @@ describe 'Translation editing', type: :feature do
       visit spotlight.edit_exhibit_translations_path(exhibit, language: 'fr')
       expect(page).to have_link('General 1/8')
       expect(page).to have_link('Search field labels 0/16')
-      expect(page).to have_link('Browse categories 0/2')
+      expect(page).to have_link('Browse categories 0/3')
       expect(page).to have_link('Metadata field labels 0/17')
     end
   end

data/spec/features/home_page_spec.rb

@@ -31,6 +31,15 @@ describe 'Home page', type: :feature, versioning: true do
     expect(page).to have_selector '.card-title a', text: 'New Home Page Title'
   end
 
+  it 'redirects back to the correct home page URL after updating (no format param to interfere w/ faceting)' do
+    visit spotlight.exhibit_home_page_path(exhibit.home_page)
+
+    click_link 'Edit'
+    click_button 'Save changes'
+
+    expect(page.current_url).to eq spotlight.exhibit_home_page_url(exhibit)
+  end
+
   it 'has working facet links' do
     visit spotlight.exhibit_home_page_path(exhibit.home_page)
     click_button 'Genre'

data/spec/features/javascript/blocks/uploaded_items_block_spec.rb

@@ -26,6 +26,7 @@ describe 'Uploaded Items Block', feature: true, js: true, versioning: true do
     within('.dd-list') do
       expect(page).to have_css('.card-title', text: '800x600.png')
       fill_in 'Caption', with: 'Some caption text'
+      fill_in 'Link URL', with: 'https://example.com/'
     end
 
     attach_file('uploaded_item_url', fixture_file2)
@@ -41,8 +42,10 @@ describe 'Uploaded Items Block', feature: true, js: true, versioning: true do
     expect(page).to have_css('p', text: text)
 
     within('.uploaded-items-block') do
-      expect(page).to have_css('img[alt=""]', count: 2)
+      expect(page).to have_css('img[alt=""]', count: 1)
+      expect(page).to have_css('img[alt="Some caption text"]', count: 1)
       expect(page).to have_css '.caption', text: 'Some caption text'
+      expect(page).to have_link 'Some caption text', href: 'https://example.com/'
     end
   end
 

data/spec/i18n_spec.rb

@@ -2,7 +2,6 @@
 
 require 'i18n/tasks'
 
-# rubocop:disable RSpec/DescribeClass
 RSpec.describe 'I18n' do
   let(:i18n) { I18n::Tasks::BaseTask.new }
   let(:missing_keys) { i18n.missing_keys }
@@ -26,4 +25,3 @@ RSpec.describe 'I18n' do
     expect(non_normalized).to be_empty, error_message
   end
 end
-# rubocop:enable RSpec/DescribeClass

data/spec/models/spotlight/exhibit_spec.rb

@@ -28,7 +28,7 @@ describe Spotlight::Exhibit, type: :model do
     end
 
     it 'does not validate the presence of the title under a non-default locale' do
-      expect(I18n).to receive(:locale).and_return(:fr)
+      allow(I18n).to receive(:locale).and_return(:fr)
       exhibit.title = ''
       expect do
         exhibit.save
@@ -402,6 +402,7 @@ describe Spotlight::Exhibit, type: :model do
       I18n.locale = 'fr'
       persisted_exhibit.reload
       expect(persisted_exhibit.title).to eq 'Titre français'
+      expect(persisted_exhibit.translated_title).to eq 'Titre français'
     end
 
     it 'has a translatable subtitle' do
@@ -417,5 +418,12 @@ describe Spotlight::Exhibit, type: :model do
       persisted_exhibit.reload
       expect(persisted_exhibit.description).to eq 'Description français'
     end
+
+    it 'is nil if no translation has been prrovided' do
+      expect(persisted_exhibit.title).to eq 'Sample'
+      I18n.locale = 'es'
+      persisted_exhibit.reload
+      expect(persisted_exhibit.translated_title(default: '')).to eq nil
+    end
   end
 end