blacklight-spotlight 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cddcc5a9f2a5d68c50a7092eec103a1fd4e4ff2
-  data.tar.gz: a368d7becced90f589111c22c2dbf2b5311d1aa8
+  metadata.gz: 6a47fab678bff54d54f4d4c3e9f2784b7f3333cf
+  data.tar.gz: 704d71ac8946a3f767ddf3d97347aeac8e72d91f
 SHA512:
-  metadata.gz: b39192c1b349d0b10f7f9968ee2683e6c62aadb203069e28eb41cf9165a6dbf527bf2870a06639298ba52cbacd29a0e6b042e43be5a7136a956ebeaf6ef3a818
-  data.tar.gz: 113f4f169e3a1ea853e39417e5a96c49e2b3492c311f3f161d35187b917d759a5b999886f44df3cce2abfe36b1b07a597bebea6e85dcdfe4f4ba432425c68724
+  metadata.gz: baaadb1e9a1abcf1122af09b59443fd47e4673068c1c7870b852d6a65433c8d9f4652d40a49b4521fc71c0e3a861d815ad5f5ed538bb5a4256801428ee4ed070
+  data.tar.gz: 9a7537f66f35fe0b3a60159510a803c081da6e69de8ea63871215db0c469cb9df38636dae65670d1b2048bca25d09de7ad81ce1fc7690d47cbc5decc4649ff96

data/Rakefile

@@ -4,7 +4,7 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-ZIP_URL = 'https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip'
+ZIP_URL = 'https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip'.freeze
 
 require 'rdoc/task'
 
@@ -48,7 +48,7 @@ namespace :spotlight do
   desc 'Copies the default SOLR config for the bundled Testing Server'
   task :configure_jetty do
     FileList['solr_conf/conf/*'].each do |f|
-      cp("#{f}", 'jetty/solr/blacklight-core/conf/', verbose: true)
+      cp(f, 'jetty/solr/blacklight-core/conf/', verbose: true)
     end
   end
 

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

@@ -88,4 +88,10 @@ label.radio {
   div.radio + div input, div.radio + input[type="file"] {
     margin-top: $padding-large-vertical;
   }
-}
+}
+
+@media (max-width: $screen-sm-max) {
+  aside.col-md-3 {
+    padding-left: 0;
+  }
+}

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

@@ -102,6 +102,10 @@
   }
 }
 
+.nav.tags {
+  display: inline-block;
+}
+
 // between the small and medium breakpoints, reduce the size of the image by a little bit
 @media (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
 
@@ -130,3 +134,21 @@
     position: relative;
   }
 }
+
+// For the medium breakpoint, reduce the max width of the .exhibit-card to align right-edge of row correctly
+@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+  .exhibit-card {
+
+    // each card is 3 columns wide
+    max-width: 3 * ($container-md / $grid-columns) - $padding-xs-horizontal;
+  }
+}
+
+// For the small breakpoint, reduce the max width of the .exhibit-card to align right-edge of row correctly
+@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+  .exhibit-card {
+
+    // each card is 4 columns wide
+    max-width: 4 * ($container-sm / $grid-columns) - $padding-xs-horizontal;
+  }
+}

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

@@ -52,7 +52,6 @@
     @extend .hidden-xs;
 
     display: block;
-    margin-top: $padding-base-vertical;
     padding-bottom: $padding-base-vertical;
     padding-top: $padding-base-vertical;
   }
@@ -90,7 +89,6 @@
 
 .site-title-container {
   max-height: $masthead-height - $navbar-height;
-  
   padding-bottom: $padding-large-vertical;
   padding-top: $padding-large-vertical;
 }

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

@@ -11,7 +11,7 @@ $exhibit-card-height: 350px !default;
 $exhibit-card-bg: $well-bg !default;
 $exhibit-card-border: $well-border !default;
 $exhibit-card-gutter: $padding-large-horizontal !default;
-$exhibit-card-image-size: 273px !default;
+$exhibit-card-image-size: 269px !default;
 $exhibit-card-shadow: inset 2px 2px 5px -2px $exhibit-card-border !default;
 
 $navbar-transparent-color: $gray !default;

data/app/controllers/concerns/spotlight/config.rb

@@ -5,15 +5,10 @@ module Spotlight
     extend ActiveSupport::Concern
 
     def exhibit_specific_blacklight_config
-      @exhibit_specific_blacklight_config ||=
-        if current_exhibit
-          current_exhibit.blacklight_config
-        elsif params[:exhibit_id]
-          fail "Exhibit id exists (#{params[:exhibit_id]}), but @exhibit hasn't been loaded yet"
-        else
-          # Not in an exhibit context. (So why are we calling a method called exhibit_specific_blacklight_config?)
-          fail 'Exhibit not found'
-        end
+      fail "Exhibit id exists (#{params[:exhibit_id]}), but @exhibit hasn't been loaded yet" if params[:exhibit_id] && current_exhibit.nil?
+      fail 'Exhibit not found' unless current_exhibit
+
+      @exhibit_specific_blacklight_config ||= current_exhibit.blacklight_config
     end
   end
 end

data/app/controllers/concerns/spotlight/controller.rb

@@ -26,8 +26,8 @@ module Spotlight
                       nil
                     elsif current_exhibit
                       current_exhibit.masthead if exhibit_masthead?
-                    else
-                      current_site.masthead if current_site.masthead && current_site.masthead.display?
+                    elsif current_site.masthead && current_site.masthead.display?
+                      current_site.masthead
                     end
     end
 
@@ -82,14 +82,9 @@ module Spotlight
 
     def exhibit_search_facet_url(*args)
       options = args.extract_options!
-      only_path = options[:only_path]
       options = params.merge(options).except(:exhibit_id, :only_path)
 
-      if only_path
-        spotlight.exhibit_catalog_facet_url(current_exhibit, *args, options)
-      else
-        spotlight.exhibit_catalog_facet_url(current_exhibit, *args, options)
-      end
+      spotlight.exhibit_catalog_facet_url(current_exhibit, *args, options)
     end
   end
 end

data/app/controllers/spotlight/about_pages_controller.rb

@@ -40,7 +40,7 @@ module Spotlight
       if action_name == 'edit'
         add_breadcrumb t(:'spotlight.pages.index.about_pages.header'), exhibit_about_pages_path(@exhibit)
       else
-        add_breadcrumb((@exhibit.main_navigations.about.label_or_default), [@exhibit, @exhibit.main_about_page])
+        add_breadcrumb(@exhibit.main_navigations.about.label_or_default, [@exhibit, @exhibit.main_about_page])
       end
     end
 

data/app/controllers/spotlight/browse_controller.rb

@@ -40,7 +40,7 @@ module Spotlight
 
     def attach_breadcrumbs
       add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb((@exhibit.main_navigations.browse.label_or_default), exhibit_browse_index_path(@exhibit))
+      add_breadcrumb(@exhibit.main_navigations.browse.label_or_default, exhibit_browse_index_path(@exhibit))
     end
 
     def _prefixes

data/app/controllers/spotlight/home_pages_controller.rb

@@ -31,8 +31,8 @@ module Spotlight
 
     private
 
-    alias_method :search_action_url, :exhibit_search_action_url
-    alias_method :search_facet_url, :exhibit_search_facet_url
+    alias search_action_url exhibit_search_action_url
+    alias search_facet_url exhibit_search_facet_url
 
     def allowed_page_params
       super.concat [:display_title, :display_sidebar]

data/app/controllers/spotlight/pages_controller.rb

@@ -126,7 +126,7 @@ module Spotlight
       @human_name ||= page_collection_name.humanize
     end
 
-    alias_method :page_collection_name, :controller_name
+    alias page_collection_name controller_name
 
     def attach_breadcrumbs
       if view_context.current_page? '/'

data/app/controllers/spotlight/roles_controller.rb

