blacklight_dynamic_sitemap 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44231f5414713681e54dddaf7024e14489b518153160fc12d9b8f0ea6afc5fd9
-  data.tar.gz: 3d3f645e3b37cee0d16a5301a8a7afb47bf334b2270daa495d10efc633aa7fa9
+  metadata.gz: 19e5252f0d82795d55dee6783ecc266b9928a275add5b657d1f7e233e7ac14c3
+  data.tar.gz: 007c0fb399604348dfa31bcf588047add2a21d8ddce6a9c199bfb436febff3ba
 SHA512:
-  metadata.gz: ec836640c85ae903245d3de6217eed3e23bdb7f9aa808b6b23357a423e11866b5ea59ad883b6304e724538efc23ea91da992b76f2cd5e2b97dd8e782e40e8b7a
-  data.tar.gz: 1808f19193c2f9a8130b8e7f4daf38f0e8a6499fa77467699e34a970da9e78eb215bff1883fc4508b9275ecf8deddcd90e725c8be4e9d0eb6054bc152d6f605a
+  metadata.gz: 4b9dac19bd9feb82176eb1a900fa73d645eeb8b611e1f0f0aeb4927251b24a72858e435ccc6e82eb666ed46758d78857e9fca21f97f23b49412f7d538046fea1
+  data.tar.gz: eacd8eb93ab81964d4ab2dc42e2d883957a45cefc8a658259498a6cb9dd8ccf15b3132aa3eb2a721157cf5e596486a9b95ca454259c05f42e15ba05c3824b6b5

data/.github/workflows/ruby.yml

@@ -12,30 +12,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7']
-        rails: ['6.0.3.7', '6.1.3.2', '7.0.3']
+        blacklight_version: ['~> 8.0']
+        ruby_version: ['2.7', '3.0', '3.1']
+        rails_version: ['7.0.7.2']
         include:
-          - rails: '7.0.3'
-            ruby: '3.0'
-
+          - 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: ${{ matrix.ruby }}
-    - 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/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

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rails'
-  spec.add_dependency 'blacklight', '> 6.0'
+  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.6.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"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_dynamic_sitemap
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jack Reed
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     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
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Dynamic sitemap.xml for BLacklight