blacklight-spotlight 0.1.0 → 0.2.0

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

@@ -13,7 +13,15 @@ module Spotlight::Concerns
       helper Spotlight::ApplicationHelper
 
       rescue_from CanCan::AccessDenied do |exception|
-        redirect_to main_app.root_url, :alert => exception.message
+        if current_exhibit and !can? :read, current_exhibit
+          # Try to authenticate the user
+          authenticate_user!
+  
+          # If that fails (and we end up back here), offer a 404 error instead
+          raise ActionController::RoutingError.new('Not Found')
+        else
+          redirect_to main_app.root_url, :alert => exception.message
+        end
       end
     end
   end

data/app/controllers/spotlight/contact_forms_controller.rb

@@ -1,6 +1,6 @@
 module Spotlight
   class ContactFormsController < Spotlight::ApplicationController
-    load_resource :exhibit, class: Spotlight::Exhibit
+    load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
 
     def new
       @contact_form = Spotlight::ContactForm.new :current_url => request.referer
@@ -12,7 +12,12 @@ module Spotlight
       @contact_form.request = request
 
       if @contact_form.valid?
-        @contact_form.deliver
+        if @contact_form.respond_to? :deliver_now
+          @contact_form.deliver_now
+        else
+          @contact_form.deliver
+        end
+
         redirect_to :back, notice: t(:'helpers.submit.contact_form.created')
       else
         render 'new' 

data/app/controllers/spotlight/contacts_controller.rb

@@ -43,7 +43,7 @@ module Spotlight
     end
 
     def contact_params
-      params.require(:contact).permit(:name, :email, :location, :title, :telephone)
+      params.require(:contact).permit(:name, :avatar, :avatar_crop_x, :avatar_crop_y, :avatar_crop_w, :avatar_crop_h, contact_info: Spotlight::Contact.fields.keys)
     end
   end
 end

data/app/controllers/spotlight/custom_fields_controller.rb

@@ -1,7 +1,7 @@
 class Spotlight::CustomFieldsController < Spotlight::ApplicationController
   before_filter :authenticate_user!
   
-  load_resource :exhibit, class: Spotlight::Exhibit
+  load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
   load_and_authorize_resource through: :exhibit
   before_filter :attach_breadcrumbs, only: [:new, :edit]
 

data/app/controllers/spotlight/dashboards_controller.rb

@@ -2,7 +2,7 @@ module Spotlight
   class DashboardsController < Spotlight::ApplicationController
     include Spotlight::Base
     before_filter :authenticate_user!
-    load_resource :exhibit, class: Spotlight::Exhibit
+    load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
 
     def show
       authorize! :curate, @exhibit

data/app/controllers/spotlight/exhibits_controller.rb

@@ -8,6 +8,9 @@ class Spotlight::ExhibitsController < Spotlight::ApplicationController
   end
 
   def import
+    add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
+    add_breadcrumb t(:'spotlight.administration.sidebar.header'), exhibit_dashboard_path(@exhibit)
+    add_breadcrumb t(:'spotlight.administration.sidebar.import'), import_exhibit_path(@exhibit)
   end
 
   def process_import
@@ -59,7 +62,7 @@ class Spotlight::ExhibitsController < Spotlight::ApplicationController
   protected
 
   def current_exhibit
-    @exhibit if @exhibit.persisted?
+    @exhibit if @exhibit and @exhibit.persisted?
   end
 
   def exhibit_params
@@ -67,6 +70,7 @@ class Spotlight::ExhibitsController < Spotlight::ApplicationController
       :title,
       :subtitle,
       :description,
+      :published,
       contact_emails_attributes: [:id, :email]
     )
   end

data/app/controllers/spotlight/home_pages_controller.rb

@@ -1,6 +1,7 @@
 module Spotlight
   class HomePagesController < Spotlight::PagesController
     include Blacklight::SolrHelper
+    include Spotlight::Catalog
 
     load_and_authorize_resource through: :exhibit, singleton: true, instance_name: 'page'
 
@@ -27,13 +28,11 @@ module Spotlight
     end
 
     private
+    alias_method :search_action_url, :exhibit_search_action_url
+    alias_method :search_facet_url, :exhibit_search_facet_url
 
     def allowed_page_params
       super.concat [:display_title]
     end
-
-    def search_action_url *args
-      exhibit_catalog_index_url(@page.exhibit, *args)
-    end
   end
 end

data/app/controllers/spotlight/lock_controller.rb

