blacklight-spotlight 0.8.2 → 0.9.0

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

@@ -87,7 +87,7 @@ describe Spotlight::Resources::Upload, type: :model do
       expect(subject.to_solr[:spotlight_full_image_width_ssm]).to eq 800
     end
     it 'has fields representing exhibit specific custom fields' do
-      expect(subject.to_solr[custom_field.field]).to eq 'Custom Field Data'
+      expect(subject.to_solr[custom_field.solr_field]).to eq 'Custom Field Data'
     end
   end
 end

data/spec/models/spotlight/solr_document_sidecar_spec.rb

@@ -13,7 +13,7 @@ describe Spotlight::SolrDocumentSidecar, type: :model do
     end
 
     its(:to_solr) { should include id: 'doc_id' }
-    its(:to_solr) { should include "exhibit_#{exhibit.id}_public_bsi".to_sym => true }
+    its(:to_solr) { should include "exhibit_#{exhibit.slug}_public_bsi".to_sym => true }
     its(:to_solr) { should include 'a_tesim', 'b_tesim', 'c_tesim' }
   end
 end

data/spec/test_app_templates/catalog_controller.rb

@@ -85,7 +85,7 @@ 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_search_field 'all_fields', label: 'All fields'
+    config.add_search_field 'all_fields', label: 'Everything'
     config.add_search_field 'title', label: 'Title', solr_local_parameters: { qf: 'full_title_tesim', pf: 'full_title_tesim' }
     config.add_search_field 'author', label: 'Author', solr_local_parameters: { qf: '$qf_author', pf: '$pf_author' }
 

data/spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb

@@ -6,7 +6,6 @@ describe 'spotlight/dashboards/_analytics.html.erb', type: :view do
   let(:page_data) { [OpenStruct.new(pageTitle: 'title', pagePath: '/path', pageviews: '123')] }
   before do
     allow(view).to receive_messages(current_exhibit: current_exhibit, exhibit_root_path: '/some/path')
-    allow(Spotlight::Analytics::Ga).to receive(:enabled?).and_return(true)
     allow(current_exhibit).to receive(:analytics).and_return(ga_data)
     allow(current_exhibit).to receive(:page_analytics).and_return(page_data)
   end

data/spec/views/spotlight/dashboards/analytics.html.erb_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'spotlight/dashboards/analytics.html.erb', type: :view do
+  let(:current_exhibit) { FactoryGirl.create(:exhibit) }
+
+  before do
+    allow(view).to receive_messages(current_exhibit: current_exhibit, exhibit_root_path: '/some/path')
+  end
+
+  it 'has a header' do
+    render
+    expect(rendered).to have_selector '.page-header', text: 'Curation'
+    expect(rendered).to have_selector '.page-header small', text: 'Analytics'
+  end
+
+  it 'has directions for configuring analytics' do
+    render
+    expect(rendered).to have_link 'configure an analytics provider'
+  end
+
+  context 'with a configured analytics integration' do
+    before do
+      allow(Spotlight::Analytics::Ga).to receive(:enabled?).and_return(true)
+      stub_template 'spotlight/dashboards/_analytics.html.erb' => 'Analytics data'
+    end
+
+    it 'has analytics data' do
+      render
+
+      expect(rendered).to have_content 'Analytics data'
+    end
+  end
+end

data/spec/views/spotlight/search_configurations/_search_fields.html.erb_spec.rb

@@ -32,7 +32,7 @@ module Spotlight
       expect(rendered).to have_selector 'input[data-behavior="enable-feature"][data-target="#search_fields"]'
     end
 
-    it 'has a read-only "all fields" search option' do
+    it 'has a read-only "everything" search option' do
       render partial: 'spotlight/search_configurations/search_fields', locals: { f: f }
       expect(rendered).to have_selector "input[name='blacklight_configuration[search_fields][all_fields][enabled]'][data-readonly='true']"
     end

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

