blacklight-spotlight 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5017845fee1b7aec23f0ca3defacc0f32ad5ee02
-  data.tar.gz: 0f84e6b1bac2250f6125a7d299718127b596ee40
+  metadata.gz: 04d55db45686c960c104b415057758f0f890225a
+  data.tar.gz: a5fe69056e63432730a864d937e56337f1fa679f
 SHA512:
-  metadata.gz: fd56e28a84ec7f003693cce1c62252986002d850bad13745adc812e55faa288983f28c4cdc2bdcb2de3a1ba6d6f8f3b7ca31e161d54e55a621c8eb5faa86b611
-  data.tar.gz: 43163422ed9ae1d38cd4a8b56786effebfc3d3e7a6e9f94a28ee99ef98b756efe5a87417f1d7c6ef0e02f86c8d790de0d4606678bde06034281164c6a548a698
+  metadata.gz: a4d9d682a2a7a8c4948ec1f92a7620019804fc5467bad97ad63b33c3e548e74845af3bb37e4a1b53b0fe6d475b00ffefc08b342b001ddb9ac5a992eaf4e49d92
+  data.tar.gz: f88c7ac71957e878187f799afd7f08bd54d7216bff08e7af74f05f7e1f9fc0624647e47cc1786f3c7bffa8225a407d80fe23061c3dded7ad2a722bfb30555803

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

@@ -0,0 +1,77 @@
+(function($) {
+  $.fn.spotlightCheckUserExistence = function() {
+    var formElements = this;
+    var target;
+
+    $(formElements).each(function() {
+      $(this).on('blur', checkIfUserExists);
+      $(this).on('change', cleanUpBlankUserField);
+    });
+
+    function checkIfUserExists() {
+      target = $(this);
+      var form = target.closest('form');
+      if (target.val() !== '' && form[0].checkValidity()) {
+        $.ajax(userExistsUrl())
+         .success(userExists)
+         .fail(userDoesNotExist);
+      } else {
+        userExists();
+      }
+    }
+
+    function cleanUpBlankUserField() {
+      if ($(this).val() === '') {
+        userExists();
+      }
+    }
+
+    function userExists() {
+      noUserNote().hide();
+      submitButton().prop('disabled', false);
+    }
+
+    function userDoesNotExist() {
+      updateNoUserNoteLink();
+      noUserNote().show();
+      roleSelect().on('change', updateNoUserNoteLink);
+      submitButton().prop('disabled', true);
+    }
+
+    function updateNoUserNoteLink() {
+      var link = noUserNote().find('a');
+      var originalHref = link.data('inviteUrl');
+      var userName = target.val();
+      var role = roleSelect().val();
+      link.attr(
+        'href',
+        originalHref + '?user=' + encodeURIComponent(userName) + '&role=' + encodeURIComponent(role)
+      );
+    }
+
+    function roleSelect() {
+      return target.closest('tr').find('select');
+    }
+
+    function noUserNote() {
+      return target.closest('td')
+                   .find('[data-behavior="no-user-note"]');
+    }
+
+    function submitButton() {
+      return target.closest('tr')
+                   .next('tr')
+                   .find('input[type="submit"]');
+    }
+
+    function userExistsUrl() {
+      return $('[data-user-exists-url]').data('userExistsUrl') + '?user=' + target.val();
+    }
+
+    return this;
+  };
+})(jQuery);
+
+Spotlight.onLoad(function() {
+  $('[data-behavior="check-user-existence"]').spotlightCheckUserExistence();
+});

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