@@ -0,0 +1,12 @@
+module Spotlight
+  class LockController < Spotlight::ApplicationController
+    load_and_authorize_resource
+
+    # DELETE /locks/1
+    def destroy
+      @lock.destroy
+
+      render text: "", status: 204
+    end
+  end
+end

data/app/controllers/spotlight/pages_controller.rb

@@ -1,13 +1,13 @@
 module Spotlight
   class PagesController < Spotlight::ApplicationController
     before_filter :authenticate_user!, except: [:show]
-    load_resource :exhibit, class: Spotlight::Exhibit
+    load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
 
     include Spotlight::Base
     include Blacklight::Catalog::SearchContext
     include Spotlight::Catalog::AccessControlsEnforcement
 
-    helper_method :get_search_results, :get_solr_response_for_doc_id, :get_solr_response_for_field_values, :page_collection_name
+    helper_method :get_search_results, :get_solr_response_for_doc_id, :get_solr_response_for_document_ids, :page_collection_name
 
     # GET /exhibits/1/pages
     def index
@@ -17,7 +17,15 @@ module Spotlight
 
     # GET /pages/1
     def show
-      fresh_when(@page)
+      fresh_when([@page.exhibit, @page])
+    end
+
+    def preview
+      @block = SirTrevorRails::Block.from_hash(JSON.parse(params[:block], symbolize_names: true), "block")
+
+      respond_to do |format|
+        format.html { render 'preview', layout: false }
+      end
     end
 
     # GET /exhibits/1/pages/new
@@ -26,6 +34,7 @@ module Spotlight
 
     # GET /pages/1/edit
     def edit
+      @page.lock! current_user
     end
 
     # POST /exhibits/1/pages
@@ -42,6 +51,8 @@ module Spotlight
 
     # PATCH/PUT /pages/1
     def update
+      @page.lock.delete if @page.lock
+
       if @page.update(page_params.merge(last_edited_by: current_user))
         redirect_to [@page.exhibit, @page], notice: t(:'helpers.submit.page.updated', model: @page.class.model_name.human.downcase)
       else
@@ -52,6 +63,7 @@ module Spotlight
     # DELETE /pages/1
     def destroy
       @page.destroy
+
       redirect_to [@page.exhibit, page_collection_name], notice: t(:'helpers.submit.page.destroyed', model: @page.class.model_name.human.downcase)
     end
 

data/app/controllers/spotlight/resources/upload_controller.rb

@@ -0,0 +1,42 @@
+module Spotlight::Resources
+  class UploadController < ApplicationController
+    helper :all
+
+    before_filter :authenticate_user!
+
+    load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
+    before_filter :build_resource, only: [:new, :create]
+
+    load_and_authorize_resource class: 'Spotlight::Resources::Upload', through_association: "exhibit.resources", instance_name: 'resource'
+
+    def create
+      @resource.attributes = resource_params
+
+      if @resource.save
+        flash[:notice] = t('spotlight.resources.upload.success')
+        if params["add-and-continue"]
+          redirect_to new_exhibit_resources_upload_path(@resource.exhibit)
+        else
+          redirect_to admin_exhibit_catalog_index_path(@resource.exhibit)
+        end
+      else
+        flash[:error] = t('spotlight.resources.upload.error')
+        redirect_to admin_exhibit_catalog_index_path(@resorce.exhibit)
+      end
+    end
+
+    private
+    def build_resource
+      @resource ||= Spotlight::Resources::Upload.new exhibit: current_exhibit
+    end
+
+    def resource_params
+      params.require(:resources_upload).permit(:url, data: data_param_keys)
+    end
+
+    def data_param_keys
+      Spotlight::Resources::Upload.fields(current_exhibit).keys + current_exhibit.custom_fields.map(&:field)
+    end
+
+  end
+end

data/app/controllers/spotlight/resources_controller.rb

@@ -1,8 +1,8 @@
 module Spotlight
-  class ResourcesController < ApplicationController
+  class ResourcesController < Spotlight::ApplicationController
     before_filter :authenticate_user!, except: [:show]
 
-    load_resource :exhibit, class: Spotlight::Exhibit
+    load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
     before_filter :build_resource, only: [:create]
 
     load_and_authorize_resource through: :exhibit
@@ -11,6 +11,7 @@ module Spotlight
     def new
 
       @resource.attributes = resource_params if params[:resource]
+      @resource = @resource.becomes_provider
 
       ## TODO: in Rails 4.1, replace this with a variant
       if from_popup?
@@ -22,6 +23,7 @@ module Spotlight
 
     def create
       @resource.attributes = resource_params
+      @resource = @resource.becomes_provider
 
       if @resource.save
         if from_popup?

data/app/controllers/spotlight/roles_controller.rb

@@ -40,7 +40,7 @@ module Spotlight
       delete_count = 0
       attrs.each do |item|
         if item[:id]
-          if ActiveRecord::ConnectionAdapters::Column.value_to_boolean(item['_destroy'])
+          if item['_destroy'].present?
             authorize! :destroy, klass.find(item[:id])
             delete_count += 1
           else

data/app/controllers/spotlight/searches_controller.rb

@@ -20,7 +20,7 @@ class Spotlight::SearchesController < Spotlight::ApplicationController
   def index
     respond_to do |format|
       format.html
-      format.json { render json: @searches }
+      format.json { render json: @searches, root: false }
     end
   end
 

data/app/forms/spotlight/appearance.rb

@@ -1,6 +1,7 @@
 module Spotlight
   class Appearance
     extend ActiveModel::Naming
+    extend ActiveModel::Translation
     include ActiveModel::Conversion
 
     def initialize(configuration)
@@ -8,10 +9,10 @@ module Spotlight
     end
 
     attr_reader :configuration
-    delegate :persisted?, :exhibit, :exhibit_id, :default_per_page, :thumbnail_size,
+    delegate :persisted?, :exhibit, :exhibit_id, :default_per_page,
       :default_blacklight_config, to: :configuration
 
-    delegate :main_navigations, to: :exhibit
+    delegate :main_navigations, :searchable, to: :exhibit
 
     ##
     # This enables us to have a group of checkboxes that is backed by the array
@@ -31,18 +32,24 @@ module Spotlight
     def sort_fields 
       fields = configuration.sort_fields
       Blacklight::OpenStructWithHashAccess.new.tap do |s|
-        default_sort_fields.each do |k, field|
-          s[field.label.underscore] = fields[k] && fields[k][:show]
+        default_sort_fields.each_with_index do |(k, field), index|
+          s[k] = Blacklight::OpenStructWithHashAccess.new.tap do |c|
+            c.enabled = fields[k] && fields[k][:enabled]
+            c.label = fields[k][:label] if fields[k]
+            c.weight = index + 1
+          end
         end
       end
     end
 
     def allowed_params
-      default_sort_field_labels.map(&:to_sym)
+      sort_fields.keys.each_with_object({}) do |field, hsh|
+        hsh[field] = [:enabled, :label, :weight]
+      end
     end
 
     def update(params)
-      configuration.exhibit.update(main_navigations_attributes: exhibit_params(params)) if exhibit_params(params)
+      configuration.exhibit.update(exhibit_params(params))
       configuration.update(configuration_params(params))
     end
 
@@ -54,8 +61,8 @@ module Spotlight
       default_blacklight_config.per_page
     end
 
-    def sort_options
-      default_sort_field_labels - ['relevance']
+    def default_sort_field
+      configuration.blacklight_config.default_sort_field.key
     end
 
     protected
@@ -64,25 +71,18 @@ module Spotlight
       default_blacklight_config.sort_fields
     end
 
-    def default_sort_field_labels
-      default_sort_fields.map { |k, v| v.label.underscore }
-    end
-
-    def enable_sort_fields(checked_fields)
-      default_sort_fields.each_with_object({}) do |(key, sf), new_val|
-        new_val[key] = {show: true} if checked_fields.include?(sf.label.underscore)
-      end
-    end
-
     def configuration_params(params)
-      p = params.except(:main_navigations)
+      p = params.except(:main_navigations, :searchable)
       p[:document_index_view_types] = keep_selected_values(p[:document_index_view_types])
-      p[:sort_fields] = enable_sort_fields(keep_selected_values(p[:sort_fields]))
       p
     end
 
     def exhibit_params(params)
-      params[:main_navigations].try(:values)
+      p = {searchable: params[:searchable]}
+      if main_nav_attributes = params[:main_navigations].try(:values)
+        p[:main_navigations_attributes] = main_nav_attributes
+      end
+      p
     end
 
     ##

data/app/helpers/spotlight/appearances_helper.rb

@@ -0,0 +1,15 @@
+module Spotlight
+  module AppearancesHelper
+    def translate_sort_fields(sort_config)
+      if sort_config[:sort]
+        safe_join(sort_config[:sort].split(',').map do |sort|
+          sort_field, sort_order = sort.split(' ')
+          safe_join([
+            t(:"spotlight.appearances.edit.sort_fields.sort_keys.#{sort_field}"),
+            t(:"spotlight.appearances.edit.sort_fields.sort_keys.#{sort_order}")
+          ], " ")
+        end, ", ")
+      end
+    end
+  end
+end

data/app/helpers/spotlight/application_helper.rb

@@ -37,6 +37,14 @@ module Spotlight
       end
     end
 
+    def document_action_path action_opts, url_opts = nil
+      if current_exhibit
+        spotlight.send(action_opts.path || "exhibit_#{action_opts.key}_#{controller_name}_path", url_opts)
+      else
+        super
+      end
+    end
+
     def url_to_tag_facet tag
       if current_exhibit
         search_action_url(add_facet_params(Spotlight::SolrDocument.solr_field_for_tagger(current_exhibit), tag, {}))
@@ -46,10 +54,11 @@ module Spotlight
     end
 
     ##
-    # TODO remove this when we use blacklight 5.2+
-    # Returns a document presenter for the given document
-    def presenter(document)
-      presenter_class.new(document, self)
+    # Overridden from Blacklight to inject a private class
+    def render_document_class(document = @document)
+      types = super || ""
+      types << " #{document_class_prefix}private" if document.private?(current_exhibit)
+      types
     end
 
     ##
@@ -60,10 +69,10 @@ module Spotlight
 
     # Return a copy of the blacklight configuration
     # that only includes views conifgured by our block
-    def blacklight_view_config_for_search_block sir_tervor_json
+    def blacklight_view_config_for_search_block block
       # Reject any views that aren't configured to display for this block
       blacklight_config.view.select do |view,_|
-        selected_search_block_views(sir_tervor_json).include? view.to_s
+        selected_search_block_views(block).include? view.to_s
       end
     end
     
@@ -78,10 +87,10 @@ module Spotlight
     end
 
     # Return the list of views that are configured to display for a block
-    def selected_search_block_views sir_tervor_json
-      sir_tervor_json.select do |key, value|
+    def selected_search_block_views block
+      block.as_json[:data].select do |key, value|
         value == "on"
-      end.keys
+      end.keys.map { |x| x.to_s }
     end
 
     def render_save_search

data/app/helpers/spotlight/pages_helper.rb

@@ -1,13 +1,30 @@
 module Spotlight
   module PagesHelper
+    def sir_trevor_markdown text
+      GitHub::Markup.render(".md", text.gsub("<br>", "\n").gsub("<p>", "").gsub("</p>", "\n\n")).html_safe
+    end
     def has_title? document
       document_heading(document) != document.id
     end
+    def item_grid_block_with_documents(block)
+      block_objects = item_grid_block_objects(block)
+      ids = item_grid_block_ids(block)
+      documents = get_solr_response_for_document_ids(ids).last
+      block_objects.each do |object|
+        if (doc = documents.find{ |d| d[:id] == object[:id] }).present?
+          object[:solr_document] = doc
+        end
+      end
+    end
     def item_grid_block_objects(block)
       objects = []
       block.each do |key, value|
         if value.present? and key.include?("item-grid-id")
-          objects << {id: value, display: (block[key.gsub("-id", "-display")])}
+          if (display = block[key.gsub("-id", "-display")])
+            objects << {id: value,
+                        display: display,
+                        thumbnail: block[key.gsub("-id", "-thumbnail")]}
+          end
         end
       end
       objects
@@ -21,22 +38,42 @@ module Spotlight
       key = "item-grid-#{type}-caption-field"
       if block[key].present?
         if block[key] == 'spotlight_title_field'
-          return document_heading(document)
+          document_heading(document)
         else
-          return safe_join(Array(document[block[key]]), ", ")
+          render_index_field_value document, block[key]
         end
       end
     end
     def disable_save_pages_button?
       page_collection_name == "about_pages" && @pages.empty?
     end
-    def get_search_widget_search_results sir_trevor_json
+    def get_search_widget_search_results block
       begin
-        search = Spotlight::Search.find(sir_trevor_json['searches-options'])
+        search = Spotlight::Search.find(block.send(:'searches-options'))
         get_search_results(search.query_params.with_indifferent_access.merge(params))
       rescue ActiveRecord::RecordNotFound
         []
       end
     end
+    def nestable_data_attributes(type)
+      nestable_data_attributes_hash(type).map do |attr, val|
+        "#{attr}='#{val}'"
+      end.join(' ')
+    end
+    def nestable_data_attributes_hash(type)
+      case type
+      when "feature_pages"
+        {:"data-max-depth" => '2',
+         :"data-expand-btn-HTML" => '',
+         :"data-collapse-btn-HTML" => ''}
+      when "about_pages"
+        {:"data-max-depth" => '1'}
+      else
+        {}
+      end
+    end
+    def render_contact_email_address(address)
+      mail_to address, address
+    end
   end
 end