blacklight-spotlight 0.12.1 → 0.13.0

data/spec/models/spotlight/custom_field_spec.rb

@@ -73,15 +73,14 @@ describe Spotlight::CustomField, type: :model do
 
   describe '#solr_field' do
     let(:exhibit) { FactoryGirl.create(:exhibit) }
-
-    before do
-      subject.configuration['label'] = 'xyz'
-      subject.exhibit = exhibit
-      subject.save
+    let(:custom_field) do
+      described_class.create(exhibit: exhibit, configuration: { 'label' => 'xyz' })
     end
 
+    subject { custom_field.solr_field }
+
     it 'is auto-generated from the field label' do
-      expect(subject.solr_field).to eq "exhibit_#{exhibit.to_param}_xyz_tesim"
+      expect(subject).to eq "exhibit_#{exhibit.to_param}_xyz_tesim"
     end
 
     context 'with a solr field prefix configured' do
@@ -90,17 +89,17 @@ describe Spotlight::CustomField, type: :model do
       end
 
       it 'uses the solr field prefix' do
-        expect(subject.solr_field).to eq "prefix_exhibit_#{exhibit.to_param}_xyz_tesim"
+        expect(subject).to eq "prefix_exhibit_#{exhibit.to_param}_xyz_tesim"
       end
     end
 
     context 'for a legacy solr field name' do
       before do
-        subject.field = "exhibit_#{exhibit.to_param}_xyz_tesim"
+        custom_field.field = "exhibit_#{exhibit.to_param}_xyz_tesim"
       end
 
       it 'returns the original field name' do
-        expect(subject.solr_field).to eq "exhibit_#{exhibit.to_param}_xyz_tesim"
+        expect(subject).to eq "exhibit_#{exhibit.to_param}_xyz_tesim"
       end
     end
   end

data/spec/models/spotlight/resources/open_graph_spec.rb

@@ -6,7 +6,7 @@ describe Spotlight::Resources::OpenGraph, type: :model do
     include Spotlight::Resources::OpenGraph
   end
 
-  let(:exhibit) { double(solr_data: {}) }
+  let(:exhibit) { double(solr_data: {}, blacklight_config: Blacklight::Configuration.new) }
 
   subject { TestResource.new url: 'info:url' }
 

data/spec/models/spotlight/search_spec.rb

@@ -99,4 +99,14 @@ describe Spotlight::Search, type: :model do
       end
     end
   end
+
+  describe '#repository' do
+    let(:search) { FactoryGirl.create(:search) }
+    before do
+      allow(search).to receive(:blacklight_config).and_return blacklight_config
+    end
+    it 'returns an exhibit specific config' do
+      expect(search.send(:repository).blacklight_config).to eql blacklight_config
+    end
+  end
 end

data/spec/models/spotlight/sitemap_spec.rb

@@ -89,7 +89,7 @@ describe Spotlight::Sitemap do
   end
 
   describe '#add_resources' do
-    let(:document) { ::SolrDocument.new(id: 'a') }
+    let(:document) { blacklight_config.document_model.new(id: 'a') }
 
     before do
       allow(exhibit).to receive(:solr_documents).and_return([document])

data/spec/models/spotlight/solr_document/atomic_updates_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Spotlight::SolrDocument::AtomicUpdates, type: :model do
   let(:blacklight_solr) { double }
   subject do
-    ::SolrDocument.new.extend(described_class)
+    SolrDocument.new.extend(described_class)
   end
 
   before do

data/spec/models/spotlight/solr_document/uploaded_resource_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe Spotlight::SolrDocument::UploadedResource, type: :model do
   let(:valid_resource) do
-    ::SolrDocument.new(id: '123',
-                       full_image_url_ssm: ['http://example.com/png.png'],
-                       spotlight_full_image_height_ssm: ['1400'],
-                       spotlight_full_image_width_ssm: ['1000'],
-                       spotlight_resource_type_ssim: ['spotlight/resources/uploads'])
+    SolrDocument.new(id: '123',
+                     full_image_url_ssm: ['http://example.com/png.png'],
+                     spotlight_full_image_height_ssm: ['1400'],
+                     spotlight_full_image_width_ssm: ['1000'],
+                     spotlight_resource_type_ssim: ['spotlight/resources/uploads'])
   end
 
   describe 'SolrDocument.use_extension' do
     it 'does not include the uploaded resource extension when the spotlight resource type is not correct' do
