blacklight-spotlight 0.0.2 → 0.0.3

data/spec/models/solr_document_spec.rb

@@ -4,6 +4,9 @@ describe SolrDocument do
   subject { ::SolrDocument.new(id: 'abcd123') }
   its(:to_key) {should == ['abcd123']}
   its(:persisted?) {should be_true}
+  before do
+    subject.stub(reindex: nil)
+  end
 
   it "should have tags on the exhibit" do
     expect(subject.tags_from(Spotlight::Exhibit.default)).to be_empty
@@ -20,6 +23,10 @@ describe SolrDocument do
     expect(::SolrDocument.find('dq287tq6352')).to be_kind_of SolrDocument
   end
 
+  it "should have ==" do
+    expect(::SolrDocument.find('dq287tq6352')).to eq ::SolrDocument.find('dq287tq6352')
+  end
+
   describe "#sidebar" do
     it "should return a sidecar for adding exhibit-specific fields" do
       expect(subject.sidecar(Spotlight::Exhibit.default)).to be_kind_of Spotlight::SolrDocumentSidecar
@@ -38,5 +45,68 @@ describe SolrDocument do
       subject.tags_from(Spotlight::Exhibit.default).should eq ['paris', 'normandy']
     end
   end
+
+  describe "#to_solr" do
+    before do
+      Spotlight::SolrDocumentSidecar.create! solr_document: subject, exhibit: Spotlight::Exhibit.default,
+        data: {'a_tesim' => 1, 'b_tesim' => 2, 'c_tesim' => 3 }
+    end
+
+    it "should include the doc id" do
+      expect(subject.to_solr[:id]).to eq 'abcd123' 
+    end
+
+    it "should include exhibit-specific tags" do
+      Spotlight::Exhibit.default.tag(subject, with: 'paris', on: :tags)
+
+      expect(subject.to_solr).to include :exhibit_1_tags_ssim
+      expect(subject.to_solr[:exhibit_1_tags_ssim]).to include 'paris'
+    end
+
+    it "should include placeholders for all exhibits' tags" do
+      expect(subject.to_solr).to include :exhibit_1_tags_ssim
+      expect(subject.to_solr[:exhibit_1_tags_ssim]).to eq nil
+    end
+
+    it "should include sidecar fields" do
+      expect(subject.to_solr).to include('a_tesim' => 1, 'b_tesim' => 2, 'c_tesim' => 3)
+    end
+  end
+
+  describe "#public?" do
+    it "should default to public" do
+      expect(subject).to be_public Spotlight::Exhibit.default
+    end
+  end
+
+  describe "#private?" do
+    it "should default to public" do
+      expect(subject).not_to be_private Spotlight::Exhibit.default
+    end
+  end
+
+  describe "#make_public!" do
+    it "should set the object to public" do
+      subject.stub(:reindex)
+      subject.make_public! Spotlight::Exhibit.default
+      expect(subject).not_to be_private Spotlight::Exhibit.default
+    end
+
+    it "should augment existing sidecar data" do
+      subject.stub(:reindex)
+
+      subject.update Spotlight::Exhibit.default, sidecar: { data: { a: 1}} 
+      subject.make_public! Spotlight::Exhibit.default
+      expect(subject.sidecar(Spotlight::Exhibit.default).data[:a]).to eq 1
+    end
+  end
+
+  describe "#make_private!" do
+    it "should set the object to private" do
+      subject.stub(:reindex)
+      subject.make_private! Spotlight::Exhibit.default
+      expect(subject).to be_private Spotlight::Exhibit.default
+    end
+  end
 end
 

data/spec/models/spotlight/ability_spec.rb

@@ -11,10 +11,9 @@ describe Spotlight::Ability do
     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(:destroy, FactoryGirl.create(:tag)) }
+    it { should_not be_able_to(:tag, exhibit) }
   end
 
   describe "a user with admin role" do
@@ -47,9 +46,13 @@ describe Spotlight::Ability do
     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) }
 
