blacklight-spotlight 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a0bdc363611ae794c9f8538a86d7c183e6106fd
-  data.tar.gz: 6eaa6b1112ae5187727f5d55fe8cc8dafd80aa66
+  metadata.gz: 5017845fee1b7aec23f0ca3defacc0f32ad5ee02
+  data.tar.gz: 0f84e6b1bac2250f6125a7d299718127b596ee40
 SHA512:
-  metadata.gz: 076a0d3486082869865b4adbf54613ed42022236890d6c2b60dcd979a65dbc1b4bb61a5294047c2c31d8f424a3d42798fc6cad267bb37016fd20d59337d10eb5
-  data.tar.gz: 67e395d6f4c102f7549ca82a54f862d0bd97f252e6c0040a48f8577b67ed91ca9cb3a2b2fc39e6b86add8903e10c1e695dc30c445a6f5fbcc9b418d98fe698aa
+  metadata.gz: fd56e28a84ec7f003693cce1c62252986002d850bad13745adc812e55faa288983f28c4cdc2bdcb2de3a1ba6d6f8f3b7ca31e161d54e55a621c8eb5faa86b611
+  data.tar.gz: 43163422ed9ae1d38cd4a8b56786effebfc3d3e7a6e9f94a28ee99ef98b756efe5a87417f1d7c6ef0e02f86c8d790de0d4606678bde06034281164c6a548a698

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

@@ -0,0 +1,18 @@
+.btn.collapse-toggle {
+  // adjust as needed, taken from bootstrap.css glyphicons
+  &:after {
+    // symbol for "opening" panels
+    color: $text-muted;
+    content: "\e114"; // chevron down
+    float: right;
+    font-family: "Glyphicons Halflings";
+    font-size: 0.8em;
+    line-height: 2em;
+    padding-left: 1ch;
+  }
+
+  &.collapsed:after {
+    // symbol for "collapsed" panels
+    content: "\e080"; //chevron right
+  }
+}

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

@@ -42,19 +42,25 @@
     display: inline-block;
     padding-top: 0;
   }
-}
 
