blacklight-spotlight 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ece8d22f7b1839d5ea4fb24642d7805f9ab02567
-  data.tar.gz: 604eeed993a923572cd6c7fb533f531ed395427d
+  metadata.gz: e57863575f59657b4c10cac8c1d0541df9d4f595
+  data.tar.gz: ff5822ee18aa552633c2bd7c996fab0fba2e0693
 SHA512:
-  metadata.gz: 5004e50bc5c190078217936076b7667d48089eb9e222ca8d4a7d9b7554059d49a02ebd18504afaae233d890b1b0fdc1a24e164547cab391aa309f6cd5ca973b3
-  data.tar.gz: dc8f7e5ccbfe784a6c3372c0131843bf2fe0732227fb279761ac7cc76532b5662d361ec7ef213c37cea3b2c1ff9824711941e9a127f55e2a807633ba4be6ad02
+  metadata.gz: 22cfb2f247035b11964b73429b82bd41210a21b737b6fe07311c357a30766b8a7de9d9c4d8cdce0fb86db9de3559691788b65fcc38ea7db392b3bad6be1d9bd6
+  data.tar.gz: 37b65199e3a1f61ef96f2f6fb6f08a74d1d6dbdf110e79fca2bcaf845ab3661eb646d5dd040d347764d10a15ab063af66af4f3b44c1b7b9c20b01a53932f6fbf

data/app/controllers/spotlight/browse_controller.rb

@@ -5,26 +5,39 @@ module Spotlight
   class BrowseController < Spotlight::ApplicationController
     load_and_authorize_resource :exhibit, class: 'Spotlight::Exhibit'
     include Spotlight::Base
+    include Blacklight::Facet
 
     load_and_authorize_resource :search, except: :index, through: :exhibit, parent: false
     before_action :attach_breadcrumbs
+    before_action :attach_search_breadcrumb, only: :show
     record_search_parameters only: :show
 
     helper_method :should_render_spotlight_search_bar?
 
+    before_action :swap_actions_configuration, only: :show
+
     def index
       @searches = @exhibit.searches.published
     end
 
     def show
-      blacklight_config.index.document_actions = blacklight_config.browse.document_actions
+      @response, @document_list = search_results(search_query)
 
-      add_breadcrumb @search.title, exhibit_browse_path(@exhibit, @search)
-      (@response, @document_list) = search_results(search_query)
+      respond_to do |format|
+        format.html
+        format.json do
+          @presenter = Blacklight::JsonPresenter.new(@response, @document_list, facets_from_request, blacklight_config)
+          render template: 'catalog/index'
+        end
+      end
     end
 
     protected
 
+    def swap_actions_configuration
+      blacklight_config.index.document_actions = blacklight_config.browse.document_actions
+    end
+
     def search_query
       @search.merge_params_for_search(params, blacklight_config)
     end
@@ -46,6 +59,10 @@ module Spotlight
       add_breadcrumb(@exhibit.main_navigations.browse.label_or_default, exhibit_browse_index_path(@exhibit))
     end
 
+    def attach_search_breadcrumb
+      add_breadcrumb @search.title, exhibit_browse_path(@exhibit, @search)
+    end
+
     def _prefixes
       @_prefixes ||= super + ['catalog']
     end

data/app/helpers/spotlight/pages_helper.rb

@@ -6,7 +6,13 @@ module Spotlight
     # Override the default #sir_trevor_markdown so we can use
     # a more complete markdown rendered
     def sir_trevor_markdown(text)
-      GitHub::Markup.render('.md', text.gsub('<br>', "\n").gsub('<p>', '').gsub('</p>', "\n\n")).html_safe
+      clean_text = if text
+                     text.gsub('<br>', "\n").gsub('<p>', '').gsub('</p>', "\n\n")
+                   else
+                     ''
+                   end
+
+      GitHub::Markup.render('.md', clean_text).html_safe
     end
 
     def available_index_fields

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = '0.28.1'.freeze
+  VERSION = '0.28.2'.freeze
 end

data/spec/controllers/spotlight/browse_controller_spec.rb

@@ -36,7 +36,7 @@ describe Spotlight::BrowseController, type: :controller do
     end
 
     describe 'GET show' do
-      let(:mock_response) { double }
+      let(:mock_response) { double aggregations: {} }
       let(:document_list) { double }
       before do
         allow(controller).to receive_messages(search_results: [mock_response, document_list])
@@ -68,6 +68,12 @@ describe Spotlight::BrowseController, type: :controller do
         get :show, params: { id: search, exhibit_id: exhibit }
         expect(controller.blacklight_config.index.document_actions).to match_array [:a, :b, :c]
       end
+
+      it 'has a json response' do
+        get :show, params: { id: search, exhibit_id: exhibit, format: :json }
+        expect(assigns[:presenter]).to be_a Blacklight::JsonPresenter
+        expect(response).to render_template 'catalog/index'
+      end
     end
   end
 end

data/spec/helpers/spotlight/pages_helper_spec.rb

@@ -91,4 +91,10 @@ describe Spotlight::PagesHelper, type: :helper do
       end
     end
   end
+
+  describe '#sir_trevor_markdown' do
+    it 'handles nil input' do
+      expect(helper.sir_trevor_markdown(nil)).to be_blank
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.2
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails