blacklight 5.16.1 → 5.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 151e13c103de8da06aff554974e4d6fb08f1ec6c
-  data.tar.gz: 5c610d9673326a95e419dcf0b8ae34487faa9808
+  metadata.gz: 9370686931e54aa59a6827ada4a6f1b9601a88d5
+  data.tar.gz: ac085fbf4b10f1ce9b97f2795ae2a2d9a637a8c3
 SHA512:
-  metadata.gz: 6dee016cf1931ba320fefff5f6cddf5180f482ea5a4d8a26d1c561bf6cff5614d2a6e057ad8b1958d7062a64262528df285004c923897824cc81ffa3dcf10fe2
-  data.tar.gz: 95261b33157f9c4544db07cb552f356377eb739ceccfe2605f773cf0200b6323fb645407e3a5b6f554d71db975ba0cedca9477dc580dfa67d6bc3b7baef1187f
+  metadata.gz: 2f01d871e47c6c786875efcd8beedd4a6829ec6968aa002221f3740ddbe4300dc5a2de7d03f4cf045c7f16bbe08e2d04abbf48ee2d5054ccefd16cfae788474e
+  data.tar.gz: 3d7a79bab1fb58028c75228c1e2c6119980e1c10c62e604dc4c9abfea97cca3770b75e31a2e58102de54a8a438b7c73647dfb981d1352bce7d4e1230a3d4969d

data/VERSION

@@ -1 +1 @@
-5.16.1
+5.16.2

data/lib/blacklight/configuration.rb

@@ -226,6 +226,14 @@ module Blacklight
 
     def locate_search_builder_class
       ::SearchBuilder
+    rescue NameError => e
+      # If the NameError is a result of the SearchBuilder having a
+      # NameError (e.g. NoMethodError) within it then raise the error.
+      raise e if Object.const_defined? "::SearchBuilder"
+
+      # Otherwise the NameError was a result of not being able to find SearchBuilder
+      Deprecation.warn(Configuration, "Your application is missing the SearchBuilder. Have you run `rails generate blacklight:search_builder`? Falling back to Blacklight::Solr::SearchBuilder")
+      Blacklight::Solr::SearchBuilder
     end
 
     def facet_paginator_class

data/lib/blacklight/solr.rb

@@ -6,6 +6,7 @@ module Blacklight
     autoload :Repository, 'blacklight/solr/repository'
     autoload :Request, 'blacklight/solr/request'
     autoload :Response, 'blacklight/solr/response'
+    autoload :SearchBuilder, 'blacklight/solr/search_builder'
     autoload :SearchBuilderBehavior, 'blacklight/solr/search_builder_behavior'
   end
 end

data/lib/blacklight/solr/search_builder.rb

@@ -0,0 +1,7 @@
+module Blacklight::Solr
+  # @deprecated In 6.0 you should have this class generated into your application and Blacklight will
+  #             no longer need to provide it.
+  class SearchBuilder < Blacklight::SearchBuilder
+    include Blacklight::Solr::SearchBuilderBehavior
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.16.1
+  version: 5.16.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -467,6 +467,7 @@ files:
 - lib/blacklight/solr/response/pagination_methods.rb
 - lib/blacklight/solr/response/response.rb
 - lib/blacklight/solr/response/spelling.rb
+- lib/blacklight/solr/search_builder.rb
 - lib/blacklight/solr/search_builder_behavior.rb
 - lib/blacklight/solr_helper.rb
 - lib/blacklight/utils.rb