-.panel-heading {
   .publish-control {
     display: inline;
     .checkbox {
       padding-top: 0;
     }
   }
+
   .main {
     display: inline-block;
     vertical-align: text-bottom;
   }
+
+  .btn-link.collapse-toggle {
+    // removing padding and margins to style this button as a simple link
+    // with the expected vertical alignment with the rest of the header.
+    margin: 0;
+    padding: 0;
+  }
 }
 
 .panel-heading.page {

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

@@ -29,6 +29,7 @@
 @import "spotlight/blacklight_overrides";
 @import "spotlight/report_a_problem";
 @import "spotlight/exhibits_index";
+@import "spotlight/collapse_toggle";
 
 
 

data/app/controllers/spotlight/search_configurations_controller.rb

@@ -47,7 +47,7 @@ module Spotlight
 
     def exhibit_configuration_facet_params
       @blacklight_configuration.blacklight_config.facet_fields.keys.each_with_object({}) do |element, result|
-        result[element] = [:show, :label, :weight]
+        result[element] = [:show, :label, :weight, :sort]
       end
     end
 

data/app/helpers/spotlight/jcrop_helper.rb

@@ -15,15 +15,23 @@ module Spotlight
     end
 
     def default_thumbnail_jcrop_options
+      w, h = Spotlight::Engine.config.featured_image_thumb_size
+
       {
         croppable: true,
         selector: 'featuredimage_image',
         bg_color: 'black',
         bg_opacity: '.4',
         box_width: '600',
-        aspect_ratio: 4.0 / 3.0,
+        aspect_ratio: w.to_f / h.to_f,
         initial_set_select: '[0, 0, 100000, 100000]'
       }
     end
+
+    def default_site_thumbnail_jcrop_options
+      w, h = Spotlight::Engine.config.featured_image_square_size
+
+      default_thumbnail_jcrop_options.merge(aspect_ratio: w.to_f / h.to_f)
+    end
   end
 end

data/app/uploaders/spotlight/featured_image_uploader.rb

@@ -11,7 +11,11 @@ module Spotlight
     end
 
     version :thumb, from_version: :cropped do
-      process resize_to_fill: [400, 300]
+      process resize_to_fill: Spotlight::Engine.config.featured_image_thumb_size
+    end
+
+    version :square, from_version: :cropped do
+      process resize_to_fill: Spotlight::Engine.config.featured_image_square_size
     end
 
     def store_dir

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

@@ -39,7 +39,7 @@
       <div role="tabpanel" class="tab-pane" id="site-thumbnail">
         <p class="instructions"><%= t(:'.site_thumbnail.help') %></p>
         <%= f.fields_for(:thumbnail, current_exhibit.thumbnail || current_exhibit.build_thumbnail) do |m| %>
-          <%= render '/spotlight/featured_images/form', f: m, jcrop_options: default_thumbnail_jcrop_options %>
+          <%= render '/spotlight/featured_images/form', f: m, jcrop_options: default_site_thumbnail_jcrop_options %>
         <% end %>
       </div>
 

data/app/views/spotlight/catalog/_status_header.html.erb

@@ -0,0 +1,19 @@
+<div class="panel panel-info index-status">
+  <div class="panel-heading">
+    <h3 class="panel-title">Reindexing status</h3>
+  </div>
+  <div class="panel-body">
+    <p>
+      <span class="text-muted">2015-11-24 at 10:53 am:</span> Began reindexing a total of 55 items.
+    </p>
+    <p>
+      <span class="text-muted">2015-11-24 at 11:04 am:</span> Reindexed 32 of 55 items.
+    </p>
+
+    <div class="progress">
+      <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="58" aria-valuemin="0" aria-valuemax="100" style="width: 58%">58%
+        <span class="sr-only">Reindexing 58% complete</span>
+      </div>
+    </div>
+  </div> 
+</div>

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

@@ -1,7 +1,7 @@
 <div class="col-xs-12 col-sm-4 exhibit-card">
   <div class="flipper">
     <div class="card-front card-face">
-      <%= image_tag(exhibit.thumbnail.image.cropped.url) if exhibit.thumbnail.present? %>
+      <%= image_tag(exhibit.thumbnail.image.square.url) if exhibit.thumbnail.present? %>
       <h2 class="card-title"><%= exhibit.title %></h2>
     </div>
     <div class="card-back card-face">

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

@@ -12,7 +12,7 @@
                 <%= facet.hidden_field :weight, 'data-property' => 'weight' %>
                 <%= facet.check_box :show, checked: config.show, label: "", title: key %>
                 <div class="main row">
-                  <div class="col-sm-7">
+                  <div class="col-sm-5">
                     <h3 class="panel-title" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
                       <a href="#edit-in-place" class="field-label edit-in-place"><%= facet_field_label(key) %></a>
                       <%= facet.hidden_field :label, value: facet_field_label(key), class: 'form-control input-sm', data: {:"edit-field-target" => 'true'} %>
@@ -27,6 +27,19 @@
                       <% end %>
                     <% end %>
                   </div>
+                  <div class="col-sm-2 pull-right">
+                    <a class="btn btn-link collapse-toggle collapsed" role="button" data-toggle="collapse" href="#<%= key.parameterize %>_facet_options" aria-expanded="false" aria-controls="<%= key.parameterize %>_facet_options">
+                      Options
+                    </a>
+                  </div>
+                </div>
+                <div id="<%= key.parameterize %>_facet_options" class="options row collapse">
+                  <div class="col-sm-12">
+                    <%= facet.form_group :terms, label_col: 'col-md-2', label: { text: t(:'.sort_by.label') } do %>
+                      <%= facet.radio_button :sort, 'count', label: t(:'.sort_by.count'), inline: true, checked: (config.sort.to_s == 'count' || config.sort.nil?) %>
+                      <%= facet.radio_button :sort, 'index', label: t(:'.sort_by.index'), inline: true, checked: (config.sort.to_s == 'index') %>
+                    <% end %>
+                  </div>
                 </div>
               </div>
             </div>

data/config/locales/spotlight.en.yml

@@ -186,6 +186,10 @@ en:
         value_count:
           one: "%{count} unique value"
           other: "%{count} unique values"
+        sort_by:
+          label: "Sort by:"
+          count: Frequency
+          index: Value
       sort:
         header: "Sort fields"
         help: >

data/db/migrate/20151204093112_add_reindexing_flag_to_spotlight_resources.rb

@@ -0,0 +1,5 @@
+class AddReindexingFlagToSpotlightResources < ActiveRecord::Migration
+  def up
+    add_column :spotlight_resources, :reindexing, :boolean
+  end
+end

data/lib/spotlight/engine.rb

@@ -91,6 +91,8 @@ module Spotlight
 
     # Configure the CarrierWave file storage mechanism
     Spotlight::Engine.config.uploader_storage = :file
+    Spotlight::Engine.config.featured_image_thumb_size = [400, 300]
+    Spotlight::Engine.config.featured_image_square_size = [400, 400]
 
     initializer 'spotlight-assets.initialize' do
       Rails.application.config.assets.precompile += %w( Jcrop.gif )

data/lib/spotlight/version.rb

@@ -1,4 +1,4 @@
 #
 module Spotlight
-  VERSION = '0.10.3'
+  VERSION = '0.11.0'
 end

data/lib/tasks/spotlight_tasks.rake

@@ -50,8 +50,6 @@ namespace :spotlight do
     exhibit.save!
 
     exhibit.reindex_later
-
-    puts Spotlight::ExhibitExportSerializer.new(exhibit.reload).to_json
   end
 
   desc 'Export an exhibit as JSON'

data/spec/features/javascript/search_config_admin_spec.rb

@@ -82,6 +82,25 @@ feature 'Search Configuration Administration', js: true do
       expect(page).not_to have_content('Genre')
       expect(page).to have_content('Topic')
     end
+
+    it 'allows the curator to select a different facet sort order' do
+      visit spotlight.edit_exhibit_search_configuration_path(exhibit)
+      click_link 'Facets'
+
+      within '.facet-config-genre_ssim' do
+        click_link 'Options'
+        expect(find(:css, '#blacklight_configuration_facet_fields_genre_ssim_sort_count')).to be_checked
+
+        choose 'Value'
+      end
+
+      click_button 'Save changes'
+
+      expect(page).to have_content('The exhibit was successfully updated.')
+
+      exhibit.reload
+      expect(exhibit.blacklight_config.facet_fields['genre_ssim'].sort).to eq 'index'
+    end
   end
 
   describe 'results' do

data/spec/helpers/spotlight/jcrop_helper_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Spotlight::JcropHelper do
+  describe '.default_thumbnail_jcrop_options' do
+    it 'produces a 4:3 aspect ratio by default' do
+      expect(helper.default_thumbnail_jcrop_options[:aspect_ratio]).to eq 4.0 / 3.0
+    end
+
+    context 'with a custom thumbnail size' do
+      before do
+        allow(Spotlight::Engine.config).to receive(:featured_image_thumb_size).and_return([7, 5])
+      end
+
+      it 'produces a 7:5 aspect ratio' do
+        expect(helper.default_thumbnail_jcrop_options[:aspect_ratio]).to eq 7.0 / 5.0
+      end
+    end
+  end
+
+  describe '.default_site_thumbnail_jcrop_options' do
+    it 'produces a 1:1 aspect ratio by default' do
+      expect(helper.default_site_thumbnail_jcrop_options[:aspect_ratio]).to eq 1
+    end
+
+    context 'with a custom square thumbnail size' do
+      before do
+        allow(Spotlight::Engine.config).to receive(:featured_image_square_size).and_return([3, 2])
+      end
+
+      it 'produces a 3:2 aspect ratio' do
+        expect(helper.default_site_thumbnail_jcrop_options[:aspect_ratio]).to eq 3.0 / 2.0
+      end
+    end
+  end
+end

data/spec/models/spotlight/blacklight_configuration_spec.rb

@@ -68,6 +68,17 @@ describe Spotlight::BlacklightConfiguration, type: :model do
       expect(subject.blacklight_config.facet_fields.keys).to eq %w(c a b)
     end
 
+    it 'allows the facet sort to be configured' do
+      subject.facet_fields['a'] = { sort: 'count' }
+      subject.facet_fields['b'] = { sort: 'index' }
+
+      blacklight_config.add_facet_field 'a'
+      blacklight_config.add_facet_field 'b'
+
+      expect(subject.blacklight_config.facet_fields['a'].sort).to eq 'count'
+      expect(subject.blacklight_config.facet_fields['b'].sort).to eq 'index'
+    end
+
     context 'custom fields' do
       it 'includes any custom fields' do
         allow(subject).to receive_messages(custom_facet_fields: { 'a' => double(if: nil, :if= => true, merge!: true, validate!: true, normalize!: true) })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -750,6 +750,7 @@ files:
 - app/assets/stylesheets/spotlight/_bootstrap_overrides.scss
 - app/assets/stylesheets/spotlight/_browse.scss
 - app/assets/stylesheets/spotlight/_catalog.scss
+- app/assets/stylesheets/spotlight/_collapse_toggle.scss
 - app/assets/stylesheets/spotlight/_croppable.scss
 - app/assets/stylesheets/spotlight/_curation.scss
 - app/assets/stylesheets/spotlight/_edit_in_place.scss
@@ -1080,6 +1081,7 @@ files:
 - db/migrate/20151117153210_change_spotlight_exhibit_published_default.rb
 - db/migrate/20151124101123_remove_default_from_spotlight_exhibit.rb
 - db/migrate/20151124105543_update_custom_field_names.rb
+- db/migrate/20151204093112_add_reindexing_flag_to_spotlight_resources.rb
 - lib/blacklight/spotlight.rb
 - lib/generators/spotlight/install_generator.rb
 - lib/generators/spotlight/templates/catalog_controller.rb
@@ -1188,6 +1190,7 @@ files:
 - spec/helpers/spotlight/application_helper_spec.rb
 - spec/helpers/spotlight/browse_helper_spec.rb
 - spec/helpers/spotlight/crud_link_helpers_spec.rb
+- spec/helpers/spotlight/jcrop_helper_spec.rb
 - spec/helpers/spotlight/main_app_helpers_spec.rb
 - spec/helpers/spotlight/navbar_helper_spec.rb
 - spec/helpers/spotlight/pages_helper_spec.rb
@@ -1418,6 +1421,7 @@ test_files:
 - spec/helpers/spotlight/application_helper_spec.rb
 - spec/helpers/spotlight/browse_helper_spec.rb
 - spec/helpers/spotlight/crud_link_helpers_spec.rb
+- spec/helpers/spotlight/jcrop_helper_spec.rb
 - spec/helpers/spotlight/main_app_helpers_spec.rb
 - spec/helpers/spotlight/navbar_helper_spec.rb
 - spec/helpers/spotlight/pages_helper_spec.rb