blacklight-spotlight 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c321ae7af7b5264e59eff345211ac2760a96cb5b
-  data.tar.gz: 2048a70d4aac48da5effa59328e3e7f73e132b2b
+  metadata.gz: 2ab14cc0712b4681b53a8dcc7da496e98eb998bf
+  data.tar.gz: c0984a3fd7962447722ee604902e86a8925a4a23
 SHA512:
-  metadata.gz: 95dd157f70fd3b9f4d670a17c611d6e649d004a5fee7fa71d526c2b7f75fab528a21326e66ac3c45c2268152c7e7f0cb57f5a6a620ccea2ca84e912e1c2f842d
-  data.tar.gz: 7e43fa7eca9cacee4e224e8a5974732578bbd00df20130b7df44f464b58d66505e568aeca905440abeaff6afe87459c2059710c6db0e94f15a8f9275f975e5d9
+  metadata.gz: 6c8155d4a110a73a98f51db66953a026abfbe412d6e0da24532b52bcf2933476ec085d6a31d98606eab91abdde8b1e81b6b8abe06f5a2fa6d1d9b3b8dcf6cd0d
+  data.tar.gz: a644d893ed4f6a8848318b646803f23fc98ad7827758b9ab37f0c8552e8da35e0209f9ca7aba651e8aae840bddb91d805799e0195ef39f26cc2e36a6555e0e06

data/lib/generators/spotlight/templates/catalog_controller.rb

@@ -1,6 +1,3 @@
-# -*- encoding : utf-8 -*-
-require 'blacklight/catalog'
-
 ##
 # Simplified catalog controller
 class CatalogController < ApplicationController

data/lib/spotlight/controller.rb

@@ -72,7 +72,7 @@ module Spotlight
     def exhibit_search_facet_url(*args)
       options = args.extract_options!
       only_path = options[:only_path]
-      options.except! :exhibit_id, :only_path
+      options = params.merge(options).except(:exhibit_id, :only_path)
 
       if only_path
         spotlight.exhibit_catalog_facet_url(current_exhibit, *args, options)

data/lib/spotlight/version.rb

@@ -1,4 +1,4 @@
 #
 module Spotlight
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/lib/tasks/spotlight_tasks.rake

@@ -47,6 +47,8 @@ namespace :spotlight do
 
     exhibit.save!
 
+    exhibit.reindex_later
+
     puts Spotlight::ExhibitExportSerializer.new(exhibit.reload).to_json
   end
 

data/spec/controllers/spotlight/catalog_controller_spec.rb

@@ -260,4 +260,36 @@ describe Spotlight::CatalogController, type: :controller do
       end
     end
   end
+
+  describe '.exhibit_search_facet_url' do
+    before do
+      allow(subject).to receive(:current_exhibit).and_return(exhibit)
+    end
+
+    it 'routes to the facet page' do
+      url = subject.exhibit_search_facet_url(id: 'x').sub('http://test.host/spotlight/', '/')
+      route = Spotlight::Engine.routes.recognize_path(url)
+      expect(route).to include controller: 'spotlight/catalog',
+                               action: 'facet',
+                               id: 'x'
+    end
+
+    it 'preserves the current exhibit context' do
+      url = subject.exhibit_search_facet_url(id: 'x').sub('http://test.host/spotlight/', '/')
+      route = Spotlight::Engine.routes.recognize_path(url)
+      expect(route).to include exhibit_id: exhibit.slug
+    end
+
+    context 'with search parameters' do
+      before do
+        allow(subject).to receive(:search_results).and_return([])
+      end
+
+      it 'preserves query parameters' do
+        get :index, q: 'xyz', exhibit_id: exhibit
+        url = subject.exhibit_search_facet_url(id: 'x')
+        expect(url).to include '?q=xyz'
+      end
+    end
+  end
 end

data/spec/test_app_templates/catalog_controller.rb

@@ -1,6 +1,3 @@
-# -*- encoding : utf-8 -*-
-require 'blacklight/catalog'
-
 class CatalogController < ApplicationController
   include Blacklight::Catalog
   helper Openseadragon::OpenseadragonHelper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails