geoblacklight 2.1.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3311159c7da844d12d381574fdb88342967fec875f58ddd7251594ce277d301f
-  data.tar.gz: c0706c48b76f15c57422d1c5d242e753a6e52dbf6ac4a095fb55ee8268fe7770
+  metadata.gz: ecb6ab2a7b58e2b177571c19ae7a50c699a409e8f1a561fd626732246959fc1a
+  data.tar.gz: d9d965e335b0132e5980705e7edc13c961efeb4746148c64d887cfdefdc3808a
 SHA512:
-  metadata.gz: 154dac9a8cd76e4ee5c43230a600c1dab4a755287c17467b4ddfa5cf2c956a2e3cd0ad5414858d49f69a9fd91c8e081e4440f6835b8513ba038a18a851b3f7a3
-  data.tar.gz: 133c966ec7d8a6a028ea6fc9decad3607185b983667fcfc9a492606430019b30da06e46f52d1c6c6839ecb8ea90f93cfeb2802c2241ef2f9340b60a65ab23190
+  metadata.gz: 5804c2bbf9122569450a7312b5046174913669fcf4b2162241f2541d7efea1e619f8554f97c7644871ca3088ce60d6a835d92c6836c1b46485b812d5d1ad1539
+  data.tar.gz: 1cacc9916d3f886093ece062ac7677ce7b83f64340494221ae7dba054c0c9ce89832b032c7b477c2d0e1f0be88ce5f2e77b6167bd28896a72f6e03013019c9bc

data/.circleci/config.yml

@@ -1,105 +1,74 @@
 ---
-version: 2
+version: 2.1
 jobs:
-  rails_5_2_3:
+  build:
     working_directory: ~/geoblacklight
+    parameters:
+      ruby_version:
+        type: string
+        default: '2.5.7'
+      solr_port:
+        type: string
+        default: '8983'
+      rails_version:
+        type: string
+        default: '5.2.4.3'
     docker:
-      - image: circleci/ruby:2.5.1-node-browsers
-        environment:
-          BUNDLE_JOBS: 3
-          BUNDLE_RETRY: 3
-          # We need both GEM_HOME and BUNDLE_PATH because of the test app
-          GEM_HOME: /home/circleci/geoblacklight/vendor/bundle
-          BUNDLE_PATH: /home/circleci/geoblacklight/vendor/bundle
-          CI: true
-          RAILS_ENV: test
-          RAILS_VERSION: 5.2.3
+      - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
       - image: solr:7-alpine
-        command: bin/solr -cloud -noprompt -f -p 8983
+        command: bin/solr -cloud -noprompt -f -p <<parameters.solr_port>>
+    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>>
+      COVERAGE: true
+    parallelism: 4
     steps:
       - checkout
-      # Update chrome
-      - run: wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-      - run: sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-      - run: sudo apt-get update
-      - run: sudo apt-get -y install google-chrome-stable
-      # Restore bundle cache
-      - type: cache-restore
-        name: Restore bundle cache
-        key: geoblacklight-bundle-5-2-0-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-3f5eff
+      # 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 >>
       # Install gems
       - run: bundle check || bundle install
-      # Run the test suites
-      - run: bundle exec rake engine_cart:generate
-      - run:
-          name: Wait for Solr
-          command: dockerize -wait tcp://localhost:8983 -timeout 1m
+      # 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: Load config into solr
+          name: Generate test app
           command: |
