blacklight_dynamic_sitemap 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 925e03d72bd9c0718e2352fa77f4086f06cded4a8f8583ac71c4c931145953cf
-  data.tar.gz: 28964bc612bb4b365f1f65de70958d2d859b78f3efe18dcb06744d07f9f10071
+  metadata.gz: 19e5252f0d82795d55dee6783ecc266b9928a275add5b657d1f7e233e7ac14c3
+  data.tar.gz: 007c0fb399604348dfa31bcf588047add2a21d8ddce6a9c199bfb436febff3ba
 SHA512:
-  metadata.gz: f98d1fe94a7ef4181af1d7857f9f503896953f22770f0af6ca6ecac1243cf69f81286a9de93da33bb9c5e76e007ce726afdb1d5bd11a1035455366d13645e9c6
-  data.tar.gz: 8e32a029a7f312259ad327fdc5fcbf24aac84c0db967f26c57ba0478673397f336924a078ede87bad7672058d92f42bc7e3f158ab3cdc0c3d4fe07903b97f586
+  metadata.gz: 4b9dac19bd9feb82176eb1a900fa73d645eeb8b611e1f0f0aeb4927251b24a72858e435ccc6e82eb666ed46758d78857e9fca21f97f23b49412f7d538046fea1
+  data.tar.gz: eacd8eb93ab81964d4ab2dc42e2d883957a45cefc8a658259498a6cb9dd8ccf15b3132aa3eb2a721157cf5e596486a9b95ca454259c05f42e15ba05c3824b6b5

data/.github/workflows/ruby.yml

@@ -12,26 +12,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails: ['5.2.6', '6.0.3.7', '6.1.3.2']
-
+        blacklight_version: ['~> 8.0']
+        ruby_version: ['2.7', '3.0', '3.1']
+        rails_version: ['7.0.7.2']
+        include:
+          - ruby_version: '3.1'
+            rails_version: '7.0.7.2'
+            blacklight_version: '~> 7.0'
+    name: test (blacklight ${{ matrix.blacklight_version }} / ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }})
+    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'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
-    - uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: ${{ runner.os }}-gems20210506-${{ hashFiles('**/Gemfile.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-gems20210506-
+        ruby-version: ${{ matrix.ruby_version }}
     - name: Bundle install
       env:
-        RAILS_VERSION: ${{ matrix.rails }}
-      run: |
-        bundle config path vendor/bundle
-        bundle install
+        RAILS_VERSION: ${{ matrix.rails_version }}
+      run: bundle install
     - name: Run tests
       run: bundle exec rake

data/.solr_wrapper

@@ -1,5 +1,6 @@
 # Place any default configuration for solr_wrapper here
 # port: 8983
+version: 8.11.2
 collection:
   dir: solr/conf/
   name: blacklight-core

data/Gemfile

@@ -4,8 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 2.3.0
-# engine_cart stanza: 0.10.0
+# engine_cart: 2.4.0
+# engine_cart stanza: 2.5.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
 file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
 if File.exist?(file)
@@ -25,15 +25,16 @@ else
     else
       gem 'rails', ENV['RAILS_VERSION']
     end
-  end
 
-  case ENV['RAILS_VERSION']
-  when /^4.2/
-    gem 'responders', '~> 2.0'
-    gem 'sass-rails', '>= 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
-  when /^4.[01]/
-    gem 'sass-rails', '< 5.0'
+    case ENV['RAILS_VERSION']
+    when /^6.0/
+      gem 'sass-rails', '>= 6'
+      gem 'webpacker', '~> 4.0'
+    when /^5.[12]/
+      gem 'sass-rails', '~> 5.0'
+      gem 'sprockets', '~> 3.7'
+      gem 'thor', '~> 0.20'
+    end
   end
 end
 # END ENGINE_CART BLOCK

data/app/models/blacklight_dynamic_sitemap/sitemap.rb

@@ -4,22 +4,18 @@ module BlacklightDynamicSitemap
   ##
   #
   class Sitemap
-    delegate :hashed_id_field, :unique_id_field, :last_modified_field, to: :engine_config
+    delegate :solr_endpoint, :hashed_id_field, :unique_id_field, :last_modified_field, to: :engine_config
 
     def get(id)
       # if someone's hacking URLs (in ways that could potentially generate enormous requests),
       # just return an empty response
       return [] if id.length != exponent
 
-      index_connection.select(
-        params: show_params(id, {
-          q: '*:*',
+      index_connection.public_send(solr_endpoint,
+        params: show_params(id, engine_config.default_params.merge({
           fq: ["{!prefix f=#{hashed_id_field} v=#{id}}"],
-          fl: [unique_id_field, last_modified_field].join(','),
-          rows: 2_000_000, # Ensure that we do not page this result
-          facet: false,
-          defType: 'lucene'
-        })
+          fl: [unique_id_field, last_modified_field].join(',')
+        }))
       ).dig('response', 'docs')
     end
 

data/blacklight_dynamic_sitemap.gemspec

@@ -24,11 +24,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  # Rails <5.0 is not covered by the automated test suite (see `.github/workflows/ruby.yml`).
-  # Anecdotally demonstrated to work fine on Rails as low as 4.2, but any lower version
-  # threshold would be arbitrary.
-  spec.add_dependency 'rails', '<= 6.2'
-  spec.add_dependency 'blacklight', '> 6.0'
+  spec.add_dependency 'rails'
+  spec.add_dependency 'blacklight', '> 7.0'
 
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'engine_cart', '~> 2.0'

data/lib/blacklight_dynamic_sitemap/engine.rb

@@ -3,6 +3,14 @@
 module BlacklightDynamicSitemap
   class Engine < ::Rails::Engine
     isolate_namespace BlacklightDynamicSitemap
+    config.default_params = {
+      q: '*:*',
+      rows: 2_000_000, # Ensure that we do not page this result
+      facet: false,
+      defType: 'lucene',
+      sort: 'id asc'
+    }
+    config.solr_endpoint = :select
     config.max_documents_expiration = 1.day
     config.minimum_average_chunk = 10_000
     config.hashed_id_field = 'hashed_id_ssi'

data/lib/blacklight_dynamic_sitemap/version.rb

@@ -1,3 +1,3 @@
 module BlacklightDynamicSitemap
-  VERSION = '0.5.0'
+  VERSION = '1.0.0'
 end

data/solr/conf/schema.xml

@@ -7,10 +7,10 @@
   <uniqueKey>id</uniqueKey>
 
   <fields>
-    <field name="id" type="string" stored="true" indexed="true" multiValued="false" required="true"/>
+    <field name="id" type="string" stored="true" indexed="true" multiValued="false" required="true" docValues="true" />
     <field name="format" type="string" stored="true" indexed="true" multiValued="true" />
     <field name="_version_" type="long"     indexed="true"  stored="true"/>
-    <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
+    <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false" docValues="true" />
 
     <field name="lat" type="tdouble" stored="true" indexed="true" multiValued="false"/>
     <field name="lng" type="tdouble" stored="true" indexed="true" multiValued="false"/>
@@ -55,7 +55,7 @@
 
     <dynamicField name="*_ss" type="string" stored="true" indexed="false" multiValued="false"/>
     <dynamicField name="*_ssm" type="string" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_ssi" type="string" stored="true" indexed="true" multiValued="false"/>
+    <dynamicField name="*_ssi" type="string" stored="true" indexed="true" multiValued="false" docValues="true" />
     <dynamicField name="*_ssim" type="string" stored="true" indexed="true" multiValued="true"/>
 
     <dynamicField name="*_ssort" type="alphaSort" stored="false" indexed="true" multiValued="false"/>

data/solr/conf/solrconfig.xml

@@ -31,6 +31,7 @@
 
   <!-- solr lib dirs -->
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 
   <dataDir>${solr.data.dir:}</dataDir>

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_dynamic_sitemap
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jack Reed
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/sul-dlss/blacklight_dynamic_sitemap
   source_code_uri: https://github.com/sul-dlss/blacklight_dynamic_sitemap
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -173,8 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Dynamic sitemap.xml for BLacklight
 test_files: []