geoblacklight 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecb6ab2a7b58e2b177571c19ae7a50c699a409e8f1a561fd626732246959fc1a
-  data.tar.gz: d9d965e335b0132e5980705e7edc13c961efeb4746148c64d887cfdefdc3808a
+  metadata.gz: 8b6da8bdd22d9bb963b6a62ffbc47b51169c003515007b414aa05d15d6239e09
+  data.tar.gz: 3b2f2e52352474379e3428bce9b4dec2113991e457a41e1b58795c56039d8687
 SHA512:
-  metadata.gz: 5804c2bbf9122569450a7312b5046174913669fcf4b2162241f2541d7efea1e619f8554f97c7644871ca3088ce60d6a835d92c6836c1b46485b812d5d1ad1539
-  data.tar.gz: 1cacc9916d3f886093ece062ac7677ce7b83f64340494221ae7dba054c0c9ce89832b032c7b477c2d0e1f0be88ce5f2e77b6167bd28896a72f6e03013019c9bc
+  metadata.gz: 0fa98bbc2a5d93c3b03ef2f04bc83a19621452433600b345a7c48fcff108dabb58159a243fa73f6f955ada943ae377fb252a54302a38262c7175a60321b94e93
+  data.tar.gz: 342425a8b399ddedc409245910141f723d88952e145bac45ee2074eb8cc78287b7845dcb0d9c89ae9a012ba3f35ee5b982a9b34a860b07b3f541ac7608968d2c

data/.circleci/config.yml

@@ -1,18 +1,59 @@
 ---
 version: 2.1
+commands:
+  restore_bundle_cache:
+    description: "Restore gems installed by bundler"
+    parameters:
+      # Use this parameter to bust the cache, if needed
+      cache_prefix:
+        type: string
+        default: "8-6-2020-A"
+      ruby_version:
+        type: string
+        default: '2.7.1'
+      rails_version:
+        type: string
+        default: '6.0.3.2'
+    steps:
+      - restore_cache:
+          keys:
+            - << parameters.cache_prefix >>-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
+          paths:
+            - /home/circleci/geoblacklight/vendor/bundle
+  save_bundle_cache:
+    description: "Save gems installed by bundler"
+    parameters:
+      # Use this parameter to bust the cache, if needed
+      cache_prefix:
+        type: string
+        default: "8-6-2020-A"
+      ruby_version:
+        type: string
+        default: '2.7.1'
+      rails_version:
+        type: string
+        default: '6.0.3.2'
+    steps:
+      - save_cache:
+          key: << parameters.cache_prefix >>-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
+          paths:
+            - /home/circleci/geoblacklight/vendor/bundle
 jobs:
   build:
     working_directory: ~/geoblacklight
     parameters:
       ruby_version:
         type: string
-        default: '2.5.7'
+        default: '2.7.1'
       solr_port:
         type: string
         default: '8983'
       rails_version:
         type: string
-        default: '5.2.4.3'
+        default: '6.0.3.2'
+      coverage:
+        type: boolean
+        default: false
     docker:
       - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
       - image: solr:7-alpine
@@ -25,35 +66,21 @@ jobs:
       RAILS_ENV: test
       RACK_ENV: test
       RAILS_VERSION: <<parameters.rails_version>>
-      COVERAGE: true
-    parallelism: 4
     steps:
       - checkout
-      # Restore bundle and internal test app from the cache
-      - restore_cache:
-          keys:
-            - cachebust-2020-07-02-geoblacklight-bundle-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
+      - restore_bundle_cache:
+          ruby_version: << parameters.ruby_version >>
+          rails_version: << parameters.rails_version >>
       # Install gems
       - run: bundle check || bundle install
-      # Store bundle cache
-      - save_cache:
-          key: cachebust-2020-07-02-geoblacklight-bundle-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
-          paths:
-            - /home/circleci/geoblacklight/vendor/bundle
-        # Restore internal test app from the cache
-      - restore_cache:
-          keys:
-            - cachebust-2020-07-02-geoblacklight-internal-test-app-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-{{ checksum "spec/test_app_templates/Gemfile.extra" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
       # Generate the internal test app
       - run:
           name: Generate test app
           command: |
             [ -e ./.internal_test_app ] || bundle exec rake engine_cart:generate
-      - save_cache:
-          name: Save test app cache
-          key: cachebust-2020-07-02-geoblacklight-internal-test-app-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-{{ checksum "spec/test_app_templates/Gemfile.extra" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
-          paths:
-            - ./.internal_test_app
+      - save_bundle_cache:
+          ruby_version: << parameters.ruby_version >>
+          rails_version: << parameters.rails_version >>
       - run:
           name: Wait for Solr
           command: dockerize -wait tcp://localhost:<<parameters.solr_port>> -timeout 1m
@@ -71,16 +98,31 @@ jobs:
             bundle check || bundle install
             bundle exec rake geoblacklight:index:seed
             bundle exec rake geoblacklight:downloads:mkdir
-      - run:
-          name: Compile the assets for Webpack
-          command: |
-            cd .internal_test_app
-            rm config/webpacker.yml
-            bundle exec rails webpacker:install
-            bundle exec rails webpacker:compile
-      - run:
-          name: Run the RSpec test suites
-          command: bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
+      - when:
+          condition: <<parameters.coverage>>
+          steps:
+            - run:
+                name: Ensure simplecov is installed
+                command: gem install simplecov
+            - run:
+                name: Run the RSpec test suites
+                command: bundle exec rspec
+            - run:
+                name: Stash Coverage Results
+                command: |
+                  cp -R coverage/ coverage_results/
+                  cp -R coverage/ /tmp/coverage_results/
+            - persist_to_workspace:
+                root: '~/geoblacklight'
+                paths: 'coverage_results'
+            - store_artifacts:
+                path: /tmp/coverage_results/
+      - unless:
+          condition: <<parameters.coverage>>
+          steps:
+            - run:
+                name: Run the RSpec test suites
+                command: bundle exec rspec
       - run:
           name: Run the Teaspoon test suites
           command: bundle exec rake teaspoon
@@ -90,10 +132,10 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: '2.5.7'
+        default: '2.7.1'
       rails_version:
         type: string
-        default: '5.2.4.3'
+        default: '6.0.3.2'
     docker:
       - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
     environment:
@@ -106,37 +148,76 @@ jobs:
       RAILS_VERSION: <<parameters.rails_version>>
     steps:
       - checkout
-      # Restore bundle cache
-      - restore_cache:
-          keys:
-            - cachebust-2020-07-02-geoblacklight-bundle-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
-          paths:
-            - /home/circleci/geoblacklight/vendor/bundle
+      - restore_bundle_cache:
+          ruby_version: << parameters.ruby_version >>
+          rails_version: << parameters.rails_version >>
       # Install gems and run rubocop
       - run: bundle check || bundle install
       - run: bundle exec rake rubocop
 
+  coverage_report:
+    working_directory: ~/geoblacklight
+    parameters:
+      ruby_version:
+        type: string
+        default: '2.7.1'
+      rails_version:
+        type: string
+        default: '6.0.3.2'
+    docker:
+      - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
+    environment:
+      GEM_HOME: /home/circleci/geoblacklight/vendor/bundle
+      BUNDLE_PATH: /home/circleci/geoblacklight/vendor/bundle
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+      RAILS_ENV: test
+      RACK_ENV: test
+      RAILS_VERSION: <<parameters.rails_version>>
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '~/geoblacklight'
+      - restore_bundle_cache:
+          ruby_version: << parameters.ruby_version >>
+          rails_version: << parameters.rails_version >>
+      # Install gems and check coverage
+      - run: bundle check || bundle install
+      - run:
+          name: Merge and check coverage
+          command: |
+            RAILS_ENV=test bundle exec ruby ./bin/coverage.rb
+      - store_artifacts:
+          path: ~/geoblacklight/coverage
+          destination: coverage
+
 workflows:
-  version: 2
+  version: 2.1
   build:
     jobs:
       - build:
-          ruby_version: 2.6.5
-          rails_version: 5.2.4.3
-          name: "ruby2-6_rails5-2"
+          ruby_version: 2.7.1
+          rails_version: 6.0.3.2
+          coverage: true
+          name: "ruby2-7_rails6-0"
       - build:
-          ruby_version: 2.5.7
+          ruby_version: 2.6.6
+          rails_version: 6.0.3.2
+          name: "ruby2-6_rails6-0"
+      - build:
+          ruby_version: 2.7.1
           rails_version: 5.2.4.3
-          name: "ruby2-5_rails5-2"
-      - rubocop:
-          ruby_version: 2.6.5
+          name: "ruby2-7_rails5-2"
+      - build:
+          ruby_version: 2.6.6
           rails_version: 5.2.4.3
-          name: "rubocop_ruby2-6_rails5-2"
+          name: "ruby2-6_rails5-2"
       - rubocop:
-          ruby_version: 2.5.7
-          rails_version: 5.2.4.3
-          name: "rubocop_ruby2-5_rails5-2"
-
+          requires:
+            - ruby2-7_rails6-0
+      - coverage_report:
+          requires:
+            - ruby2-7_rails6-0
   nightly:
     triggers:
       - schedule:
@@ -147,18 +228,25 @@ workflows:
                 - master
     jobs:
       - build:
-          ruby_version: 2.6.5
-          rails_version: 5.2.4.3
-          name: "ruby2-6_rails5-2"
+          ruby_version: 2.7.1
+          rails_version: 6.0.3.2
+          coverage: true
+          name: "ruby2-7_rails6-0"
+      - build:
+          ruby_version: 2.6.6
+          rails_version: 6.0.3.2
+          name: "ruby2-6_rails6-0"
       - build:
-          ruby_version: 2.5.7
+          ruby_version: 2.7.1
           rails_version: 5.2.4.3
-          name: "ruby2-5_rails5-2"
-      - rubocop:
-          ruby_version: 2.6.5
+          name: "ruby2-7_rails5-2"
+      - build:
+          ruby_version: 2.6.6
           rails_version: 5.2.4.3
-          name: "rubocop_ruby2-6_rails5-2"
+          name: "ruby2-6_rails5-2"
       - rubocop:
-          ruby_version: 2.5.7
-          rails_version: 5.2.4.3
-          name: "rubocop_ruby2-5_rails5-2"
+          requires:
+            - ruby2-7_rails6-0
+      - coverage_report:
+          requires:
+            - ruby2-7_rails6-0

data/.rubocop.yml

@@ -11,15 +11,14 @@ Rails:
 AllCops:
   TargetRubyVersion: 2.7
   DisplayCopNames: true
-  Include:
-  - '**/Rakefile'
   Exclude:
-  - 'db/**/*'
-  - 'vendor/**/*'
   - '.internal_test_app/**/*'
-  - 'lib/generators/geoblacklight/templates/**/*'
+  - 'db/**/*'
   - 'geoblacklight.gemspec'
   - 'Gemfile'
+  - 'lib/generators/geoblacklight/templates/**/*'
+  - 'tmp/**/*'
+  - 'vendor/**/*'
 
 Layout/DotPosition:
   Description: Checks the position of the dot in multi-line method calls.
@@ -30,18 +29,21 @@ Layout/DotPosition:
   - leading
   - trailing
 
-Metrics/BlockLength:
-  Exclude:
-  - 'spec/helpers/geoblacklight_helper_spec.rb'
-
-Metrics/LineLength:
+Layout/LineLength:
   Max: 115
   Exclude:
-  - 'spec/**/*'
-  - 'Rakefile'
+  - 'app/models/concerns/geoblacklight/spatial_search_behavior.rb'
+  - 'bin/coverage.rb'
   - 'lib/generators/geoblacklight/install_generator.rb'
   - 'lib/tasks/geoblacklight.rake'
-  - 'app/models/concerns/geoblacklight/spatial_search_behavior.rb'
+  - 'Rakefile'
+  - 'spec/**/*'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'lib/tasks/geoblacklight.rake'
+    - 'Rakefile'
+    - 'spec/**/*'
 
 Metrics/MethodLength:
   Max: 16

data/.rubocop_todo.yml

@@ -1,18 +1,61 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-06-23 08:31:16 -0600 using RuboCop version 0.85.1.
+# on 2020-08-07 13:49:06 -0500 using RuboCop version 0.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
-  Max: 66
+# Offense count: 2
+# Configuration parameters: CustomIncludeMethods.
+RSpec/EmptyExampleGroup:
+  Exclude:
+    - 'spec/views/catalog/_document_split.html.erb_spec.rb'
+    - 'spec/views/catalog/_index_split.html.erb_spec.rb'
+
+# Offense count: 48
+# Configuration parameters: .
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+# Offense count: 29
+# Configuration parameters: IgnoreSharedExamples.
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/lib/geoblacklight/metadata/base_spec.rb'
+    - 'spec/lib/geoblacklight/metadata_transformer/base_spec.rb'
+    - 'spec/lib/geoblacklight/metadata_transformer/fgdc_spec.rb'
+    - 'spec/lib/geoblacklight/metadata_transformer/iso19139_spec.rb'
+    - 'spec/lib/geoblacklight/metadata_transformer_spec.rb'
+    - 'spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb'
+    - 'spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb'
 
 # Offense count: 4
+RSpec/SubjectStub:
+  Exclude:
+    - 'spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb'
+    - 'spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb'
+
+# Offense count: 9
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: slashes, arguments
+# Rails/FilePath:
+#   Exclude:
+#     - 'lib/geoblacklight/download.rb'
+#     - 'lib/tasks/geoblacklight.rake'
+#     - 'spec/lib/geoblacklight/download_spec.rb'
+#     - 'spec/lib/geoblacklight/metadata_transformer/fgdc_spec.rb'
+#     - 'spec/lib/geoblacklight/metadata_transformer/iso19139_spec.rb'
+#     - 'spec/tasks/geoblacklight_spec.rb'
+
+# Offense count: 6
+Rails/OutputSafety:
+  Exclude:
+    - 'app/controllers/download_controller.rb'
+    - 'app/helpers/geoblacklight_helper.rb'
+
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: Include.
 # Include: **/Rakefile, **/*.rake
@@ -20,11 +63,24 @@ Rails/RakeEnvironment:
   Exclude:
     - 'lib/capistrano/tasks/**/*.rake'
     - 'Rakefile'
+    - 'lib/tasks/geoblacklight.rake'
 
 # Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/generators/geoblacklight/assets_generator.rb'
+
+# Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
   Exclude:
-    - 'Rakefile'
+    - 'lib/tasks/geoblacklight.rake'
+
+# Offense count: 2
+Style/MissingRespondToMissing:
+  Exclude:
+    - 'app/models/concerns/geoblacklight/solr_document.rb'
+    - 'lib/geoblacklight/references.rb'

data/README.md

@@ -1,6 +1,6 @@
 # GeoBlacklight
 
-[![CircleCI](https://circleci.com/gh/geoblacklight/geoblacklight.svg?style=svg)](https://circleci.com/gh/geoblacklight/geoblacklight) | [![Coverage Status](https://img.shields.io/coveralls/geoblacklight/geoblacklight.svg)](https://coveralls.io/r/geoblacklight/geoblacklight?branch=coveralls) | [![Gem Version](https://img.shields.io/gem/v/geoblacklight.svg)](https://github.com/geoblacklight/geoblacklight/releases)
+[![CircleCI](https://circleci.com/gh/geoblacklight/geoblacklight.svg?style=svg)](https://circleci.com/gh/geoblacklight/geoblacklight) | [![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)
 
 GeoBlacklight is a world-class discovery platform for geospatial (GIS) holdings. It
 is an open collaborative project aiming to build off of the successes