Merge pull request #288 from sul-dlss/default-exhibit

remove unnecessary references to Spotlight::Exhibit.default

app/controllers/spotlight/catalog_controller.rb

@@ -4,7 +4,6 @@ class Spotlight::CatalogController < Spotlight::ApplicationController
   load_resource :exhibit, class: Spotlight::Exhibit
   before_filter :authenticate_user!, only: [:admin, :edit, :make_public, :make_private]
   before_filter :check_authorization, only: [:admin, :edit, :make_public, :make_private]
-  load_and_authorize_resource instance_name: :document, class: ::SolrDocument, only: [:edit]
 
   before_filter :attach_breadcrumbs
 
@@ -51,7 +50,7 @@ def update
     if params[:solr_document]
       @document = ::SolrDocument.find params[:id] 
       authenticate_user!
-      authorize! :update, @document
+      authorize! :curate, current_exhibit
       @document.update(current_exhibit, solr_document_params)
       @document.save
       redirect_to exhibit_catalog_path(current_exhibit, @document)
@@ -61,6 +60,7 @@ def update
   end
 
   def edit
+    @document = ::SolrDocument.find(params[:id])
     blacklight_config.view.edit.partials = blacklight_config.view_config(:show).partials.dup
     blacklight_config.view.edit.partials.delete "spotlight/catalog/tags"
     blacklight_config.view.edit.partials.insert(2, :edit)

app/controllers/spotlight/contact_forms_controller.rb

@@ -6,6 +6,7 @@ def new
 
     def create
       @contact_form = Spotlight::ContactForm.new(contact_form_params)
+      @contact_form.current_exhibit = current_exhibit
       @contact_form.request = request
 
       if @contact_form.valid?

app/controllers/spotlight/contacts_controller.rb

@@ -1,9 +1,8 @@
 module Spotlight
   class ContactsController < Spotlight::ApplicationController
     before_filter :authenticate_user!
-    load_and_authorize_resource except: [:new, :create]
     load_and_authorize_resource :exhibit, class: "Spotlight::Exhibit",  only: [:new, :create]
-    load_and_authorize_resource through: :exhibit, only: [:new, :create]
+    load_and_authorize_resource through: :exhibit, shallow: true
     before_filter :attach_breadcrumbs
 
     def new

app/controllers/spotlight/custom_fields_controller.rb

@@ -2,9 +2,7 @@ class Spotlight::CustomFieldsController < Spotlight::ApplicationController
   before_filter :authenticate_user!
 
   load_resource :exhibit, class: Spotlight::Exhibit, only: [:index, :new, :create]
-  load_and_authorize_resource through: :exhibit, only: [:index, :new, :create]
-
-  load_and_authorize_resource only: [:edit, :update, :destroy]
+  load_and_authorize_resource through: :exhibit, shallow: true
   before_filter :attach_breadcrumbs, only: [:new, :edit]
 
   def new

app/controllers/spotlight/exhibits_controller.rb

@@ -1,9 +1,8 @@
 class Spotlight::ExhibitsController < Spotlight::ApplicationController
   before_filter :authenticate_user!
-  before_filter :default_exhibit
   include Blacklight::SolrHelper
 
-  authorize_resource
+  load_and_authorize_resource
 
   def edit
     add_breadcrumb @exhibit.title, @exhibit
@@ -30,8 +29,4 @@ def exhibit_params
       contact_emails_attributes: [:email]
     )
   end
-
-  def default_exhibit
-    @exhibit = Spotlight::Exhibit.default
-  end
 end

app/controllers/spotlight/home_pages_controller.rb

@@ -37,8 +37,10 @@ def search_action_url *args
     def blacklight_config
       if @page
         @page.exhibit.blacklight_config
-      else 
-        Spotlight::Exhibit.default.blacklight_config
+      elsif current_exhibit
+        current_exhibit.blacklight_config
+      else
+        super
       end
     end
   end

app/controllers/spotlight/pages_controller.rb

@@ -3,8 +3,7 @@ class PagesController < Spotlight::ApplicationController
     before_filter :authenticate_user!, except: [:show]
 
     load_resource :exhibit, class: Spotlight::Exhibit, only: [:index, :new, :create, :update_all]
-    load_and_authorize_resource only: [:show, :edit, :update, :destroy, :update_all], instance_name: 'page'
-    load_and_authorize_resource through: :exhibit, only: [:index, :new, :create], instance_name: 'page'
+    load_and_authorize_resource through: :exhibit, shallow: true,  instance_name: 'page'
 
     before_filter :attach_breadcrumbs
 

app/models/spotlight/ability.rb

