blacklight-spotlight 3.0.0.alpha.1 → 3.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f01691bf97fbfeae90a4f5d12da7fc7ab256a9b47ba5e80b6b9cc30c06fb3d16
-  data.tar.gz: 8d033238da5914280b8e4b0307fabe79d57de50041123e77d573843b5aa87dc7
+  metadata.gz: 2faee384954ac8cb3de9ce3fedee4c5b9dcb8d7d8f28161a41182bbbd3cb06f1
+  data.tar.gz: bb80b682dab6d85a1195eb09259371032f120b55053c1f1d4d138b77eeb238f8
 SHA512:
-  metadata.gz: 112798c03866efb84b4b67e121aac6144ccb6eedd0f1b3e2259d92a338828841cf1e3951eeb9008f26c0cd2c21d8e399475747a972d4296689efc562f89d6d64
-  data.tar.gz: '0781a517029421e6c39415921ae7c7fe51abde6c78d4287e7928a42cf6a5d2b251a2be3514efe42ceedf87082af16a96c3eca1c8a42f34331a418d9c579ae5c8'
+  metadata.gz: 9008ca36a6e8ca50111935a5b69eb7b74c6f3b5114a594d8e31981bfbf525cf634bded7ee98accdce79cf4862433b8091ceba0f5e17f3464dd24f7b0b6d2f79d
+  data.tar.gz: 1be3d1bf193d008f940de66eba4838b479bd61cbb5b18840dc9de11965b706330991bb96241b01a82b1d3cbd2add7b4b811a530b8a67e9f6159f32dcf899ed41

data/app/assets/stylesheets/spotlight/_exhibits_index.scss

@@ -4,6 +4,7 @@
   margin-bottom: 2rem;
   //               image width        +       gutter         + border (x2)
   max-width: $exhibit-card-image-size + $exhibit-card-gutter + 2px;
+  padding-right: ($exhibit-card-gutter / 2) !important;
   perspective: 1000; // for flip animation
   position: relative;
 
@@ -54,10 +55,10 @@
     width: 100%;
   }
 
-  .card-title {
+  .exhibit-card-title {
+    @extend .h5;
     padding-left: $padding-small-horizontal;
     padding-right: $padding-small-horizontal;
-    padding-top: $padding-large-vertical;
   }
 
   .unpublished {
@@ -68,10 +69,6 @@
     margin-top: -1em;
     position: relative;
     width: 15ch;
-
-    + .card-title {
-      padding-top: 0;
-    }
   }
 }
 
@@ -81,21 +78,24 @@
   transform: rotateY(-180deg);
 
   .card-title {
+    @extend .h5;
     @extend .text-center;
     border-bottom: 1px dotted $exhibit-card-border;
     line-height: $headings-line-height;
     margin-bottom: $padding-base-vertical;
     padding-bottom: $padding-base-vertical;
+    padding-top: $padding-base-vertical;
   }
 
   .subtitle {
     @extend .h5;
     @extend .text-center;
+    font-size: 0.875rem;
     line-height: $headings-line-height;
   }
 
   .description {
-    font-size: $h6-font-size;
+    font-size: 0.75rem;
   }
 
   .visit-exhibit {
@@ -104,10 +104,6 @@
   }
 }
 
-.nav.tags {
-  display: inline-block;
-}
-
 // between the small and medium breakpoints, reduce the size of the image by a little bit
 @media (min-width: breakpoint-min("sm")) and (max-width: breakpoint-max("lg")) {
 

data/app/helpers/spotlight/crud_link_helpers.rb

@@ -70,19 +70,22 @@ module Spotlight
 
       html_options ||= {}
 
-      nav_link_html_options = html_options.merge(class: [html_options[:class], 'nav-link', ('active' if current_page?(options))].join(' '))
-
       content_tag(:li, class: 'nav-item') do
         if block_given?
-          link_to(options, nav_link_html_options, &block)
+          link_to(options, nav_link_html_options(options, html_options), &block)
         else
-          link_to(name, options, nav_link_html_options, &block)
+          link_to(name, options, nav_link_html_options(options, html_options), &block)
         end
       end
     end
 
     private
 
+    def nav_link_html_options(options, html_options)
+      active = html_options.key?(:active) ? html_options[:active] : current_page?(options)
+      html_options.merge(class: [html_options[:class], 'nav-link', ('active' if active)].join(' '))
+    end
+
     # rubocop:disable Metrics/MethodLength
     def action_default_value(object, key = nil)
       object_model = convert_to_model(object)

data/app/models/concerns/spotlight/solr_document.rb

@@ -50,7 +50,7 @@ module Spotlight
     end
 
     def update(current_exhibit, new_attributes)
-      attributes = new_attributes.stringify_keys
+      attributes = convert_incoming_attributes(new_attributes)
 
       custom_data = attributes.delete('sidecar')
       tags = attributes.delete('exhibit_tag_list')
@@ -141,6 +141,48 @@ module Spotlight
         "#{Spotlight::Engine.config.solr_fields.prefix}spotlight_exhibit_slugs#{Spotlight::Engine.config.solr_fields.string_suffix}" => slugs
       }
     end
