blacklight-access_controls 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa4c2281c3cf2d75a25711b2225ac638f3e1987682b3b6f154ee173f52f4a3a
-  data.tar.gz: 1a84e0cf14c47d65c3821fbc374c6f071ff8cfd10123c900adc4559f8a8b772a
+  metadata.gz: 3b9fce315e1dd04f42137f6638ba01c3fd88db2c5abf5fcd81015c03ecf73889
+  data.tar.gz: c0537bab02b3b95c80841c4617eda10fe03acab1debd578d28b0dbb8b9468a42
 SHA512:
-  metadata.gz: 052f22d4fcf11b8d60139421d0af1d374a0bb32483e5514c99adfa27d07f014a919cd729904775e33d12e1238c7b66b095d085e9c1c85904c1c1a115da772d45
-  data.tar.gz: 0424e35387bb4ca3d6c9a8a7fcf1f1fbba9964c0fa36db4e45ee41d8c0ee3b4453c02d850712c4c88e4898153b8fad467ab180894c1ac205501dc016b48d5ea5
+  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/README.textile

@@ -89,10 +89,8 @@ This section contains information about working on the blacklight-access_control
 h3. Set up Solr
 
 <pre>
-$ bundle exec rake solr:clean
-$ bundle exec rake solr:config
-$ bundle exec rake solr:start
-$ bundle exec rake solr:stop
+$ bundle exec solr_wrapper clean
+$ bundle exec solr_wrapper
 </pre>
 
 h3. Generate a Rails test app
@@ -113,7 +111,7 @@ $ bundle exec rake solr:spec
 h3. Run the Rails server in development mode
 
 <pre>
-$ bundle exec rake solr:start
+$ bundle exec solr_wrapper
 $ bundle exec rake engine_cart:generate
 $ bundle exec rake engine_cart:server
 </pre>

data/Rakefile

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

data/VERSION

@@ -1 +1 @@
-6.0.0
+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
@@ -26,15 +26,15 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.1.0'
 
   gem.add_dependency 'blacklight', *Blacklight::AccessControls.bl_version
-  gem.add_dependency 'cancancan', '~> 1.8'
+  gem.add_dependency 'cancancan', '>= 1.8'
   gem.add_dependency 'deprecation', '~> 1.0'
 
   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/_rest_managed.json

@@ -0,0 +1,3 @@
+{
+  "initArgs":{},
+  "managedList":[]}

data/solr_conf/conf/admin-extra.html

@@ -15,10 +15,17 @@
  limitations under the License.
 -->
 
-<!-- The content of this page will be statically included into the top-
-right box of the cores overview page. Uncomment this as an example to 
-see there the content will show up.
+<!-- The content of this page will be statically included into the top
+of the admin page.  Uncomment this as an example to see there the content
+will show up.
+
+<hr>
+<i>This line will appear before the first table</i>
+<tr>
+<td colspan="2">
+This row will be appended to the end of the first table
+</td>
+</tr>
+<hr>
 
-<img src="img/ico/construction.png"> This line will appear at the top-
-right box on collection1's Overview
 -->

data/solr_conf/conf/elevate.xml

@@ -19,10 +19,8 @@
 <!-- If this file is found in the config directory, it will only be
      loaded once at startup.  If it is found in Solr's data
      directory, it will be re-loaded every commit.
-
-   See http://wiki.apache.org/solr/QueryElevationComponent for more info
-
 -->
+
 <elevate>
  <query text="foo bar">
   <doc id="1" />

data/solr_conf/conf/mapping-ISOLatin1Accent.txt

@@ -16,231 +16,231 @@
 #     "target".length() >= 0 (target can be empty.)
 
 # example:
-#   "À" => "A"
+#   "??" => "A"
 #   "\u00C0" => "A"
 #   "\u00C0" => "\u0041"
-#   "ß" => "ss"
+#   "??" => "ss"
 #   "\t" => " "
 #   "\n" => ""
 
-# À => A
+# ?? => A
 "\u00C0" => "A"
 
-# Á => A
+# ?? => A
 "\u00C1" => "A"
 
-# Â => A
+# ?? => A
 "\u00C2" => "A"
 
-# Ã => A
+# ?? => A
 "\u00C3" => "A"
 
-# Ä => A
+# ?? => A
 "\u00C4" => "A"
 
-# Å => A
+# ?? => A
 "\u00C5" => "A"
 
-# Æ => AE
+# ?? => AE
 "\u00C6" => "AE"
 
-# Ç => C
+# ?? => C
 "\u00C7" => "C"
 
-# È => E
+# ?? => E
 "\u00C8" => "E"
 
-# É => E
+# ?? => E
 "\u00C9" => "E"
 
-# Ê => E
+# ?? => E
 "\u00CA" => "E"
 
-# Ë => E
+# ?? => E
 "\u00CB" => "E"
 