-    it { should be_able_to(:index, ActsAsTaggableOn::Tag) }
-    it { should be_able_to(:destroy, FactoryGirl.create(:tag)) }
+    let(:contact) { FactoryGirl.create(:contact, exhibit: exhibit) }
+
+    it { should be_able_to(:edit, contact) }
+    it { should be_able_to(:new, contact) }
+    it { should be_able_to(:create, contact) }
+    it { should be_able_to(:destroy, contact) }
   end
 end

data/spec/models/spotlight/blacklight_configuration_spec.rb

@@ -24,24 +24,24 @@ describe Spotlight::BlacklightConfiguration do
     end
 
     it "should filter the upstream blacklight config" do
-      subject.facet_fields['a'] = { enabled: true }
-      subject.facet_fields['b'] = { enabled: false }
-      subject.facet_fields['d'] = { enabled: true }
+      subject.facet_fields['a'] = { show: true }
+      subject.facet_fields['b'] = { show: false }
+      subject.facet_fields['d'] = { show: true }
 
       blacklight_config.add_facet_field 'a'
       blacklight_config.add_facet_field 'b'
       blacklight_config.add_facet_field 'c'
 
-      expect(subject.blacklight_config.facet_fields).to include('a')
-      expect(subject.blacklight_config.facet_fields).to_not include('b')
-      expect(subject.blacklight_config.facet_fields).to have(1).fields
+      expect(subject.blacklight_config.facet_fields['a'].show).to be_true
+      expect(subject.blacklight_config.facet_fields['b'].show).to be_false
+      expect(subject.blacklight_config.facet_fields['d']).to be_nil
     end
 
     it "should order the fields by weight" do
 
-      subject.facet_fields['a'] = { enabled: true, weight: 3 }
-      subject.facet_fields['b'] = { enabled: true, weight: 5 }
-      subject.facet_fields['c'] = { enabled: true, weight: 1 }
+      subject.facet_fields['a'] = { show: true, weight: 3 }
+      subject.facet_fields['b'] = { show: true, weight: 5 }
+      subject.facet_fields['c'] = { show: true, weight: 1 }
 
       blacklight_config.add_facet_field 'a'
       blacklight_config.add_facet_field 'b'

data/spec/models/spotlight/custom_field_spec.rb

@@ -12,7 +12,7 @@ describe Spotlight::CustomField do
       subject.exhibit = Spotlight::Exhibit.default
       subject.save
 
-      expect(subject.field).to eq "exhibit_#{Spotlight::Exhibit.default.to_param}_xyz"
+      expect(subject.field).to eq "exhibit_#{Spotlight::Exhibit.default.to_param}_xyz_tesim"
     end
   end
-end
+end

data/spec/models/spotlight/exhibit_spec.rb

@@ -33,5 +33,14 @@ describe Spotlight::Exhibit do
     expect(subject.searches).to eq [search]
   end
 
-   
+  describe "contacts" do
+    before do
+      subject.contacts_attributes= [
+        {"show_in_sidebar"=>"0", "name"=>"Justin Coyne", "email"=>"jcoyne@justincoyne.com", "title"=>"", "location"=>"US"},
+        {"show_in_sidebar"=>"0", "name"=>"", "email"=>"", "title"=>"Librarian", "location"=>""}]
+    end
+    it "should accept nested contacts" do
+      expect(subject.contacts.size).to eq 2
+    end
+  end
 end

data/spec/models/spotlight/home_page_spec.rb

@@ -20,4 +20,18 @@ describe Spotlight::HomePage do
       expect(json["data"].first["data"]["text"]).to eq Spotlight::HomePage.default_content_text
     end
   end
+  describe "title_or_default" do
+    describe "when present" do
+      subject { FactoryGirl.build(:home_page, title: "Home Page Title") }
+      its(:title_or_default) { should eq "Home Page Title" }
+    end
+    describe "when blank" do
+      subject { FactoryGirl.build(:home_page, title: "") }
+      its(:title_or_default) { should eq "Exhibit Home" }
+    end
+    describe "when nil" do
+      subject { FactoryGirl.build(:home_page, title: nil) }
+      its(:title_or_default) { should eq "Exhibit Home" }
+    end
+  end
 end

data/spec/models/spotlight/page_spec.rb

@@ -35,4 +35,11 @@ describe Spotlight::Page do
 
     end
   end
-end
+
+  describe "title_or_default" do
+    subject { FactoryGirl.build(:about_page, title: 'my title') }
+    it "should return the title" do
+      expect(subject.title_or_default).to eq 'my title'
+    end
+  end
+end

data/spec/models/spotlight/role_spec.rb

@@ -13,22 +13,22 @@ describe Spotlight::Role do
     describe "with user_key" do
       let (:user) { FactoryGirl.create(:user)}
       describe "that doesn't point at a user" do
-        let(:args) { {role: 'curate', user_key: 'bob'} }
+        let(:args) { {role: 'curator', user_key: 'bob'} }
         it "should not be valid" do
           expect(subject).not_to be_valid
           expect(subject.errors.messages).to eq({:user_key=>["User must sign up first."]})
         end
       end
       describe "that points at a user" do
-        let(:args) { {role: 'curate', user_key: user.email} }
+        let(:args) { {role: 'curator', user_key: user.email} }
         it "should be valid" do
           expect(subject).to be_valid
           expect(subject.errors.messages).to be_empty
         end
       end
       describe "that points at a user with an existing role" do
-        before { Spotlight::Role.create!(role: 'curate', user: user) }
-        let(:args) { {role: 'curate', user_key: user.email} }
+        before { Spotlight::Role.create!(role: 'curator', user: user) }
+        let(:args) { {role: 'curator', user_key: user.email} }
         it "should be valid" do
           expect(subject).not_to be_valid
           expect(subject.errors.messages).to eq({:user_key => ["already a member of this exhibit"]})

data/spec/models/spotlight/solr_document_atomic_updates_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Spotlight::SolrDocument::AtomicUpdates do
+  let(:blacklight_solr) { double }
+  subject do
+    ::SolrDocument.new.extend(Spotlight::SolrDocument::AtomicUpdates)
+  end
+
+  before do
+    subject.stub(blacklight_solr: blacklight_solr)
+  end
+
+  describe "#reindex" do
+    before do
+      subject.stub(to_solr: { id: 'doc_id', a: 1, b: 2 })
+    end
+
+    it "should send an atomic update request" do
+      blacklight_solr.should_receive(:update).with(params: { commitWithin: 500 }, data: [{id: 'doc_id', a: { set: 1 }, b: { set: 2 }}].to_json, headers: { 'Content-Type' => 'application/json'})
+      subject.reindex
+    end
+
+    it "should cowardly refuse to index a document if the only value is an id" do
+      subject.stub(to_solr: { id: 'doc_id' })
+      blacklight_solr.should_not_receive(:update)
+      subject.reindex
+    end
+  end
+end

data/spec/models/spotlight/solr_document_sidecar_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Spotlight::SolrDocumentSidecar do
+  before do
+    subject.stub exhibit: Spotlight::Exhibit.default
+    subject.stub solr_document_id: 'doc_id'
+  end
+
+  describe "#to_solr" do
+    before do
+      subject.data = {'a_tesim' => 1, 'b_tesim' => 2, 'c_tesim' => 3 }
+    end
+
+    its(:to_solr) { should include id: 'doc_id' }
+    its(:to_solr) { should include exhibit_1_public_bsi: true }
+    its(:to_solr) { should include 'a_tesim', 'b_tesim', 'c_tesim' }
+  end
+
+end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'rspec/rails'
 require 'rspec/autorun'
 require 'capybara/poltergeist'
 Capybara.javascript_driver = :poltergeist
+Capybara.default_wait_time = 5
 
 if ENV["COVERAGE"] or ENV["CI"]
   require 'simplecov'
