blacklight-spotlight 0.0.2 → 0.0.3

data/config/routes.rb

@@ -1,8 +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"
@@ -12,10 +15,17 @@ Spotlight::Engine.routes.draw do
       collection do
         get 'admin'
       end
+
+      put 'visiblity', to: "catalog#make_public"
+      delete 'visiblity', to: "catalog#make_private"
     end
 
+    resources :solr_document, only: [:edit], to: 'catalog#edit'
+
     resources :custom_fields, shallow: true
 
+    resource :dashboard, only: :show
+
     resources :searches, shallow: true do
       collection do
         patch :update_all
@@ -24,8 +34,11 @@ Spotlight::Engine.routes.draw do
     resources :browse, only: [:index, :show]
     resources :tags, only: [:index, :destroy]
 
+
     resources :about, controller: "about_pages", as: "about_pages", shallow: true do
       collection do
+        patch 'contacts' => 'about_pages#update_contacts'
+        resources :contacts, only: [:new, :create]
         patch :update_all
       end
     end

data/db/migrate/20131119213142_create_spotlight_pages.rb

@@ -7,6 +7,8 @@ class CreateSpotlightPages < ActiveRecord::Migration
       t.integer    :weight, default: 50
       t.boolean    :published
       t.references :exhibit
+      t.integer :created_by_id
+      t.integer :last_edited_by_id
       t.timestamps
       t.integer :parent_page_id
       t.boolean :display_sidebar

data/db/migrate/20140128155151_create_exhibits.rb

@@ -6,7 +6,6 @@ class CreateExhibits < ActiveRecord::Migration
       t.string :subtitle
       t.text :description
       t.text :contact_emails
-      t.references :blacklight_configuration
       t.timestamps
     end
 

data/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

data/db/migrate/20140211212626_create_spotlight_solr_document_sidecars.rb

@@ -3,6 +3,7 @@ class CreateSpotlightSolrDocumentSidecars < ActiveRecord::Migration
     create_table :spotlight_solr_document_sidecars do |t|
       t.references :exhibit, index: true
       t.string :solr_document_id, index: true
+      t.boolean :public, default: true
       t.text :data
 
       t.timestamps

data/db/migrate/20140218155151_create_contacts.rb

@@ -0,0 +1,16 @@
+class CreateContacts < ActiveRecord::Migration
+  def change
+    create_table :spotlight_contacts do |t|
+      t.string     :name
+      t.string     :email
+      t.string     :title
+      t.string     :location
+      t.boolean    :show_in_sidebar
+      t.integer    :weight, default: 50
+      t.references :exhibit
+      t.timestamps
+    end
+
+    add_index :spotlight_contacts, :exhibit_id
+  end
+end

data/lib/generators/spotlight/install_generator.rb

@@ -36,7 +36,7 @@ module Spotlight
 
     def add_model_mixin
       inject_into_file 'app/models/solr_document.rb', after: "include Blacklight::Solr::Document" do
-       "\n  include Spotlight::SolrDocument\n"
+       "\n  include Spotlight::SolrDocument\n  include Spotlight::SolrDocument::AtomicUpdates\n"
      end
     end
   end

data/lib/generators/spotlight/templates/spotlight.css.scss

@@ -1,3 +1,3 @@
-/*
- *= require spotlight/application
- */
+@import 'spotlight/variables_bootstrap';
+@import 'bootstrap';
+@import 'spotlight/application';

data/lib/spotlight/catalog.rb

@@ -1,7 +1,17 @@
 module Spotlight
   module Catalog
+    extend ActiveSupport::Concern
+
+    require 'spotlight/catalog/access_controls_enforcement'
+
+    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

data/lib/spotlight/catalog/access_controls_enforcement.rb

@@ -0,0 +1,15 @@
+module Spotlight::Catalog::AccessControlsEnforcement
+  extend ActiveSupport::Concern
+
+  included do
+    self.solr_search_params_logic << :apply_permissive_visibility_filter
+  end
+
+  protected
+
+  def apply_permissive_visibility_filter solr_params, user_params
+    unless can? :curate, current_exhibit
+      solr_params.append_filter_query "-#{Spotlight::SolrDocument.visibility_field(current_exhibit)}:false"
+    end
+  end
+end

data/lib/spotlight/engine.rb