+
+    def convert_incoming_attributes(attributes)
+      attributes = attributes.stringify_keys
+
+      # convert blank strings to nil
+      attributes = deep_transform_values(attributes, &:presence)
+
+      # trim excess nils from arrays
+      deep_compact(attributes)
+    end
+
+    def deep_transform_values(object, &block)
+      # Available in Rails 6
+      if object.respond_to?(:deep_transform_values)
+        object.deep_transform_values(&block)
+      else
+        _deep_transform_values(object, &block)
+      end
+    end
+
+    # Shimmed from Rails 6
+    def _deep_transform_values(object, &block)
+      case object
+      when Hash
+        object.transform_values { |value| deep_transform_values(value, &block) }
+      when Array
+        object.map { |e| deep_transform_values(e, &block) }
+      else
+        yield(object)
+      end
+    end
+
+    def deep_compact(object)
+      case object
+      when Hash
+        object.transform_values { |value| deep_compact(value) }
+      when Array
+        object.compact
+      else
+        object
+      end
+    end
   end
 end
 

data/app/models/spotlight/reindex_progress.rb

@@ -60,19 +60,19 @@ module Spotlight
     def localized_start_time
       return unless started_at
 
-      I18n.l(started_at, format: :short)
+      I18n.l(started_at, format: :long)
     end
 
     def localized_finish_time
       return unless finished_at
 
-      I18n.l(finished_at, format: :short)
+      I18n.l(finished_at, format: :long)
     end
 
     def localized_updated_time
       return unless updated_at
 
-      I18n.l(updated_at, format: :short)
+      I18n.l(updated_at, format: :long)
     end
   end
 end

data/app/models/spotlight/solr_document_sidecar.rb

@@ -44,7 +44,7 @@ module Spotlight
       blacklight_config.document_model
     end
 
-    protected
+    private
 
     def visibility_field
       blacklight_config.document_model.visibility_field(exhibit)
@@ -63,7 +63,7 @@ module Spotlight
         custom_field = custom_fields[key]
         field_name = custom_field.solr_field if custom_field
         field_name ||= key
-        solr_hash[field_name] = value
+        solr_hash[field_name] = convert_stored_value_to_solr(value)
       end
     end
 
@@ -75,10 +75,10 @@ module Spotlight
         next unless configured_fields && configured_fields[field_name].present?
 
         value = configured_fields[field_name]
-        field_data = field.data_to_solr(value)
+        field_data = field.data_to_solr(convert_stored_value_to_solr(value))
 
         # merge duplicate field mappings into a multivalued field
-        solr_hash.merge!(field_data) { |_key, v1, v2| Array(v1) + Array(v2) }
+        solr_hash.merge!(field_data) { |_key, v1, v2| (Array(v1) + Array(v2)).reject(&:blank?) }
       end
     end
 
@@ -94,5 +94,15 @@ module Spotlight
         hash[custom_field.field] = custom_field
       end
     end
+
+    def convert_stored_value_to_solr(value)
+      if value.blank?
+        nil
+      elsif value.is_a? Enumerable
+        value.reject(&:blank?)
+      else
+        value
+      end
+    end
   end
 end

data/app/views/shared/_curated_features_navbar.html.erb

@@ -2,7 +2,7 @@
 <% if published_top_level_feature_pages.present? %>
   <% if published_top_level_feature_pages.many? %>
     <li class="nav-item dropdown">
-      <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown"><%= navigation.label_or_default %> <b class="caret"></b></a>
+      <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown"><%= navigation.label_or_default %></a>
       <ul class="dropdown-menu">
         <% published_top_level_feature_pages.each do |page| %>
           <li><%= link_to page.title, [spotlight, page.exhibit, page], class: 'dropdown-item' %></li>

data/app/views/shared/_user_util_links.html.erb

@@ -8,7 +8,7 @@
   <%= render '/spotlight/shared/locale_picker' %>
   <% if current_user %>
     <li class="nav-item dropdown">
-      <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown"><%=current_user%> <b class="caret"></b></a>
+      <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown"><%=current_user%></a>
       <ul class="dropdown-menu">
         <% if can? :manage, Spotlight::Site.instance %>
           <li><%= link_to t(:'spotlight.header_links.edit_site'), spotlight.edit_site_path, class: 'dropdown-item' %></li>

data/app/views/spotlight/dashboards/_page.html.erb

@@ -12,5 +12,5 @@
     </div>
   </td>
   <td class="col-4"><%= page.last_edited_by.to_s if page.last_edited_by %></td>