-# Ì => I
+# ?? => I
 "\u00CC" => "I"
 
-# Í => I
+# ?? => I
 "\u00CD" => "I"
 
-# Î => I
+# ?? => I
 "\u00CE" => "I"
 
-# Ï => I
+# ?? => I
 "\u00CF" => "I"
 
-# IJ => IJ
+# ?? => IJ
 "\u0132" => "IJ"
 
-# Ð => D
+# ?? => D
 "\u00D0" => "D"
 
-# Ñ => N
+# ?? => N
 "\u00D1" => "N"
 
-# Ò => O
+# ?? => O
 "\u00D2" => "O"
 
-# Ó => O
+# ?? => O
 "\u00D3" => "O"
 
-# Ô => O
+# ?? => O
 "\u00D4" => "O"
 
-# Õ => O
+# ?? => O
 "\u00D5" => "O"
 
-# Ö => O
+# ?? => O
 "\u00D6" => "O"
 
-# Ø => O
+# ?? => O
 "\u00D8" => "O"
 
-# Π=> OE
+# ?? => OE
 "\u0152" => "OE"
 
-# Þ
+# ??
 "\u00DE" => "TH"
 
-# Ù => U
+# ?? => U
 "\u00D9" => "U"
 
-# Ú => U
+# ?? => U
 "\u00DA" => "U"
 
-# Û => U
+# ?? => U
 "\u00DB" => "U"
 
-# Ü => U
+# ?? => U
 "\u00DC" => "U"
 
-# Ý => Y
+# ?? => Y
 "\u00DD" => "Y"
 
-# Ÿ => Y
+# ?? => Y
 "\u0178" => "Y"
 
-# à => a
+# ?? => a
 "\u00E0" => "a"
 
-# á => a
+# ?? => a
 "\u00E1" => "a"
 
-# â => a
+# ?? => a
 "\u00E2" => "a"
 
-# ã => a
+# ?? => a
 "\u00E3" => "a"
 
-# ä => a
+# ?? => a
 "\u00E4" => "a"
 
-# å => a
+# ?? => a
 "\u00E5" => "a"
 
-# æ => ae
+# ?? => ae
 "\u00E6" => "ae"
 
-# ç => c
+# ?? => c
 "\u00E7" => "c"
 
-# è => e
+# ?? => e
 "\u00E8" => "e"
 
-# é => e
+# ?? => e
 "\u00E9" => "e"
 
-# ê => e
+# ?? => e
 "\u00EA" => "e"
 
-# ë => e
+# ?? => e
 "\u00EB" => "e"
 
-# ì => i
+# ?? => i
 "\u00EC" => "i"
 
-# í => i
+# ?? => i
 "\u00ED" => "i"
 
-# î => i
+# ?? => i
 "\u00EE" => "i"
 
-# ï => i
+# ?? => i
 "\u00EF" => "i"
 
-# ij => ij
+# ?? => ij
 "\u0133" => "ij"
 
-# ð => d
+# ?? => d
 "\u00F0" => "d"
 
-# ñ => n
+# ?? => n
 "\u00F1" => "n"
 
-# ò => o
+# ?? => o
 "\u00F2" => "o"
 
-# ó => o
+# ?? => o
 "\u00F3" => "o"
 
-# ô => o
+# ?? => o
 "\u00F4" => "o"
 
-# õ => o
+# ?? => o
 "\u00F5" => "o"
 
-# ö => o
+# ?? => o
 "\u00F6" => "o"
 
-# ø => o
+# ?? => o
 "\u00F8" => "o"
 
-# œ => oe
+# ?? => oe
 "\u0153" => "oe"
 
-# ß => ss
+# ?? => ss
 "\u00DF" => "ss"
 
-# þ => th
+# ?? => th
 "\u00FE" => "th"
 
-# ù => u
+# ?? => u
 "\u00F9" => "u"
 
-# ú => u
+# ?? => u
 "\u00FA" => "u"
 
-# û => u
+# ?? => u
 "\u00FB" => "u"
 
-# ü => u
+# ?? => u
 "\u00FC" => "u"
 
-# ý => y
+# ?? => y
 "\u00FD" => "y"
 
-# ÿ => y
+# ?? => y
 "\u00FF" => "y"
 
-# ff => ff
+# ??? => ff
 "\uFB00" => "ff"
 
-# fi => fi
+# ??? => fi
 "\uFB01" => "fi"
 
-# fl => fl
+# ??? => fl
 "\uFB02" => "fl"
 
-# ffi => ffi
+# ??? => ffi
 "\uFB03" => "ffi"
 
-# ffl => ffl
+# ??? => ffl
 "\uFB04" => "ffl"
 
-# ſt => ft
+# ??? => ft
 "\uFB05" => "ft"
 
-# st => st
+# ??? => st
 "\uFB06" => "st"