geoblacklight 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f7188aa67f1fd402b335987b7c0d53bc1ee7b60a21c5334253aad774eb850f1
-  data.tar.gz: 413aae55a53d966894b419a8b55b90834fff753554d6cf1cef1141ab0a65a560
+  metadata.gz: e2e3a858e92e8bb0af8d6cfbb3ca9861cb55102d64ca24e73511924dde247c8d
+  data.tar.gz: 63a4a7e376f0ffc2e420c3dcaa0fada82063e9b5da4993bc4bdf2925b21a8147
 SHA512:
-  metadata.gz: c27ca9af470f01f6b6c9bf71d9043a1e8c5a92423c3118780d064b241b6277d085d0a20a2d06e8e68b477f0255fb4868a45efbb1a6393a5ac4e90ff787bddf40
-  data.tar.gz: 7002c3644d74f9a53595a359723c0d3a91a5e7d3311e22ed2c8dbf005d10ae1c86653d9f2e810dd019aa097eec085ccf354e8ce245f81b54855e3c6fe5e10671
+  metadata.gz: f3c1db766c32f1e62bf6d269b21ff72850c7f1472192e22b12d116374e150d00ba88d9b493bc89b774b9c7a5a5ba3471254224ebfea294479a6b9eed8dd4a686
+  data.tar.gz: 5a2e07a485de06230e6e5ae5fc03bb5b31e66fad43bf3e9f77769e3eff99ee16ab9812fc98af9359aabd5e18ed4d085af748a25870bd0c226e07beb11b349689

data/.circleci/config.yml

@@ -10,10 +10,10 @@ commands:
         default: "8-6-2020-A"
       ruby_version:
         type: string
-        default: '2.7.1'
+        default: '2.7.2'
       rails_version:
         type: string
-        default: '6.0.3.2'
+        default: '6.0.3.4'
     steps:
       - restore_cache:
           keys:
@@ -29,10 +29,10 @@ commands:
         default: "8-6-2020-A"
       ruby_version:
         type: string
-        default: '2.7.1'
+        default: '2.7.2'
       rails_version:
         type: string
-        default: '6.0.3.2'
+        default: '6.0.3.4'
     steps:
       - save_cache:
           key: << parameters.cache_prefix >>-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
@@ -44,13 +44,13 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: '2.7.1'
+        default: '2.7.2'
       solr_port:
         type: string
         default: '8983'
       rails_version:
         type: string
-        default: '6.0.3.2'
+        default: '6.0.3.4'
       coverage:
         type: boolean
         default: false
@@ -132,10 +132,10 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: '2.7.1'
+        default: '2.7.2'
       rails_version:
         type: string
-        default: '6.0.3.2'
+        default: '6.0.3.4'
     docker:
       - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
     environment:
@@ -160,10 +160,10 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: '2.7.1'
+        default: '2.7.2'
       rails_version:
         type: string
-        default: '6.0.3.2'
+        default: '6.0.3.4'
     docker:
       - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
     environment:
@@ -196,21 +196,25 @@ workflows:
   build:
     jobs:
       - build:
-          ruby_version: 2.7.1
-          rails_version: 6.0.3.2
+          ruby_version: 2.7.2
+          rails_version: 6.1.0
+          name: "ruby2-7_rails6-1"
+      - build:
+          ruby_version: 2.7.2
+          rails_version: 6.0.3.4
           coverage: true
           name: "ruby2-7_rails6-0"
       - build:
           ruby_version: 2.6.6
-          rails_version: 6.0.3.2
+          rails_version: 6.0.3.4
           name: "ruby2-6_rails6-0"
       - build:
-          ruby_version: 2.7.1
-          rails_version: 5.2.4.3
+          ruby_version: 2.7.2
+          rails_version: 5.2.4.4
           name: "ruby2-7_rails5-2"
       - build:
           ruby_version: 2.6.6
-          rails_version: 5.2.4.3
+          rails_version: 5.2.4.4
           name: "ruby2-6_rails5-2"
       - rubocop:
           requires:
@@ -228,21 +232,21 @@ workflows:
                 - master
     jobs:
       - build:
-          ruby_version: 2.7.1
-          rails_version: 6.0.3.2
+          ruby_version: 2.7.2
+          rails_version: 6.0.3.4
           coverage: true
           name: "ruby2-7_rails6-0"
       - build:
           ruby_version: 2.6.6
