blacklight-access_controls 0.7.0.rc1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad6262064035e0af1ebfcae414a52f18073874ba0d4ef695fd01cf22e3ef2c06
-  data.tar.gz: 2f4f590ed542157b3d0e09335cb66a9ac90132908494a3d797ca041fb037ecb4
+  metadata.gz: 1432718300b52451d466cc04768b4c9c0e96f6cd642618fe6634d7de19a98dc0
+  data.tar.gz: 8ecd44bb67934ca4e5e2eab5f97211fefef0c30b35b74896f96737e08ded9977
 SHA512:
-  metadata.gz: bf9cd42d89e6315c6e8c65d46341f995e4d0d668a24fa62e98c06d5bcee80c45c49deb81a47a18625cae26574e3d0f6f0ee34b95278a6420a5b6f4b40b126a6a
-  data.tar.gz: 11de766eb48a9d94ed7aa6c1b8483a7e78d7bb4166ebbba8cf549b1b4b66171e633e418e3482b29e46245acb7c47b5db634e3b1520c0e29583128ea23bde75c5
+  metadata.gz: '018a2d0bce5a6e1f41cce61631117535fa9fdddc80ea598d2ef16a1a76633ba9c70f1f5c075e4625cd924c22a1fe7233296d6e0437a3247f505ea2085c5116d3'
+  data.tar.gz: 2c4a64bb4342cf51bbbc6e1d8690bdbc713b1ce9b84ab978ac8fe0db16803b50a9e5c2b837591e950c246fc75fab4078fc68e9c208aebe9fe7fbd2943c9dd598

data/.travis.yml

@@ -5,10 +5,12 @@ notifications:
   email: false
 
 rvm:
-  - 2.3.1
+  - 2.5.1
 
 env:
- - "RAILS_VERSION=5.0.0.1"
+ - "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

data/VERSION

@@ -1 +1 @@
-0.7.0.rc1
+0.7.0

data/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'
 

data/lib/blacklight/access_controls/catalog.rb

@@ -18,7 +18,7 @@ module Blacklight
 
       # This will work for BL 6, but will need to move to SearchService in BL 7
       def search_builder
-        Blacklight::AccessControls::SearchBuilder.new(self, current_ability)
+        Blacklight::AccessControls::SearchBuilder.new(self, ability: current_ability)
       end
     end
   end

data/lib/blacklight/access_controls/permissions_query.rb

@@ -13,12 +13,17 @@ module Blacklight::AccessControls
       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 @@ module Blacklight::AccessControls
       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

data/spec/test_app_templates/Gemfile.extra

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

data/spec/unit/blacklight/access_controls/search_builder_spec.rb

@@ -28,8 +28,9 @@ RSpec.describe Blacklight::AccessControls::SearchBuilder do
       let(:ability) { instance_double(Ability, user_groups: [], current_user: user) }
 
       it 'is called with debug' do
-        expect(Rails.logger).to receive(:debug).with(/^Solr parameters/)
+        allow(Rails.logger).to receive(:debug)
         search_builder.send(:apply_gated_discovery, {})
+        expect(Rails.logger).to have_received(:debug).with(/^Solr parameters/)
       end
     end
 

data/spec/unit/catalog_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-describe Blacklight::AccessControls::Catalog do
+RSpec.describe Blacklight::AccessControls::Catalog do
   let(:controller) { CatalogController.new }
 
   describe '#enforce_show_permissions' do
-    subject { controller.send(:enforce_show_permissions) }
+    subject { controller.enforce_show_permissions }
 
     let(:params) { { id: doc.id } }
 
@@ -38,4 +38,16 @@ describe Blacklight::AccessControls::Catalog do
       end
     end
   end
+
+  describe '#search_builder' do
+    subject { controller.search_builder }
+
+    before do
+      allow(controller).to receive(:current_ability).and_return(instance_double(Ability))
+    end
+
+    it 'creates a search_builder' do
+      expect(subject).to be_kind_of Blacklight::AccessControls::SearchBuilder
+    end
+  end
 end

data/spec/unit/enforcement_spec.rb

@@ -40,8 +40,9 @@ describe Blacklight::AccessControls::Enforcement do
       let(:ability) { instance_double(Ability, user_groups: [], current_user: user) }
 
       it 'is called with debug' do
-        expect(Rails.logger).to receive(:debug).with(/^Solr parameters/)
+        allow(Rails.logger).to receive(:debug)
         controller.send(:apply_gated_discovery, {})
+        expect(Rails.logger).to have_received(:debug).with(/^Solr parameters/)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-access_controls
 version: !ruby/object:Gem::Version
-  version: 0.7.0.rc1
+  version: 0.7.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,22 +11,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +274,7 @@ files:
 - spec/factories/user.rb
 - spec/spec_helper.rb
 - spec/support/solr_support.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/blacklight.yml
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/unit/ability_spec.rb
@@ -290,12 +297,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Access controls for blacklight-based applications
@@ -303,6 +310,7 @@ test_files:
 - spec/factories/user.rb
 - spec/spec_helper.rb
 - spec/support/solr_support.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/blacklight.yml
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/unit/ability_spec.rb