@@ -8,34 +8,23 @@ def initialize(user)
     # until this PR is merged: https://github.com/ryanb/cancan/pull/917
     # can :create, Spotlight::Exhibit, admin_roles: { id: user.role_ids } 
     # Until then, workaround:
-    can :update, Spotlight::Exhibit, id: user.admin_roles.map(&:exhibit_id)
 
-    can [:index, :update, :destroy, :create], Spotlight::Role, exhibit_id: user.admin_roles.map(&:exhibit_id)
+    # exhibit admin 
+    can :manage, Spotlight::Exhibit, id: user.admin_roles.map(&:exhibit_id)
+    can :manage, [Spotlight::Role], exhibit_id: user.admin_roles.map(&:exhibit_id)
 
+    # exhibit curator
+    can :manage, [
+      Spotlight::Search,
+      Spotlight::Page,
+      Spotlight::BlacklightConfiguration,
+      Spotlight::Contact,
+      Spotlight::CustomField], exhibit_id: user.roles.map(&:exhibit_id)
 
-    can [:create, :update, :destroy], Spotlight::Contact, exhibit_id: user.roles.map(&:exhibit_id)
-
-    can [:update, :edit_metadata_fields, :edit_facet_fields], Spotlight::BlacklightConfiguration do |config|
-      config.exhibit.roles.where(id: user.role_ids).any?
-    end
-
-    can :manage, Spotlight::CustomField do |config|
-      config.exhibit.roles.where(id: user.role_ids).any?
-    end
-
-    can [:curate, :tag], Spotlight::Exhibit do |exhibit|
-      # any curator or admin role
-      exhibit.roles.where(id: user.role_ids).any?
-    end
+    can [:curate, :tag], Spotlight::Exhibit, id: user.roles.map(&:exhibit_id)
 
+    # public
     can [:read, :index], [Spotlight::Exhibit, Spotlight::Page, Spotlight::Search]
 
-    # any curator or admin role
-    if Spotlight::Exhibit.default.roles.where(id: user.role_ids).any?
-      can [:create, :update, :destroy], [Spotlight::Search, Spotlight::Page]
-      can :update_all, [Spotlight::Search, Spotlight::Page] #TODO make these specific to the owning exhibit
-      can [:update], ::SolrDocument
-    end
-
   end
 end

app/models/spotlight/blacklight_configuration.rb

@@ -2,7 +2,7 @@
 
 module Spotlight
   class BlacklightConfiguration < ActiveRecord::Base
-    has_one :exhibit
+    belongs_to :exhibit
     serialize :facet_fields, Hash
     serialize :index_fields, Hash
     serialize :sort_fields, Hash

app/models/spotlight/contact_form.rb

@@ -2,6 +2,7 @@
 
 module Spotlight
   class ContactForm < MailForm::Base
+    attribute :current_exhibit
     attribute :name, validate: false
     attribute :email, validate: /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
     attribute :message
@@ -12,10 +13,11 @@ class ContactForm < MailForm::Base
     def headers
       {
         subject: "#{I18n.t(:'blacklight.application_name')} Contact Form",
-        to: Spotlight::Exhibit.default.contact_emails.first,
+        to: current_exhibit.contact_emails.first,
         from: %("#{name}" <#{email}>),
-        cc: Spotlight::Exhibit.default.contact_emails.join(", ")
+        cc: current_exhibit.contact_emails.join(", ")
       }
     end
+
   end
 end

app/models/spotlight/exhibit.rb

@@ -10,8 +10,8 @@ class Spotlight::Exhibit < ActiveRecord::Base
   has_many :users, through: :roles, class_name: '::User'
   has_many :custom_fields
   has_many :contacts
+  has_one :blacklight_configuration, class_name: Spotlight::BlacklightConfiguration
 
-  belongs_to :blacklight_configuration, class_name: Spotlight::BlacklightConfiguration
   accepts_nested_attributes_for :blacklight_configuration
   accepts_nested_attributes_for :searches
   accepts_nested_attributes_for :about_pages

app/views/_user_util_links.html.erb

@@ -14,5 +14,5 @@
     <% else %>
       <li><%= link_to t('spotlight.header_links.login'), new_user_session_path %></li>
     <% end %>
-    <li><%= link_to t('spotlight.header_links.contact'), spotlight.new_contact_form_path %></li>
+    <li><%= link_to t('spotlight.header_links.contact'), spotlight.new_exhibit_contact_form_path(current_exhibit) %></li>
   </ul>

app/views/catalog/_save_search.html.erb

@@ -1,7 +1,7 @@
 <%= button_tag t(:'spotlight.saved_search.label'), class: 'btn btn-default',  data: {toggle:"modal", target:"#save-modal"} %>
 <div class="modal fade" id="save-modal" tabindex="-1" role="dialog" aria-labelledby="save-modal-label" aria-hidden="true">
   <div class="modal-dialog">
-  <%= bootstrap_form_for [spotlight, Spotlight::Exhibit.default, Spotlight::Search.new] do |f| %>
+  <%= bootstrap_form_for [spotlight, current_exhibit, Spotlight::Search.new] do |f| %>
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>

app/views/catalog/_sort_and_per_page.html.erb

@@ -1,7 +1,7 @@
 <div id="sortAndPerPage" class="clearfix">
   <%= render :partial => "paginate_compact", :object => @response %>
   <div class="search-widgets pull-right">
-    <%= render('save_search') if can?( :curate, Spotlight::Exhibit.default) %>
+    <%= render('save_search') if current_exhibit and can?( :curate, current_exhibit) %>
     <%= render :partial => 'sort_widget' %>
     <%= render :partial => 'per_page_widget' %>
     <%= render :partial => 'view_type_group' %>

app/views/spotlight/contact_forms/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content" class="col-md-9">
-<%= bootstrap_form_for @contact_form, url: spotlight.contact_form_path(@contact_form), style: :horizontal, right: "col-sm-5" do |f| %>
+<%= bootstrap_form_for @contact_form, url: spotlight.exhibit_contact_form_path(current_exhibit, @contact_form), style: :horizontal, right: "col-sm-5" do |f| %>
   <%= curation_page_title %>
   <div class="row">
     <%= f.text_field :name %>

config/routes.rb

@@ -1,11 +1,11 @@
 Spotlight::Engine.routes.draw do
   resources :attachments
-  resource :contact_form, only: [:new, :create]
 
   get 'exhibits/:id' => 'home_pages#show'
 
   resources :contacts, only: [:edit, :update, :destroy]
   resources :exhibits, only: [:edit, :update] do
+    resource :contact_form, only: [:new, :create]
     resource :blacklight_configuration, only: [:update]
 
     get 'edit/metadata', to: "blacklight_configurations#edit_metadata_fields"

db/migrate/20140128155151_create_exhibits.rb

@@ -6,7 +6,6 @@ def change
       t.string :subtitle
       t.text :description
       t.text :contact_emails
-      t.references :blacklight_configuration
       t.timestamps
     end
 

db/migrate/20140130215634_create_spotlight_blacklight_configurations.rb

@@ -1,6 +1,7 @@
 class CreateSpotlightBlacklightConfigurations < ActiveRecord::Migration
   def change
     create_table :spotlight_blacklight_configurations do |t|
+      t.references :exhibit
       t.text :facet_fields
       t.text :index_fields
       t.text :search_fields

lib/spotlight/catalog.rb

@@ -7,7 +7,11 @@ module Catalog
     include Spotlight::Catalog::AccessControlsEnforcement
 
     def blacklight_config
-      @blacklight_config ||= Exhibit.default.blacklight_config params.fetch(:view, :list)
+      if current_exhibit
+        @blacklight_config ||= current_exhibit.blacklight_config params.fetch(:view, :list)
+      else
+        super
+      end
     end
   end
 end

spec/features/curator_items.rb

@@ -8,7 +8,7 @@
 
     visit '/'
     within '.dropdown-menu' do
-      click_link 'Curation'
+      click_link 'Dashboard'
     end
     expect(page).to have_content "Items"
   end

spec/features/feature_page_spec.rb

@@ -2,6 +2,8 @@
 
 describe "Feature page" do
   describe "sidebar" do
+    let!(:exhibit) { Spotlight::Exhibit.default }
+
     let!(:parent_feature_page) { 
       FactoryGirl.create(:feature_page, title: "Parent Page")
     }

spec/models/spotlight/ability_spec.rb

@@ -11,9 +11,8 @@
     it { should_not be_able_to(:create, exhibit) }
     it { should be_able_to(:read, exhibit) }
     it { should be_able_to(:read, page) }
-    it { should_not be_able_to(:create, Spotlight::Page) }
+    it { should_not be_able_to(:create, Spotlight::Page.new(exhibit: exhibit)) }
     it { should be_able_to(:read, search) }
-    it { should_not be_able_to(:edit, SolrDocument.new) }
     it { should_not be_able_to(:tag, exhibit) }
   end
 
@@ -47,8 +46,6 @@
     it { should be_able_to(:update, page) }
     it { should be_able_to(:destroy, page) }
 
-    it { should be_able_to(:edit, SolrDocument.new) }
-
     it { should be_able_to(:tag, exhibit) }
 
     let(:contact) { FactoryGirl.create(:contact, exhibit: exhibit) }