cul_hydra 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9f2d1672e6b0151d647c2982cb663e138e8f9066ca610926a87a0e993f41e8f
-  data.tar.gz: 4f5c9ded2819a0e2a0456c64c88623de5e2c85fc49388ed511ad674800adf15c
+  metadata.gz: a00f8ff9e61a56af80a27f48225517956a370d24243a5dcb090e803f78c35d98
+  data.tar.gz: bfa3132fbf567bda31f498411a52cdd2995864223c93aa07acd4aeb37aecaf9f
 SHA512:
-  metadata.gz: e28a9ab016bc62b8ebac7f0ded9481c766db74e74f36426d1eeffd46535a7036ab3a8b80b444188c9385132b7afd67a40dfc86ed8d6a24b43de6036629ffc655
-  data.tar.gz: 4eac117be6bf09d0c59e4222a5c5c5422941826f4cd287b5839d09a38db580edb92277d1c838de80d7a687af472e6bac8eda52c1932b1a44aae852405e9e5f95
+  metadata.gz: 065a2f0a6ac2d6619d5e5c09274b5a218900628ae252149e9cc2d65e9d575e0fdad570399775b9c350f35450bdfdbd3392f7440418c26be3a066be4733720a5f
+  data.tar.gz: 71692ab2aa1668090b8d18412a36c5a0d45024a941340a62bb1ee62acf5d165cdf1ca16ee960738cd5512946f409a24c3a11407ed6b24db964f347adf97ff478

data/app/controllers/concerns/cul/hydra/application_id_behavior.rb

@@ -3,7 +3,7 @@ module Cul::Hydra::ApplicationIdBehavior
 
   def find_for_params(path,solr_params)
     res = blacklight_config.repository.send_and_receive(path, {key=>solr_params.to_hash, method:blacklight_config.http_method})
-    Blacklight::SolrResponse.new(res, solr_params, solr_document_model: blacklight_config.solr_document_model)
+    Blacklight::SolrResponse.new(res, solr_params, blacklight_config: blacklight_config)
   end
 
   def get_solr_response_for_app_id(id=nil, extra_controller_params={})
@@ -18,7 +18,7 @@ module Cul::Hydra::ApplicationIdBehavior
     #p[:qt] ||= blacklight_config.document_solr_request_handler
     repository = blacklight_config.repository_class.new(blacklight_config)
     solr_response = repository.search(p)
-    raise Blacklight::Exceptions::InvalidSolrID.new(id) if solr_response.docs.empty?
+    raise Blacklight::Exceptions::RecordNotFound.new(id) if solr_response.docs.empty?
     document = SolrDocument.new(solr_response.docs.first, solr_response)
     @response, @document = [solr_response, document]
   end
@@ -35,7 +35,7 @@ module Cul::Hydra::ApplicationIdBehavior
     #p[:qt] ||= blacklight_config.document_solr_request_handler
     repository = blacklight_config.repository_class.new(blacklight_config)
     solr_response = repository.search(p)
-    raise Blacklight::Exceptions::InvalidSolrID.new(id) if solr_response.docs.empty?
+    raise Blacklight::Exceptions::RecordNotFound.new(id) if solr_response.docs.empty?
     document = SolrDocument.new(solr_response.docs.first, solr_response)
     @response, @document = [solr_response, document]
   end

data/app/controllers/concerns/cul/hydra/resolver.rb

@@ -4,10 +4,10 @@ module Cul::Hydra::Resolver
   extend ActiveSupport::Concern
 
   included do 
-    # Whenever an action raises SolrHelper::InvalidSolrID, this block gets executed.
+    # Whenever an action raises SolrHelper::RecordNotFound, this block gets executed.
     # Hint: the SolrHelper #get_solr_response_for_doc_id method raises this error,
     # which is used in the #show action here.
-    self.rescue_from Blacklight::Exceptions::InvalidSolrID, :with => :invalid_solr_id_error
+    self.rescue_from Blacklight::Exceptions::RecordNotFound, :with => :invalid_solr_id_error
     # When RSolr::RequestError is raised, the rsolr_request_error method is executed.
     # The index action will more than likely throw this one.
     # Example, when the standard query parser is used, and a user submits a "bad" query.
@@ -19,7 +19,7 @@ module Cul::Hydra::Resolver
     solr_params = blacklight_config.default_document_solr_params.merge!(extra_controller_params)
     solr_params[:fq] = "identifier_ssim:#{(id)}"
     solr_response = find((blacklight_config.document_solr_request_handler || blacklight_config.qt), solr_params)
-    raise Blacklight::Exceptions::InvalidSolrID.new if solr_response.docs.empty?
+    raise Blacklight::Exceptions::RecordNotFound.new if solr_response.docs.empty?
     document = SolrDocument.new(solr_response.docs.first, solr_response)
     @response, @document = [solr_response, document]
   end
@@ -51,7 +51,7 @@ module Cul::Hydra::Resolver
       end
     end
   end
-  
+
   # when a request for /resolve/:action/BAD_SOLR_ID is made, this method is executed...
   def invalid_solr_id_error
     id = params.delete(:id)
@@ -60,10 +60,6 @@ module Cul::Hydra::Resolver
   end
 
   def blacklight_solr
-    @solr ||=  RSolr.connect(blacklight_solr_config)
-  end
-
-  def blacklight_solr_config
-    Blacklight.solr_config
+    @solr ||=  Blacklight.default_index
   end
 end

data/lib/cul_hydra/version.rb

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.10.0'
+    VERSION = '1.11.0'
     def self.version
       VERSION
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement