Merge pull request #47 from projectblacklight/blacklight-7

Blacklight 7 Support

Author: awead

.travis.yml

@@ -8,8 +8,9 @@ rvm:
   - 2.5.1
 
 env:
- - "RAILS_VERSION=5.2.0"
- - "RAILS_VERSION=5.1.0"
+ - "BLACKLIGHT_VERSION=master RAILS_VERSION=5.2.1"
+ - "RAILS_VERSION=5.2.1"
+ - "RAILS_VERSION=5.1.6"
 
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

blacklight-access_controls.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.1.0'
 
-  gem.add_dependency 'blacklight', '~> 6.0'
+  gem.add_dependency 'blacklight', '> 6.0', '< 8'
   gem.add_dependency 'cancancan', '~> 1.8'
   gem.add_dependency 'deprecation', '~> 1.0'
 

lib/blacklight/access_controls/permissions_query.rb

@@ -13,12 +13,17 @@ def permissions_doc(pid)
       doc
     end
 
+    # This is only valid for, and should only be used for blacklight 6
     def permissions_document_class
-      SolrDocument
+      blacklight_config.document_model
     end
 
     protected
 
+    def blacklight_config
+      CatalogController.blacklight_config
+    end
+
     # a solr query method
     # retrieve a solr document, given the doc id
     # Modeled on Blacklight::SolrHelper.get_permissions_solr_response_for_doc_id
@@ -28,7 +33,11 @@ def get_permissions_solr_response_for_doc_id(id = nil, extra_controller_params =
       raise Blacklight::Exceptions::RecordNotFound, 'The application is trying to retrieve permissions without specifying an asset id' if id.nil?
       solr_opts = permissions_solr_doc_params(id).merge(extra_controller_params)
       response = Blacklight.default_index.connection.get('select', params: solr_opts)
-      solr_response = Blacklight::Solr::Response.new(response, solr_opts, document_model: permissions_document_class)
+
+      # Passing :blacklight_config is required for Blacklight 7, :document_model is required for Blacklight 6
+      solr_response = Blacklight::Solr::Response.new(response, solr_opts,
+                                                     blacklight_config: blacklight_config,
+                                                     document_model: permissions_document_class)
 
       raise Blacklight::Exceptions::RecordNotFound, "The solr permissions search handler didn't return anything for id \"#{id}\"" if solr_response.docs.empty?
       solr_response.docs.first

spec/test_app_templates/Gemfile.extra

@@ -0,0 +1,3 @@
+if ENV['BLACKLIGHT_VERSION'] == 'master'
+  gem 'blacklight', github: 'projectblacklight/blacklight'
+end