-            cd .internal_test_app/solr/conf
-            zip -1 -r solr_config.zip ./*
-            curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://localhost:8983/solr/admin/configs?action=UPLOAD&name=solrconfig"
-            curl -H 'Content-type: application/json' http://localhost:8983/api/collections/ -d '{create: {name: blacklight-core, config: solrconfig, numShards: 1}}'
-      - run:
-          name: Seed Solr
-          command: |
-            cd .internal_test_app
-            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 rake geoblacklight:coverage
-      # Store bundle cache
-      - type: cache-save
-        name: Store bundle cache
-        key: geoblacklight-bundle-5-2-0-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-3f5eff
-        paths:
-          - /home/circleci/geoblacklight/vendor/bundle
-  rails_5_1_7:
-    working_directory: ~/geoblacklight
-    docker:
-      - image: circleci/ruby:2.4.4-node-browsers
-        environment:
-          BUNDLE_JOBS: 3
-          BUNDLE_RETRY: 3
-          GEM_HOME: /home/circleci/geoblacklight/vendor/bundle
-          BUNDLE_PATH: /home/circleci/geoblacklight/vendor/bundle
-          RAILS_ENV: test
-          RAILS_VERSION: 5.1.7
-      - image: solr:7-alpine
-        command: bin/solr -cloud -noprompt -f -p 8983
-    steps:
-      - checkout
-      # Restore bundle cache
-      - type: cache-restore
-        name: Restore bundle cache
-        key: geoblacklight-bundle-5-1-7-{{ checksum "Gemfile" }}-{{ checksum "geoblacklight.gemspec" }}-3f5eff
-      # Install gems and run specs
-      - run: bundle check || bundle install
-      # Run the test suites
-      - run: bundle exec rake engine_cart:generate
+            [ -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
       - run:
           name: Wait for Solr
-          command: dockerize -wait tcp://localhost:8983 -timeout 1m
+          command: dockerize -wait tcp://localhost:<<parameters.solr_port>> -timeout 1m
       - run:
           name: Load config into solr
           command: |
             cd .internal_test_app/solr/conf
             zip -1 -r solr_config.zip ./*
             curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://localhost:8983/solr/admin/configs?action=UPLOAD&name=solrconfig"
-            curl -H 'Content-type: application/json' http://localhost:8983/api/collections/ -d '{create: {name: blacklight-core, config: solrconfig, numShards: 1}}'
+            curl -H 'Content-type: application/json' http://localhost:<<parameters.solr_port>>/api/collections/ -d '{create: {name: blacklight-core, config: solrconfig, numShards: 1}}'
       - run:
           name: Seed Solr
           command: |
             cd .internal_test_app
+            bundle check || bundle install
             bundle exec rake geoblacklight:index:seed
             bundle exec rake geoblacklight:downloads:mkdir
       - run:
@@ -111,36 +80,85 @@ jobs:
             bundle exec rails webpacker:compile
       - run:
           name: Run the RSpec test suites
-          command: bundle exec rake geoblacklight:coverage
-      # Store bundle cache
-      - type: cache-save
-        name: Store bundle cache
-        key: geoblacklight-bundle-5-1-7-{{ checksum "Gemfile" }}-{{ checksum "geoblacklight.gemspec" }}-3f5eff
-        paths:
-          - /home/circleci/geoblacklight/vendor/bundle
+          command: bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
+      - run:
+          name: Run the Teaspoon test suites
+          command: bundle exec rake teaspoon
+
   rubocop:
     working_directory: ~/geoblacklight
+    parameters:
+      ruby_version:
+        type: string
+        default: '2.5.7'
+      rails_version:
+        type: string
+        default: '5.2.4.3'
     docker:
-      - image: circleci/ruby:2.5.1-node-browsers
-        environment:
-          GEM_HOME: /home/circleci/geoblacklight/vendor/bundle
-          BUNDLE_PATH: /home/circleci/geoblacklight/vendor/bundle
-          RAILS_ENV: test
+      - 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
       # Restore bundle cache
-      - type: cache-restore
-        name: Restore bundle cache
-        key: geoblacklight-bundle-5-2-3-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-3f5eff
+      - 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
       # Install gems and run rubocop
       - run: bundle check || bundle install
       - run: bundle exec rake rubocop
+
 workflows:
   version: 2
-  build_accept_deploy:
+  build:
     jobs:
-      - rails_5_2_3
-      - rails_5_1_7
+      - build:
+          ruby_version: 2.6.5
+          rails_version: 5.2.4.3
+          name: "ruby2-6_rails5-2"
+      - build:
+          ruby_version: 2.5.7
+          rails_version: 5.2.4.3
+          name: "ruby2-5_rails5-2"
+      - rubocop:
+          ruby_version: 2.6.5
+          rails_version: 5.2.4.3
+          name: "rubocop_ruby2-6_rails5-2"
+      - rubocop:
+          ruby_version: 2.5.7
+          rails_version: 5.2.4.3
+          name: "rubocop_ruby2-5_rails5-2"
+
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - build:
+          ruby_version: 2.6.5
+          rails_version: 5.2.4.3
+          name: "ruby2-6_rails5-2"
+      - build:
+          ruby_version: 2.5.7
+          rails_version: 5.2.4.3
+          name: "ruby2-5_rails5-2"
+      - rubocop:
+          ruby_version: 2.6.5
+          rails_version: 5.2.4.3
+          name: "rubocop_ruby2-6_rails5-2"
       - rubocop:
-          requires:
-            - rails_5_2_3
+          ruby_version: 2.5.7
+          rails_version: 5.2.4.3
+          name: "rubocop_ruby2-5_rails5-2"

data/.gitignore

@@ -16,4 +16,6 @@ test/tmp
 test/version_tmp
 tmp
 jetty
-.internal_test_app
+.internal_test_app
+# Ignore byebug history
+.byebug_history

data/.rubocop.yml

@@ -9,7 +9,7 @@ Rails:
   Enabled: true
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.7
   DisplayCopNames: true
   Include:
   - '**/Rakefile'
@@ -35,7 +35,7 @@ Metrics/BlockLength:
   - 'spec/helpers/geoblacklight_helper_spec.rb'
 
 Metrics/LineLength:
-  Max: 100
+  Max: 115
   Exclude:
   - 'spec/**/*'
   - 'Rakefile'
@@ -45,6 +45,8 @@ Metrics/LineLength:
 
 Metrics/MethodLength:
   Max: 16
+  Exclude:
+    - 'lib/geoblacklight/metadata/base.rb'
 
 Metrics/ModuleLength:
   Exclude:

data/.rubocop_todo.yml

@@ -1,217 +1,30 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-12-21 14:41:38 -0700 using RuboCop version 0.52.1.
+# on 2020-06-23 08:31:16 -0600 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: 16
-# Cop supports --auto-correct.
-# Configuration parameters: Width, IgnoredPatterns.
-Layout/IndentationWidth:
-  Exclude:
-    - 'app/controllers/download_controller.rb'
-    - 'app/controllers/relation_controller.rb'
-    - 'app/controllers/wms_controller.rb'
-    - 'app/helpers/carto_helper.rb'
-    - 'app/models/concerns/geoblacklight/solr_document.rb'
-    - 'app/models/concerns/geoblacklight/solr_document/finder.rb'
-    - 'lib/geoblacklight/bounding_box.rb'
-    - 'lib/geoblacklight/download.rb'
-    - 'lib/geoblacklight/metadata/base.rb'
-    - 'lib/geoblacklight/metadata/fgdc.rb'
-    - 'lib/geoblacklight/metadata/iso19139.rb'
-    - 'lib/geoblacklight/metadata_transformer/base.rb'
-    - 'lib/geoblacklight/reference.rb'
-    - 'lib/geoblacklight/references.rb'
-    - 'lib/tasks/geoblacklight.rake'
-
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceBeforeFirstArg:
-  Exclude:
-    - 'app/views/relation/index.json.jbuilder'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
-  Exclude:
-    - 'lib/tasks/geoblacklight.rake'
-
-# Offense count: 46
 # Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 227
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect.
-Performance/HashEachMethods:
-  Exclude:
-    - 'app/presenters/geoblacklight/document_presenter.rb'
-
-# 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: 1
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, each, example
-RSpec/HookArgument:
-  Exclude:
-    - 'spec/spec_helper.rb'
-
-# Offense count: 8
-RSpec/LeadingSubject:
-  Exclude:
-    - 'spec/lib/geoblacklight/document_presenter_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'
-
-# Offense count: 49
-# Configuration parameters: .
-# SupportedStyles: have_received, receive
-RSpec/MessageSpies:
-  EnforcedStyle: receive
-
-# Offense count: 24
-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: 6
-RSpec/RepeatedDescription:
-  Exclude:
-    - 'spec/features/esri_viewer_spec.rb'
-    - 'spec/features/search_results_map_spec.rb'
-    - 'spec/lib/geoblacklight/references_spec.rb'
-
-# Offense count: 2
-RSpec/RepeatedExample:
-  Exclude:
-    - 'spec/features/esri_viewer_spec.rb'
-
-# Offense count: 2
-RSpec/SubjectStub:
-  Exclude:
-    - 'spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb'
-
-# Offense count: 7
-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'
+  Max: 66
 
-# Offense count: 7
-Rails/OutputSafety:
-  Exclude:
-    - 'app/controllers/download_controller.rb'
-    - 'app/helpers/geoblacklight_helper.rb'
-    - 'lib/geoblacklight/view_helper_override.rb'
-
-# Offense count: 1
+# Offense count: 4
 # Cop supports --auto-correct.
-Style/ColonMethodCall:
+# Configuration parameters: Include.
+# Include: **/Rakefile, **/*.rake
+Rails/RakeEnvironment:
   Exclude:
-    - 'lib/tasks/geoblacklight.rake'
+    - 'lib/capistrano/tasks/**/*.rake'
+    - 'Rakefile'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
-# SupportedStyles: assign_to_condition, assign_inside_condition
-Style/ConditionalAssignment:
-  Exclude:
-    - 'app/controllers/download_controller.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/EmptyLiteral:
-  Exclude:
-    - 'spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb'
-
-# Offense count: 128
-# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: when_needed, always, never
+# SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
-  Enabled: false
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-Style/HashSyntax:
-  Exclude:
-    - 'lib/tasks/geoblacklight.rake'
-
-# Offense count: 2
-Style/MethodMissing:
-  Exclude:
-    - 'app/models/concerns/geoblacklight/solr_document.rb'
-    - 'lib/geoblacklight/references.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/MultilineIfModifier:
-  Exclude:
-    - 'app/helpers/geoblacklight_helper.rb'
-    - 'lib/geoblacklight/references.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/geoblacklight/relation/relation_response.rb'
-
-# Offense count: 11
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'app/models/concerns/geoblacklight/solr_document/inspection.rb'
-    - 'spec/helpers/geoblacklight_helper_spec.rb'
-    - 'spec/lib/geoblacklight/document_presenter_spec.rb'
-    - 'spec/lib/geoblacklight/references_spec.rb'
-    - 'spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb'
-    - 'spec/spec_helper.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil.
-Style/SafeNavigation:
-  Exclude:
-    - 'app/models/concerns/geoblacklight/solr_document.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-    - 'lib/tasks/geoblacklight.rake'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/UnneededInterpolation:
   Exclude:
-    - 'lib/tasks/geoblacklight.rake'
+    - 'Rakefile'