@@ -1,6 +1,6 @@
 (function( $ ){
 
-  $.fn.spotlight_users = function( options ) {  
+  $.fn.spotlight_users = function( options ) {
 
     // Create some defaults, extending them with any options that were provided
     var settings = $.extend( { }, options);
@@ -27,13 +27,15 @@
     }
 
     function clear_errors(element) {
-      element.find('.has-error').removeClass('has-error');
-      element.find('.help-block').remove(); // Remove the error messages
+      element.find('.has-error')
+             .removeClass('has-error')
+             .find('.help-block')
+             .remove(); // Remove the error messages
     }
 
     function rollback_changes(element) {
       $.each(element.find('input[type="text"], select'), function() {
-        $(this).val($(this).data('orig'));
+        $(this).val($(this).data('orig')).trigger('change');
       });
     }
 
@@ -58,7 +60,7 @@
       edit_row.next().show();
     }
 
-    return this.each(function() {        
+    return this.each(function() {
 
       container = $(this);
       $('[data-edit-for]', container).hide();

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

@@ -10,11 +10,11 @@
     margin-top: 10px;
     margin-left: 0;
     padding-left: 0;
-    
+
     &.not-validated {
       margin-top: 0;
     }
-    
+
     .confirmed {
       @extend .text-success;
       white-space: nowrap;
@@ -84,4 +84,14 @@
   }
 
   border-bottom: 1px solid $table-border-color;
-}
+}
+
+.pending-label {
+  display: none;
+}
+
+.invite-pending {
+  .pending-label {
+    display: inline;
+  }
+}

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

@@ -41,6 +41,7 @@ $masthead-image-blur: 1px;
 
   &.page-masthead {
     @include transparent-masthead-navigation-menu();
+    background-color: $navbar-transparent-page-bg;
     border-bottom: 1px solid $navbar-transparent-border;
     margin-bottom: 0;
     margin-top: 0;

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

@@ -21,6 +21,8 @@ $navbar-transparent-link-active-bg: rgba(255, 255, 255, 0.3) !default;
 $navbar-transparent-link-disabled-color: #ccc !default;
 $navbar-transparent-link-disabled-bg: transparent !default;
 
+$navbar-transparent-page-bg: rgba(0, 0, 0, 0.5) !default;
+
 // Navbar brand label
 $navbar-transparent-brand-color: $navbar-transparent-link-color !default;
 $navbar-transparent-brand-hover-color: darken($navbar-transparent-brand-color, 10%) !default;

data/app/controllers/spotlight/roles_controller.rb

@@ -30,12 +30,41 @@ module Spotlight
       end
     end
 
+    def exists
+      # note: the messages returned are not shown to users and really only useful for debug, hence no translation necessary
+      #  app uses html status code to act on response
+      if ::User.where(email: exists_params).present?
+        render json: { message: 'User exists' }
+      else
+        render json: { message: 'User does not exist' }, status: :not_found
+      end
+    end
+
+    def invite
+      user = ::User.invite!(email: invite_params[:user], skip_invitation: true) # don't deliver the invitation yet
+      role = Spotlight::Role.create(exhibit: current_exhibit, user: user, role: invite_params[:role])
+      if role.save
+        user.deliver_invitation # now deliver it when we have saved the role
+        redirect_to :back, notice: t(:'helpers.submit.role.updated')
+      else
+        redirect_to :back, alert: t(:'helpers.submit.role.batch_error')
+      end
+    end
+
     protected
 
     def exhibit_params
       params.require(:exhibit).permit(roles_attributes: [:id, :user_key, :role, :_destroy])
     end
 
+    def invite_params
+      params.permit(:user, :role)
+    end
+
+    def exists_params
+      params.require(:user)
+    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/models/concerns/spotlight/user.rb

@@ -4,7 +4,7 @@ module Spotlight
   module User
     extend ActiveSupport::Concern
     included do
-      has_many :roles, class_name: 'Spotlight::Role'
+      has_many :roles, class_name: 'Spotlight::Role', dependent: :destroy
 
       before_create :add_default_roles
     end
@@ -21,6 +21,10 @@ module Spotlight
       roles.build role: 'admin' unless self.class.any?
     end
 
+    def invite_pending?
+      invited_to_sign_up? && !invitation_accepted?
+    end
+
     alias_attribute :user_key, :email
 
     ##

data/app/models/spotlight/contact.rb

@@ -42,7 +42,7 @@ module Spotlight
     protected
 
     def should_generate_new_friendly_id?
-      name_changed?
+      super || (name_changed? && persisted?)
     end
   end
 end

data/app/models/spotlight/custom_field.rb

@@ -102,7 +102,7 @@ module Spotlight
     end
 
     def should_generate_new_friendly_id?
-      true
+      super || persisted?
     end
 
     # Try building a slug based on the following fields in

data/app/models/spotlight/exhibit.rb

@@ -13,6 +13,8 @@ module Spotlight
     friendly_id :title, use: [:slugged, :finders]
     validates :title, presence: true
 
+    default_scope { order('weight ASC') }
+
     acts_as_tagger
     delegate :blacklight_config, to: :blacklight_configuration
     serialize :facets, Array

data/app/models/spotlight/page.rb

@@ -76,7 +76,7 @@ module Spotlight
     end
 
     def should_generate_new_friendly_id?
-      title_changed?
+      super || (title_changed? && persisted?)
     end
 
     def should_display_title?

data/app/models/spotlight/search.rb

@@ -88,7 +88,7 @@ module Spotlight
     end
 
     def should_generate_new_friendly_id?
-      title_changed?
+      super || (title_changed? && persisted?)
     end
 
     alias_method :current_exhibit, :exhibit

data/app/views/devise/mailer/invitation_instructions.html.erb

@@ -0,0 +1,7 @@
+<p><%= t("spotlight.invitation_mailer.invitation_instructions.hello", email: @resource.email) %></p>
+
+<p><%= t("spotlight.invitation_mailer.invitation_instructions.someone_invited_you", role: @resource.roles.first.role, exhibit_name: @resource.roles.first.exhibit.title, url: spotlight.exhibit_home_page_url(@resource.roles.first.exhibit)) %></p>
+
+<p><%= link_to t("spotlight.invitation_mailer.invitation_instructions.accept"), accept_invitation_url(@resource, :invitation_token => @token) %></p>
+
+<p><%= t("spotlight.invitation_mailer.invitation_instructions.ignore_html") %></p>

data/app/views/spotlight/roles/_edit_fields.html.erb

@@ -1,5 +1,11 @@
         <tr data-edit-for="<%= f.object.new_record? ? 'new' : f.object.id %>">
-          <td><%= f.text_field :user_key, hide_label: true %></td>
+          <td>
+            <%= f.email_field :user_key, hide_label: true, disabled: f.object.persisted?, data: { behavior: 'check-user-existence' } %>
+            <span style='display:none' class='help-block' data-behavior='no-user-note'>
+              <%= t('.invite_html', link: link_to(t('.invite_link'), spotlight.invite_exhibit_roles_path(current_exhibit), data: { method: 'post', 'invite-url': spotlight.invite_exhibit_roles_path(current_exhibit) })) %>
+              <span class='label label-warning pending-label'><%= t('.pending') %></span>
+            </span>
+          </td>
           <td><%= f.select :role, roles_for_select, hide_label: true %></td>
           <td></td>
         </tr>

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

@@ -1,11 +1,10 @@
 <%= render 'spotlight/shared/exhibit_sidebar' %>
-<div id="content" class="col-md-9">
+<div id="content" class="col-md-9" data-user-exists-url="<%= spotlight.exists_exhibit_roles_path(current_exhibit) %>">
   <%= configuration_page_title %>
-  <%= bootstrap_form_for @exhibit, url: spotlight.update_all_exhibit_roles_path(@exhibit) do |f| %>
-
+  <%= bootstrap_form_for current_exhibit, url: spotlight.update_all_exhibit_roles_path(current_exhibit) do |f| %>
     <table class="table table-striped users">
       <thead>
-        <th><%= t '.name' %></th>
+        <th><%= t '.email' %></th>
         <th><%= t '.role' %></th>
         <th><%= t '.actions' %></th>
       </thead>
@@ -25,8 +24,11 @@
             </td>
           </tr>
         <% else %>
-          <tr data-show-for="<%= r.object.id %>">
-            <td><%= r.object.user.to_s %></td>
+          <tr data-show-for="<%= r.object.id %>" class="<%= 'invite-pending' if r.object.user.invite_pending? %>">
+            <td>
+              <%= r.object.user.to_s %>
+              <span class='label label-warning pending-label'><%= t('.invite_pending') %></span>
+            </td>
             <td><%= r.object.role.humanize %></td>
             <td><%= link_to "#", data: {behavior: 'edit-user', target: r.object.id } do %>
               <span class="glyphicon glyphicon-edit"></span>

data/config/locales/spotlight.en.yml

@@ -72,7 +72,7 @@ en:
       role:
         updated: "User has been updated."
         destroyed: "User has been removed."
-        batch_error: "There was a problem saving the users."
+        batch_error: "There was a problem saving the user(s)."
     label:
       solr_document:
         exhibit_tag_list: "Tags"
@@ -261,6 +261,12 @@ en:
           non_repo_item: "Add non-repository item"
       new:
         header: Import items
+    invitation_mailer:
+      invitation_instructions:
+        hello: "Hello %{email}!"
+        someone_invited_you: "The Exhibits Administrator has invited to be a member of '%{exhibit_name}' at %{url}. You can accept it through the link below."
+        accept: "Accept invitation"
+        ignore_html: "If you don't want to accept the invitation, please ignore this email.<br />Your account won't be created until you access the link above."
     confirmation_mailer:
       confirmation_instructions:
         welcome: "Welcome %{email}!"
@@ -466,10 +472,15 @@ en:
         bookmarklet: "%{application_name} widget"
       reindexing_in_progress: "Reindexing all resources"
     roles:
+      edit_fields:
+        invite_html: "This user does not yet exist. Would you like to send them an %{link}?"
+        invite_link: invite
       index:
         title: Site Configuration - Users
+        invite_pending: pending
         header: Users
         name: Username
+        email: "Email Address"
         role: "Role"
         actions: "Actions"
     searches: &search

data/config/routes.rb

@@ -88,6 +88,8 @@ Spotlight::Engine.routes.draw do
 
     resources :roles, path: 'users', only: [:index, :create, :destroy] do
       collection do
+        get :exists
+        post :invite
         patch :update_all
       end
     end

data/db/migrate/20151208085432_add_weight_to_exhibits.rb

@@ -0,0 +1,5 @@
+class AddWeightToExhibits < ActiveRecord::Migration
+  def up
+    add_column :spotlight_exhibits, :weight, :integer, default: 50
+  end
+end

data/lib/generators/spotlight/install_generator.rb

@@ -121,5 +121,11 @@ module Spotlight
       copy_file 'jetty.rake', 'lib/tasks/jetty.rake'
       directory 'solr_conf'
     end
+
+    def generate_devise_invitable
+      gem 'devise_invitable'
+      generate 'devise_invitable:install'
+      generate 'devise_invitable', 'User'
+    end
   end
 end

data/lib/spotlight/engine.rb

@@ -1,9 +1,13 @@
 # Load blacklight which will give spotlight views a higher preference than those in blacklight
+
+# devise must be required to first to ensure we can override devise and invitable views in spotlight correctly
+require 'devise'
+require 'devise_invitable'
+
 require 'blacklight'
 require 'blacklight/oembed'
 require 'autoprefixer-rails'
 require 'friendly_id'
-require 'devise'
 require 'tophat'
 require 'paper_trail'
 

data/lib/spotlight/version.rb

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

data/spec/controllers/spotlight/exhibits_controller_spec.rb

@@ -4,6 +4,10 @@ describe Spotlight::ExhibitsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }
 
+  before do
+    allow(Spotlight::DefaultThumbnailJob).to receive(:perform_later)
+  end
+
   describe 'when the user is not authorized' do
     before do
       sign_in FactoryGirl.create(:exhibit_visitor)

data/spec/controllers/spotlight/roles_controller_spec.rb

@@ -71,7 +71,57 @@ describe Spotlight::RolesController, type: :controller do
           }
         }
         expect(response).to be_successful
-        expect(flash[:alert]).to eq 'There was a problem saving the users.'
+        expect(flash[:alert]).to eq 'There was a problem saving the user(s).'
+      end
+    end
+
+    describe 'GET exists' do
+      it 'requires a user parameter' do
+        expect do
+          get :exists, exhibit_id: exhibit
+        end.to raise_error(ActionController::ParameterMissing)
+      end
+
+      it 'returns a successful status when the requested user exists' do
+        user = FactoryGirl.create(:exhibit_curator)
+        get :exists, exhibit_id: exhibit, user: user.email
+        expect(response).to be_success
+      end
+
+      it 'returns an unsuccessful status when the user does not exist' do
+        get :exists, exhibit_id: exhibit, user: 'user@example.com'
+        expect(response).not_to be_success
+        expect(response.status).to eq 404
+      end
+    end
+
+    describe 'GET invite' do
+      before { request.env['HTTP_REFERER'] = 'http://example.com' }
+
+      it 'invites the selected user' do
+        expect do
+          post :invite, exhibit_id: exhibit, user: 'user@example.com', role: 'curator'
+        end.to change { ::User.count }.by(1)
+        expect(::User.last.roles.length).to eq 1
+        expect(::User.last.roles.first.exhibit).to eq exhibit
+      end
+
+      it 'adds the user to the exhibit via a role' do
+        expect do
+          post :invite, exhibit_id: exhibit, user: 'user@example.com', role: 'curator'
+        end.to change { Spotlight::Role.count }.by(1)
+      end
+
+      it 'redirects back with a flash notice upon success' do
+        post :invite, exhibit_id: exhibit, user: 'user@example.com', role: 'curator'
+        expect(flash[:notice]).to eq 'User has been updated.'
+        expect(response).to redirect_to(:back)
+      end
+
+      it 'redirects back with flash error upon failure' do
+        post :invite, exhibit_id: exhibit, user: 'user@example.com', role: 'not-a-real-role'
+        expect(flash[:alert]).to eq 'There was a problem saving the user(s).'
+        expect(response).to redirect_to(:back)
       end
     end
   end

data/spec/controllers/spotlight/searches_controller_spec.rb

@@ -4,6 +4,10 @@ describe Spotlight::SearchesController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }
 
+  before do
+    allow(Spotlight::DefaultThumbnailJob).to receive(:perform_later)
+  end
+
   describe 'when the user is not authorized' do
     before do
       sign_in FactoryGirl.create(:exhibit_visitor)

data/spec/features/create_exhibit_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Create a new exhibit', type: :feature do
   let(:user) { FactoryGirl.create(:site_admin) }
   before do
-    allow_any_instance_of(Spotlight::Search).to receive(:set_default_featured_image)
+    allow(Spotlight::DefaultThumbnailJob).to receive(:perform_later)
     login_as user
   end
 

data/spec/features/create_page_spec.rb

@@ -10,10 +10,7 @@ describe 'Creating a page', type: :feature do
     let!(:page3) { FactoryGirl.create(:about_page, exhibit: exhibit, title: 'A new one') }
     it 'is able to show a list of About pages to be curated' do
       login_as exhibit_curator
-      visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-      within '#user-util-collapse .dropdown' do
-        click_link 'Dashboard'
-      end
+      visit spotlight.exhibit_dashboard_path(exhibit)
       within '#sidebar' do
         click_link 'About pages'
       end

data/spec/features/curator_items.rb

@@ -2,14 +2,12 @@ require 'spec_helper'
 
 describe 'A curator can see the items page', type: :feature do
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator) }
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
 
   it 'works' do
     login_as exhibit_curator
+    visit spotlight.exhibit_dashboard_path(exhibit)
 
-    visit '/'
-    within '.dropdown-menu' do
-      click_link 'Dashboard'
-    end
     expect(page).to have_content 'Items'
   end
 end

data/spec/features/home_page_spec.rb

@@ -4,20 +4,14 @@ describe 'Home page', type: :feature do
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
   before { login_as exhibit_curator }
   it 'exists by default on exhibits' do
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    within '#user-util-collapse .dropdown-menu' do
-      click_link 'Dashboard'
-    end
+    visit spotlight.exhibit_dashboard_path(exhibit)
     click_link 'Feature pages'
     expect(page).to have_selector 'h3', text: 'Homepage'
     expect(page).to have_selector 'h3.panel-title', text: 'Exhibit Home'
   end
 
   it 'allows users to edit the home page title' do
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    within '#user-util-collapse .dropdown-menu' do
-      click_link 'Dashboard'
-    end
+    visit spotlight.exhibit_dashboard_path(exhibit)
     click_link 'Feature pages'
     within('.home_page') do
       click_link 'Edit'
@@ -83,7 +77,7 @@ describe 'Home page', type: :feature do
       exhibit.home_page.save
     end
     it 'does not display the facet sidebar' do
-      visit spotlight.exhibit_home_page_path(exhibit.home_page)
+      visit spotlight.exhibit_home_page_path(exhibit)
       expect(page).not_to have_css('#sidebar')
     end
   end