@@ -6,15 +6,22 @@ require 'spotlight/rails/routes'
 module Spotlight
   class Engine < ::Rails::Engine
     isolate_namespace Spotlight
-    initializer "require dependencies" do
+    # Breadcrumbs on rails must be required outside of an initializer or it doesn't get loaded.
+    require 'breadcrumbs_on_rails'
+    require 'carrierwave'
+
+    config.autoload_paths += %W(
+      #{config.root}/app/builders
+    )
+
+    initializer "spotlight.initialize" do
       require 'sir-trevor-rails'
-      require 'carrierwave'
-      require 'carrierwave/orm/activerecord'
       require 'cancan'
       require 'bootstrap_form'
       require 'acts-as-taggable-on'
     end
 
+
     Blacklight::Engine.config.inject_blacklight_helpers = false
 
   end

data/lib/spotlight/rails/routes.rb

@@ -2,7 +2,11 @@ module ActionDispatch::Routing
   class Mapper
 
     def spotlight_root
-      root to: "spotlight/home_pages#show"
+      if Spotlight::Exhibit.table_exists?
+        root to: "spotlight/home_pages#show", defaults: {id: Spotlight::Exhibit.default.home_page.id} 
+      else
+        root to: "catalog#index"
+      end
     end
   end
-end
+end

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/controllers/spotlight/about_pages_controller_spec.rb

@@ -17,11 +17,65 @@ describe Spotlight::AboutPagesController do
   describe "when signed in as a curator" do
     let(:user) { FactoryGirl.create(:exhibit_curator) }
     before {sign_in user }
+    let(:exhibit) { page.exhibit }
+
+    describe "GET show" do
+      let(:page) { FactoryGirl.create(:about_page, weight: 0) }
+      let(:page2) { FactoryGirl.create(:about_page, weight: 5) }
+      describe "on the main about page" do
+        it "is successful" do
+          expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit)
+          expect(controller).to receive(:add_breadcrumb).with("About", page)
+          get :show, id: page
+          expect(assigns(:page)).to eq page
+          expect(assigns(:exhibit)).to eq Spotlight::Exhibit.default
+        end
+      end
+      describe "on a different about page" do
+        it "is successful" do
+          expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit)
+          expect(controller).to receive(:add_breadcrumb).with('About', page)
+          expect(controller).to receive(:add_breadcrumb).with(page2.title, page2)
+          get :show, id: page2
+          expect(assigns(:page)).to eq page2
+          expect(assigns(:exhibit)).to eq Spotlight::Exhibit.default
+        end
+      end
+    end
+
+    describe "GET edit" do
+      let(:page) { FactoryGirl.create(:about_page, weight: 0) }
+      let(:page2) { FactoryGirl.create(:about_page, weight: 5) }
+      describe "on the main about page" do
+        it "is successful" do
+          expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit)
+          expect(controller).to receive(:add_breadcrumb).with("About Pages", exhibit_about_pages_path(exhibit))
+          get :edit, id: page
+          expect(assigns(:page)).to eq page
+          expect(assigns(:exhibit)).to eq Spotlight::Exhibit.default
+        end
+      end
+      describe "on a different about page" do
+        it "is successful" do
+          expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit)
+          expect(controller).to receive(:add_breadcrumb).with("About Pages", exhibit_about_pages_path(exhibit))
+          expect(controller).to receive(:add_breadcrumb).with(page2.title, edit_about_page_path(page2))
+          get :edit, id: page2
+          expect(assigns(:page)).to eq page2
+          expect(assigns(:exhibit)).to eq Spotlight::Exhibit.default
+        end
+      end
+    end
 
     describe "GET index" do
       let!(:page) { FactoryGirl.create(:about_page) }
       it "is successful" do
+        expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit)
+        expect(controller).to receive(:add_breadcrumb).with("Curation", exhibit_dashboard_path(exhibit))
+        expect(controller).to receive(:add_breadcrumb).with("About Pages", exhibit_about_pages_path(exhibit))
         get :index, exhibit_id: Spotlight::Exhibit.default
+        expect(assigns(:page)).to be_kind_of Spotlight::Page
+        expect(assigns(:page)).to be_new_record
         expect(assigns(:pages)).to include page
         expect(assigns(:exhibit)).to eq Spotlight::Exhibit.default
       end
