blacklight-spotlight 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a47fab678bff54d54f4d4c3e9f2784b7f3333cf
-  data.tar.gz: 704d71ac8946a3f767ddf3d97347aeac8e72d91f
+  metadata.gz: a0e7cf4f1e70ba9c0eceafb312f984eaaec2f196
+  data.tar.gz: 0d312a6be60fefc15e1a01d6c46629b01368c643
 SHA512:
-  metadata.gz: baaadb1e9a1abcf1122af09b59443fd47e4673068c1c7870b852d6a65433c8d9f4652d40a49b4521fc71c0e3a861d815ad5f5ed538bb5a4256801428ee4ed070
-  data.tar.gz: 9a7537f66f35fe0b3a60159510a803c081da6e69de8ea63871215db0c469cb9df38636dae65670d1b2048bca25d09de7ad81ce1fc7690d47cbc5decc4649ff96
+  metadata.gz: ce5ec4536695fe29b7f2dc34dc346c71dfd1f84552a3b1e02fc06bb54af26ab0b4ab1d54591a1bffeb56f5d0d03092e6c841fdaa1e821731c88fd763bf5e7d1b
+  data.tar.gz: d12bb30e5e9757d7189ac856dec1e59e570adfb3f673dc48f42218d4f8277048d1e4759ad5971db2578f465e883130ac30d9339d1b688100d897d64c8b70d047

data/Rakefile

@@ -104,7 +104,7 @@ namespace :spotlight do
 
                 _, exit_status = Process.wait2(io.pid)
 
-                fail 'Failed to generate spotlight' if exit_status != 0
+                raise 'Failed to generate spotlight' if exit_status != 0
               end
             end
 

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

@@ -5,8 +5,8 @@ module Spotlight
     extend ActiveSupport::Concern
 
     def exhibit_specific_blacklight_config
-      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
+      raise "Exhibit id exists (#{params[:exhibit_id]}), but @exhibit hasn't been loaded yet" if params[:exhibit_id] && current_exhibit.nil?
+      raise 'Exhibit not found' unless current_exhibit
 
       @exhibit_specific_blacklight_config ||= current_exhibit.blacklight_config
     end

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

@@ -19,7 +19,7 @@ module Spotlight
             authenticate_user!
 
             # If that fails (and we end up back here), offer a 404 error instead
-            fail ActionController::RoutingError, 'Not Found'
+            raise ActionController::RoutingError, 'Not Found'
           else
             redirect_to main_app.root_url, alert: exception.message
           end

data/app/helpers/spotlight/title_helper.rb

@@ -20,15 +20,5 @@ module Spotlight
       @page_title = strip_tags(t(:'spotlight.html_title', title: title || t(:'.title', default: :'.header'), application_name: application_name))
     end
     # rubocop:enable Style/AccessorMethodName
-
-    def header_with_count(*args)
-      title, count = if args.length == 2
-                       args
-                     else
-                       [t(:'.header'), args.first]
-                     end
-
-      safe_join([title, content_tag(:span, count, class: 'label label-default')], ' ')
-    end
   end
 end

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

@@ -19,7 +19,7 @@ module Spotlight
     end
 
     def set_default_thumbnail
-      fail NotImplementedError
+      raise NotImplementedError
     end
   end
 end

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