@@ -25,9 +25,9 @@ describe 'spotlight/searches/index.html.erb', type: :view do
       render
       expect(rendered).to have_css '.alert-warning', text: %(\
 This exhibit is not currently searchable. To perform searches that can \
-be saved as additional browse categories, an Administrator must \
-temporarily turn on the Searchable option in the search configuration section \
-of the Administration > Appearance page.)
+be saved as additional browse categories, \
+temporarily turn on the Display search box option in the Options section \
+of the Configuration > Search page.)
     end
   end
 end

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

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'spotlight/sir_trevor/blocks/_browse_block.html.erb', type: :view do
+  let(:p) { 'spotlight/sir_trevor/blocks/browse_block.html.erb' }
+  let(:page) { double('Page', display_sidebar?: true) }
+  let(:search) { FactoryGirl.create(:search) }
+  let(:block) do
+    assign(:page, page)
+    SirTrevorRails::Blocks::BrowseBlock.new({ type: 'block', data: {} }, page)
+  end
+
+  before do
+    allow(block).to receive(:searches).and_return([search])
+  end
+
+  it 'links to the search' do
+    render partial: p, locals: { browse_block: block }
+    expect(rendered).to have_link search.title, href: spotlight.exhibit_browse_path(search.exhibit, search)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -951,6 +951,7 @@ files:
 - app/views/spotlight/dashboards/_page.html.erb
 - app/views/spotlight/dashboards/_page_activity.html.erb
 - app/views/spotlight/dashboards/_solr_document_activity.html.erb
+- app/views/spotlight/dashboards/analytics.html.erb
 - app/views/spotlight/dashboards/show.html.erb
 - app/views/spotlight/exhibits/_confirmation_status.html.erb
 - app/views/spotlight/exhibits/_contact.html.erb
@@ -1012,8 +1013,9 @@ files:
 - app/views/spotlight/searches/_search.html.erb
 - app/views/spotlight/searches/edit.html.erb
 - app/views/spotlight/searches/index.html.erb
-- app/views/spotlight/shared/_admin_sidebar.html.erb
+- app/views/spotlight/shared/_configuration_sidebar.html.erb
 - app/views/spotlight/shared/_curation_sidebar.html.erb
+- app/views/spotlight/shared/_exhibit_sidebar.html.erb
 - app/views/spotlight/shared/_report_a_problem.html.erb
 - app/views/spotlight/sir_trevor/_sir_trevor_block_array.html.erb
 - app/views/spotlight/sir_trevor/blocks/_browse_block.html.erb
@@ -1074,6 +1076,8 @@ files:
 - db/migrate/20151016092343_remove_searchable_from_exhibit.rb
 - db/migrate/20151110082345_add_metadata_to_spotlight_resource.rb
 - db/migrate/20151117153210_change_spotlight_exhibit_published_default.rb
+- db/migrate/20151124101123_remove_default_from_spotlight_exhibit.rb
+- db/migrate/20151124105543_update_custom_field_names.rb
 - lib/blacklight/spotlight.rb
 - lib/generators/spotlight/install_generator.rb
 - lib/generators/spotlight/templates/catalog_controller.rb
@@ -1169,7 +1173,6 @@ files:
 - spec/features/javascript/search_context_spec.rb
 - spec/features/main_navigation_spec.rb
 - spec/features/metadata_admin_spec.rb
-- spec/features/multiple_exhibits_spec.rb
 - spec/features/report_a_problem_spec.rb
 - spec/features/site_masthead_spec.rb
 - spec/features/slideshow_spec.rb
@@ -1261,6 +1264,7 @@ files:
 - spec/views/spotlight/catalog/new.html.erb_spec.rb
 - spec/views/spotlight/contacts/edit.html.erb_spec.rb
 - spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb
+- spec/views/spotlight/dashboards/analytics.html.erb_spec.rb
 - spec/views/spotlight/exhibits/edit.html.erb_spec.rb
 - spec/views/spotlight/exhibits/index.html.erb_spec.rb
 - spec/views/spotlight/feature_pages/_empty.html.erb_spec.rb
@@ -1279,6 +1283,7 @@ files:
 - spec/views/spotlight/searches/_search.html.erb_spec.rb
 - spec/views/spotlight/searches/edit.html.erb_spec.rb
 - spec/views/spotlight/searches/index.html.erb_spec.rb
+- spec/views/spotlight/sir_trevor/blocks/_browse_block.html.erb_spec.rb
 - spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb
 - spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb
 - spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb
@@ -1398,7 +1403,6 @@ test_files:
 - spec/features/javascript/search_context_spec.rb
 - spec/features/main_navigation_spec.rb
 - spec/features/metadata_admin_spec.rb
-- spec/features/multiple_exhibits_spec.rb
 - spec/features/report_a_problem_spec.rb
 - spec/features/site_masthead_spec.rb
 - spec/features/slideshow_spec.rb
@@ -1490,6 +1494,7 @@ test_files:
 - spec/views/spotlight/catalog/new.html.erb_spec.rb
 - spec/views/spotlight/contacts/edit.html.erb_spec.rb
 - spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb
+- spec/views/spotlight/dashboards/analytics.html.erb_spec.rb
 - spec/views/spotlight/exhibits/edit.html.erb_spec.rb
 - spec/views/spotlight/exhibits/index.html.erb_spec.rb
 - spec/views/spotlight/feature_pages/_empty.html.erb_spec.rb
@@ -1508,6 +1513,7 @@ test_files:
 - spec/views/spotlight/searches/_search.html.erb_spec.rb
 - spec/views/spotlight/searches/edit.html.erb_spec.rb
 - spec/views/spotlight/searches/index.html.erb_spec.rb
+- spec/views/spotlight/sir_trevor/blocks/_browse_block.html.erb_spec.rb
 - spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb
 - spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb
 - spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb

data/app/views/spotlight/shared/_admin_sidebar.html.erb

@@ -1,10 +0,0 @@
-<h4><%=t(:'spotlight.administration.sidebar.header') %></h4>
-<ul class="nav sidenav">
-  <% if can? :update, current_exhibit %>
-    <li><%= link_to t(:'spotlight.administration.sidebar.settings'), spotlight.edit_exhibit_path(current_exhibit) %></li>
-    <li><%= link_to t(:'spotlight.administration.sidebar.appearance'), spotlight.edit_exhibit_appearance_path(current_exhibit) %></li>
-  <% end %>
-  <% if can? :manage, Spotlight::Role.new(exhibit: current_exhibit) %>
-    <li><%= link_to t(:'spotlight.administration.sidebar.users'), spotlight.exhibit_roles_path(current_exhibit) %></li>
-  <% end %>
-</ul>

data/spec/features/multiple_exhibits_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-describe 'Home page', type: :feature do
-  let(:exhibit_visitor) { FactoryGirl.create(:exhibit_visitor) }
-  let!(:default_exhibit) { FactoryGirl.create(:exhibit, title: 'Default exhibit', published: true) }
-  let!(:second_exhibit) { FactoryGirl.create(:exhibit, title: 'Second exhibit', published: true) }
-
-  before { login_as exhibit_visitor }
-
-  it 'exists by default on exhibits' do
-    visit spotlight.url_for(default_exhibit)
-
-    expect(page).to have_selector '.site-title', text: 'Default exhibit'
-    expect(page).to have_link 'More Exhibits'
-    within '#exhibit-masthead .dropdown-menu' do
-      expect(page).to have_no_link 'Default exhibit'
-      click_link 'Second exhibit'
-    end
-
-    expect(page).to have_selector '.site-title', text: 'Second exhibit'
-    expect(page).to have_link 'More Exhibits'
-    within '#exhibit-masthead .dropdown-menu' do
-      expect(page).to have_no_link 'Second exhibit'
-      click_link 'Default exhibit'
-    end
-    expect(page).to have_selector '.site-title', text: 'Default exhibit'
-  end
-end