data/spec/features/import_exhibit_spec.rb

@@ -10,12 +10,7 @@ describe 'Allow exhibit admins to import and export content from an exhibit', ty
     pending(%(There's not really any good way to test the contents of a
 downloaded file with Poltergeist (which is now necessary since we've moved
 the export option behind a bootstrap tab)))
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-
-    click_link user.email
-    within '#user-util-collapse .dropdown-menu' do
-      click_link 'Dashboard'
-    end
+    visit spotlight.exhibit_dashboard_path(exhibit)
 
     click_link 'General'
     within('.nav-tabs') do
@@ -31,12 +26,7 @@ the export option behind a bootstrap tab)))
   end
 
   it 'allows admins to import content into an exhibit' do
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-
-    click_link user.email
-    within '#user-util-collapse .dropdown-menu' do
-      click_link 'Dashboard'
-    end
+    visit spotlight.exhibit_dashboard_path(exhibit)
 
     click_link 'General'
 

data/spec/features/javascript/about_page_admin_spec.rb

@@ -7,13 +7,7 @@ feature 'About Pages Adminstration', js: true do
 
   it 'is able to create new pages' do
     login_as exhibit_curator
-
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link exhibit_curator.email
-
-    within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
-    end
+    visit spotlight.exhibit_dashboard_path(exhibit)
 
     click_link 'About pages'
 

data/spec/features/javascript/block_controls_spec.rb

@@ -7,11 +7,8 @@ feature 'Block controls' do
 
   scenario 'should be split into separate sections', js: true do
     # create page
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link exhibit_curator.email
-    within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
-    end
+    visit spotlight.exhibit_dashboard_path(exhibit)
+
     click_link 'Feature pages'
 
     add_new_page_via_button('My New Feature Page')

data/spec/features/javascript/blocks/uploaded_items_block_spec.rb

@@ -45,7 +45,7 @@ feature 'Uploaded Items Block', feature: true, js: true do
     end
   end
 
-  scenario 'users can to toggle individual images to not display' do
+  scenario 'users can toggle individual images to not display' do
     attach_file('uploaded_item_url', fixture_file1)
     attach_file('uploaded_item_url', fixture_file2)
 

data/spec/features/javascript/feature_page_admin_spec.rb

@@ -18,16 +18,11 @@ feature 'Feature Pages Adminstration', js: true do
       display_sidebar: true
     )
   end
-  before { login_as exhibit_curator }
-  it 'is able to create new pages' do
-    login_as exhibit_curator
 
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link exhibit_curator.email
+  before { login_as exhibit_curator }
 
-    within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
-    end
+  it 'is able to create new pages' do
+    visit spotlight.exhibit_dashboard_path(exhibit)
 
     click_link 'Feature pages'
 
@@ -39,12 +34,7 @@ feature 'Feature Pages Adminstration', js: true do
   end
 
   it 'updates the page titles' do
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link exhibit_curator.email
-
-    within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
-    end
+    visit spotlight.exhibit_dashboard_path(exhibit)
 
     click_link 'Feature pages'
     within("[data-id='#{page1.id}']") do
@@ -84,11 +74,7 @@ feature 'Feature Pages Adminstration', js: true do
   end
 
   it 'does not update the pages list when the user has unsaved changes' do
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link exhibit_curator.email
-    within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
-    end
+    visit spotlight.exhibit_dashboard_path(exhibit)
 
     click_link 'Feature pages'
     within("[data-id='#{page1.id}']") do
@@ -122,11 +108,7 @@ feature 'Feature Pages Adminstration', js: true do
   end
 
   it 'is able to update home page titles' do
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link exhibit_curator.email
-    within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
-    end
+    visit spotlight.exhibit_dashboard_path(exhibit)
 
     click_link 'Feature pages'
 

data/spec/features/javascript/roles_admin_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe 'Roles Admin', type: :feature, js: true do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit_admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  before do
+    login_as exhibit_admin
+
+    visit spotlight.exhibit_dashboard_path(exhibit)
+    click_link 'Users'
+  end
+
+  it 'informs the admin that a user they are trying to add does not yet exist' do
+    expect(page).to have_css('.help-block[data-behavior="no-user-note"]', visible: false)
+    expect(page).not_to have_css('input[disabled]')
+
+    click_link 'Add a new user'
+    fill_in 'User key', with: 'user@example.com'
+
+    expect(page).to have_css('.help-block[data-behavior="no-user-note"]', visible: true)
+    expect(page).to have_link('invite', visible: true)
+    expect(page).to have_css('input[disabled]')
+  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)
+
+    click_link 'Add a new user'
+    fill_in 'User key', with: 'user@example.com'
+    click_link 'invite'
+
+    within('tr.invite-pending') do
+      expect(page).to have_css('td', text: 'user@example.com')
+      expect(page).to have_css('.label-warning.pending-label', text: 'pending', visible: true)
+    end
+  end
+end

data/spec/features/javascript/search_config_admin_spec.rb

@@ -27,11 +27,8 @@ feature 'Search Configuration Administration', js: true do
     end
 
     it 'allows the curator to update search field options' do
-      visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-      click_link user.email
-      within '#user-util-collapse .dropdown' do
-        click_link 'Dashboard'
-      end
+      visit spotlight.exhibit_dashboard_path(exhibit)
+
       click_link 'Search'
 
       click_link 'Options'
@@ -55,11 +52,8 @@ feature 'Search Configuration Administration', js: true do
   describe 'facets' do
     it 'allows us to update the label with edit-in-place' do
       input_id = 'blacklight_configuration_facet_fields_genre_ssim_label'
-      visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-      click_link user.email
-      within '#user-util-collapse .dropdown' do
-        click_link 'Dashboard'
-      end
+      visit spotlight.exhibit_dashboard_path(exhibit)
+
       click_link 'Search'
 
       click_link 'Facets'
@@ -105,11 +99,8 @@ feature 'Search Configuration Administration', js: true do
 
   describe 'results' do
     it 'updates search result options' do
-      visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-      click_link user.email
-      within '#user-util-collapse .dropdown' do
-        click_link 'Dashboard'
-      end
+      visit spotlight.exhibit_dashboard_path(exhibit)
+
       click_link 'Search'
 
       click_link 'Results'
@@ -131,11 +122,8 @@ feature 'Search Configuration Administration', js: true do
       expect(field_labeled('10')).to_not be_checked
     end
     it 'updates Sort field result options' do
-      visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-      click_link user.email
-      within '#user-util-collapse .dropdown' do
-        click_link 'Dashboard'
-      end
+      visit spotlight.exhibit_dashboard_path(exhibit)
+
       click_link 'Search'
 
       click_link 'Results'

data/spec/features/javascript/search_context_spec.rb

@@ -71,14 +71,17 @@ feature 'Search contexts' do
     expect(page).to have_link 'FeaturePage1', href: spotlight.exhibit_feature_page_path(exhibit, feature_page)
   end
 
-  scenario 'should add context breadcrumbs back to the browse page when navigating to an item from a browse page', js: true do
-    search = Spotlight::Search.create! exhibit_id: exhibit.id, title: 'Some Saved Search', published: true
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link 'Browse'
-    click_link 'Some Saved Search'
-    click_link 'A MAP of AMERICA from the latest and best Observations'
-    expect(page).to have_link 'Home'
-    expect(page).to have_link 'Browse'
-    expect(page).to have_link 'Some Saved Search', href: spotlight.exhibit_browse_path(exhibit, search)
+  context 'from a browse page' do
+    let!(:search) { FactoryGirl.create(:search, title: 'Some Saved Search', exhibit: exhibit, published: true) }
+
+    scenario 'should add context breadcrumbs back to the browse page when navigating to an item', js: true do
+      visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
+      click_link 'Browse'
+      click_link 'Some Saved Search'
+      click_link 'A MAP of AMERICA from the latest and best Observations'
+      expect(page).to have_link 'Home'
+      expect(page).to have_link 'Browse'
+      expect(page).to have_link 'Some Saved Search', href: spotlight.exhibit_browse_path(exhibit, search)
+    end
   end
 end

data/spec/models/spotlight/page_spec.rb

@@ -74,4 +74,25 @@ describe Spotlight::Page, type: :model do
       expect(page).to have_content
     end
   end
+
+  describe '#slug' do
+    let(:page) { FactoryGirl.create(:feature_page) }
+
+    it 'gets a default slug' do
+      expect(page.slug).not_to be_blank
+    end
+
+    it 'is updated when the title changes' do
+      page.update(title: 'abc')
+      expect(page.slug).to eq 'abc'
+    end
+
+    context 'with a custom slug' do
+      let(:page) { FactoryGirl.create(:feature_page, slug: 'xyz') }
+
+      it 'gets a default slug' do
+        expect(page.slug).to eq 'xyz'
+      end
+    end
+  end
 end

data/spec/models/spotlight/search_spec.rb

@@ -58,4 +58,25 @@ describe Spotlight::Search, type: :model do
       expect(described_class.published.map(&:weight)).to eq [1, 5, 10]
     end
   end
+
+  describe '#slug' do
+    let(:search) { FactoryGirl.create(:search) }
+
+    it 'gets a default slug' do
+      expect(search.slug).not_to be_blank
+    end
+
+    it 'is updated when the title changes' do
+      search.update(title: 'abc')
+      expect(search.slug).to eq 'abc'
+    end
+
+    context 'with a custom slug' do
+      let(:search) { FactoryGirl.create(:search, slug: 'xyz') }
+
+      it 'gets a default slug' do
+        expect(search.slug).to eq 'xyz'
+      end
+    end
+  end
 end

data/spec/models/spotlight/user_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Spotlight::User do
+  subject { Class.new }
+  before { subject.extend described_class }
+
+  describe '#invite_pending?' do
+    it 'is false if the user was never invited in the first place' do
+      expect(subject).to receive_messages(invited_to_sign_up?: false)
+      expect(subject.invite_pending?).to be false
+    end
+
+    it 'is true if the user was invited but has not accepted' do
+      expect(subject).to receive_messages(invited_to_sign_up?: true)
+      expect(subject).to receive_messages(invitation_accepted?: false)
+      expect(subject.invite_pending?).to be true
+    end
+
+    it 'is false if the user was invited and has accpeted the invite' do
+      expect(subject).to receive_messages(invited_to_sign_up?: true)
+      expect(subject).to receive_messages(invitation_accepted?: true)
+      expect(subject.invite_pending?).to be false
+    end
+  end
+end

data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb

@@ -176,6 +176,14 @@ describe Spotlight::ExhibitExportSerializer do
       expect(subject.feature_pages.first.child_pages.length).to eq 1
     end
 
+    context 'page slugs' do
+      let!(:feature_page) { FactoryGirl.create(:feature_page, exhibit: source_exhibit, slug: 'xyz') }
+
+      it 'uses the existing slug for the page' do
+        expect(subject.feature_pages.find('xyz')).to be_persisted
+      end
+    end
+
     context 'with a feature page' do
       let(:feature_page) { FactoryGirl.create(:feature_page, exhibit: source_exhibit) }
       let(:thumbnail) { FactoryGirl.create(:featured_image) }
@@ -341,6 +349,10 @@ describe Spotlight::ExhibitExportSerializer do
         source_exhibit.searches.create title: 'custom query', slug: 'xyz', published: true
       end
 
+      before do
+        allow(Spotlight::DefaultThumbnailJob).to receive(:perform_later)
+      end
+
       it 'creates a search within the exhibit' do
         expect(subject.feature_pages.first.content.first.search.exhibit).to eq subject
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -263,6 +263,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: devise_invitable
+  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: roar-rails
   requirement: !ruby/object:Gem::Requirement
@@ -724,6 +738,7 @@ files:
 - app/assets/javascripts/spotlight/blocks/solr_documents_grid_block.js
 - app/assets/javascripts/spotlight/blocks/uploaded_items_block.js
 - 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/croppable.js
 - app/assets/javascripts/spotlight/edit_in_place.js
@@ -891,6 +906,7 @@ files:
 - app/views/catalog/_save_search.html.erb
 - app/views/catalog/_search_form.html.erb
 - app/views/devise/confirmations/new.html.erb
+- app/views/devise/mailer/invitation_instructions.html.erb
 - app/views/layouts/spotlight/home.html.erb
 - app/views/layouts/spotlight/popup.html.erb
 - app/views/layouts/spotlight/spotlight.html.erb
@@ -937,7 +953,6 @@ files:
 - app/views/spotlight/catalog/_document_visibility_control.html.erb
 - app/views/spotlight/catalog/_edit_default.html.erb
 - app/views/spotlight/catalog/_index_compact_default.html.erb
-- app/views/spotlight/catalog/_status_header.html.erb
 - app/views/spotlight/catalog/admin.html.erb
 - app/views/spotlight/catalog/edit.html.erb
 - app/views/spotlight/catalog/new.html.erb
@@ -1081,7 +1096,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
+- db/migrate/20151208085432_add_weight_to_exhibits.rb
 - lib/blacklight/spotlight.rb
 - lib/generators/spotlight/install_generator.rb
 - lib/generators/spotlight/templates/catalog_controller.rb
@@ -1172,6 +1187,7 @@ files:
 - spec/features/javascript/metadata_admin_spec.rb
 - spec/features/javascript/multi_image_select_spec.rb
 - spec/features/javascript/preview_block_spec.rb
+- spec/features/javascript/roles_admin_spec.rb
 - spec/features/javascript/rule_block_spec.rb
 - spec/features/javascript/search_config_admin_spec.rb
 - spec/features/javascript/search_context_spec.rb
@@ -1236,6 +1252,7 @@ files:
 - spec/models/spotlight/solr_document/spotlight_images_spec.rb
 - spec/models/spotlight/solr_document/uploaded_resource_spec.rb
 - spec/models/spotlight/solr_document_sidecar_spec.rb
+- spec/models/spotlight/user_spec.rb
 - spec/routing/spotlight/exhibit_catalog_spec.rb
 - spec/routing/spotlight/pages_routing_spec.rb
 - spec/serializers/spotlight/exhibit_export_serializer_spec.rb
@@ -1403,6 +1420,7 @@ test_files:
 - spec/features/javascript/metadata_admin_spec.rb
 - spec/features/javascript/multi_image_select_spec.rb
 - spec/features/javascript/preview_block_spec.rb
+- spec/features/javascript/roles_admin_spec.rb
 - spec/features/javascript/rule_block_spec.rb
 - spec/features/javascript/search_config_admin_spec.rb
 - spec/features/javascript/search_context_spec.rb
@@ -1467,6 +1485,7 @@ test_files:
 - spec/models/spotlight/solr_document/spotlight_images_spec.rb
 - spec/models/spotlight/solr_document/uploaded_resource_spec.rb
 - spec/models/spotlight/solr_document_sidecar_spec.rb
+- spec/models/spotlight/user_spec.rb
 - spec/routing/spotlight/exhibit_catalog_spec.rb
 - spec/routing/spotlight/pages_routing_spec.rb
 - spec/serializers/spotlight/exhibit_export_serializer_spec.rb

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

@@ -1,19 +0,0 @@
-<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/db/migrate/20151204093112_add_reindexing_flag_to_spotlight_resources.rb

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