@@ -38,7 +38,7 @@ module Spotlight
       {
         version: :thumb,
         field: Spotlight::Engine.config.try(:thumbnail_field),
-        lambda: lambda do|_|
+        lambda: lambda do |_|
           version :thumb do
             process resize_to_fit: [400, 400]
           end
@@ -47,7 +47,7 @@ module Spotlight
       {
         version: :square,
         field: Spotlight::Engine.config.try(:square_image_field),
-        lambda: lambda do|_|
+        lambda: lambda do |_|
           version :square do
             process resize_to_fill: [100, 100]
           end

data/app/models/spotlight/exhibit.rb

@@ -52,7 +52,7 @@ module Spotlight
                                   :main_navigations, :owned_taggings, :resources, :searches, :solr_document_sidecars
     accepts_nested_attributes_for :blacklight_configuration, :home_page, :masthead, :thumbnail, :filters, update_only: true
     accepts_nested_attributes_for :contact_emails, reject_if: proc { |attr| attr['email'].blank? }
-    accepts_nested_attributes_for :roles, allow_destroy: true, reject_if: proc { |attr| attr['user_key'].blank? }
+    accepts_nested_attributes_for :roles, allow_destroy: true, reject_if: proc { |attr| attr['user_key'].blank? && attr['id'].blank? }
 
     before_save :sanitize_description, if: :description_changed?
     include Spotlight::DefaultThumbnailable

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

@@ -1,7 +1,7 @@
 <%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
   <%= curation_page_title %>
-  <h3><%= header_with_count(t(:'.categories_header'), @searches.count) %></h3>
+  <h3><%= t(:'.categories_header') %></h3>
 
   <% if @searches.empty? %>
     <%= t :'.no_saved_searches' %>

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

@@ -1,6 +1,6 @@
 <%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
-  <%= curation_page_title(header_with_count(@tags.length)) %>
+  <%= curation_page_title t(:".header") %>
 
   <% if @tags.empty? %>
     <p><%= t :'.no_tags' %></p>

data/lib/spotlight/version.rb

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

data/spec/controllers/spotlight/roles_controller_spec.rb

@@ -16,6 +16,7 @@ describe Spotlight::RolesController, type: :controller do
 
   describe 'when user is an admin' do
     let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+    let(:user) { FactoryGirl.create(:user) }
     let(:role) { admin.roles.first }
     before { sign_in admin }
     it 'allows index' do
@@ -28,24 +29,46 @@ describe Spotlight::RolesController, type: :controller do
     end
 
     describe 'PATCH update_all' do
-      it 'is successful' do
+      it 'creates new roles' do
         patch :update_all, exhibit_id: exhibit, 'exhibit' => {
           'roles_attributes' => {
-            '0' => { 'user_key' => 'cbeer@cbeer.io', 'role' => 'curator', 'id' => role.id },
-            '1' => { 'user_key' => '', 'role' => 'admin' }
+            '0' => { 'role' => 'curator', 'user_key' => user.email }
+          }
+        }
+
+        expect(exhibit.roles.last.role).to eq 'curator'
+        expect(exhibit.roles.last.user.email).to eq user.email
+      end
+
+      it 'updates roles' do
+        patch :update_all, exhibit_id: exhibit, 'exhibit' => {
+          'roles_attributes' => {
+            '0' => { 'role' => 'curator', 'id' => role.id }
           }
         }
         expect(response).to redirect_to exhibit_roles_path(exhibit)
         expect(flash[:notice]).to eq 'User has been updated.'
-        expect(admin.reload.roles.first.role).to eq 'curator'
-        expect(admin.reload.roles.first.user.email).to eq 'cbeer@cbeer.io'
+
+        admin.reload
+
+        expect(admin.roles.first.role).to eq 'curator'
+      end
+
+      it 'ignores empty roles' do
+        expect do
+          patch :update_all, exhibit_id: exhibit, 'exhibit' => {
+            'roles_attributes' => {
+              '0' => { 'user_key' => '', 'role' => '' }
+            }
+          }
+        end.not_to change { exhibit.roles.length }
       end
 
       it 'authorizes records' do
         allow(controller).to receive(:authorize!).and_raise(CanCan::AccessDenied)
         patch :update_all, exhibit_id: exhibit, 'exhibit' => {
           'roles_attributes' => {
-            '0' => { 'user_key' => 'cbeer@cbeer.info', 'role' => 'curator', 'id' => role.id }
+            '0' => { 'role' => 'curator', 'id' => role.id }
           }
         }
         expect(response).to redirect_to main_app.root_path
@@ -56,7 +79,7 @@ describe Spotlight::RolesController, type: :controller do
       it 'destroys records' do
         patch :update_all, exhibit_id: exhibit, 'exhibit' => {
           'roles_attributes' => {
-            '0' => { 'user_key' => 'cbeer@cbeer.info', 'role' => 'curator', 'id' => role.id, '_destroy' => '1' }
+            '0' => { 'role' => 'curator', 'id' => role.id, '_destroy' => '1' }
           }
         }
 
@@ -69,7 +92,7 @@ describe Spotlight::RolesController, type: :controller do
         allow_any_instance_of(Spotlight::Exhibit).to receive_messages(update: false)
         patch :update_all, exhibit_id: exhibit, 'exhibit' => {
           'roles_attributes' => {
-            '0' => { 'user_key' => 'cbeer@cbeer.info', 'role' => 'curator', 'id' => role.id }
+            '0' => { 'role' => 'curator', 'id' => role.id }
           }
         }
         expect(response).to be_successful

data/spec/helpers/spotlight/title_helper_spec.rb

@@ -47,12 +47,4 @@ describe Spotlight::TitleHelper, type: :helper do
       expect(title).to have_selector 'h1 small', text: 'Some title'
     end
   end
-
-  describe '#header_with_count' do
-    it 'merges the title with a count label' do
-      val = helper.header_with_count 'some title', 5
-      expect(val).to include 'some title'
-      expect(val).to have_selector 'span.label', text: 5
-    end
-  end
 end

data/spec/views/spotlight/tags/index.html.erb_spec.rb

@@ -19,10 +19,4 @@ describe 'spotlight/tags/index.html.erb', type: :view do
       end
     end
   end
-  describe 'Total tags' do
-    it 'is displayed' do
-      render
-      expect(rendered).to have_css('span.label.label-default', text: 2)
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -437,14 +437,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: openseadragon
   requirement: !ruby/object:Gem::Requirement
@@ -549,14 +549,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.37'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.37'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement