blacklight-spotlight 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0aefec4ae05cfb0ff575bc3f774e69f8e949757
-  data.tar.gz: 2bf34ba4683b051d523cb98e461e96fa2cad2149
+  metadata.gz: b22ac299ef75ed65fdbf1db182d8ffdd7c0fb955
+  data.tar.gz: 2a309cdf19b962204d101ccb949ee9dc3a9ea5f7
 SHA512:
-  metadata.gz: e6e7e9d9b16f7267bb1862edc08be110799329d727cdf4d6e208e70af90442c665733aaa3d750dd26c26215a456dc04c9a22e53d711e2c9358cc385194fef93f
-  data.tar.gz: 44143ac2594a25f1b191c8117bd986b90d593bb7d95c36d6fe0b04f20d8e89665551ac3ce8373115c2cf1e957fb8b5ff015e34de1bbd6f6de51dcc29592c4381
+  metadata.gz: 44cf9fb4a4c7550722d1b3ff8d3d9f5aaa69e515089b55739899cea0fafe93d33f0f413cafa61480dd221d2c60b3d1097fcf316b319ba05122f37a7970d04fb4
+  data.tar.gz: 9285521d65457583d865917083633faefc00dd9413120ee6e4182a655964f8fa13cada3f1d1975f404765ee20157b0eb17b39c1165b670ae97e4376d72c1d7d0

data/app/models/sir_trevor_rails/blocks/browse_block.rb

@@ -38,10 +38,6 @@ module SirTrevorRails
       def display_item_counts?
         send(:'display-item-counts') == 'true'
       end
-
-      def item_count(category)
-        solr_helper.search_results(category.query_params, solr_helper.search_params_logic).first['response']['numFound']
-      end
     end
   end
 end

data/app/models/spotlight/exhibit.rb

@@ -12,6 +12,7 @@ module Spotlight
     extend FriendlyId
     friendly_id :title, use: [:slugged, :finders]
     validates :title, presence: true
+    validates :slug, uniqueness: true
 
     default_scope { order('weight ASC') }
 
@@ -56,8 +57,6 @@ module Spotlight
     after_create :initialize_main_navigation
     include Spotlight::DefaultThumbnailable
 
-    scope :published, -> { where(published: true) }
-
     def main_about_page
       @main_about_page ||= about_pages.published.first
     end

data/app/models/spotlight/site.rb

@@ -7,7 +7,8 @@ module Spotlight
 
     belongs_to :masthead, dependent: :destroy
 
-    accepts_nested_attributes_for :masthead, :exhibits
+    accepts_nested_attributes_for :masthead, update_only: true
+    accepts_nested_attributes_for :exhibits
 
     def self.instance
       first || create

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

@@ -1,6 +1,8 @@
 <% if can?(:manage, Spotlight::Site.instance) || can?(:create, Spotlight::Exhibit) %>
 <h4 class="nav-heading"><%=t(:'.header') %></h4>
 <ul class="nav sidenav">
+  <li><%= link_to t('.documentation'), 'https://github.com/sul-dlss/spotlight/wiki/Configuration-settings' %></li>
+
   <% if can? :manage, Spotlight::Site.instance %>
     <li><%= link_to t(:'spotlight.sites.edit.section'), spotlight.edit_site_path %></li>
   <% end %>

data/app/views/spotlight/appearances/edit.html.erb

@@ -2,7 +2,7 @@
 <div id="content" class="col-md-9">
   <%= configuration_page_title %>
 
-<%= bootstrap_form_for @exhibit, url: spotlight.exhibit_appearance_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5', html: {data: { autocomplete_exhibit_catalog_index_path: spotlight.autocomplete_exhibit_catalog_index_path(current_exhibit, q: "%QUERY", format: "json") } } do |f| %>
+<%= bootstrap_form_for @exhibit, url: spotlight.exhibit_appearance_path(@exhibit), layout: :horizontal, label_col: 'col-md-3 col-sm-3', control_col: 'col-md-5 col-sm-5', html: {data: { autocomplete_exhibit_catalog_index_path: spotlight.autocomplete_exhibit_catalog_index_path(current_exhibit, q: "%QUERY", format: "json") } } do |f| %>
   <% if @exhibit.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@exhibit.errors.count, "error") %> prohibited this page from being saved:</h2>

data/app/views/spotlight/contact_forms/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content" class="col-md-9">
-<%= bootstrap_form_for @contact_form, url: spotlight.exhibit_contact_form_path(current_exhibit, @contact_form), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5' do |f| %>
+<%= bootstrap_form_for @contact_form, url: spotlight.exhibit_contact_form_path(current_exhibit, @contact_form), layout: :horizontal, label_col: 'col-md-3 col-sm-3', control_col: 'col-sm-5 col-md-5' do |f| %>
   <h1 class="page-title"><%= t(:'.header') %></h1>
   <div class="row">
     <%= f.text_field :name %>

data/app/views/spotlight/metadata_configurations/edit.html.erb

@@ -1,7 +1,7 @@
 <%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
 <%= configuration_page_title %>
-<%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_metadata_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5' do |f| %>
+<%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_metadata_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3 col-sm-3', control_col: 'col-md-5 col-sm-5' do |f| %>
     <h3><%= t(:'.order_header') %></h3>
 
     <p class="instructions"><%= t :'.instructions' %></p>

data/app/views/spotlight/search_configurations/edit.html.erb

@@ -1,7 +1,7 @@
 <%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
   <%= configuration_page_title %>
-  <%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_search_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5' do |f| %>
+  <%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_search_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3 col-sm-3', control_col: 'col-md-5 col-sm-5' do |f| %>
 
     <div role="tabpanel">
       <ul class="nav nav-tabs" role="tablist">

data/app/views/spotlight/searches/_form.html.erb

@@ -1,4 +1,4 @@
-<%= bootstrap_form_for [@search.exhibit, @search], layout: :horizontal, label_col: 'col-md-2', control_col: 'col-sm-7', data: {form_observer: 'true', autocomplete_exhibit_catalog_index_path: spotlight.autocomplete_exhibit_search_path(@search.exhibit, @search, q: "%QUERY", format: "json")}, html: {id: 'edit-search'} do |f| %>
+<%= bootstrap_form_for [@search.exhibit, @search], layout: :horizontal, label_col: 'col-md-2 col-sm-2', control_col: 'col-md-7 col-sm-7', data: {form_observer: 'true', autocomplete_exhibit_catalog_index_path: spotlight.autocomplete_exhibit_search_path(@search.exhibit, @search, q: "%QUERY", format: "json")}, html: {id: 'edit-search'} do |f| %>
   <% if @search.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@search.errors.count, "error") %> prohibited this page from being saved:</h2>

data/app/views/spotlight/sir_trevor/blocks/_browse_block.html.erb

@@ -12,7 +12,7 @@
               </p>
 
               <% if browse_block.display_item_counts? %>
-                <span class="item-count"><%= pluralize(browse_block.item_count(search), 'item') %></span>
+                <span class="item-count"><%= t(:'.items', count: search.documents.size) %></span>
               <% end %>
             </div>
           </div>

data/config/locales/spotlight.en.yml

@@ -404,6 +404,12 @@ en:
           help: >
             You can select and crop an image to visually represent this page. It will be
             used as the thumbnail image if you include this page using the 'Highlight Featured Pages' widget.
+    sir_trevor:
+      blocks:
+        browse_block:
+          items:
+            one: "%{count} item"
+            other: "%{count} items"
     contacts:
       edit:
         header: "Edit Contact"
@@ -601,3 +607,4 @@ en:
     site_sidebar:
       header: Actions
       create_exhibit: 'Create a new exhibit'
+      documentation: 'Curator documentation'

data/lib/spotlight/version.rb

@@ -1,4 +1,4 @@
 #
 module Spotlight
-  VERSION = '0.14.1'
+  VERSION = '0.14.2'
 end

data/spec/features/create_exhibit_spec.rb

@@ -44,4 +44,21 @@ describe 'Create a new exhibit', type: :feature do
     expect(page).to have_content 'The exhibit was created.'
     expect(Spotlight::Exhibit.last.slug).to eq 'custom-slug'
   end
+
+  it 'fails validation if the slug is already used' do
+    visit spotlight.new_exhibit_path
+
+    fill_in 'Title', with: 'My exhibit title'
+    fill_in 'URL slug', with: 'custom-slug'
+
+    click_button 'Save'
+
+    visit spotlight.new_exhibit_path
+
+    fill_in 'Title', with: 'My exhibit title'
+    fill_in 'URL slug', with: 'custom-slug'
+
+    click_button 'Save'
+    expect(page).to have_content 'has already been taken'
+  end
 end

data/spec/features/site_masthead_spec.rb

@@ -26,6 +26,26 @@ describe 'Add and update the site masthead', type: :feature do
       expect(field_labeled('Show background image in masthead')).to be_checked
     end
   end
+
+  it 'idempotently updates the site masthead options' do
+    visit spotlight.edit_site_path
+
+    click_link 'Site masthead'
+
+    within '#site-masthead' do
+      check 'Show background image in masthead'
+      attach_file('site_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+    end
+
+    click_button 'Save changes'
+
+    expect(page).to have_content('The site was successfully updated.')
+
+    visit spotlight.edit_site_path
+    click_link 'Site masthead'
+    click_button 'Save changes'
+    expect(page).to have_css('.image-masthead .background-container')
+  end
   it 'displays a masthead image when one is uploaded and configured' do
     visit spotlight.edit_site_path
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails