blacklight_advanced_search 8.0.0.alpha1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e9396af949fde0ccc4ecb6c3aed38179618b43fb94981cf703b45f7f4e0e9d9
-  data.tar.gz: '08420957e733036ac9bf41eebc1d85a0c0bf1904758239f3135f59c2395a7148'
+  metadata.gz: 863f87d073f3a7e0d89385ab55f1cb18ad064cd13ce8c1971b9ee57e3669aa74
+  data.tar.gz: 6f1d559935ed0467adb44f37f568265eb6571e81db3ba9319e8b0dee8c259910
 SHA512:
-  metadata.gz: aa70a1c801b2a471341b5521259f6b30614a8fb1df8d2006531170632dcbbd5e82dca2d3e6d4f496dab47b0d43bd6766224206a0e0766f5ab438f72765b39bb4
-  data.tar.gz: e636fc6d32911b8254eac38fe35842ec5f310f50fcacee0fdf59679b52dec3d0f38fee2954e425ead63f82f4c43b96c9cd9f24818ba19b786c0943b134aa08d4
+  metadata.gz: 59d72605083343d869eeeab7eb4c275185bd2f70c28793e0ec55fc413266577588ae062ced95d68ed73eda219e7b763b9a796255602dd8925fac7a4535d6e0dd
+  data.tar.gz: '09d0649bf731822a18067bb6199cea04625efb7bad7c6c0fe4f0f10c7c8c2359af9d59a57ea1fc8adac6ca1e2fd3d95b3c8d093de740c35e74bee0b7b17e8e22'

data/.github/workflows/ruby.yml

@@ -1,126 +1,57 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
 name: CI
 
 on:
   push:
     branches:
       - main
-      - master
       - 'release-*'
   pull_request:
+    branches:
+      - main
+      - 'release-*'
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.1
     - name: Install dependencies
       run: bundle install
     - name: Run linter
       run: bundle exec rake rubocop
   test:
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        ruby: [2.7, '3.0', 3.1]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        ENGINE_CART_RAILS_OPTIONS: '-a propshaft --skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-  test_bootstrap5:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: ['3.0']
+        ruby: ['3.2', '3.3', '3.4']
+        rails_version: ['~> 7.2', '~> 8.1']
+        blacklight_version: ['~> 8.0']
+        experimental: [false]
+        include:
+        - ruby: '3.4'
+          rails_version: '~> 8.1'
+          blacklight_version: '~> 9.0'
+          experimental: false
+        - ruby: '3.4'
+          rails_version: '~> 8.1'
+          blacklight_version: 'github'
+          experimental: true
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+      BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
+      ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test --skip-kamal --css=bootstrap --js=esbuild'
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
+    - uses: actions/checkout@v6
+    - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        BOOTSTRAP_VERSION: '~> 5.0'
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-  test_rails6_0:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [2.6]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-      env:
-        RAILS_VERSION: 6.0.3.7
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: 6.0.3.7
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-  test_rails5_2:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [2.7]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-      env:
-        RAILS_VERSION: 5.2.4.6
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: 5.2.4.6
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-
-  test_rails6_1:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: ['3.0']
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
+    - name: Install dependencies with Rails ${{ matrix.rails_version }}
       run: bundle install
-      env:
-        RAILS_VERSION: 6.1.5
     - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: 6.1.5
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-keeps --skip-action-cable --skip-test'
+      run: bundle exec rake

data/.solr_wrapper.yml

@@ -3,3 +3,5 @@
 collection:
   dir: solr/conf/
   name: blacklight-core
+env:
+  SOLR_OPTS: '-Dsolr.config.lib.enabled=true'

data/Gemfile

@@ -32,3 +32,5 @@ else
   end
 end
 # END ENGINE_CART BLOCK
+
+eval_gemfile File.expand_path("spec/test_app_templates/Gemfile.extra", File.dirname(__FILE__))

data/README.md

@@ -192,12 +192,12 @@ in likely ways.  For one example, see the wiki page on [Adding a range limit to
 
 The code for mapping a user-entered query to a Solr query is called "nesting_parsing", and maps to a 'lucene' query parser query, with nested 'dismax' query parser queries.
 
-Some technical details can be found in the nesting_parsing README: [https://github.com/projectblacklight/blacklight_advanced_search/tree/master/lib/parsing_nesting]
+Some technical details can be found in the nesting_parsing README: [https://github.com/projectblacklight/blacklight_advanced_search/tree/main/lib/parsing_nesting]
 
 You may also find the rspecs for parsing a user-entered query and converting it to Solr illumnating:
 
-1. Converting user-entered query to Solr: [https://github.com/projectblacklight/blacklight_advanced_search/blob/master/spec/parsing_nesting/to_solr_spec.rb]
-2. Parsing user-entered query to internal syntax tree: [https://github.com/projectblacklight/blacklight_advanced_search/blob/master/spec/parsing_nesting/build_tree_spec.rb]
+1. Converting user-entered query to Solr: [https://github.com/projectblacklight/blacklight_advanced_search/blob/main/spec/parsing_nesting/to_solr_spec.rb]
+2. Parsing user-entered query to internal syntax tree: [https://github.com/projectblacklight/blacklight_advanced_search/blob/main/spec/parsing_nesting/build_tree_spec.rb]
 
 ## Running tests
 

data/VERSION

@@ -1 +1 @@
-8.0.0.alpha1
+8.0.0

data/blacklight_advanced_search.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'blacklight', '>= 7.15', '< 9'
+  s.add_dependency 'blacklight', '>= 7.15', '< 10'
   s.add_dependency "parslet"
 
   s.add_development_dependency "rails"
-  s.add_development_dependency "rspec-rails", "~> 5.0"
+  s.add_development_dependency "rspec-rails", "~> 8.0"
   s.add_development_dependency "capybara"
   s.add_development_dependency 'solr_wrapper'
   s.add_development_dependency 'engine_cart', "~> 2.0"

data/lib/blacklight_advanced_search/redirect_legacy_params_filter.rb

@@ -40,8 +40,8 @@ module BlacklightAdvancedSearch
       end
 
       if legacy_converted
-        controller.send(:redirect_to, params, :status => :moved_permanently)
+        controller.send(:redirect_to, params.to_unsafe_h, :status => :moved_permanently)
       end
     end
   end
-  end
+end

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1,5 @@
+if ENV['BLACKLIGHT_VERSION'] == 'github'
+  gem 'blacklight', github: 'projectblacklight/blacklight'
+elsif ENV['BLACKLIGHT_VERSION'] && !ENV['BLACKLIGHT_VERSION'].empty?
+  gem 'blacklight', ENV['BLACKLIGHT_VERSION']
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 8.0.0.alpha1
+  version: 8.0.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 - Chris Beer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -20,7 +19,7 @@ dependencies:
         version: '7.15'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +29,7 @@ dependencies:
         version: '7.15'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -65,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +170,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - blacklight-development@googlegroups.com
 executables: []
@@ -228,13 +226,13 @@ files:
 - spec/parsing_nesting/to_solr_spec.rb
 - spec/rcov.opts
 - spec/spec_helper.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/app/controllers/catalog_controller.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 homepage: http://projectblacklight.org/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -245,12 +243,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Blacklight Advanced Search plugin
 test_files:
@@ -263,5 +260,6 @@ test_files:
 - spec/parsing_nesting/to_solr_spec.rb
 - spec/rcov.opts
 - spec/spec_helper.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/app/controllers/catalog_controller.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb