blacklight-access_controls 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42bc79d32ffb74382743a9369ccb54bd68a57791e9df8f48c6448b22d6bf1577
-  data.tar.gz: cfad8e539c0dad24339828d70f5da920e110fc6fa8da631eaaca7cdfb8a0ae3f
+  metadata.gz: 3b9fce315e1dd04f42137f6638ba01c3fd88db2c5abf5fcd81015c03ecf73889
+  data.tar.gz: c0537bab02b3b95c80841c4617eda10fe03acab1debd578d28b0dbb8b9468a42
 SHA512:
-  metadata.gz: 64885571fb3a23d9cd11d9a0c4f5b6303bc0cd7e1eda451a03b932abad4f519475716dcf4db53f7dc63fa889f026ec12e6a1ff593552391253b4fdf04415d360
-  data.tar.gz: a52e7d5aaf059cc904928a6b7ae7887d5cb009036de6acd3462f50157399221ed9574fa392786c5b9e1e1fa22ca5892d98ca24eb3552556830448fe5e8546ac0
+  metadata.gz: 5c7484ef418484e7e91f26237eb35cd56d2fc04282deea8998b77db0747f5283634d5e0e0ece7eea55a35a421c9b07a8f6dbb8ed24cb24b86367a90623f95b2b
+  data.tar.gz: 708e32e0d761ad496750390e45dc17d70dac0748644310645972f8625e9007b5cc880134960ba7f682a895322bc4673c5991f8ed412eed8f5fb26b3ef3e51110

data/.github/workflows/main.yml

@@ -0,0 +1,31 @@
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby_version: ['3.4.4', '3.3.8', '3.2.8']
+        rails_version: ['8.0.1', '7.2.2.1', '7.1.5.1']
+
+    runs-on: ubuntu-latest
+    name: ruby ${{ matrix.ruby_version }} | rails ${{ matrix.rails_version }}
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-kamal --skip-solid --skip-coffee --skip-test --skip-assets"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler: "latest"
+          ruby-version: ${{ matrix.ruby_version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake ci

data/.rubocop.yml

@@ -16,7 +16,7 @@ Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 185
 
 Naming/FileName:
@@ -25,9 +25,6 @@ Naming/FileName:
     - 'blacklight-access_controls.gemspec'
     - 'lib/blacklight-access_controls.rb'
 
-Rails:
-  Enabled: true
-
 RSpec/MessageSpies:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -32,7 +32,7 @@ RSpec/ExampleLength:
 
 # Offense count: 3
 # Configuration parameters: CustomTransform, IgnoreMethods.
-RSpec/FilePath:
+RSpec/SpecFilePathFormat:
   Exclude:
     - 'spec/unit/catalog_spec.rb'
     - 'spec/unit/config_spec.rb'

data/.solr_wrapper.yml

@@ -1,5 +1,7 @@
 # Place any default configuration for solr_wrapper here
 # port: 8983
+env:
+  SOLR_MODULES: analysis-extras
 collection:
   dir: solr_conf/conf/
   name: blacklight-core

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-6.0.1
+6.1.0

data/blacklight-access_controls.gemspec

@@ -3,7 +3,7 @@ version = File.read(File.expand_path('../VERSION', __FILE__)).strip
 module Blacklight
   module AccessControls
     def self.bl_version
-      ENV['BLACKLIGHT_VERSION'] ? [ENV['BLACKLIGHT_VERSION']] : ['> 6.0', '< 8']
+      ENV['BLACKLIGHT_VERSION'] ? [ENV['BLACKLIGHT_VERSION']] : ['> 6.0', '< 9']
     end
   end
 end
@@ -31,10 +31,10 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'engine_cart', '~> 2.2'
-  gem.add_development_dependency 'factory_bot_rails', '~> 4.8'
+  gem.add_development_dependency 'factory_bot_rails', '>= 4.8'
   gem.add_development_dependency 'rake', '~> 12.3'
   gem.add_development_dependency 'rspec', '~> 3.1'
-  gem.add_development_dependency 'rubocop', '~> 0.52.1'
+  gem.add_development_dependency 'rubocop', '~> 1.29'
   gem.add_development_dependency 'rubocop-rspec'
   gem.add_development_dependency 'solr_wrapper'
 end

data/lib/blacklight/access_controls/enforcement.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'deprecation'
 
 module Blacklight
   module AccessControls
@@ -15,11 +16,11 @@ module Blacklight
       extend ActiveSupport::Concern
 
       included do
-        extend Deprecation
+        extend ::Deprecation
         attr_writer :current_ability, :discovery_permissions
         deprecation_deprecate :current_ability=
 
-        Deprecation.warn(self, 'Blacklight::AccessControls::Enforcement is deprecated and will be removed in 1.0')
+        ::Deprecation.warn(self, 'Blacklight::AccessControls::Enforcement is deprecated and will be removed in 1.0')
         class_attribute :solr_access_filters_logic
         alias_method :add_access_controls_to_solr_params, :apply_gated_discovery
 

data/solr_conf/conf/solrconfig.xml

@@ -16,7 +16,8 @@
     </updateLog>
   </updateHandler>
 
-  <!-- solr lib dirs -->
+  <!-- solr lib dirs, which are needed for Solr 8 compatibility but ignored in solr 9.8 and above -->
+  <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 
@@ -46,9 +47,75 @@
           full_title_tsim
           short_title_tsim
           alternative_title_tsim
-          active_fedora_model_ssi
           title_tsim
-          author_tsimesim
+          author_tsim
+          subject_tsim
+          all_text_timv
+        </str>
+        <str name="pf">
+          all_text_timv^10
+        </str>
+
+       <str name="author_qf">
+          author_tsim
+       </str>
+       <str name="author_pf">
+       </str>
+       <str name="title_qf">
+          title_tsim
+          full_title_tsim
+          short_title_tsim
+          alternative_title_tsim
+       </str>
+       <str name="title_pf">
+       </str>
+       <str name="subject_qf">
+          subject_tsim
+       </str>
+       <str name="subject_pf">
+       </str>
+
+       <str name="fl">
+         *,
+         score
+       </str>
+
+       <str name="facet">true</str>
+       <str name="facet.mincount">1</str>
+       <str name="facet.limit">10</str>
+       <str name="facet.field">subject_ssim</str>
+
+       <str name="spellcheck">true</str>
+       <str name="spellcheck.dictionary">default</str>
+       <str name="spellcheck.onlyMorePopular">true</str>
+       <str name="spellcheck.extendedResults">true</str>
+       <str name="spellcheck.collate">false</str>
+       <str name="spellcheck.count">5</str>
+
+     </lst>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
+  </requestHandler>
+
+  <requestHandler name="/advanced" class="solr.SearchHandler">
+    <!-- a lucene request handler for using the JSON Query DSL,
+         specifically for advanced search.
+         Using a separate requestHandler is a workaround to
+         https://issues.apache.org/jira/browse/SOLR-16916, although
+         it could be desirable for other reasons as well.
+      -->
+     <lst name="defaults">
+       <str name="defType">lucene</str>
+       <str name="echoParams">explicit</str>
+        <str name="df">title_tsim</str>
+        <str name="qf">
+          id
+          full_title_tsim
+          short_title_tsim
+          alternative_title_tsim
+          title_tsim
+          author_tsim
           subject_tsim
           all_text_timv
         </str>
@@ -83,7 +150,6 @@
        <str name="facet">true</str>
        <str name="facet.mincount">1</str>
        <str name="facet.limit">10</str>
-       <str name="facet.field">active_fedora_model_ssi</str>
        <str name="facet.field">subject_ssim</str>
 
        <str name="spellcheck">true</str>

data/spec/factories/user.rb

@@ -3,6 +3,6 @@
 FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user_#{n}@example.com" }
-    password 'password'
+    password { 'password' }
   end
 end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -11,7 +11,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   def generate_blacklight
     say_status('status', 'GENERATING BLACKLIGHT', :yellow)
-    generate 'blacklight:install', '--devise'
+    generate 'blacklight:install', '--devise --skip-assets'
   end
 
   def configure_blacklight

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

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Blacklight::AccessControls::SearchBuilder do
-  subject { search_builder }
+  subject(:search_builder) { described_class.new scope, ability: ability }
 
-  let(:search_builder) do
-    described_class.new(controller, ability: ability)
-  end
-  let(:controller) { double }
+  let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:scope) { double blacklight_config: blacklight_config, search_state_class: nil }
   let(:user) { User.new }
   let(:ability) { Ability.new(user) }
 

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-access_controls
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Chris Beer
 - Justin Coyne
 - Matt Zumwalt
 - Valerie Maher
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -22,7 +21,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +31,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +92,14 @@ dependencies:
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.8'
 - !ruby/object:Gem::Dependency
@@ -137,14 +136,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '1.29'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '1.29'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -180,12 +179,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".solr_wrapper.yml"
-- ".travis.yml"
 - Gemfile
 - README.textile
 - Rakefile
@@ -234,7 +233,6 @@ homepage: https://github.com/projectblacklight/blacklight-access_controls
 licenses:
 - APACHE2
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -249,8 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Access controls for blacklight-based applications
 test_files:

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-sudo: false
-
-notifications:
-  email: false
-
-rvm:
-  - 2.5.1
-
-env:
- - "BLACKLIGHT_VERSION='~>7.0' RAILS_VERSION=5.2.2"
- - "BLACKLIGHT_VERSION='~>6.0' RAILS_VERSION=5.2.2"
- - "RAILS_VERSION=5.1.6"
-
-global_env:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-before_script:
-  - jdk_switcher use oraclejdk8