blacklight_dynamic_sitemap 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efd092440ea6b487972636c1b219cf17a6d1afcf2f10f75d2892125719ce7772
-  data.tar.gz: 96b2a345f4b6b03cf39b3316bb6581b439511214e245c8d6ab47c674ec2d74bf
+  metadata.gz: 44231f5414713681e54dddaf7024e14489b518153160fc12d9b8f0ea6afc5fd9
+  data.tar.gz: 3d3f645e3b37cee0d16a5301a8a7afb47bf334b2270daa495d10efc633aa7fa9
 SHA512:
-  metadata.gz: 017c6c3459d3fb722cf3bc05eea855c8c33f8f63d622cfa3713149f20a932a31b6620b03f865a6f78a02658b631a67071f14780a524503e8e3b244e036888949
-  data.tar.gz: 11ea817570658dffaf136c425dddc374dcba98d49fab21808d6250e37c7f168d03ceb274f91f0edd1f864299eb5c9dbf3139a2c5a7dda60fad5640462c6dc685
+  metadata.gz: ec836640c85ae903245d3de6217eed3e23bdb7f9aa808b6b23357a423e11866b5ea59ad883b6304e724538efc23ea91da992b76f2cd5e2b97dd8e782e40e8b7a
+  data.tar.gz: 1808f19193c2f9a8130b8e7f4daf38f0e8a6499fa77467699e34a970da9e78eb215bff1883fc4508b9275ecf8deddcd90e725c8be4e9d0eb6054bc152d6f605a

data/.github/workflows/ruby.yml

@@ -0,0 +1,41 @@
+
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.7']
+        rails: ['6.0.3.7', '6.1.3.2', '7.0.3']
+        include:
+          - rails: '7.0.3'
+            ruby: '3.0'
+
+    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-
+    - name: Bundle install
+      env:
+        RAILS_VERSION: ${{ matrix.rails }}
+      run: |
+        bundle config path vendor/bundle
+        bundle install
+    - name: Run tests
+      run: bundle exec rake

data/Gemfile

@@ -3,11 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in blacklight_dynamic_sitemap.gemspec
 gemspec
 
-gem 'rake', '~> 12.0'
-gem 'rspec', '~> 3.0'
 # 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)
@@ -27,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/README.md

@@ -44,6 +44,9 @@ This gem offers several configuration options that can be configured in a Rails
 
 See [engine.rb](https://github.com/sul-dlss/blacklight_dynamic_sitemap/blob/master/lib/blacklight_dynamic_sitemap/engine.rb) for available configurations.
 
+### Rails version compatibility note
+Note that the gemspec does not list a lower threshold for Rails version compatibility. This gem has been anecdotally demonstrated to work fine as low as Rails 4.2, but maintaining compatibility of the test suite with rails <5.0 was more complex than practical benefits warranted. Exercise caution when using with Rails <5.0.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake ci` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/app/models/blacklight_dynamic_sitemap/sitemap.rb

@@ -7,14 +7,19 @@ module BlacklightDynamicSitemap
     delegate :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: {
-          q: "{!prefix f=#{hashed_id_field} v=#{id}}",
+        params: show_params(id, {
+          q: '*:*',
+          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'
-        }
+        })
       ).dig('response', 'docs')
     end
 
@@ -24,6 +29,14 @@ module BlacklightDynamicSitemap
 
     private
 
+    def show_params(id, default_params)
+      engine_config.modify_show_params&.call(id, default_params) || default_params
+    end
+
+    def index_params(default_params)
+      engine_config.modify_index_params&.call(default_params) || default_params
+    end
+
     def index_connection
       @index_connection ||= Blacklight.default_index.connection
     end
@@ -34,10 +47,10 @@ module BlacklightDynamicSitemap
 
     def max_documents
       key = 'blacklight_dynamic_sitemap.index_max_docs'
-      expiration = BlacklightDynamicSitemap::Engine.config.max_documents_expiration
+      expiration = engine_config.max_documents_expiration
       Rails.cache.fetch(key, expires_in: expiration) do
-        Blacklight.default_index.connection.select(
-          params: { q: '*:*', rows: 0, facet: false }
+        index_connection.select(
+          params: index_params({ q: '*:*', rows: 0, facet: false })
         )['response']['numFound']
       end
     end

data/app/views/blacklight_dynamic_sitemap/sitemap/show.xml.builder

@@ -6,10 +6,12 @@ xml.urlset(
   'xsi:schemaLocation' => 'http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd',
   'xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9'
 ) do
+  config = BlacklightDynamicSitemap::Engine.config
   @sitemap_entries.each do |doc|
     xml.url do
-      xml.loc(main_app.solr_document_url(doc[BlacklightDynamicSitemap::Engine.config.unique_id_field]))
-      xml.lastmod(doc[BlacklightDynamicSitemap::Engine.config.last_modified_field])
+      xml.loc(main_app.solr_document_url(doc[config.unique_id_field]))
+      last_modified = doc[config.last_modified_field]
+      xml.lastmod(config.format_last_modified&.call(last_modified) || last_modified)
     end
   end
 end

data/blacklight_dynamic_sitemap.gemspec

@@ -24,11 +24,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rails', '>= 5.2', '<= 6.1'
+  spec.add_dependency 'rails'
   spec.add_dependency 'blacklight', '> 6.0'
 
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'engine_cart', '~> 2.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'solr_wrapper'
+  spec.add_development_dependency 'rake'
 end

data/lib/blacklight_dynamic_sitemap/engine.rb

@@ -8,5 +8,8 @@ module BlacklightDynamicSitemap
     config.hashed_id_field = 'hashed_id_ssi'
     config.unique_id_field = 'id'
     config.last_modified_field = 'timestamp'
+    config.modify_show_params = nil # lambda { |id, default_params| default_params }
+    config.modify_index_params = nil # lambda { |default_params| default_params }
+    config.format_last_modified = nil # lambda { |raw_last_modified| raw_last_modified }
   end
 end

data/lib/blacklight_dynamic_sitemap/version.rb

@@ -1,3 +1,3 @@
 module BlacklightDynamicSitemap
-  VERSION = '0.3.0'
+  VERSION = '0.6.0'
 end

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>

data/tasks/blacklight_dynamic_sitemap.rake

@@ -10,7 +10,7 @@ task ci: ['blacklight_dynamic_sitemap:generate'] do
   SolrWrapper.wrap do |solr|
     solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('..', File.dirname(__FILE__)), 'solr', 'conf')) do
       within_test_app do
-        system 'RAILS_ENV=test rake blacklight:index:seed'
+        system 'RAILS_ENV=test bundle exec rake blacklight:index:seed'
       end
       Rake::Task['spec'].invoke
     end
@@ -36,7 +36,7 @@ namespace :blacklight_dynamic_sitemap do
       solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('..', File.dirname(__FILE__)), 'solr', 'conf')) do
 
         within_test_app do
-          system 'RAILS_ENV=development rake blacklight:index:seed'
+          system 'RAILS_ENV=development bundle exec rake blacklight:index:seed'
           system "bundle exec rails s #{args[:rails_server_args]}"
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_dynamic_sitemap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jack Reed
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Dynamic sitemap.xml for BLacklight
 email:
 - phillipjreed@gmail.com
@@ -107,10 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".solr_wrapper"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -150,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
@@ -165,8 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Dynamic sitemap.xml for BLacklight
 test_files: []

data/.travis.yml

@@ -1,14 +0,0 @@
----
-language: ruby
-cache: bundler
-
-matrix:
-  include:
-    - env: RAILS_VERSION=6.0.3.2
-    - env: RAILS_VERSION=5.2.4.3
-
-rvm:
-  - 2.7.1
-notifications:
-  email: false
-jdk: openjdk11