@@ -54,5 +108,30 @@ describe Spotlight::AboutPagesController do
         expect(page3.reload.published).to be_true # should remain untouched since it wasn't in present[]
       end
     end
+
+    describe "PATCH update_contacts" do
+      let!(:contact1) { FactoryGirl.create(:contact, name: 'Aphra Behn', exhibit: exhibit) }
+      let!(:contact2) { FactoryGirl.create(:contact, exhibit: exhibit) }
+      let(:exhibit) { user.roles.first.exhibit }
+      it "should update contacts" do
+        patch :update_contacts, exhibit_id: exhibit, exhibit: {contacts_attributes: [
+          {"show_in_sidebar"=>"1", "id"=>contact1.id, weight: 1},
+          {"show_in_sidebar"=>"0", "id"=>contact2.id, weight: 2}]}
+        expect(response).to redirect_to exhibit_about_pages_path(exhibit)
+        expect(flash[:notice]).to eq 'Contacts were successfully updated.'
+        expect(exhibit.contacts.size).to eq 2
+        expect(exhibit.contacts.published.map(&:name)).to eq ['Aphra Behn']
+        expect(contact1.reload.weight).to eq 1
+        expect(contact2.reload.weight).to eq 2
+      end
+      it "should show index on failure" do
+        Spotlight::Exhibit.any_instance.should_receive(:update).and_return(false)
+        patch :update_contacts, exhibit_id: exhibit, exhibit: {contacts_attributes: [
+          {"show_in_sidebar"=>"1", "name"=>"Justin Coyne", "email"=>"jcoyne@justincoyne.com", "title"=>"", "location"=>"US"},
+          {"show_in_sidebar"=>"0", "name"=>"", "email"=>"", "title"=>"", "location"=>""},
+          {"show_in_sidebar"=>"0", "name"=>"", "email"=>"", "title"=>"Librarian", "location"=>""}]}
+        response.should render_template("index")
+      end
+    end
   end
 end

data/spec/controllers/spotlight/blacklight_configurations_controller_spec.rb

@@ -51,6 +51,9 @@ describe Spotlight::BlacklightConfigurationsController do
 
     describe "#edit_metadata_fields" do
       it "should be successful" do
+        expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit)
+        expect(controller).to receive(:add_breadcrumb).with("Curation", exhibit_dashboard_path(exhibit))
+        expect(controller).to receive(:add_breadcrumb).with("Metadata", exhibit_edit_metadata_path(exhibit))
         get :edit_metadata_fields, exhibit_id: exhibit
         expect(response).to be_successful
       end
@@ -58,6 +61,9 @@ describe Spotlight::BlacklightConfigurationsController do
 
     describe "#edit_facet_fields" do
       it "should be successful" do
+        expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit)
+        expect(controller).to receive(:add_breadcrumb).with("Curation", exhibit_dashboard_path(exhibit))
+        expect(controller).to receive(:add_breadcrumb).with("Search facets", exhibit_edit_facets_path(exhibit))
         controller.stub_chain(:blacklight_solr, :get).and_return({})
         get :edit_facet_fields, exhibit_id: exhibit
         expect(response).to be_successful
@@ -67,7 +73,7 @@ describe Spotlight::BlacklightConfigurationsController do
     describe "#update" do
 
       it "should update metadata fields" do
-        exhibit.blacklight_configuration.default_blacklight_config.stub(index_fields: { 'a' => {},  'b' => {},  'c' => {}, 'd' => {},  'e' => {}, 'f' => {} })
+        ::CatalogController.stub(blacklight_config: Blacklight::Configuration.new(index_fields: { 'a' => {},  'b' => {},  'c' => {}, 'd' => {},  'e' => {}, 'f' => {} }))
         patch :update, exhibit_id: exhibit, blacklight_configuration: {
           index_fields: {
             c: { enabled: true, show: true},
@@ -86,12 +92,12 @@ describe Spotlight::BlacklightConfigurationsController do
 
       it "should update facet fields" do
         patch :update, exhibit_id: exhibit, blacklight_configuration: { 
-          facet_fields: { 'genre_sim' => { enabled: '1', label: "Label"} }  
+          facet_fields: { 'genre_ssim' => { enabled: '1', label: "Label"} }  
         }
         expect(flash[:notice]).to eq "The exhibit was saved."
         expect(response).to redirect_to main_app.root_path
         assigns[:exhibit].tap do |saved|
-          expect(saved.blacklight_configuration.facet_fields.keys).to eq ['genre_sim']
+          expect(saved.blacklight_configuration.facet_fields.keys).to eq ['genre_ssim']
         end
       end
     end

data/spec/controllers/spotlight/browse_controller_spec.rb

@@ -2,24 +2,33 @@ require 'spec_helper'
 
 describe Spotlight::BrowseController do
   routes { Spotlight::Engine.routes }
-  let(:search) { FactoryGirl.create(:published_search) }
   let(:exhibit) { Spotlight::Exhibit.default }
+  let!(:search) { FactoryGirl.create(:published_search, exhibit: exhibit) }
+  let!(:unpublished) { FactoryGirl.create(:search, exhibit: exhibit) }
 
   describe "#index" do
     it "should show the list of browse categories" do
+      expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit)
+      expect(controller).to receive(:add_breadcrumb).with("Browse", exhibit_browse_index_path(exhibit))
       get :index, exhibit_id: exhibit
       expect(response).to be_successful
-      expect(assigns[:searches]).to eq exhibit.searches.published
+      expect(assigns[:searches]).to eq [search]
+      expect(assigns[:searches]).to_not include unpublished
       expect(assigns[:exhibit]).to eq exhibit
       expect(response).to render_template "spotlight/browse/index"
     end
   end
 
   describe "#show" do
-    it "should show the items in the category" do
-      mock_response = double
-      document_list = double
+    let(:mock_response) { double }
+    let(:document_list) { double }
+    before do
       controller.stub(get_search_results: [mock_response, document_list])
+    end
+    it "should show the items in the category" do
+      expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit)
+      expect(controller).to receive(:add_breadcrumb).with("Browse", exhibit_browse_index_path(exhibit))
+      expect(controller).to receive(:add_breadcrumb).with(search.title, exhibit_browse_path(exhibit, search))
       get :show, id: search, exhibit_id: exhibit
       expect(response).to be_successful
       expect(assigns[:search]).to be_a Spotlight::Search

data/spec/controllers/spotlight/catalog_controller_spec.rb

@@ -19,6 +19,40 @@ describe Spotlight::CatalogController do
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
+
+    describe "GET show" do
+      let (:exhibit) {Spotlight::Exhibit.default}
+      let (:document) { SolrDocument.find('dq287tq6352') }
+      let(:search) { FactoryGirl.create(:search) }
+      it "should show the item" do
+        expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit_path(exhibit, q: ''))
+        expect(controller).to receive(:add_breadcrumb).with("L'AMERIQUE", exhibit_catalog_path(exhibit, document))
+        get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+        expect(response).to be_successful
+      end
+
+      it "should show the item with breadcrumbs to the browse page" do
+        controller.stub(current_browse_category: search)
+        
+        expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit_path(exhibit, q: ''))
+        expect(controller).to receive(:add_breadcrumb).with("Browse", exhibit_browse_index_path(exhibit))
+        expect(controller).to receive(:add_breadcrumb).with(search.title, exhibit_browse_path(exhibit, search))
+        expect(controller).to receive(:add_breadcrumb).with("L'AMERIQUE", exhibit_catalog_path(exhibit, document))
+        get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+        expect(response).to be_successful
+      end
+    end
+
+
+    describe "GET index" do
+      let (:exhibit) {Spotlight::Exhibit.default}
+      it "should show the item" do
+        expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit_path(exhibit, q: ''))
+        expect(controller).to receive(:add_breadcrumb).with("Search Results", exhibit_catalog_index_path(exhibit, q:'map'))
+        get :index, exhibit_id: exhibit, q: 'map'
+        expect(response).to be_successful
+      end
+    end
   end
 
   describe "when the user is not authorized" do
@@ -26,6 +60,12 @@ describe Spotlight::CatalogController do
       sign_in FactoryGirl.create(:exhibit_visitor)
     end
 
+    describe "GET index" do
+      it "should apply gated discovery access controls" do
+        expect(controller.solr_search_params_logic).to include :apply_permissive_visibility_filter
+      end
+    end
+
     describe "GET admin" do
       it "should deny access" do
         get :admin, exhibit_id: Spotlight::Exhibit.default