@@ -21,8 +21,6 @@ module Spotlight
     def update_all
       authorize_nested_attributes! exhibit_params[:roles_attributes], Role
 
-      any_deleted = exhibit_params[:roles_attributes].values.any? { |item| item['_destroy'].present? }
-
       if @exhibit.update(exhibit_params)
         notice = any_deleted ? t(:'helpers.submit.role.destroyed') : t(:'helpers.submit.role.updated')
         redirect_to exhibit_roles_path(@exhibit), notice: notice
@@ -38,6 +36,12 @@ module Spotlight
       params.require(:exhibit).permit(roles_attributes: [:id, :user_key, :role, :_destroy])
     end
 
+    def any_deleted
+      exhibit_params[:roles_attributes].values.any? do |item|
+        item['_destroy'].present? && item['_destroy'] != 'false'
+      end
+    end
+
     # When nested attributes are passed in, ensure we have authorization to update each row.
     # @param attr [Hash,Array] the nested attributes
     # @param klass [Class] the class that is getting created

data/app/controllers/spotlight/sites_controller.rb

@@ -21,6 +21,14 @@ module Spotlight
       end
     end
 
+    def tags
+      authorize! :tag, @site
+
+      respond_to do |format|
+        format.json { render json: Spotlight::Exhibit.all_tags.map(&:name) }
+      end
+    end
+
     private
 
     def load_site

data/app/helpers/spotlight/application_helper.rb

@@ -155,8 +155,7 @@ module Spotlight
     private
 
     def main_app_url_helper?(method)
-      (method.to_s.end_with?('_path') || method.to_s.end_with?('_url')) &&
-        main_app.respond_to?(method)
+      method.to_s.end_with?('_path', '_url') && main_app.respond_to?(method)
     end
   end
 end

data/app/helpers/spotlight/search_configurations_helper.rb

@@ -11,9 +11,9 @@ module Spotlight
       sort_description ||= sort_config[:sort].split(',').map do |sort|
         sort_field, sort_order = sort.split(' ')
         safe_join([
-          t(:"spotlight.search_configurations.sort.keys.#{sort_field.strip}", default: sort_field.humanize.downcase),
-          t(:"spotlight.search_configurations.sort.keys.#{sort_order.strip}", default: '')
-        ], ' ')
+                    t(:"spotlight.search_configurations.sort.keys.#{sort_field.strip}", default: sort_field.humanize.downcase),
+                    t(:"spotlight.search_configurations.sort.keys.#{sort_order.strip}", default: '')
+                  ], ' ')
       end.to_sentence if sort_config[:sort]
 
       sort_description

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

@@ -93,7 +93,7 @@ module Spotlight
     end
 
     def private?(exhibit)
-      !(public?(exhibit))
+      !public?(exhibit)
     end
 
     def public?(exhibit)

data/app/models/spotlight/field_metadata.rb

@@ -61,6 +61,6 @@ module Spotlight
       blacklight_config.facet_fields.reject { |_k, v| v.pivot || v.query }
     end
 
-    alias_method :current_exhibit, :exhibit
+    alias current_exhibit exhibit
   end
 end

data/app/models/spotlight/home_page.rb

@@ -8,6 +8,12 @@ module Spotlight
     before_save :publish
     before_create :default_content
 
+    class << self
+      def default_title_text
+        I18n.t('spotlight.pages.index.home_pages.title')
+      end
+    end
+
     def should_display_title?
       display_title?
     end
@@ -18,10 +24,6 @@ module Spotlight
 
     private
 
-    def self.default_title_text
-      I18n.t('spotlight.pages.index.home_pages.title')
-    end
-
     def publish
       self.published = true
     end

data/app/models/spotlight/page.rb

@@ -43,7 +43,7 @@ module Spotlight
     def content?
       self[:content].present? && content.present?
     end
-    alias_method :has_content?, :content?
+    alias has_content? content?
 
     def display_sidebar?
       true

data/app/models/spotlight/resources/upload.rb

@@ -52,11 +52,11 @@ module Spotlight
 
       def add_file_versions(solr_hash)
         spotlight_image_derivatives.each do |config|
-          if config[:version]
-            solr_hash[config[:field]] = url.send(config[:version]).url
-          else
-            solr_hash[config[:field]] = url.url
-          end
+          solr_hash[config[:field]] = if config[:version]
+                                        url.send(config[:version]).url
+                                      else
+                                        url.url
+                                      end
         end
       end
 

data/app/models/spotlight/role.rb

@@ -2,7 +2,7 @@ module Spotlight
   ##
   # Exhibit authorization roles
   class Role < ActiveRecord::Base
-    ROLES = %w(admin curator)
+    ROLES = %w(admin curator).freeze
     belongs_to :resource, polymorphic: true
     belongs_to :user, class_name: Spotlight::Engine.config.user_class, autosave: true
     validates :role, inclusion: { in: ROLES }

data/app/models/spotlight/search.rb

@@ -101,6 +101,6 @@ module Spotlight
       super || (title_changed? && persisted?)
     end
 
-    alias_method :current_exhibit, :exhibit
+    alias current_exhibit exhibit
   end
 end

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

@@ -4,16 +4,16 @@
   <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>
+    <li><%= link_to t(:'spotlight.sites.edit.page_title'), spotlight.edit_site_path %></li>
   <% end %>
 
   <% if can? :manange, Spotlight::Exhibit %>
-    <li><%= link_to t(:'spotlight.sites.edit_exhibits.section'), spotlight.edit_site_exhibits_path %></li>
-    <li><%= link_to t(:'spotlight.admin_users.index.section'), spotlight.admin_users_path %></li>
+    <li><%= link_to t(:'spotlight.sites.edit_exhibits.page_title'), spotlight.edit_site_exhibits_path %></li>
+    <li><%= link_to t(:'spotlight.admin_users.index.page_title'), spotlight.admin_users_path %></li>
   <% end %>
 </ul>
 
 <ul class="nav sidenav nav-pills nav-stacked">
-  <li><%= link_to t('.create_exhibit'), new_exhibit_path, class: 'btn btn-default btn-nav', role: 'button' if can? :create, Spotlight::Exhibit %></li>
+  <li><%= link_to t(:'spotlight.sites.new.page_title'), new_exhibit_path, class: 'btn btn-default btn-nav', role: 'button' if can? :create, Spotlight::Exhibit %></li>
 </ul>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= bootstrap_form_for @exhibit, url: ((spotlight.exhibit_path(@exhibit) if @exhibit.persisted?) || spotlight.exhibits_path), layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10', html: {class: "row"} do |f| %>
+<%= bootstrap_form_for @exhibit, url: ((spotlight.exhibit_path(@exhibit) if @exhibit.persisted?) || spotlight.exhibits_path), layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
 <div class="row col-md-12">
   <%= f.text_field :title, label: t(:'.fields.title.label'), help: t(:'.fields.title.help_block') %>
   <%= f.text_field :slug, label: t(:'.fields.slug.label'), help: t(:'.fields.slug.help_block') %>

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

@@ -1,11 +1,13 @@
 <% if tags.any? %>
 <div class="row">
-  <ul class="nav nav-pills col-md-10 col-md-offset-1 tags">
-    <li class="<%= 'active' if params[:tag].blank? %>"><%= link_to t('.all'), exhibits_path %></li>
+  <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>
 
-    <% 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>
+      <% 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>
 <% end %>

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

@@ -1,4 +1,8 @@
 <div id="content" class="col-md-9 exhibit-admin">
-<%= configuration_page_title %>
+<%= page_title t(:'spotlight.sites.new.section') %>
 <%= render 'new_exhibit_form' %>
 </div>
+
+<aside class="col-md-3">
+  <%= render "shared/site_sidebar" %>
+</aside>

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

@@ -1,7 +1,7 @@
 <div id="content" class="col-md-9 exhibit-admin">
   <%= page_title(t('.section'), t('.page_title')) %>
   <div role="tabpanel">
-    <%= bootstrap_form_for @site, url: spotlight.site_path, layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10', html: {class: "row"} do |f| %>
+    <%= bootstrap_form_for @site, url: spotlight.site_path, layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
       <ul class="nav nav-tabs" role="tablist">
         <li role="presentation" class="active">
           <a href="#basic" aria-controls="basic" role="tab" data-toggle="tab"><%= t(:'.basic_settings.heading') %></a>

data/config/locales/spotlight.en.yml

@@ -125,15 +125,15 @@ en:
         header: "Settings"
     admin_users:
       create:
-        success: Added user as exhibts adminstrator
+        success: Added user as an exhibits adminstrator
         error: There was a problem adding the user as an exhibits adminstrator
       destroy:
         success: User removed from site adminstrator role
         error: There was a problem removing the user from the site adminstrator role
       index:
-        section: Manage users
-        page_title: Exhibits administrators
-        instructions: Existing exhibit administrators
+        section: Manage exhibits
+        page_title: Manage administrators
+        instructions: Existing exhibits administrators
         add: Add new administrator
         destroy: Remove from role
         save: Add role
@@ -493,7 +493,7 @@ en:
             header: "Cropped image"
             help: >
               Adjust the cropping box to cover the area of the image you want to use
-              as the thumbnail image. Click "Save Changes" to save the cropped area.
+              as the thumbnail image. Click "Save changes" to save the cropped area.
       upload_form: *featured_images_form
 
     resources:
@@ -543,9 +543,12 @@ en:
         role: "Role"
         actions: "Actions"
     sites:
+      new:
+        section: Manage exhibits
+        page_title: Create a new exhibit
       edit:
-        section: Customize appearance
-        page_title: Exhibits landing page
+        section: Manage exhibits
+        page_title: Customize appearance
         basic_settings:
           heading: Title
         site_masthead:
@@ -558,7 +561,7 @@ en:
               You can crop larger images using the cropping tool below.
       edit_exhibits:
         section: Manage exhibits
-        page_title: Existing exhibits
+        page_title: Order exhibits
         instructions: Drag and drop the exhibits below to specify the order in which they are displayed on the exhibits homepage.
     searches: &search
       nav_link: "Browse"

data/config/routes.rb

@@ -13,9 +13,13 @@ Spotlight::Engine.routes.draw do
     end
   end
 
-  get '/edit' => 'sites#edit', as: :edit_site
-  get '/exhibits/edit' => 'sites#edit_exhibits', as: :edit_site_exhibits
-  patch '/edit' => 'sites#update', as: :site
+  resource :site, only: [:edit, :update] do
+    collection do
+      get '/tags', to: 'sites#tags'
+    end
+  end
+
+  get '/exhibits/edit', to: 'sites#edit_exhibits', as: 'edit_site_exhibits'
 
   resources :admin_users, only: [:index, :create, :destroy], concerns: [:user_existable, :user_invitable]
 

data/db/migrate/20151217211019_create_spotlight_exhibit_filters.rb

@@ -3,7 +3,7 @@ class CreateSpotlightExhibitFilters < ActiveRecord::Migration
     create_table :spotlight_filters do |t|
       t.string :field
       t.string :value
-      t.references :exhibit, index: true, foreign_key: true
+      t.references :exhibit, index: true
 
       t.timestamps null: false
     end

data/lib/generators/spotlight/templates/jetty.rake

@@ -5,7 +5,7 @@ begin
     desc "Copies the application's solr config into jetty"
     task configure_solr: ['jetty:clean'] do
       FileList['solr_conf/conf/*'].each do |f|
-        cp("#{f}", 'jetty/solr/blacklight-core/conf/', verbose: true)
+        cp(f.to_s, 'jetty/solr/blacklight-core/conf/', verbose: true)
       end
     end
   end

data/lib/spotlight/version.rb

@@ -1,4 +1,4 @@
 #
 module Spotlight
