blacklight-spotlight 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 136e58b1c7ddacee60a975326d3b482f88a19bb6
-  data.tar.gz: 607da59315b2155874802b87f117b940f358abc7
+  metadata.gz: d51b05fb4abe823ca225314173cd629c12a963ec
+  data.tar.gz: 8ee0d3c095e06d42de53f10f2041c929948192be
 SHA512:
-  metadata.gz: 531b33a80abda0a690e4120bcb4776bbadfe7bc4bba9d23a2e39f5878749547877a07b1a162596da47a8ca476a158215367d73e667ef226cf12bd6cdd97bf455
-  data.tar.gz: 9bfe3194807b9b227d768a63da611409f317a7d8e9e92b5e225ef0c6585e5d5ca9e640198066feea688903f5d8f36e85775ad45e2f1bb04c9c896641bfa2229a
+  metadata.gz: 9dba2d6f177687cba357fdee4948c3af932983c4c8c2c16b8371ea8ccc6ec42778ac952083255a1d5cc891e465597736a7fa09fb58ead53f620540267892408d
+  data.tar.gz: 28a1090a7a5aaa46f12eed7a9e11f994b7f48ca1ec2fa4bb102d7ba0c18dbc9f056f6da8b3ac0bc585c4d56b257591d8525ac313e50e171775dd72f861abb459

data/app/assets/javascripts/spotlight/application.js

@@ -22,5 +22,6 @@
 //= require bootstrap/carousel
 //= require bootstrap-tagsinput
 //= require jquery.serializejson
+//= require clipboard
 
 //= require_tree .

data/app/assets/javascripts/spotlight/copy_email_addresses.js

@@ -0,0 +1,9 @@
+(function($) {
+    $.fn.copyEmailAddresses = function( options ) {
+        var clip = new Clipboard('.copy-email-addresses');
+    };
+})( jQuery );
+
+Spotlight.onLoad(function() {
+    $('.copy-email-addresses').copyEmailAddresses();
+});

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

@@ -82,7 +82,7 @@ module Spotlight
 
     def exhibit_search_facet_url(*args)
       options = args.extract_options!
-      options = params.to_unsafe_h.merge(options).except(:exhibit_id, :only_path)
+      options = Blacklight::Parameters.sanitize(params.to_unsafe_h.with_indifferent_access).merge(options).except(:exhibit_id, :only_path)
       spotlight.facet_exhibit_catalog_url(current_exhibit, *args, options)
     end
   end

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

@@ -7,6 +7,8 @@ module Spotlight
       has_many :roles, class_name: 'Spotlight::Role', dependent: :destroy
       has_many :exhibits, class_name: 'Spotlight::Exhibit', through: :roles, source: 'resource', source_type: 'Spotlight::Exhibit'
 
+      scope :with_roles, -> { where(id: Spotlight::Role.uniq.pluck(:user_id)) }
+
       before_create :add_default_roles
     end
 

data/app/models/spotlight/reindex_progress.rb

@@ -17,7 +17,11 @@ module Spotlight
     def started_at
       return unless resources.present?
 
-      @started ||= resources.select(&:enqueued_at?).min_by(&:enqueued_at).enqueued_at
+      enqueued_resources = resources.select(&:enqueued_at?)
+
+      return unless enqueued_resources.any?
+
+      @started ||= enqueued_resources.min_by(&:enqueued_at).enqueued_at
     end
 
     def updated_at

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

@@ -50,6 +50,16 @@
       </div>
     </div>
   <% end %>
+
+  <p class="instructions"><%= t :'.all_users' %></p>
+  <div id="all_users" class="well well-sm">
+      <div class='btn-toolbar pull-right'>
+          <button class="btn btn-xs btn-default copy-email-addresses" data-clipboard-target="#all_users">
+              Copy
+          </button>
+      </div>
+      <%= Spotlight::Engine.user_class.with_roles.pluck(:email).sort.join(', ') %>
+  </div>
 </div>
 
 <aside class="col-md-3">

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

@@ -1,7 +1,7 @@
 <%= f.form_group :document_index_view_types, label: {text: t(:'.label')} do %>
   <%= f.fields_for :document_index_view_types, @blacklight_configuration.document_index_view_types_selected_hash do |vt| %>
     <% @blacklight_configuration.default_blacklight_config.view.select { |_k, v| v.if != false }.keys.each do |key| %>
-      <%= vt.check_box key %>
+      <%= vt.check_box key, label: view_label(key) %>
     <% end %>
   <% end %>
 <% end %>

data/config/locales/spotlight.en.yml

@@ -136,6 +136,8 @@ en:
         section: Manage exhibits
         page_title: Manage administrators
         instructions: Existing exhibits administrators
+        all_users: Administrators and curators of all exhibits
+        copy: Copy
         add: Add new administrator
         destroy: Remove from role
         save: Add role

data/lib/spotlight/engine.rb

@@ -10,6 +10,7 @@ require 'autoprefixer-rails'
 require 'friendly_id'
 require 'tophat'
 require 'paper_trail'
+require 'clipboard/rails'
 
 module Spotlight
   ##

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = '0.22.0'.freeze
+  VERSION = '0.23.0'.freeze
 end

data/spec/features/javascript/reindex_monitor_spec.rb

@@ -1,11 +1,12 @@
 feature 'Reindex Monitor', js: true do
   let(:resources) do
-    [FactoryGirl.create(:resource, updated_at: Time.zone.now, index_status: 1)]
+    [FactoryGirl.create(:resource)]
   end
   let(:exhibit) { FactoryGirl.create(:exhibit, resources: resources) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
 
   before do
+    resources.each(&:waiting!)
     login_as exhibit_curator
     visit spotlight.admin_exhibit_catalog_path(exhibit)
   end

data/spec/features/site_admin_management_spec.rb

@@ -1,6 +1,8 @@
 describe 'Site admin management', js: true do
   let(:user) { FactoryGirl.create(:site_admin) }
-  let(:existing_user) { FactoryGirl.create(:exhibit_visitor) }
+  let!(:existing_user) { FactoryGirl.create(:exhibit_visitor) }
+  let!(:exhibit_admin) { FactoryGirl.create(:exhibit_admin) }
+  let!(:exhibit_curator) { FactoryGirl.create(:exhibit_curator) }
 
   before do
     login_as(user)
@@ -11,6 +13,16 @@ describe 'Site admin management', js: true do
     expect(page).to have_css('td', text: user.email)
   end
 
+  describe 'copy email addresses' do
+    it 'displays only email addresses of users w/ roles' do
+      expect(page).to have_css('div#all_users', text: user.email)
+      expect(page).to have_css('div#all_users', text: exhibit_admin.email)
+      expect(page).to have_css('div#all_users', text: exhibit_curator.email)
+      expect(page).not_to have_css('div#all_users', text: existing_user.email)
+      expect(page).to have_css('button.copy-email-addresses')
+    end
+  end
+
   it 'allows for existing users to be added as site adminstrators' do
     expect(page).not_to have_css('td', text: existing_user.email)
     click_link 'Add new administrator'

data/spec/lib/spotlight/controller_spec.rb

@@ -6,8 +6,10 @@ describe Spotlight::Controller do
 
   subject { MockController.new }
 
+  let(:params) { { action: 'show' } }
+
   before do
-    allow(subject).to receive_messages(params: { action: 'show' })
+    allow(subject).to receive_messages(params: ActionController::Parameters.new(params))
   end
 
   describe '#current_exhibit' do
@@ -82,4 +84,17 @@ describe Spotlight::Controller do
       expect(subject.resource_masthead?).to eq false
     end
   end
+
+  describe '#exhibit_search_facet_url' do
+    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:params) { { action: 'index', q: 'xyz' } }
+
+    before do
+      allow(subject).to receive(:current_exhibit).and_return(exhibit)
+    end
+    it 'adds the current exhibit context to the route' do
+      expect(subject.spotlight).to receive(:facet_exhibit_catalog_url).with(exhibit, id: 'some_field', q: 'xyz')
+      subject.exhibit_search_facet_url(id: 'some_field')
+    end
+  end
 end

data/spec/models/spotlight/reindex_progress_spec.rb

@@ -81,6 +81,14 @@ describe Spotlight::ReindexProgress, type: :model do
     it 'is included in the json as a localized string' do
       expect(json['started_at']).to eq I18n.l(start_time, format: :short)
     end
+
+    context 'with unqueued resources' do
+      subject { described_class.new(Spotlight::Resource.where(id: new_resource.id)) }
+
+      it 'returns the indexed_at attribute of the first resource' do
+        expect(subject.started_at).to be_nil
+      end
+    end
   end
 
   describe '#updated_at' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -431,6 +431,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: clipboard-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -747,6 +761,7 @@ files:
 - app/assets/javascripts/spotlight/catalog_edit.js
 - app/assets/javascripts/spotlight/check_user_existence.js
 - app/assets/javascripts/spotlight/compat.js
+- app/assets/javascripts/spotlight/copy_email_addresses.js
 - app/assets/javascripts/spotlight/croppable.js
 - app/assets/javascripts/spotlight/edit_in_place.js
 - app/assets/javascripts/spotlight/exhibits.js