@@ -42,25 +82,59 @@ describe Spotlight::CatalogController do
         expect(flash[:alert]).to eq "You are not authorized to access this page."
       end
     end
+
+    describe "GET show with private item" do
+      let (:exhibit) {Spotlight::Exhibit.default}
+      it "should not be allowed" do
+        ::SolrDocument.any_instance.stub(:private?).and_return(true)
+        get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+        expect(response).to redirect_to main_app.root_path
+        expect(flash[:alert]).to eq "You are not authorized to access this page."
+      end
+    end
+
+    describe "PUT make_public" do
+
+      let (:exhibit) {Spotlight::Exhibit.default}
+      it "should not be allowed" do
+        put :make_public, exhibit_id: exhibit, catalog_id: 'dq287tq6352'
+        expect(response).to redirect_to main_app.root_path
+        expect(flash[:alert]).to eq "You are not authorized to access this page."
+      end
+
+    end
+
+    describe "DELETE make_private" do
+
+      let (:exhibit) {Spotlight::Exhibit.default}
+      it "should not be allowed" do
+        delete :make_private, exhibit_id: exhibit, catalog_id: 'dq287tq6352'
+        expect(response).to redirect_to main_app.root_path
+        expect(flash[:alert]).to eq "You are not authorized to access this page."
+      end
+    end
   end
 
   describe "when the user is a curator" do
     before do
       sign_in FactoryGirl.create(:exhibit_curator)
     end
+    let (:exhibit) { Spotlight::Exhibit.default }
 
     it "should show all the items" do
-      get :admin, exhibit_id: Spotlight::Exhibit.default
+      expect(controller).to receive(:add_breadcrumb).with(exhibit.title, exhibit_path(exhibit, q: ''))
+      expect(controller).to receive(:add_breadcrumb).with("Curation", exhibit_dashboard_path(exhibit))
+      expect(controller).to receive(:add_breadcrumb).with("Items", admin_exhibit_catalog_index_path(exhibit))
+      get :admin, exhibit_id: exhibit
       expect(response).to be_successful
       expect(assigns[:document_list]).to be_a Array
-      expect(assigns[:exhibit]).to eq Spotlight::Exhibit.default
+      expect(assigns[:exhibit]).to eq exhibit
       expect(response).to render_template "spotlight/catalog/admin"
     end
 
     before {sign_in FactoryGirl.create(:exhibit_curator)}
 
     describe "GET edit" do
-      let (:exhibit) {Spotlight::Exhibit.default}
       it "should be successful" do
         get :edit, exhibit_id: exhibit, id: 'dq287tq6352'
         expect(response).to be_successful
@@ -69,11 +143,41 @@ describe Spotlight::CatalogController do
       end
     end
     describe "PATCH update" do
-      let (:exhibit) {Spotlight::Exhibit.default}
       it "should be successful" do
         patch :update, exhibit_id: exhibit, id: 'dq287tq6352', solr_document: {tag_list: 'one, two'}
         expect(response).to be_redirect
       end
     end
+
+
+    describe "PUT make_public" do
+      before do
+        request.env["HTTP_REFERER"] = "where_i_came_from"
+        ::SolrDocument.any_instance.stub(:reindex)
+      end
+
+      it "should be successful" do
+        ::SolrDocument.any_instance.should_receive(:reindex)
+        ::SolrDocument.any_instance.should_receive(:make_public!).with(exhibit)
+        put :make_public, exhibit_id: exhibit, catalog_id: 'dq287tq6352'
+        expect(response).to redirect_to "where_i_came_from"
+      end
+
+    end
+
+    describe "DELETE make_private" do
+
+      before do
+        request.env["HTTP_REFERER"] = "where_i_came_from"
+        ::SolrDocument.any_instance.stub(:reindex)
+      end
+
+      it "should be successful" do
+        ::SolrDocument.any_instance.should_receive(:reindex)
+        ::SolrDocument.any_instance.should_receive(:make_private!).with(exhibit)
+        delete :make_private, exhibit_id: exhibit, catalog_id: 'dq287tq6352'
+        expect(response).to redirect_to "where_i_came_from"
+      end
+    end
   end
 end