-      expect(::SolrDocument.new(id: '123', spotlight_resource_type_ssim: ['not-correct'])).to_not be_a_kind_of(described_class)
+      expect(SolrDocument.new(id: '123', spotlight_resource_type_ssim: ['not-correct'])).to_not be_a_kind_of(described_class)
     end
     it 'includes the uploaded resource extension when the correct fields are present with the correct data' do
       expect(valid_resource).to be_a_kind_of(described_class)

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

@@ -8,7 +8,7 @@ module Spotlight
 
     before do
       assign(:exhibits, exhibits)
-      allow(view).to receive_messages(exhibit_path: '/', current_ability: ability)
+      allow(view).to receive_messages(exhibit_path: '/', current_user: user, current_ability: ability)
     end
 
     context 'with published exhibits' do
@@ -29,24 +29,53 @@ module Spotlight
         expect(rendered).not_to include 'Private exhibits'
       end
 
-      context 'with an authorized user' do
+      it 'does not include the tab bar' do
+        render
+
+        expect(rendered).not_to have_selector '.nav-tabs'
+      end
+
+      context 'with an exhibit admin' do
+        let(:user) { FactoryGirl.create(:exhibit_admin) }
+
+        it 'includes a tab with the exhibits curated by the user' do
+          render
+
+          expect(rendered).to have_selector '.nav-tabs'
+          expect(rendered).to have_link 'Your exhibits'
+          expect(rendered).to have_text user.exhibits.first.title
+        end
+
+        it 'does not include a tab for unpublished exhibits' do
+          render
+
+          expect(rendered).to have_selector '.nav-tabs'
+          expect(rendered).not_to have_link 'Unpublished exhibits'
+        end
+      end
+
+      context 'with a site admin' do
         let(:user) { FactoryGirl.create(:site_admin) }
 
-        it 'includes a list of unpublished exhibits' do
+        before do
+          allow(view).to receive_messages(can?: true, new_exhibit_path: '/exhibits/new')
+        end
+
+        it 'includes a tab with unpublished exhibits' do
           render
 
-          expect(rendered).to include 'Private exhibits'
+          expect(rendered).to have_selector '.nav-tabs'
+          expect(rendered).to have_link 'Unpublished exhibits'
           expect(rendered).to have_text exhibit_c.title
         end
       end
     end
 
     context 'with an authorized user' do
-      let(:current_user) { double }
+      let(:user) { FactoryGirl.build(:site_admin) }
 
       before do
         allow(view).to receive_messages(can?: true,
-                                        current_user: current_user,
                                         new_exhibit_path: '/exhibits/new')
       end
 

data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb

@@ -6,7 +6,7 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_block.html.erb', type: :vi
   let(:block) do
     SirTrevorRails::Blocks::SolrDocumentsBlock.new({ type: 'block', data: { title: 'Some title', text: 'Some text', 'text-align' => 'right' } }, page)
   end
-  let(:doc) { ::SolrDocument.new(id: 1) }
+  let(:doc) { blacklight_config.document_model.new(id: 1) }
   let(:blacklight_config) do
     Blacklight::Configuration.new do |config|
       config.view.embed.partials = %w(a b c)

data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb

@@ -7,7 +7,11 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb',
   end
 
   before do
-    allow(block).to receive(:each_document).and_return([[{}, ::SolrDocument.new(id: 1)], [{}, ::SolrDocument.new(id: 2)], [{}, ::SolrDocument.new(id: 3)]])
+    allow(block).to receive(:each_document).and_return([
+      [{}, SolrDocument.new(id: 1)],
+      [{}, SolrDocument.new(id: 2)],
+      [{}, SolrDocument.new(id: 3)]
+    ])
     allow(block).to receive_messages(documents?: true)
     allow(view).to receive_messages(solr_documents_carousel_block: block)
     allow(view).to receive_messages(has_thumbnail?: true, render_thumbnail_tag: 'thumb')

data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb

@@ -6,7 +6,7 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb', typ
   let(:block) do
     SirTrevorRails::Blocks::SolrDocumentsEmbedBlock.new({ type: 'block', data: { title: 'Some title', text: 'Some text', 'text-align' => 'right' } }, page)
   end
-  let(:doc) { ::SolrDocument.new(id: 1) }
+  let(:doc) { blacklight_config.document_model.new(id: 1) }
   let(:blacklight_config) do
     Blacklight::Configuration.new do |config|
       config.view.embed.partials = %w(a b c)

data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb

@@ -7,9 +7,9 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb',
   end
 
   before do
-    doc1 = [{}, ::SolrDocument.new(id: 1, x: 'a' * 100)]
-    doc2 = [{}, ::SolrDocument.new(id: 2)]
-    doc3 = [{}, ::SolrDocument.new(id: 3)]
+    doc1 = [{}, SolrDocument.new(id: 1, x: 'a' * 100)]
+    doc2 = [{}, SolrDocument.new(id: 2)]
+    doc3 = [{}, SolrDocument.new(id: 3)]
     allow(block).to receive(:each_document).and_return([doc1, doc2, doc3])
     allow(block).to receive_messages(documents?: true)
     allow(view).to receive_messages(solr_documents_features_block: block)

data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb

@@ -8,7 +8,11 @@ describe 'spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb', type
   end
 
   before do
-    allow(block).to receive(:each_document).and_return([[{}, ::SolrDocument.new(id: 1)], [{}, ::SolrDocument.new(id: 2)], [{}, ::SolrDocument.new(id: 3)]])
+    allow(block).to receive(:each_document).and_return([
+      [{}, SolrDocument.new(id: 1)],
+      [{}, SolrDocument.new(id: 2)],
+      [{}, SolrDocument.new(id: 3)]
+    ])
   end
 
   before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -918,7 +918,6 @@ files:
 - app/views/shared/_exhibit_masthead.html.erb
 - app/views/shared/_exhibit_masthead_and_navbar.html.erb
 - app/views/shared/_exhibit_navbar.html.erb
-- app/views/shared/_flash_messages.html.erb
 - app/views/shared/_footer.html.erb
 - app/views/shared/_header_navbar.html.erb
 - app/views/shared/_home_sidebar.html.erb
@@ -975,7 +974,6 @@ files:
 - app/views/spotlight/exhibits/_contact.html.erb
 - app/views/spotlight/exhibits/_delete.html.erb
 - app/views/spotlight/exhibits/_exhibit_card.html.erb
-- app/views/spotlight/exhibits/_exhibit_list.html.erb
 - app/views/spotlight/exhibits/_export.html.erb
 - app/views/spotlight/exhibits/_form.html.erb
 - app/views/spotlight/exhibits/_import.html.erb
@@ -1098,7 +1096,6 @@ files:
 - db/migrate/20151124101123_remove_default_from_spotlight_exhibit.rb
 - db/migrate/20151124105543_update_custom_field_names.rb
 - db/migrate/20151208085432_add_weight_to_exhibits.rb
-- db/migrate/20151210073829_create_spotlight_configuration.rb
 - lib/blacklight/spotlight.rb
 - lib/generators/spotlight/install_generator.rb
 - lib/generators/spotlight/templates/catalog_controller.rb

data/app/views/shared/_flash_messages.html.erb

@@ -1,7 +0,0 @@
-<div class="row">
-  <div class="col-md-12">
-    <div id="main-flashes">
-      <%= render :partial=>'/flash_msg' %>
-    </div>
-  </div>
-</div>

data/app/views/spotlight/exhibits/_exhibit_list.html.erb

@@ -1,3 +0,0 @@
-<li>
-  <%= link_to exhibit.title, exhibit %>
-</li>

data/db/migrate/20151210073829_create_spotlight_configuration.rb

@@ -1,7 +0,0 @@
-class CreateSpotlightConfiguration < ActiveRecord::Migration
-  def change
-    create_table :spotlight_configurations do |t|
-      t.references :masthead
-    end
-  end
-end