-          rails_version: 6.0.3.2
+          rails_version: 6.0.3.4
           name: "ruby2-6_rails6-0"
       - build:
-          ruby_version: 2.7.1
-          rails_version: 5.2.4.3
+          ruby_version: 2.7.2
+          rails_version: 5.2.4.4
           name: "ruby2-7_rails5-2"
       - build:
           ruby_version: 2.6.6
-          rails_version: 5.2.4.3
+          rails_version: 5.2.4.4
           name: "ruby2-6_rails5-2"
       - rubocop:
           requires:

data/bin/coverage.rb

@@ -27,8 +27,8 @@ class SimpleCovHelper
     results = SimpleCov::ResultMerger.merge_results(*results)
     results.format!
     covered_percent = results.covered_percent.round(2)
-    return unless covered_percent < SimpleCov.minimum_coverage[:line]
-    $stderr.printf("Coverage (%.2f%%) is below the expected minimum coverage (%.2f%%).\n", covered_percent, SimpleCov.minimum_coverage[:line])
+    return unless covered_percent < SimpleCov.minimum_coverage
+    $stderr.printf("Coverage (%.2f%%) is below the expected minimum coverage (%.2f%%).\n", covered_percent, SimpleCov.minimum_coverage)
     Kernel.exit SimpleCov::ExitCodes::MINIMUM_COVERAGE
   end
 end

data/geoblacklight.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_rubygems_version = '>= 2.5.2'
 
-  spec.add_dependency 'rails', '>= 5.2.4', '< 6.1'
+  spec.add_dependency 'rails', '>= 5.2.4', '< 6.2'
   spec.add_dependency 'blacklight', '~> 7.0'
   spec.add_dependency 'config'
   spec.add_dependency 'faraday', '~> 1.0'
@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'geo_combine', '~> 0.4'
   spec.add_dependency 'mime-types'
   spec.add_dependency 'handlebars_assets'
-  spec.add_dependency 'webpacker', '~> 4.0'
 
   spec.add_development_dependency 'solr_wrapper'
   spec.add_development_dependency 'rails-controller-testing'
@@ -40,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'factory_bot_rails'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
   spec.add_development_dependency 'bixby'
-  spec.add_development_dependency 'simplecov', '~> 0.16'
+  spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'foreman'
   spec.add_development_dependency 'teaspoon'
 end

data/lib/generators/geoblacklight/templates/catalog_controller.rb

@@ -97,6 +97,7 @@ class CatalogController < ApplicationController
     config.add_facet_field Settings.FIELDS.RIGHTS, label: 'Access', limit: 8, partial: "icon_facet"
     config.add_facet_field Settings.FIELDS.GEOM_TYPE, label: 'Data type', limit: 8, partial: "icon_facet"
     config.add_facet_field Settings.FIELDS.FILE_FORMAT, :label => 'Format', :limit => 8
+    config.add_facet_field Settings.FIELDS.SOURCE, show: false
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request

data/lib/geoblacklight/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Geoblacklight
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -16,7 +16,7 @@ class TestAppGenerator < Rails::Generators::Base
     gem 'blacklight'
     gem 'teaspoon'
     gem 'teaspoon-jasmine'
-    gem 'webpacker'
+    gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
     Bundler.with_clean_env do
       run 'bundle install'
     end

data/spec/views/catalog/_show_tools.html.erb_spec.rb

@@ -17,7 +17,7 @@ describe 'catalog/_show_tools.html.erb', type: :view do
 
     it 'renders a document action' do
       allow(view).to receive(:some_action_solr_document_path).with(document, any_args).and_return 'x'
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_link 'Some action', href: 'x'
     end

data/template.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 gem 'blacklight', '~> 7.0'
-gem 'geoblacklight', '~> 2.0'
-gem 'webpacker'
+gem 'geoblacklight', '~> 3.0'
+gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
 
 # Hack for https://github.com/rails/rails/issues/35153
 # Adapted from https://github.com/projectblacklight/blacklight/pull/2065

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -22,7 +22,7 @@ dependencies:
         version: 5.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 5.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -159,20 +159,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webpacker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -305,14 +291,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -802,7 +788,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings