geoblacklight 4.0.0.pre.alpha.2 → 4.0.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f2e7004abc760233f8cca1ea261b927bc4a59a49396a85963018fa9f7c6997a
-  data.tar.gz: 9343d1633a6c44603967d225a4380fd8a47f2f8a290c35dbef6e1dd5d195bb7d
+  metadata.gz: 2e016f04146c4adb059ab8e46fc9ab057bc6f3fbaddc93db8bc08f1cbd4f9109
+  data.tar.gz: 32ce106b04443cbcf338542e6cf249fac74fd1d3631ec07f8bd91f71cef65b5d
 SHA512:
-  metadata.gz: d51c4abeee5d0949dbe9399ce644899e0f18431005e0502a2cf92b68b73eee33d49181f1d65b9a4dbc06c27c554c68d135bffb3990ef82a6e373a518c90b4b05
-  data.tar.gz: 8bf2c640d645c695801ff940595dd3e3fcdcc435c0521e40c245e3df86abd28d8bafd22d6f9ffaa38dafd83c416c15644e6a7b563d9b941b1735c8230c64af1e
+  metadata.gz: 434df1f2da05c35bc5aa86c3209810f6cc6cba302153a42e005aea9997ea59e1049deba575d720da8b8324c16d2cc14774507a591fba76bb043b94e39c7ad0c4
+  data.tar.gz: 4150a0c44452e67547212301a17ee1ace802784034845b7832f5cbcb82f686c9dbab68f93d6b61dcef54f5405fc7ab35312d4b100055f00a276f14efa2db7cc1

data/.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### Descriptive summary
 
-Include what version of GeoBlacklight related to this issue (1.3.0, master, etc.) if appropriate, and any relevant tracebacks if you're reporting a bug.
+Include what version of GeoBlacklight related to this issue (1.3.0, main, etc.) if appropriate, and any relevant tracebacks if you're reporting a bug.
 
 ### Expected behavior
 

data/.github/workflows/ruby.yml

@@ -1,6 +1,10 @@
 name: CI
 
-on: [push]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   rubocop:
@@ -16,133 +20,53 @@ jobs:
     - name: Run linter
       run: bundle exec rake rubocop
 
-  coverage:
-    runs-on: ubuntu-latest
-    needs: test
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-
-    - name: Install dependencies
-      run: bundle install
-
-    - name: Download coverage artifacts
-      uses: actions/download-artifact@v2
-      with:
-        name: coverage
-        path: coverage_results
-
-    - name: Run coverage report
-      run: RAILS_ENV=test bundle exec ruby ./bin/coverage.rb
-
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7, 3.0]
+        ruby_version: ['3.0', 2.7]
+        rails_version: [6.1]
+        bundler_version: [2.1.1]
+        faraday_version: ['>= 2', '~> 1.0']
+        include:
+          - ruby_version: 2.6
+            rails_version: 6.1
+            bundler_version: 2.1.1
+            faraday_version: '~> 1.0'
+    name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / faraday ${{ matrix.faraday_version }}
     steps:
     - uses: actions/checkout@v2
-
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby }}
-
+        ruby-version: ${{ matrix.ruby_version }}
     - name: Create Solr container
       run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
-
+    - name: Install bundler
+      run: gem install bundler -v ${{ matrix.bundler_version }}
     - name: Install dependencies
-      run: bundle install
-
+      run: bundle _${{ matrix.bundler_version }}_ install
+      env:
+        RAILS_VERSION: ${{ matrix.rails_version }}
+        FARADAY_VERSION: ${{ matrix.faraday_version }}
+    - name: Setup Yarn
+      run: exec "yarnpkg"
     - name: Load config into solr
       run: |
           cd solr/conf
           zip -1 -r solr_config.zip ./*
           curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://solr:SolrRocks@127.0.0.1:8983/solr/admin/configs?action=UPLOAD&name=blacklight"
           curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8983/api/collections/  -d '{create: {name: blacklight-core, config: blacklight, numShards: 1}}'
-
     - name: Run tests
       run: bundle exec rake ci
       env:
+        RAILS_VERSION: ${{ matrix.rails_version }}
+        FARADAY_VERSION: ${{ matrix.faraday_version }}
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
         SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
-
     - name: Upload coverage artifacts
       uses: actions/upload-artifact@v2
+      if: always()
       with:
         name: coverage
         path: coverage/
-
-  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: Create Solr container
-      run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
-
-    - name: Install dependencies
-      run: bundle install
-      env:
-        RAILS_VERSION: 6.0.3.4
-
-    - name: Load config into solr
-      run: |
-          cd solr/conf
-          zip -1 -r solr_config.zip ./*
-          curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://solr:SolrRocks@127.0.0.1:8983/solr/admin/configs?action=UPLOAD&name=blacklight"
-          curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8983/api/collections/  -d '{create: {name: blacklight-core, config: blacklight, numShards: 1}}'
-
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: 6.0.3.4
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-        SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
-
-  test_rails5_2:
-    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: Create Solr container
-      run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
-
-    - name: Install dependencies
-      run: bundle install
-      env:
-        RAILS_VERSION: 5.2.6
-
-    - name: Load config into solr
-      run: |
-          cd solr/conf
-          zip -1 -r solr_config.zip ./*
-          curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://solr:SolrRocks@127.0.0.1:8983/solr/admin/configs?action=UPLOAD&name=blacklight"
-          curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8983/api/collections/  -d '{create: {name: blacklight-core, config: blacklight, numShards: 1}}'
-
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: 5.2.6
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-        SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core

data/.gitignore

@@ -17,6 +17,7 @@ test/version_tmp
 tmp
 jetty
 .internal_test_app
+.tool-versions
 # Ignore byebug history
 .byebug_history
 .DS_Store

data/.rubocop.yml

@@ -7,7 +7,7 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   TargetRubyVersion: 2.7
   DisplayCopNames: true
-  NewCops: pending
+  NewCops: enable
   Exclude:
   - '.internal_test_app/**/*'
   - 'db/**/*'
@@ -31,6 +31,7 @@ Layout/DotPosition:
 Layout/LineLength:
   Max: 115
   Exclude:
+  - 'app/models/concerns/geoblacklight/bbox_filter_query.rb'
   - 'app/models/concerns/geoblacklight/spatial_search_behavior.rb'
   - 'bin/coverage.rb'
   - 'lib/generators/geoblacklight/install_generator.rb'
@@ -59,11 +60,6 @@ Metrics/ModuleLength:
 Style/Documentation:
   Enabled: false
 
-# Overrides method in blacklight. Must use method name.
-Naming/PredicateName:
-  Exclude:
-    - 'lib/geoblacklight/view_helper_override.rb'
-
 # geoblacklight references in solr_document_spec are
 # difficult to mock because of the use of 'method_missing'.
 # https://relishapp.com/rspec/rspec-mocks/docs/verifying-doubles/dynamic-classes
@@ -90,6 +86,10 @@ RSpec/VerifiedDoubles:
     - 'spec/lib/geoblacklight/download/hgl_download_spec.rb'
     - 'spec/lib/geoblacklight/document_presenter_spec.rb'
 
+# TODO: Investigate use of OpenStruct in specs
+Style/OpenStructUse:
+  Enabled: false
+
 Style/SignalException:
   EnforcedStyle: semantic
 

data/.rubocop_todo.yml

@@ -29,7 +29,6 @@ Layout/EmptyLineAfterGuardClause:
     - 'lib/geoblacklight/item_viewer.rb'
     - 'lib/geoblacklight/metadata/base.rb'
     - 'lib/geoblacklight/references.rb'
-    - 'lib/geoblacklight/view_helper_override.rb'
 
 # Offense count: 141
 # Cop supports --auto-correct.
@@ -266,7 +265,6 @@ RSpec/NestedGroups:
 RSpec/PredicateMatcher:
   Exclude:
     - 'spec/lib/geoblacklight/download_spec.rb'
-    - 'spec/lib/geoblacklight/view_helper_override_spec.rb'
     - 'spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb'
     - 'spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb'
     - 'spec/models/concerns/geoblacklight/solr_document_spec.rb'
@@ -333,7 +331,6 @@ Rails/OutputSafety:
 Style/ExpandPathArguments:
   Exclude:
     - 'lib/generators/geoblacklight/install_generator.rb'
-    - 'lib/generators/geoblacklight/webpacker_generator.rb'
     - 'spec/spec_helper.rb'
     - 'spec/support/features.rb'
     - 'spec/test_app_templates/lib/generators/test_app_generator.rb'

data/.solr_wrapper

@@ -1,4 +1,6 @@
+url: https://archive.apache.org/dist/lucene/solr/8.11.1/solr-8.11.1.zip
 validate: false
+instance_dir: tmp/solr
 download_dir: tmp/solr
 collection:
   dir: solr/conf/

data/README.md

@@ -1,6 +1,6 @@
 # GeoBlacklight
 
-![CI](https://github.com/geoblacklight/geoblacklight/actions/workflows/ruby.yml/badge.svg) | [![Coverage Status](https://raw.githubusercontent.com/geoblacklight/geoblacklight/coverage-badge/coverage.svg)]() | [![Gem Version](https://img.shields.io/gem/v/geoblacklight.svg)](https://github.com/geoblacklight/geoblacklight/releases)
+![CI](https://github.com/geoblacklight/geoblacklight/actions/workflows/ruby.yml/badge.svg) | [![Coverage Status](https://img.shields.io/badge/coverage-100%25-brightgreen)]() | [![Gem Version](https://img.shields.io/gem/v/geoblacklight.svg)](https://github.com/geoblacklight/geoblacklight/releases)
 
 GeoBlacklight is a world-class discovery platform for geospatial (GIS) holdings. It
 is an open collaborative project aiming to build off of the successes
@@ -25,9 +25,6 @@ $ rake geoblacklight:server
 
 Note that this method launches an application that does not have any fixture records to be examined. You may want to launch a test application that has fixture data loaded into a Solr core. If so, refer to the [development guide](https://github.com/geoblacklight/geoblacklight/wiki/Development). For further information on installing a blank app, see the [installation guide](https://github.com/geoblacklight/geoblacklight/wiki/Installation)
 
-### Webpacker
-GeoBlacklight can use [Webpacker](https://github.com/rails/webpacker) in order to manage JavaScript dependencies and assets, which requires that either [Yarn](https://yarnpkg.com/) or the [Node Package Manager](https://www.npmjs.com/) be available on the system where this is deployed.  How Webpacker interacts with Rails is overviewed within its own documentation, including [how best to configure JavaScript processing settings](https://github.com/rails/webpacker). We encourage you to review this.
-
 ### Contributing
 Interested in contributing to GeoBlacklight? Please see our [contributing](CONTRIBUTING.md) guide.
 

data/Rakefile

@@ -35,7 +35,6 @@ desc 'Run test suite'
 task ci: ['geoblacklight:generate'] do
   within_test_app do
     system 'RAILS_ENV=test rake geoblacklight:index:seed'
-    system 'RAILS_ENV=test bundle exec rails webpacker:compile'
   end
 
   # Run RSpec tests with Coverage

data/app/assets/images/blacklight/child-item.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28">
+  <path fill="#6c757d" d="M20 11a1 1 0 0 0-1-1c-5.53 0-9.1 2.31-12.7 6.3a1 1 0 0 0-.3.7 1 1 0 1 0 1.7.7c.77-.68 1.46-1.43 2.2-2.14C12.74 13.01 15.17 12 19 12a1 1 0 0 0 1-1zm8-3.1c0 1-.1 2.02-.31 3.02-1 4.86-4.13 8.02-8.47 10.17a15.33 15.33 0 0 1-6.85 1.7c-1.5 0-3.04-.26-4.46-.74-.75-.25-2.25-1.24-2.88-1.24-.78 0-1.72 3.19-3.08 3.19-.98 0-1.28-.48-1.7-1.2-.14-.27-.25-.36-.25-.7 0-1.62 3.1-2.88 3.1-3.79 0-.14-.41-.97-.48-1.28a9.35 9.35 0 0 1-.14-1.62c0-4.97 3.96-8.52 8.4-9.99 3.2-1.06 10.01.17 12.18-1.89.86-.8 1.28-1.53 2.6-1.53C27.42 2 28 6.58 28 7.9z"/>
+</svg>

data/app/assets/images/blacklight/collections.svg

@@ -0,0 +1,4 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<path fill="#6c757d" d="M2 28c0 1.106 0.894 2 2 2h24c1.106 0 2-0.894 2-2v-18h-28v18zM12 14.75c0-0.412 0.338-0.75 0.75-0.75h6.5c0.413 0 0.75 0.338 0.75 0.75v0.5c0 0.412-0.337 0.75-0.75 0.75h-6.5c-0.412 0-0.75-0.338-0.75-0.75v-0.5zM30 2h-28c-1.106 0-2 0.894-2 2v3c0 0.55 0.45 1 1 1h30c0.55 0 1-0.45 1-1v-3c0-1.106-0.894-2-2-2z"></path>
+</svg>

data/app/assets/images/blacklight/datasets.svg

@@ -0,0 +1,7 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="30" height="32" viewBox="0 0 30 32">
+<path fill="none" stroke="#6c757d" stroke-linejoin="miter" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1.72" d="M0.86 10.9h4.2v4.17h-4.2v-4.17zM16.87 10.9h4.2v4.17h-4.2v-4.17zM0.86 26.89h4.2v4.22h-4.2v-4.22zM16.87 26.89h4.2v4.22h-4.2v-4.22z"></path>
+<path fill="none" stroke="#6c757d" stroke-linejoin="miter" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="3.44" d="M5.020 13.060h11.78M5.020 29.56h11.78M18.94 26.83v-11.76M3.010 26.83v-11.76"></path>
+<path fill="none" stroke="#6c757d" stroke-linejoin="miter" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1.72" d="M8.75 0.86h4.2v4.16h-4.2v-4.16zM24.76 0.86h4.2v4.16h-4.2v-4.16zM8.75 16.84h4.2v4.23h-4.2v-4.23zM24.76 16.84h4.2v4.22h-4.2v-4.22z"></path>
+<path fill="none" stroke="#6c757d" stroke-linejoin="miter" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="3.44" d="M12.91 3.010h11.77M12.91 19.52h11.77M26.83 16.79v-11.77M10.9 16.79v-11.77"></path>
+</svg>