blacklight-spotlight 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b138edc90732ce33fe7f454da4f4a21858b016d6
-  data.tar.gz: 38b9e958eac1286631b35752da63bf583aa540bf
+  metadata.gz: 7997d0d2ea068a8e6cb52fd07c0da1188dd6ec32
+  data.tar.gz: bb3925808a6e75e24c939b3283f36e52e8acb8ce
 SHA512:
-  metadata.gz: 55de525b9576d2dd3153b107063d9ca1d8f9680049f53875f2e29fa9f13def90d664327827a871c360f5055f1fdc8f0131f354ec3f1d52a29551959e83e46150
-  data.tar.gz: 150fb2d102718f3284f3213b6c3d6146a3d521a0443932f95bbb238283811aa7a26e5e49d3fedb3778d48a5846ae73cfc3a389b6c5d60f7c765403c40331ed45
+  metadata.gz: a5039403405d1d6c8b6537e0011091b705e298e92438b6c14f239d99455123a9f5975c50c784d769a39c5c798b12e39e762d692bd36b758a9b84469a8de9f6f8
+  data.tar.gz: 534cbcc8647cae7b757eb723728eaeaead58118f141202349f0f3c78e38a4f947000e364e2af454866715874ed01ce1765f717313800766fbba8ce91f52e3118

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

@@ -28,8 +28,10 @@
     padding: 0 15px 0 0;
   }
 
-  .dashboard > a {
-    padding-left: 0;
+  &.top-level {
+    li > a {
+      padding-left: 0;
+    }
   }
 }
 

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

@@ -1,4 +1,4 @@
-footer {
+.site-footer {
   background-color: $gray-lighter;
   color: $gray-light;
   margin-top: $footer-top-margin;

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

@@ -163,52 +163,12 @@ $menu-link-background-color-hover: rgba(255, 255, 255, 0.15);
     small {
       color: $white;
     }
-
-    .more-exhibits {
-      a {
-        color: $gray-lighter;
-        background: rgba(0, 0, 0, 0.4);
-        border-top-left-radius: $border-radius-base;
-        border-top-right-radius: $border-radius-base;
-      }
-
-      a:hover,
-      a:focus,
-      a:active {
-        background: rgba(0, 0, 0, 0.6);
-      }
-
-      .dropdown-menu a {
-        background: none;
-        color: $gray;
-
-        &:hover,
-        &:focus,
-        &:active {
-          background-color: $gray-lighter;
-        }
-      }
-    }
-  }
-
-  .more-exhibits {
-    @extend .navbar-right;
   }
 
   &.with-page-masthead {
     .site-title {
       margin-top: $padding-large-vertical * 3;
     }
-
-    .more-exhibits {
-      @extend .navbar-left;
-      padding-top: $padding-base-vertical;
-
-      .dropdown-menu {
-        left: 0;
-        right: auto;
-      }
-    }
   }
 
   // This is to add a background image to the masthead, in a way that

data/app/controllers/spotlight/appearances_controller.rb

@@ -16,8 +16,8 @@ module Spotlight
 
     def edit
       add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.administration.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.administration.sidebar.appearance'), edit_exhibit_appearance_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.appearance'), edit_exhibit_appearance_path(@exhibit)
     end
 
     protected

data/app/controllers/spotlight/custom_fields_controller.rb

@@ -49,7 +49,7 @@ module Spotlight
 
     def attach_breadcrumbs
       add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
       add_breadcrumb t(:'spotlight.metadata_configurations.edit.header'), edit_exhibit_metadata_configuration_path(@exhibit)
     end
 

data/app/controllers/spotlight/dashboards_controller.rb

@@ -23,12 +23,23 @@ module Spotlight
       attach_dashboard_breadcrumbs
     end
 
+    def analytics
+      authorize! :curate, @exhibit
+
+      attach_analytics_breadcrumbs
+    end
+
     def _prefixes
       @_prefixes ||= super + ['spotlight/catalog', 'catalog']
     end
 
     protected
 