-  VERSION = '0.16.0'
+  VERSION = '0.17.0'.freeze
 end

data/spec/controllers/spotlight/sites_controller_spec.rb

@@ -44,5 +44,17 @@ describe Spotlight::SitesController, type: :controller do
         expect(exhibit_a.reload.weight).to eq 5
       end
     end
+
+    describe 'GET tags' do
+      let!(:exhibit_a) { FactoryGirl.create(:exhibit, tag_list: 'a') }
+
+      it 'serializes the exhibit-level tags' do
+        get :tags, format: 'json'
+        expect(response).to be_successful
+        data = JSON.parse(response.body)
+
+        expect(data).to include 'a'
+      end
+    end
   end
 end

data/spec/features/create_exhibit_spec.rb

@@ -12,7 +12,7 @@ describe 'Create a new exhibit', type: :feature do
     within '.dropdown-menu' do
       click_link 'Create Exhibit'
     end
-    expect(page).to have_selector 'h1', text: 'Configuration'
+    expect(page).to have_selector 'h1', text: 'Manage exhibits'
     expect(page).to have_selector 'h1 small', text: 'Create a new exhibit'
   end
 

data/spec/features/edit_search_fields_spec.rb

@@ -54,7 +54,7 @@ describe 'Search Administration', type: :feature do
 
         # #field_labeled doesn't appear to work for disabled inputs
         expect(page).to have_css("input[name='blacklight_configuration[sort_fields][relevance][enable]'][disabled='disabled']")
-        expect(page).to have_css('#nested-sort-fields .dd-item:nth-child(5) h3', text: 'Identifier')
+        expect(page).to have_css('#nested-sort-fields .dd-item:nth-child(5) h3', text: 'Date (new to old)')
 
         uncheck 'blacklight_configuration_sort_fields_title_enabled'
         uncheck 'blacklight_configuration_sort_fields_identifier_enabled'

data/spec/features/javascript/roles_admin_spec.rb

@@ -22,6 +22,18 @@ describe 'Roles Admin', type: :feature, js: true do
     expect(page).to have_css('input[disabled]')
   end
 
+  it 'has the appropriate status message when an existing user is added' do
+    second_user = FactoryGirl.create(:site_admin)
+
+    click_link 'Add a new user'
+    fill_in 'User key', with: second_user.email
+
+    click_button 'Save changes'
+
+    expect(page).to have_css('.alert-info', text: 'User has been updated.')
+    expect(page).to have_css('.table.users td', text: second_user.email)
+  end
+
   it 'persists invited users to the exhibits user list' do
     expect(page).not_to have_css('.label-warning pending-label', text: 'pending', visible: true)
 

data/spec/features/site_admin_management_spec.rb

@@ -20,7 +20,7 @@ describe 'Site admin management', js: true do
     fill_in 'user_email', with: existing_user.email
     click_button 'Add role'
 
-    expect(page).to have_content('Added user as exhibts adminstrator')
+    expect(page).to have_content('Added user as an exhibits adminstrator')
     expect(page).to have_css('td', text: existing_user.email)
   end
 

data/spec/helpers/spotlight/application_helper_spec.rb

@@ -43,7 +43,7 @@ describe Spotlight::ApplicationHelper, type: :helper do
     it 'is a url for a search with the given tag facet' do
       allow(SolrDocument).to receive_messages(solr_field_for_tagger: :exhibit_tags)
       expected = spotlight.exhibit_catalog_index_path(exhibit_id: helper.current_exhibit, f: { exhibit_tags: ['tag_value'] })
-      expect(helper.url_to_tag_facet 'tag_value').to eq expected
+      expect(helper.url_to_tag_facet('tag_value')).to eq expected
     end
   end
 

data/spec/models/spotlight/blacklight_configuration_spec.rb

