geoblacklight 4.0.0.pre.alpha.3 → 4.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efc10c8f1326de26d6eeba5f9c7179735c4e99c9cdfa812cceccbafeb08aeefb
-  data.tar.gz: 2c6d87d57c7873feb1cbeb27356770636f38dc82ee03b07ef43bda50f72f4e6e
+  metadata.gz: e35f0dd973e0bd06a6e80c4b2c10df2603312a4b2a8e8a750a57e3a289929a82
+  data.tar.gz: addf3e2ca5fc2f91d4a99f96181949c3f85bfa928b1574a3128e3fcbc0856a57
 SHA512:
-  metadata.gz: 5c6d9303f001da4d11e65bb9858c6d1b66f01e37c8d4b1f707d156ae9b9c462f8aed556adcd8d21e234a4f8517908d7f56e76d45db0707c92c857c3b922633ca
-  data.tar.gz: 8816f40c830bd5b1d0e381b15b08c2455ebb509e361f179ce16a6201270601eb079c1309939b67e0b23a37721c5a4c5d38f6726c5d8f4dd458254b34254c7089
+  metadata.gz: 994da847b15fd940b705e1abf1c68a339384533bc4fee4221fa9af5550a8f4034fa7204c0d43624221e7ef1e78dc19dd45770bf68d7f202b1a322658a3d4893f
+  data.tar.gz: c1817f025bff6255c3ee0b9576864c3d97855bd3a4f6f7754962b8054a31d1066d114ed18edf53d7d2bd66b0c0f449022abe9b5a0634c5007c3878af5b114ddc

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,34 +20,15 @@ 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: [2.7, '3.0']
+        faraday_version: ['']
+        include:
+          - ruby: 2.7
+            faraday_version: '~> 1.0'
     steps:
     - uses: actions/checkout@v2
 
@@ -55,8 +40,17 @@ jobs:
     - 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 2.1.1
+
     - name: Install dependencies
-      run: bundle install
+      run: bundle _2.1.1_ install
+      env:
+        rails_version: 7.0.1
+        FARADAY_VERSION: ${{ matrix.faraday_version }}
+
+    - name: Setup Yarn
+      run: exec "yarnpkg"
 
     - name: Load config into solr
       run: |
@@ -68,16 +62,19 @@ jobs:
     - name: Run tests
       run: bundle exec rake ci
       env:
+        rails_version: 7.0.1
         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
+        FARADAY_VERSION: ${{ matrix.faraday_version }}
 
     - name: Upload coverage artifacts
       uses: actions/upload-artifact@v2
+      if: always()
       with:
         name: coverage
         path: coverage/
 
-  test_rails6_0:
+  test_rails6_1:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -93,45 +90,16 @@ jobs:
     - 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 bundler
+      run: gem install bundler -v 2.1.1
 
     - name: Install dependencies
-      run: bundle install
+      run: bundle _2.1.1_ install
       env:
-        RAILS_VERSION: 5.2.6
+        RAILS_VERSION: 6.1.4.4
+
+    - name: Setup Yarn
+      run: exec "yarnpkg"
 
     - name: Load config into solr
       run: |
@@ -143,6 +111,6 @@ jobs:
     - name: Run tests
       run: bundle exec rake ci
       env:
-        RAILS_VERSION: 5.2.6
+        RAILS_VERSION: 6.1.4.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

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,5 @@
 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>