+    def attach_analytics_breadcrumbs
+      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
+      add_breadcrumb t(:'spotlight.curation.sidebar.analytics'), analytics_exhibit_dashboard_path(@exhibit)
+    end
+
     def attach_dashboard_breadcrumbs
       add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
       add_breadcrumb t(:'spotlight.curation.sidebar.dashboard'), exhibit_dashboard_path(@exhibit)

data/app/controllers/spotlight/exhibits_controller.rb

@@ -52,8 +52,8 @@ module Spotlight
 
     def edit
       add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.administration.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.administration.sidebar.settings'), edit_exhibit_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.settings'), edit_exhibit_path(@exhibit)
       build_initial_exhibit_contact_emails
     end
 

data/app/controllers/spotlight/metadata_configurations_controller.rb

@@ -17,8 +17,8 @@ module Spotlight
 
     def edit
       add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.curation.sidebar.metadata'), edit_exhibit_metadata_configuration_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.metadata'), edit_exhibit_metadata_configuration_path(@exhibit)
     end
 
     def update

data/app/controllers/spotlight/roles_controller.rb

@@ -12,8 +12,8 @@ module Spotlight
       authorize! :edit, role
 
       add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.administration.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.administration.sidebar.users'), exhibit_roles_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.users'), exhibit_roles_path(@exhibit)
     end
 
     def update_all

data/app/controllers/spotlight/search_configurations_controller.rb

@@ -18,8 +18,8 @@ module Spotlight
 
     def edit
       add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.curation.sidebar.search_configuration'), edit_exhibit_search_configuration_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.search_configuration'), edit_exhibit_search_configuration_path(@exhibit)
 
       @field_metadata = Spotlight::FieldMetadata.new(repository, @blacklight_configuration.blacklight_config)
     end

data/app/helpers/spotlight/title_helper.rb

@@ -6,8 +6,8 @@ module Spotlight
       page_title t(:'spotlight.curation.header'), title
     end
 
-    def administration_page_title(title = nil)
-      page_title t(:'spotlight.administration.header'), title
+    def configuration_page_title(title = nil)
+      page_title t(:'spotlight.configuration.header'), title
     end
 
     def page_title(section, title = nil)

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

@@ -30,6 +30,10 @@ module Spotlight
       rescue Blacklight::Exceptions::InvalidSolrID => e
         Rails.logger.debug "Unable to find document #{id}: #{e}"
       end
+
+      def reindex_all
+        find_each(&:reindex)
+      end
     end
 
     def update(current_exhibit, new_attributes)
@@ -64,20 +68,22 @@ module Spotlight
       { self.class.unique_key.to_sym => id }.reverse_merge(sidecars.inject({}) { |a, e| a.merge(e.to_solr) }).merge(tags_to_solr)
     end
 
-    # rubocop:disable Metrics/LineLength
     def self.solr_field_for_tagger(tagger)
-      :"#{Spotlight::Engine.config.solr_fields.prefix}#{tagger.class.model_name.param_key}_#{tagger.id}_tags#{Spotlight::Engine.config.solr_fields.string_suffix}"
+      :"#{solr_field_prefix(tagger)}tags#{Spotlight::Engine.config.solr_fields.string_suffix}"
     end
 
     def self.visibility_field(exhibit)
-      :"#{Spotlight::Engine.config.solr_fields.prefix}#{exhibit.class.model_name.param_key}_#{exhibit.id}_public#{Spotlight::Engine.config.solr_fields.boolean_suffix}"
+      :"#{solr_field_prefix(exhibit)}public#{Spotlight::Engine.config.solr_fields.boolean_suffix}"
     end
-    # rubocop:enable Metrics/LineLength
 
     def self.resource_type_field
       :"#{Spotlight::Engine.config.solr_fields.prefix}spotlight_resource_type#{Spotlight::Engine.config.solr_fields.string_suffix}"
     end
 