-  <td class="col-2"><%= l page.updated_at, format: :short %></td>
+  <td class="col-2"><%= l page.updated_at, format: :long %></td>
 </tr>

data/app/views/spotlight/dashboards/_reindexing_activity.html.erb

@@ -14,7 +14,7 @@
   <tbody>
     <% @recent_reindexing.each do |log_entry| %>
       <tr class="d-flex">
-        <td class="col-3"><%= l log_entry.start_time, format: :short if log_entry.start_time %></td>
+        <td class="col-3"><%= l log_entry.start_time, format: :long if log_entry.start_time %></td>
         <td class="col-3"><%= log_entry.user.email if log_entry.user %></td>
         <td class="col-1"><%= log_entry.items_reindexed_count %></td>
         <td class="col-3"><%= distance_of_time_in_words log_entry.duration, 0, include_seconds: true if log_entry.duration %></td>

data/app/views/spotlight/exhibits/_exhibit_card_back.html.erb

@@ -10,8 +10,8 @@
   <p class="description">
     <%= truncated_description = exhibit.description.truncate(168, omission: '', separator: ' ') %>
     <% if exhibit.description.length > 168 %>
-      <%= content_tag(:span,"&hellip;".html_safe, class: "visible-sm visible-md") %>
-      <span class="hidden-sm hidden-md">
+      <%= content_tag(:span,"&hellip;".html_safe, class: "d-sm-block d-md-block") %>
+      <span class="d-sm-none d-md-none">
         <%= exhibit.description.slice(truncated_description.length, exhibit.description.length) %>
       </span>
     <% end %>

data/app/views/spotlight/exhibits/_exhibits.html.erb

@@ -1,5 +1,5 @@
 <% exhibits.each_slice(3).each do |row| %>
-  <div class="row"><!-- start main content row -->
+  <div class="row no-gutters"><!-- start main content row -->
     <%= render collection: row, partial: 'exhibit_card', as: 'exhibit' %>
   </div>
 <% end %>

data/app/views/spotlight/exhibits/_tags.html.erb

@@ -1,13 +1,9 @@
 <% if tags.any? %>
-<div class="row">
-  <div class="col-md-12 text-center">
-    <ul class="nav nav-pills tags">
-      <li class="<%= 'active' if params[:tag].blank? %>"><%= link_to t('.all'), exhibits_path %></li>
+  <ul class="nav nav-pills tags justify-content-center">
+    <%= nav_link t('.all'), exhibits_path, active: params[:tag].blank? %>
 
-      <% tags.sort_by(&:name).each do |tag| %>
-        <li class="<%= 'active' if params[:tag] == tag.name %>"><%= link_to tag.name, exhibits_path(tag: tag.name) %></li>
-      <% end %>
-    </ul>
-  </div>
-</div>
+    <% tags.sort_by(&:name).each do |tag| %>
+      <%= nav_link tag.name, exhibits_path(tag: tag.name), active: params[:tag] == tag.name %>
+    <% end %>
+  </ul>
 <% end %>

data/app/views/spotlight/shared/_locale_picker.html.erb

@@ -1,7 +1,7 @@
 <% if current_exhibit && current_exhibit.languages.accessible_by(current_ability).any? %>
   <li class="nav-item dropdown">
     <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-      <%= Spotlight::Language.new(locale: I18n.locale).to_native %> <b class="caret"></b>
+      <%= Spotlight::Language.new(locale: I18n.locale).to_native %>
     </a>
     <ul class="dropdown-menu">
       <% locale_selecter_dropown_options.each do |language| %>

data/app/views/spotlight/sites/_exhibit.html.erb

@@ -13,6 +13,6 @@
   </td>
   <td class="text-right"><%= exhibit.published? ? t(:'.published') : t(:'.unpublished') %></td>
   <td class="text-right"><%= exhibit.requested_by %></td>
-  <td class="text-right"><%= l exhibit.created_at, format: :short %></td>
-  <td class="text-right"><%= l exhibit.updated_at, format: :short %></td>
+  <td class="text-right"><%= l exhibit.created_at, format: :long %></td>
+  <td class="text-right"><%= l exhibit.updated_at, format: :long %></td>
 </tr>

data/lib/spotlight/version.rb

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

data/spec/helpers/spotlight/crud_link_helpers_spec.rb

@@ -146,5 +146,15 @@ describe Spotlight::CrudLinkHelpers, type: :helper do
       rendered = Capybara.string(helper.nav_link('Some link', root_url))
       expect(rendered).to have_css('.nav-link.active')
     end
+
+    it 'accepts an active argument to toggle the active class without regard for the current page' do
+      rendered = Capybara.string(helper.nav_link('Some link', root_url, active: true))
+      expect(rendered).to have_css('.nav-link.active')
+
+      allow(helper).to receive(:current_page?).with(root_url).and_return(true)
+
+      rendered = Capybara.string(helper.nav_link('Some link', root_url, active: false))
+      expect(rendered).not_to have_css('.nav-link.active')
+    end
   end
 end

data/spec/models/solr_document_spec.rb

@@ -73,10 +73,25 @@ describe SolrDocument, type: :model do
       expect(mock_sidecar).to receive(:update).with(data: { 'a' => 1 })
       subject.update exhibit, sidecar: { data: { 'a' => 1 } }
     end
+
     it 'stores tags' do
       subject.update exhibit, exhibit_tag_list: 'paris, normandy'
       expect(subject.sidecar(exhibit).tags_from(exhibit)).to eq %w(paris normandy)
     end
+
+    it 'converts empty strings to nil' do
+      mock_sidecar = double
+      allow(subject).to receive_messages(sidecar: mock_sidecar)
+      expect(mock_sidecar).to receive(:update).with(data: { 'a' => nil })
+      subject.update exhibit, sidecar: { data: { 'a' => '' } }
+    end
+
+    it 'compacts arrays of empty or nil values' do
+      mock_sidecar = double
+      allow(subject).to receive_messages(sidecar: mock_sidecar)
+      expect(mock_sidecar).to receive(:update).with(data: { 'a' => ['a'] })
+      subject.update exhibit, sidecar: { data: { 'a' => ['', nil, 'a'] } }
+    end
   end
 
   describe '#to_solr' do

data/spec/models/spotlight/reindex_progress_spec.rb

@@ -53,9 +53,9 @@ describe Spotlight::ReindexProgress, type: :model do
     it 'returns a hash with values for current_log_entry via the various helper methods' do
       expect(subject.as_json).to eq(
         recently_in_progress: subject.recently_in_progress?,
-        started_at: I18n.l(reindexing_log_entry.start_time, format: :short),
-        finished_at: I18n.l(reindexing_log_entry.end_time, format: :short),
-        updated_at: I18n.l(reindexing_log_entry.updated_at, format: :short),
+        started_at: I18n.l(reindexing_log_entry.start_time, format: :long),
+        finished_at: I18n.l(reindexing_log_entry.end_time, format: :long),
+        updated_at: I18n.l(reindexing_log_entry.updated_at, format: :long),
         total: subject.total,
         completed: subject.completed,
         errored: subject.errored?,

data/spec/models/spotlight/solr_document_sidecar_spec.rb

@@ -28,5 +28,19 @@ describe Spotlight::SolrDocumentSidecar, type: :model do
 
       its(:to_solr) { should include 'the_solr_field' => 'some value' }
     end
+
+    context 'with blank fields' do
+      before do
+        subject.data = {
+          'a_blank_field' => '',
+          'a_blank_multivalued_field' => ['', ''],
+          'a_multivalued_field_with_some_blanks' => ['', 'a']
+        }
+      end
+
+      its(:to_solr) { should include 'a_blank_field' => nil }
+      its(:to_solr) { should include 'a_blank_multivalued_field' => [] }
+      its(:to_solr) { should include 'a_multivalued_field_with_some_blanks' => ['a'] }
+    end
   end
 end

data/spec/views/spotlight/dashboards/_reindexing_activity.html.erb_spec.rb

@@ -43,8 +43,8 @@ describe 'spotlight/dashboards/_reindexing_activity.html.erb', type: :view do
     end
 
     it 'formats the start time correctly' do
-      expect(rendered).to have_css('table.table-striped td', text: '05 Jan 23:00', count: 1)
-      expect(rendered).to have_css('table.table-striped td', text: '10 Jan 23:00', count: 1)
+      expect(rendered).to have_css('table.table-striped td', text: 'January 05, 2017 23:00', count: 1)
+      expect(rendered).to have_css('table.table-striped td', text: 'January 10, 2017 23:00', count: 1)
     end
 
     it 'displays the user that initiated the reindexing' do
@@ -80,7 +80,7 @@ describe 'spotlight/dashboards/_reindexing_activity.html.erb', type: :view do
 
       # we expect one blank table cell for the user, and values for everything else
       expect(rendered).to have_css('table.table-striped td', text: /^$/, count: 1)
-      expect(rendered).to have_css('table.table-striped td', text: '05 Jan 23:00', count: 1)
+      expect(rendered).to have_css('table.table-striped td', text: 'January 05, 2017 23:00', count: 1)
       expect(rendered).to have_css('table.table-striped td', text: /^10$/, count: 1)
       expect(rendered).to have_css('table.table-striped td', text: '5 minutes', count: 1)
       expect(rendered).to have_css('table.table-striped td', text: 'Successful', count: 1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.1
+  version: 3.0.0.alpha.2
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails