blacklight-spotlight 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b12afe1e6f1ab467dd5f467712531eefba3b6e3
-  data.tar.gz: 6013ba28f723ffae008846bb85ed2a8b01d818fd
+  metadata.gz: 4477ac2d54b4a5009867cbcff8bdf710b93bee8d
+  data.tar.gz: 3c274d2b475395ca0f55da0e5c000fe0338b772f
 SHA512:
-  metadata.gz: d424c79909a478c681e245d548dbcbe1246a90715ce3a5df852d81c6f21b0aa90e64644cac8ac08372981f2db5750cff3f27efb78d0983b2e0153842d45af125
-  data.tar.gz: 585cf4431078a9401d7d7726117545cb7d7dae8e867da5888bcef48e8c2ced5a8346f8646ba0bbce0812de1277faf05a600d1b6b5ace2eac3431a5cd8cc9a198
+  metadata.gz: 53ac3d47317e9e867604f218abc36bf0995979eefeddfe54090595322e47edae1b3384cb14055293c92f9f0b7d2c146ab9b5478bec2572a69e24c97ec6679f09
+  data.tar.gz: 551bc13319ac8f7992d78dc82b49e16832500cd7dd9d5a7c2d6c184ad4a25308b5609da8583ff249e29ea5e42aabc75477e16ebb04ae1eccc4a7ad631b008f59

data/app/models/concerns/spotlight/exhibit_documents.rb

@@ -10,22 +10,25 @@ module Spotlight
       return to_enum(:solr_documents) unless block_given?
 
       start = 0
-      response = repository.search(exhibit_search_params.merge(start: start))
+      search_params = exhibit_search_builder.merge(q: '*:*', fl: '*')
+
+      response = repository.search(search_params.start(start).to_h)
 
       while response.documents.present?
         response.documents.each { |x| yield x }
         start += response.documents.length
-        response = repository.search(exhibit_search_params.merge(start: start))
+        response = repository.search(search_params.start(start).to_h)
       end
     end
 
     private
 
-    def exhibit_search_params
-      params = { q: '*:*', fl: '*' }
-      params[:fq] ||= []
-      params[:fq] << solr_data if Spotlight::Engine.config.filter_resources_by_exhibit
-      params
+    def exhibit_search_builder
+      blacklight_config.search_builder_class.new(true, exhibit_search_builder_context).except(:apply_permissive_visibility_filter)
+    end
+
+    def exhibit_search_builder_context
+      OpenStruct.new(blacklight_config: blacklight_config, current_exhibit: self)
     end
 
     def repository

data/app/models/spotlight/blacklight_configuration.rb

@@ -67,8 +67,6 @@ module Spotlight
         # Create a new config based on the defaults
         config = default_blacklight_config.inheritable_copy
 
-        config.search_builder_class.send(:include, Spotlight::Catalog::AccessControlsEnforcement::SearchBuilder)
-
         config.show.merge! show unless show.blank?
         config.index.merge! index unless index.blank?
 

data/lib/generators/spotlight/install_generator.rb

@@ -75,6 +75,16 @@ module Spotlight
       end
     end
 
+    def add_search_builder_mixin
+      if File.exist? 'app/models/search_builder.rb'
+        inject_into_file 'app/models/search_builder.rb', after: "include Blacklight::Solr::SearchBuilderBehavior\n" do
+          "\n  include Spotlight::Catalog::AccessControlsEnforcement::SearchBuilder\n"
+        end
+      else
+        say 'Unable to find SearchBuilder class; add `include Spotlight::Catalog::AccessControlsEnforcement::SearchBuilder` to the class manually.'
+      end
+    end
+
     def add_example_catalog_controller
       copy_file 'catalog_controller.rb', 'app/controllers/catalog_controller.rb'
     end

data/lib/spotlight/catalog/access_controls_enforcement.rb

@@ -12,6 +12,12 @@ module Spotlight
       ##
       # SearchBuilder mixin
       module SearchBuilder
+        extend ActiveSupport::Concern
+
+        included do
+          self.default_processor_chain += [:apply_permissive_visibility_filter, :apply_exhibit_resources_filter]
+        end
+
         def apply_permissive_visibility_filter(solr_params)
           return unless current_exhibit
           return if scope.respond_to?(:can?) && scope.can?(:curate, current_exhibit) && !blacklight_params[:public]

data/lib/spotlight/version.rb

@@ -1,4 +1,4 @@
 #
 module Spotlight
-  VERSION = '0.9.2'
+  VERSION = '0.10.0'
 end

data/spec/models/spotlight/exhibit_spec.rb

@@ -174,9 +174,11 @@ describe Spotlight::Exhibit, type: :model do
 
   describe '#solr_documents' do
     let(:blacklight_config) { Blacklight::Configuration.new }
+    let(:slug) { 'some_slug' }
 
     before do
       allow(subject).to receive(:blacklight_config).and_return(blacklight_config)
+      allow(subject).to receive(:slug).and_return(slug)
     end
 
     it 'enumerates the documents in the exhibit' do
@@ -184,7 +186,7 @@ describe Spotlight::Exhibit, type: :model do
     end
 
     it 'pages through the index' do
-      allow_any_instance_of(Blacklight::Solr::Repository).to receive(:search).with(hash_including(start: 0)).and_return(double(documents: [1, 2, 3]))
+      allow_any_instance_of(Blacklight::Solr::Repository).to receive(:search).and_return(double(documents: [1, 2, 3]))
       allow_any_instance_of(Blacklight::Solr::Repository).to receive(:search).with(hash_including(start: 3)).and_return(double(documents: [4, 5, 6]))
       allow_any_instance_of(Blacklight::Solr::Repository).to receive(:search).with(hash_including(start: 6)).and_return(double(documents: []))
 
@@ -197,7 +199,8 @@ describe Spotlight::Exhibit, type: :model do
       end
 
       it 'filters the solr results using the exhibit filter' do
-        allow_any_instance_of(Blacklight::Solr::Repository).to receive(:search).with(hash_including(fq: [subject.solr_data])).and_return(double(documents: []))
+        expected_query_params = { fq: ["spotlight_exhibit_slug_#{subject.slug}_bsi:true"] }
+        allow_any_instance_of(Blacklight::Solr::Repository).to receive(:search).with(hash_including(expected_query_params)).and_return(double(documents: []))
         expect(subject.solr_documents.to_a).to be_blank
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -935,6 +935,7 @@ files:
 - app/views/spotlight/catalog/_document_visibility_control.html.erb
 - app/views/spotlight/catalog/_edit_default.html.erb
 - app/views/spotlight/catalog/_index_compact_default.html.erb
+- app/views/spotlight/catalog/_status_header.html.erb
 - app/views/spotlight/catalog/admin.html.erb
 - app/views/spotlight/catalog/edit.html.erb
 - app/views/spotlight/catalog/new.html.erb