+    def self.solr_field_prefix(exhibit)
+      "#{Spotlight::Engine.config.solr_fields.prefix}#{exhibit.class.model_name.param_key}_#{exhibit.to_param}_"
+    end
+
     def make_public!(exhibit)
       sidecar(exhibit).public!
     end

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

@@ -17,6 +17,20 @@ module Spotlight
           @index ||= blacklight_config.repository_class.new(blacklight_config)
         end
 
+        def find_each
+          return to_enum(:find_each) unless block_given?
+
+          start = 0
+          search_params = { q: '*:*', fl: 'id', facet: false }
+          response = index.search(search_params.merge(start: start))
+
+          while response.documents.present?
+            response.documents.each { |x| yield x }
+            start += response.documents.length
+            response = index.search(search_params.merge(start: start))
+          end
+        end
+
         protected
 
         def blacklight_config

data/app/models/spotlight/ability.rb

@@ -14,7 +14,7 @@ module Spotlight
 
       # exhibit admin
       can [:update, :import, :export, :destroy], Spotlight::Exhibit, id: user.admin_roles.pluck(:exhibit_id)
-      can :manage, Spotlight::Role, exhibit_id: user.admin_roles.pluck(:exhibit_id)
+      can :manage, [Spotlight::BlacklightConfiguration, Spotlight::Role], exhibit_id: user.admin_roles.pluck(:exhibit_id)
 
       can :manage, PaperTrail::Version if user.roles.any?
 
@@ -29,8 +29,6 @@ module Spotlight
 
       can :manage, Spotlight::Lock, by: user
 
-      can [:read, :update], Spotlight::BlacklightConfiguration, exhibit_id: user.roles.pluck(:exhibit_id)
-
       can [:read, :curate, :tag], Spotlight::Exhibit, id: user.roles.pluck(:exhibit_id)
 
       # public

data/app/models/spotlight/blacklight_configuration.rb

@@ -192,14 +192,14 @@ module Spotlight
 
     def custom_index_fields
       Hash[exhibit.custom_fields.map do |x|
-        field = Blacklight::Configuration::IndexField.new x.configuration.merge(field: x.field)
+        field = Blacklight::Configuration::IndexField.new x.configuration.merge(key: x.field, field: x.solr_field)
         [x.field, field]
       end]
     end
 
     def custom_facet_fields
       Hash[exhibit.custom_fields.vocab.map do |x|
-        field = Blacklight::Configuration::FacetField.new x.configuration.merge(field: x.field, show: false)
+        field = Blacklight::Configuration::FacetField.new x.configuration.merge(key: x.field, field: x.solr_field, show: false)
         [x.field, field]
       end]
     end

data/app/models/spotlight/custom_field.rb

@@ -10,25 +10,13 @@ module Spotlight
 
     scope :vocab, -> { where(field_type: 'vocab') }
 
-    before_save do
+    before_create do
       self.field ||= field_name
       self.field_type ||= 'text'
     end
 
     before_save do
-      if persisted? && field_type_changed?
-        old_field = self.field
-        self.field = field_name
-
-        if blacklight_configuration && blacklight_configuration.index_fields.key?(old_field)
-          blacklight_configuration.index_fields_will_change!
-          f = blacklight_configuration.index_fields.delete(old_field)
-          blacklight_configuration.index_fields[field] = f
-          blacklight_configuration.save
-        end
-
-        Spotlight::RenameSidecarFieldJob.perform_later(exhibit, old_field, self.field)
-      end
+      update_field_name(field_name) if persisted? && field_type_changed?
     end
 
     def label=(label)
@@ -62,6 +50,15 @@ module Spotlight
         end
     end
 
+    def solr_field
+      if field && field.starts_with?(solr_field_prefix)
+        # backwards compatibility with pre-0.9 custom fields
+        field
+      else
+        "#{solr_field_prefix}#{field || field_name}"
+      end
+    end
+
     protected
 
     def blacklight_configuration
@@ -76,7 +73,15 @@ module Spotlight
     end
 
     def field_name
-      "#{Spotlight::Engine.config.solr_fields.prefix}exhibit_#{exhibit.to_param}_#{configuration['label'].parameterize}#{field_suffix}"
+      "#{field_slug}#{field_suffix}"
+    end
+
+    def field_slug
+      configuration['label'].parameterize
+    end
+
+    def solr_field_prefix
+      Spotlight::SolrDocument.solr_field_prefix(exhibit)
     end
 
     def field_suffix
@@ -108,5 +113,22 @@ module Spotlight
         :field
       ]
     end
+
+    ##
+    # Rename this custom field to new_name
+    # @param [String] the new name for the field
+    def update_field_name(new_field)
+      old_field = field
+      self.field = new_field
+
+      if blacklight_configuration && blacklight_configuration.index_fields.key?(old_field)
+        blacklight_configuration.index_fields_will_change!
+        f = blacklight_configuration.index_fields.delete(old_field)
+        blacklight_configuration.index_fields[field] = f
+        blacklight_configuration.save
+      end
+
+      Spotlight::RenameSidecarFieldJob.perform_later(exhibit, old_field, self.field)
+    end
   end
 end

data/app/models/spotlight/solr_document_sidecar.rb

@@ -44,7 +44,16 @@ module Spotlight
     end
 
     def data_to_solr
-      data.except('configured_fields').merge(configured_fields_data_to_solr)
+      custom_fields_data_to_solr.merge(configured_fields_data_to_solr)
+    end
+
+    def custom_fields_data_to_solr
+      data.except('configured_fields').each_with_object({}) do |(key, value), solr_hash|
+        custom_field = custom_fields[key]
+        field_name = custom_field.solr_field if custom_field
+        field_name ||= key
+        solr_hash[field_name] = value
+      end
     end
 
     def configured_fields_data_to_solr
@@ -65,5 +74,11 @@ module Spotlight
     def upload_fields
       Spotlight::Resources::Upload.fields(exhibit)
     end
+
+    def custom_fields
+      exhibit.custom_fields.each_with_object({}) do |custom_field, hash|
+        hash[custom_field.field] = custom_field
+      end
+    end
   end
 end

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

@@ -1,3 +1,7 @@
 <div class="container">
-<%= render_breadcrumbs :builder => Spotlight::BootstrapBreadcrumbsBuilder %>
+  <div class="row">
+    <div class="col-md-12">
+      <%= render_breadcrumbs builder: Spotlight::BootstrapBreadcrumbsBuilder %>
+    </div>
+  </div>
 </div>

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

@@ -5,23 +5,6 @@
     <span class='background-container-gradient'></span>
   <% end %>
   <div class="container">
-    <%= cache [current_exhibit, cache_key_for_spotlight_exhibits] do %>
-    <ul class="more-exhibits nav navbar-nav navbar-sm">
-      <% if Spotlight::Exhibit.many? %>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t(:'.more_exhibits') %> <b class="caret"></b></a>
-          <ul class="dropdown-menu">
-            <% Spotlight::Exhibit.accessible_by(current_ability).where.not(id: current_exhibit).each do |exhibit| %>
-              <li>
-              <%= link_to exhibit.title, [spotlight, exhibit] %>
-              </li>
-            <% end %>
-          </ul>
-        </li>
-      <% end %>
-    </ul>
-    <% end if current_exhibit %>
-
     <div class="site-title h1">
       <% if content_for? :masthead %>
         <%= content_for :masthead %>

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

@@ -1,4 +1,4 @@
-<footer>
+<footer class="site-footer">
   <div class="row">
     <%= render 'shared/share_follow' %>
   </div>

data/app/views/spotlight/about_pages/index.html.erb

@@ -1,4 +1,4 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
   <%= render 'order_pages' %>
   <% if can? :manage, Spotlight::Contact.new(exhibit: @exhibit) %>