@@ -452,9 +452,9 @@ describe Spotlight::BlacklightConfiguration, type: :model do
   describe '#custom_index_fields' do
     it 'converts exhibit-specific fields to Blacklight configurations' do
       allow(subject.exhibit).to receive_messages(custom_fields: [
-        stub_model(Spotlight::CustomField, field: 'abc', configuration: { a: 1 }, exhibit: subject.exhibit),
-        stub_model(Spotlight::CustomField, field: 'xyz', configuration: { x: 2 }, exhibit: subject.exhibit)
-      ])
+                                                   stub_model(Spotlight::CustomField, field: 'abc', configuration: { a: 1 }, exhibit: subject.exhibit),
+                                                   stub_model(Spotlight::CustomField, field: 'xyz', configuration: { x: 2 }, exhibit: subject.exhibit)
+                                                 ])
 
       expect(subject.custom_index_fields).to include 'abc', 'xyz'
       expect(subject.custom_index_fields['abc']).to be_a_kind_of Blacklight::Configuration::Field

data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb

@@ -120,7 +120,7 @@ describe Spotlight::ExhibitExportSerializer do
     end
 
     it 'has sidecars' do
-      expect(SolrDocument.new(id: 1).public? subject).to be_falsey
+      expect(SolrDocument.new(id: 1).public?(subject)).to be_falsey
     end
 
     context 'for an exhibit with contacts' do

data/spec/spec_helper.rb

@@ -51,11 +51,11 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = false
 
   config.before :each do
-    if Capybara.current_driver == :rack_test
-      DatabaseCleaner.strategy = :transaction
-    else
-      DatabaseCleaner.strategy = :truncation
-    end
+    DatabaseCleaner.strategy = if Capybara.current_driver == :rack_test
+                                 :transaction
+                               else
+                                 :truncation
+                               end
     DatabaseCleaner.start
 
     # The first user is automatically granted admin privileges; we don't want that behavior for many of our tests

data/spec/test_app_templates/catalog_controller.rb

@@ -92,8 +92,8 @@ class CatalogController < ApplicationController
     config.add_sort_field 'relevance', sort: 'score desc, sort_title_ssi asc', label: 'Relevance'
     config.add_sort_field 'title', sort: 'sort_title_ssi asc', label: 'Title'
     config.add_sort_field 'type', sort: 'sort_type_ssi asc', label: 'Type'
-    config.add_sort_field 'date', sort: 'sort_date_dtsi asc', label: 'Date (old to new)'
     config.add_sort_field 'source', sort: 'sort_source_ssi asc', label: 'Source'
     config.add_sort_field 'identifier', sort: 'id asc', label: 'Identifier'
+    config.add_sort_field 'date', sort: 'sort_date_dtsi desc', label: 'Date (new to old)'
   end
 end

data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb

@@ -8,10 +8,10 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb',
 
   before do
     allow(block).to receive(:each_document).and_return([
-      [{}, SolrDocument.new(id: 1)],
-      [{}, SolrDocument.new(id: 2)],
-      [{}, SolrDocument.new(id: 3)]
-    ])
+                                                         [{}, SolrDocument.new(id: 1)],
+                                                         [{}, SolrDocument.new(id: 2)],
+                                                         [{}, SolrDocument.new(id: 3)]
+                                                       ])
     allow(block).to receive_messages(documents?: true)
     allow(view).to receive_messages(solr_documents_carousel_block: block)
     allow(view).to receive_messages(has_thumbnail?: true, render_thumbnail_tag: 'thumb')

data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb

@@ -9,10 +9,10 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb', type
 
   before do
     allow(block).to receive(:each_document).and_return([
-      [{}, SolrDocument.new(id: 1)],
-      [{}, SolrDocument.new(id: 2)],
-      [{}, SolrDocument.new(id: 3)]
-    ])
+                                                         [{}, SolrDocument.new(id: 1)],
+                                                         [{}, SolrDocument.new(id: 2)],
+                                                         [{}, SolrDocument.new(id: 3)]
+                                                       ])
   end
 
   before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -407,16 +407,16 @@ dependencies:
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -549,14 +549,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.36'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.36'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -1375,7 +1375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections