blacklight-maps 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b23c73a0ba75175cfe101746f9ff1ae0592a42556a34c9d1e4fe8cc2c42b8081
-  data.tar.gz: ce938a6f2884faccb3051985ab84fe0bf40505f1246fe56ca1d2621ca823b2a9
+  metadata.gz: a5f97f65f09264f6f7c17afda244ee952c15c01fccf072e60e89ec7401a15989
+  data.tar.gz: c00ba470859274d2e62cff117c875deea3c7aa4c419595e46b5087bbc30b4c99
 SHA512:
-  metadata.gz: c83862d2c315629f8610d15978b386aa7f9e6d889a82fd70ef540870f6b7e80bb6c0cd2b507bbf06019f31b39a68f34970721d90bffb1bc747b86fec433c8607
-  data.tar.gz: e1de2250bbe1f18826ff9ab17f814ef3e2ce53e745fd0c66e3f19c2de7f45e13bff72224da8d042ca91ae0546ad87c673e93cd136fe84d3abb8927b98f374b2c
+  metadata.gz: e27c8bc1357431f728a924d8ff6557ec6e9ea0d32962cb3c94eeaf0e0c5a8fff5a7eb7c7dc62f2c84c89f77ae1308521eef579c76d4ee01991b813cdbc76d5a6
+  data.tar.gz: 00134ab9767316aa17974520e3b8f8a050bbd7959c7b31d24913d791a7556028307b4266fa60d495e6f15c7adf1df0d9389914ac68e023fb4dadb88e6fbb7e37

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }} / blacklight ${{ matrix.blacklight_version }} ${{ matrix.additional_name }})
+    strategy:
+      matrix:
+        ruby: ["3.2", "3.3", "3.4"]
+        rails_version: ["7.1.5.1", "7.2.2"]
+        blacklight_version: ["~> 7.0"]
+        additional_engine_cart_rails_options: [""]
+        additional_name: [""]
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+      BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
+      ENGINE_CART_RAILS_OPTIONS: "--skip-action-cable ${{ matrix.additional_engine_cart_rails_options }}"
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies with Rails ${{ matrix.rails_version }}
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/.rubocop.yml

@@ -1,8 +1,10 @@
-require: rubocop-rspec
+plugins:
+  - rubocop-rspec
+  - rubocop-rails
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 3.4
   Exclude:
     - "lib/generators/blacklight_maps/templates/**/*"
     - "blacklight-maps.gemspec"
@@ -33,7 +35,7 @@ Metrics/ClassLength:
   Exclude:
     - 'lib/blacklight/maps/export.rb'
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 200
   Exclude:
     - 'lib/blacklight/maps/engine.rb'
@@ -46,12 +48,15 @@ Naming/HeredocDelimiterNaming:
   Enabled: false
 
 Naming/PredicateName:
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
     - is_
 
 Rails:
   Enabled: true
 
+Rails/HelperInstanceVariable:
+  Enabled: false
+
 Rails/OutputSafety:
   Enabled: false
 
@@ -66,7 +71,7 @@ RSpec/DescribeClass:
   Exclude:
     - 'spec/system/*'
 
-RSpec/FilePath:
+RSpec/SpecFilePathFormat:
   Exclude:
     - 'spec/lib/blacklight/maps/*'
 
@@ -76,6 +81,9 @@ RSpec/MessageSpies:
 RSpec/MultipleExpectations:
   Max: 4
 
+RSpec/MultipleMemoizedHelpers:
+  Max: 10
+
 RSpec/NestedGroups:
   Max: 5
 
@@ -87,10 +95,6 @@ RSpec/PredicateMatcher:
 Style/AccessModifierDeclarations:
   Enabled: false
 
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'spec/lib/blacklight/maps/export_spec.rb'
-
 Style/Documentation:
   Enabled: false
 

data/.solr_wrapper.yml

@@ -5,3 +5,4 @@
 collection:
   dir: ./.internal_test_app/solr/conf/
   name: blacklight-core
+version: 9.6.1

data/Gemfile

@@ -5,13 +5,12 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'coveralls', require: false
+  gem 'coveralls_reborn', require: false
 end
 
-gem 'engine_cart'
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 1.2.0
-# engine_cart stanza: 0.10.0
+# engine_cart: 2.6.0
+# engine_cart stanza: 2.5.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
 file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
 if File.exist?(file)
@@ -31,18 +30,16 @@ else
     else
       gem 'rails', ENV['RAILS_VERSION']
     end
-  end
 
-  case ENV['RAILS_VERSION']
-  when /^5.[12]/, /^6.0/
-    gem 'sass-rails', '~> 5.0'
-  when /^4.2/
-    gem 'responders', '~> 2.0'
-    gem 'sass-rails', '>= 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
-    gem 'json', '~> 1.8'
-  when /^4.[01]/
-    gem 'sass-rails', '< 5.0'
+    case ENV['RAILS_VERSION']
+    when /^6.0/
+      gem 'sass-rails', '>= 6'
+      gem 'webpacker', '~> 4.0'
+    when /^5.[12]/
+      gem 'sass-rails', '~> 5.0'
+      gem 'sprockets', '~> 3.7'
+      gem 'thor', '~> 0.20'
+    end
   end
 end
 # END ENGINE_CART BLOCK

data/README.md

@@ -1,6 +1,6 @@
 # Blacklight::Maps
 
-[![Build Status](https://travis-ci.org/projectblacklight/blacklight-maps.png?branch=master)](https://travis-ci.org/projectblacklight/blacklight-maps) | [![Coverage Status](https://coveralls.io/repos/projectblacklight/blacklight-maps/badge.svg?branch=master)](https://coveralls.io/r/projectblacklight/blacklight-maps?branch=master)
+![CI](https://github.com/projectblacklight/blacklight-maps/workflows/CI/badge.svg) | [![Coverage Status](https://coveralls.io/repos/projectblacklight/blacklight-maps/badge.svg?branch=master)](https://coveralls.io/r/projectblacklight/blacklight-maps?branch=master)
 
 Provides map views for Blacklight for items with geospatial coordinate (latitude/longitude) metadata.
 
@@ -196,6 +196,7 @@ The table below indicates which versions of Blacklight Maps are compatible with
 
 Blacklight Maps version | works with Blacklight version
 ----------------------- | ---------------------
+1.2.* | >= 7.35.0, < 8
 1.1.* | >= 7.8.0, < 8
 0.5.* | >= 6.1.0, < 7
 0.4.* | >= 5.12.0, < 6.*

data/app/helpers/blacklight/blacklight_maps_helper_behavior.rb

@@ -12,7 +12,7 @@ module Blacklight
         mapattribution: maps_config.mapattribution
       }
       options = { id: id, data: default_data }.deep_merge(tag_options)
-      block_given? ? content_tag(:div, options, &block) : tag(:div, options)
+      block_given? ? content_tag(:div, options, &block) : tag.div(**options)
     end
 
     # return the placename value to be used as a link

data/blacklight-maps.gemspec

@@ -20,15 +20,15 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'blacklight', '>= 7.8.0', '< 8'
-  s.add_dependency 'rails', '>= 5.1', '< 7'
+  s.add_dependency 'blacklight', '>= 7.35.0', '< 8'
+  s.add_dependency 'rails', '>= 7.1', '< 8'
 
   s.add_development_dependency 'capybara'
-  s.add_development_dependency 'engine_cart', '~> 2.1'
-  s.add_development_dependency 'rspec-rails', '~> 3.0'
-  s.add_development_dependency 'rubocop', '~> 0.63.0'
-  s.add_development_dependency 'rubocop-rspec', '~> 1.8'
-  s.add_development_dependency 'selenium-webdriver', '>= 3.13.1'
-  s.add_development_dependency 'solr_wrapper', '~> 2.0'
-  s.add_development_dependency 'webdrivers', '~> 3.0'
+  s.add_development_dependency 'engine_cart', '~> 2.6'
+  s.add_development_dependency 'rspec-rails', '~> 7.1'
+  s.add_development_dependency 'rubocop', '~> 1.72.2'
+  s.add_development_dependency 'rubocop-rspec', '~> 3.4'
+  s.add_development_dependency "rubocop-rails", '~> 2.30'
+  s.add_development_dependency 'selenium-webdriver', '~> 4.0'
+  s.add_development_dependency 'solr_wrapper', '~> 4.1'
 end

data/lib/blacklight/maps/engine.rb

@@ -23,7 +23,9 @@ module Blacklight
 
       # Add our helpers
       initializer 'blacklight-maps.helpers' do |_app|
-        ActionView::Base.send :include, BlacklightMapsHelper
+        config.after_initialize do
+          ActionView::Base.include BlacklightMapsHelper
+        end
       end
 
       # This makes our rake tasks visible.

data/lib/blacklight/maps/export.rb

@@ -94,6 +94,7 @@ module BlacklightMaps
     # turn bboxes into points for index view so we don't get weird mix of boxes and markers
     # @param loc [Hash]
     # @param hits [Integer]
+    # rubocop:disable Metrics/AbcSize
     def build_feature_from_geojson(loc, hits = nil)
       geojson = JSON.parse(loc).deep_symbolize_keys
       if @action != :show && geojson[:bbox]
@@ -107,6 +108,7 @@ module BlacklightMaps
       geojson[:properties][:popup] = render_leaflet_popup_content(geojson, hits)
       geojson
     end
+    # rubocop:enable Metrics/AbcSize
 
     # build GeoJSON feature from incoming raw coordinate data
     # turn bboxes into points for index view so we don't get weird mix of boxes and markers
@@ -116,7 +118,7 @@ module BlacklightMaps
       geojson = { type: 'Feature', properties: {} }
       if coords =~ /ENVELOPE/ # bbox
         geojson.merge!(build_bbox_feature_from_coords(coords))
-      elsif coords =~ /^[-]?[\d]*[\.]?[\d]*[ ,][-]?[\d]*[\.]?[\d]*$/ # point
+      elsif coords =~ /^-?\d*\.?\d*[ ,]-?\d*\.?\d*$/ # point
         geojson[:geometry] = build_point_geometry(coords)
       else
         Rails.logger.error("This coordinate format is not yet supported: '#{coords}'")

data/lib/blacklight/maps/geometry.rb

@@ -46,7 +46,7 @@ module BlacklightMaps
       # Creates a new bounding box from from a Solr WKT Envelope string
       # "ENVELOPE(34.26, 35.89, 33.33, 29.47)" (minX, maxX, maxY, minY)
       def self.from_wkt_envelope(envelope)
-        coords = envelope.gsub(/[[A-Z]\(\)]/, '')&.split(', ')
+        coords = envelope.gsub(/[[A-Z]()]/, '')&.split(', ')
         new([coords[0], coords[3], coords[1], coords[2]])
       end
 

data/lib/blacklight/maps/version.rb

@@ -2,6 +2,6 @@
 
 module Blacklight
   module Maps
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/spec/lib/blacklight/maps/export_spec.rb

@@ -6,7 +6,7 @@ describe BlacklightMaps::GeojsonExport do
   let(:controller) { CatalogController.new }
   let(:action) { :index }
   let(:response_docs) do
-    YAML.safe_load(File.open(File.join(fixture_path, 'sample_solr_documents.yml')))
+    YAML.safe_load(File.open(File.join(RSpec.configuration.fixture_paths.first, 'sample_solr_documents.yml')))
   end
   let(:export) { described_class.new(controller, action, response_docs, foo: 'bar') }
 

data/spec/spec_helper.rb

@@ -22,13 +22,12 @@ require 'blacklight/maps'
 require 'rspec/rails'
 require 'capybara/rspec'
 require 'selenium-webdriver'
-require 'webdrivers'
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
-  config.fixture_path = "#{Blacklight::Maps.root}/spec/fixtures"
+  config.fixture_paths = ["#{Blacklight::Maps.root}/spec/fixtures"]
 
-  config.before(:each, type: :system, js: true) do
+  config.before(:each, :js, type: :system) do
     driven_by :selenium, using: :headless_chrome, screen_size: [1024, 768]
   end
 end

data/spec/system/index_view_spec.rb

@@ -2,12 +2,13 @@
 
 require 'spec_helper'
 
-describe 'catalog#index map view', js: true do
+describe 'catalog#index map view', :js do
   before do
     CatalogController.blacklight_config = Blacklight::Configuration.new
     CatalogController.configure_blacklight do |config|
       # use geojson facet for blacklight-maps catalog#index map view specs
       config.add_facet_field 'geojson_ssim', limit: -2, label: 'GeoJSON', show: false
+      config.add_facet_field 'subject_geo_ssim', label: 'Region'
       config.add_facet_fields_to_solr_request!
     end
     visit search_catalog_path q: 'korea', view: 'maps'

data/spec/system/initial_view_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Initial map bounds view parameter', js: true do
+describe 'Initial map bounds view parameter', :js do
   before(:all) do
     CatalogController.configure_blacklight do |config|
       config.view.maps.facet_mode = 'coordinates'
@@ -20,7 +20,7 @@ describe 'Initial map bounds view parameter', js: true do
     let(:map_tag) { '<div id="blacklight-index-map" data-initialview="[[37.65, -122.56],[37.89, -122.27]]" data-maxzoom="18" data-tileurl="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" data-mapattribution="Map data &amp;copy; &lt;a href=&quot;http://openstreetmap.org&quot;&gt;OpenStreetMap&lt;/a&gt; contributors, &lt;a href=&quot;http://creativecommons.org/licenses/by-sa/2.0/&quot;&gt;CC-BY-SA&lt;/a&gt;" data-searchcontrol="true" data-catalogpath="/catalog" data-placenamefield="placename_field" data-clustercount="hits" />'.html_safe }
 
     it 'sets map to correct bounds when initialview provided' do
-      expect_any_instance_of(Blacklight::BlacklightMapsHelperBehavior).to receive(:blacklight_map_tag).and_return(map_tag)
+      allow_any_instance_of(Blacklight::BlacklightMapsHelperBehavior).to receive(:blacklight_map_tag).and_return(map_tag)
       visit search_catalog_path f: { format: ['Book'] }, view: 'maps'
       expect(page).not_to have_selector('.leaflet-marker-icon.marker-cluster')
     end

data/spec/system/map_view_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'catalog#map view', js: true do
+describe 'catalog#map view', :js do
   before do
     CatalogController.blacklight_config = Blacklight::Configuration.new
     CatalogController.configure_blacklight do |config|

data/spec/system/show_view_maplet_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'catalog#show view', js: true do
+describe 'catalog#show view', :js do
   before(:all) do
     CatalogController.blacklight_config = Blacklight::Configuration.new
     CatalogController.configure_blacklight do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-maps
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2025-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.8.0
+        version: 7.35.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.8.0
+        version: 7.35.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -38,20 +38,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -72,98 +72,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.0
+        version: 1.72.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.0
+        version: 1.72.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '2.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '2.30'
 - !ruby/object:Gem::Dependency
-  name: solr_wrapper
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: webdrivers
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
 description: Blacklight plugin providing map views for records with geographic data.
 email:
 - cabeer@stanford.edu
@@ -174,10 +174,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".solr_wrapper.yml"
-- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
@@ -269,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Maps for Blacklight

data/.travis.yml

@@ -1,28 +0,0 @@
-language: ruby
-sudo: false
-dist: bionic
-
-addons:
-  chrome: stable
-
-before_install:
-  - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
-
-env:
-  global:
-    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-    - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-
-matrix:
-  include:
-    - rvm: 2.7.0
-      env: "RAILS_VERSION=6.0.2.2"
-    - rvm: 2.6.5
-      env: "RAILS_VERSION=6.0.2.2"
-    - rvm: 2.6.5
-      env: "RAILS_VERSION=5.2.4.2"
-    - rvm: 2.5.7
-      env: "RAILS_VERSION=5.2.4.2"
-  fast_finish: true
-
-jdk: openjdk11