@@ -46,6 +47,7 @@ RSpec.configure do |config|
 
   config.include Devise::TestHelpers, type: :controller
   config.include Devise::TestHelpers, type: :view
+  config.include Spotlight::TestViewHelpers, type: :view
   config.include Warden::Test::Helpers, type: :feature
   config.include Controllers::EngineHelpers, type: :controller
   config.include Capybara::DSL

data/spec/support/views/test_view_helpers.rb

@@ -0,0 +1,12 @@
+module Spotlight
+  module TestViewHelpers
+    extend ActiveSupport::Concern
+
+    included do
+      before do
+        view.send(:extend, Spotlight::CrudLinkHelpers)
+        view.send(:extend, Spotlight::AdminTitleHelper)
+      end
+    end
+  end
+end

data/spec/test_app_templates/catalog_controller.rb

@@ -50,12 +50,12 @@ class CatalogController < ApplicationController
     #
     # :show may be set to false if you don't want the facet to be drawn in the 
     # facet bar
-    config.add_facet_field 'genre_sim', :label => 'Genre', :limit => true 
+    config.add_facet_field 'genre_ssim', :label => 'Genre', :limit => true 
     config.add_facet_field 'personal_name_ssm', :label => 'Personal Names', :limit => true 
     config.add_facet_field 'corporate_name_ssm', :label => 'Corporate Names', :limit => true
-    config.add_facet_field 'subject_geographic_sim', :label => 'Geographic' 
-    config.add_facet_field 'subject_temporal_sim', :label => 'Era'  
-    config.add_facet_field 'language_sim', :label => 'Language'  
+    config.add_facet_field 'subject_geographic_ssim', :label => 'Geographic' 
+    config.add_facet_field 'subject_temporal_ssim', :label => 'Era'  
+    config.add_facet_field 'language_ssim', :label => 'Language'  
 
 
     # Have BL send all facet field names to Solr, which has been the default
@@ -85,8 +85,9 @@ class CatalogController < ApplicationController
     config.add_show_field 'personal_name_ssm', :label => 'Personal Names'
     config.add_show_field 'corporate_name_ssm', :label => 'Corporate Names'
 
+    config.add_sort_field 'score desc, sort_title_ssi asc', :label => 'Relevance' 
   end
 
 
 
-end 
+end 

data/spec/views/_user_util_links.html.erb_spec.rb

@@ -2,8 +2,10 @@ require 'spec_helper'
 
 module Spotlight
   describe "_user_util_links" do
+    let(:current_exhibit) { Spotlight::Exhibit.default }
     before do
       view.stub(:current_user).and_return(current_user)
+      view.stub(:current_exhibit).and_return(current_exhibit)
     end
 
     describe "when user is not logged in" do
@@ -20,8 +22,7 @@ module Spotlight
       it "renders the links" do
         render
         expect(rendered).to have_link 'Report a problem'
-        expect(rendered).to_not have_link 'Administration'
-        expect(rendered).to_not have_link 'Curation'
+        expect(rendered).to_not have_link 'Dashboard'
         expect(rendered).to have_link 'Sign out'
       end
     end
@@ -29,28 +30,26 @@ module Spotlight
     describe "when user is a curator" do
       let(:current_user) { ::User.new }
       before do
-        view.stub(:can?).with(:update, Spotlight::Exhibit.default).and_return(false)
-        view.stub(:can?).with(:curate, Spotlight::Exhibit.default).and_return(true)
+        view.stub(:can?).with(:update, current_exhibit).and_return(false)
+        view.stub(:can?).with(:curate, current_exhibit).and_return(true)
       end
       it "renders the links" do
         render
         expect(rendered).to have_link 'Report a problem'
-        expect(rendered).to have_link 'Curation'
+        expect(rendered).to have_link 'Dashboard'
         expect(rendered).to have_link 'Sign out'
-        expect(rendered).to_not have_link 'Administration'
       end
     end
     describe "when user is an admin" do
       let(:current_user) { ::User.new }
       before do
-        view.stub(:can?).with(:update, Spotlight::Exhibit.default).and_return(true)
-        view.stub(:can?).with(:curate, Spotlight::Exhibit.default).and_return(true)
+        view.stub(:can?).with(:update, current_exhibit).and_return(true)
+        view.stub(:can?).with(:curate, current_exhibit).and_return(true)
       end
       it "renders the links" do
         render
         expect(rendered).to have_link 'Report a problem'
-        expect(rendered).to have_link 'Administration'
-        expect(rendered).to have_link 'Curation'
+        expect(rendered).to have_link 'Dashboard'
         expect(rendered).to have_link 'Sign out'
       end
     end

data/spec/views/shared/_exhibit_masthead.html.erb_spec.rb

@@ -8,15 +8,15 @@ module Spotlight
     it "should display the title and subtitle" do
       view.stub(current_exhibit: current_exhibit)
       render
-      expect(rendered).to have_selector('h1', text: "Some title")
-      expect(rendered).to have_selector('h1 small', text: "Subtitle")
+      expect(rendered).to have_selector('.site-title', text: "Some title")
+      expect(rendered).to have_selector('.site-title small', text: "Subtitle")
     end
 
     it "should display just the title" do
       view.stub(current_exhibit: current_exhibit_without_subtitle)
       render
-      expect(rendered).to have_selector('h1', text: "Some title")
-      expect(rendered).to_not have_selector('h1 small')
+      expect(rendered).to have_selector('.site-title', text: "Some title")
+      expect(rendered).to_not have_selector('.site-title small')
     end
   end
 end

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

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe "spotlight/about_pages/index.html.erb" do
+  let(:pages) {[
+      stub_model(Spotlight::AboutPage,
+        :title => "Title1",
+        :content => "MyText",
+        exhibit: exhibit
+      ),
+      stub_model(Spotlight::AboutPage,
+        :title => "Title2",
+        :content => "MyText",
+        exhibit: exhibit
+      )
+    ]}
+  let(:contacts) {[
+      stub_model(Spotlight::Contact,
+        exhibit: exhibit
+      ),
+      stub_model(Spotlight::Contact,
+        exhibit: exhibit
+      )
+    ]}
+  let(:exhibit) { stub_model(Spotlight::Exhibit) }
+  before do
+    view.stub(:page_collection_name).and_return(:about_pages)
+    view.stub(:update_all_exhibit_about_pages_path).and_return("/exhibit/about/update_all")
+    view.stub(:exhibit_contacts_path).and_return("/exhibit/1/contacts")
+    exhibit.stub(:contacts => contacts)
+    assign(:page, Spotlight::AboutPage.new)
+    assign(:exhibit, exhibit)
+    view.stub(:current_exhibit).and_return(exhibit)
+    view.lookup_context.prefixes << 'spotlight/pages'
+  end
+
+  it "renders a list of pages and contacts" do
+    assign(:pages, pages)
+    exhibit.stub(:about_pages).and_return pages
+    render
+    expect(rendered).to have_selector '.panel-title', text: 'Title1'
+    expect(rendered).to have_selector '.panel-title', text: 'Title2'
+
+    expect(rendered).to have_selector '.contacts_admin ol.dd-list li[data-id]', count: 2
+    expect(rendered).to have_selector '.contacts_admin ol.dd-list li input[data-property=weight]', count: 2
+    expect(rendered).to have_selector '.contacts_admin ol.dd-list li input#exhibit_contacts_attributes_0_id'
+    expect(rendered).to have_selector '.contacts_admin ol.dd-list li input#exhibit_contacts_attributes_1_id'
+  end
+
+  describe "Without pages" do
+    it "should disable the update button" do
+      assign(:pages, [])
+      render
+      expect(rendered).to have_selector 'button[disabled]', text: "Save changes"
+    end
+  end
+
+end