blacklight_heatmaps 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d17c7141af8d62f449bd775e630d6025aaf0bac17246624d69a2f7670362c32f
-  data.tar.gz: 005c68a070804d833652823aacfa4c0e132a5dcf58c6b59acba858ce7a21691d
+  metadata.gz: e5f792dd3439c90b1cc83ab1795075b47fa180e3ded27fad4f48105d967633e0
+  data.tar.gz: ff7a0845972e091916328f5eb3d3fb48fdb0517a5529adabc98509a83940c93b
 SHA512:
-  metadata.gz: 5a5699ecdf0aa29be155b2d2f958782788956941504b2bbf1b3fe4040984c37256298c544064f2e730bc2b600e3b553824f62b311000271e4d5bed36e788ac16
-  data.tar.gz: db83dfacd91ab4030ad762d9cefdd863b01c78103082d175b09f4c0cfe6cfaf2d4369003222b4aa15837a25d8f074fb62ab0aae11e2117a5cd60189b95929e7b
+  metadata.gz: d80757994c735f385cff5ba8cddca36b7c32915bfffed7dd702ffcbc5e8faddf76f5feca22bd3bc1fc9a1feff35d16a751ed2b78daaafa48ea849d27e5d46ad3
+  data.tar.gz: 727bd1fd654f14b78b963154fbf1ef4ea83575a2bbeb59fc504af6dd0fab53958184d6a0561a493bb3a3bdc250155574053c277ecd902ace3302bb0bb9dd3fdb

data/app/assets/javascripts/index.js

@@ -0,0 +1,8 @@
+//= require leaflet
+//= require L.Control.Sidebar
+import 'blacklight-heatmaps/vendor/assets/javascripts/leaflet_solr_heatmap'
+import 'blacklight_heatmaps'
+import 'basemaps'
+import 'icons'
+import 'viewers/index'
+import 'viewers/show'

data/app/components/blacklight_heatmaps/icons/heatmaps_component.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module BlacklightHeatmaps
+  module Icons
+    # This is the gallery icon for the view type button.
+    # You can override the default svg by setting:
+    #   Blacklight::Gallery:Icons::SlideshowComponent.svg = '<svg>your SVG here</svg>'
+    class HeatmapsComponent < Blacklight::Icons::IconComponent
+      self.svg = <<~SVG
+        <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M16 10h-2v2h2v-2zm0 4h-2v2h2v-2zm-8-4H6v2h2v-2zm4 0h-2v2h2v-2zm8-6H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H4V6h16v12z"/></svg>
+      SVG
+    end
+  end
+end

data/app/helpers/blacklight/maps_helper.rb

@@ -10,6 +10,7 @@ module Blacklight
         class: 'blacklight-heatmaps-index-map',
         id: 'index-map',
         data: index_map_data_attributes,
+        role: 'region',
         'aria-label': t('blacklight.heatmaps.aria-label')
       )
     end
@@ -24,7 +25,7 @@ module Blacklight
       <div class='media'>
         <div class='media-body'>
           <h3 class='media-heading'>
-            <a href=\"{url}\"}>
+            <a href="{url}">
               {title}
             </a>
           </h3>

data/app/views/catalog/index.heatmaps.jbuilder

@@ -3,7 +3,7 @@ presenter = Blacklight::JsonPresenter.new(@response, blacklight_config)
 json.response do
   json.docs(presenter.documents) do |document|
     document_presenter = document_presenter(document)
-    json.url search_state.url_for_document(document)
+    json.url url_for(search_state.url_for_document(document))
     json.title document_presenter.heading
   end
 

data/config/importmap.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+pin_all_from File.expand_path('../app/assets/javascripts/blacklight_heatmaps', __dir__), under: 'blacklight_heatmaps'
+pin_all_from File.expand_path('../vendor/assets/javascripts', __dir__)

data/lib/blacklight_heatmaps/engine.rb

@@ -14,5 +14,9 @@ module BlacklightHeatmaps
         end
       end
     end
+
+    initializer "blacklight_heatmaps.importmap", before: "importmap" do |app|
+      app.config.importmap.paths << Engine.root.join("config/importmap.rb") if app.config.respond_to?(:importmap)
+    end
   end
 end

data/lib/blacklight_heatmaps/version.rb

@@ -1,3 +1,3 @@
 module BlacklightHeatmaps
-  VERSION = "1.2.0"
+  VERSION = '1.3.1'
 end

data/lib/generators/blacklight_heatmaps/install_generator.rb

@@ -24,7 +24,9 @@ module BlacklightHeatmaps
         "\n    config.basemap_provider = 'positron'" \
         "\n    config.show.partials.insert(1, :show_leaflet_map)" \
         "\n    config.index.respond_to.heatmaps = true" \
-        "\n    config.view.heatmaps(partials: [], color_ramp: ['#ffffcc', '#a1dab4', '#41b6c4', '#2c7fb8', '#253494'])" \
+        "\n    config.view.heatmaps(partials: []," \
+        "\n                         color_ramp: ['#ffffcc', '#a1dab4', '#41b6c4', '#2c7fb8', '#253494']," \
+        "\n                         icon: BlacklightHeatmaps::Icons::HeatmapsComponent)" \
         "\n"
       end
     end

data/spec/helpers/blacklight/maps_helper_spec.rb

@@ -26,6 +26,7 @@ describe Blacklight::MapsHelper do
         .to have_css '[data-basemap-provider="positron"]'
       expect(helper.index_map_div).to have_css '[data-sidebar-template]'
       expect(helper.index_map_div).to have_css '[data-color-ramp]'
+      expect(helper.index_map_div).to have_css '[role="region"]'
       expect(helper.index_map_div).to have_css '[aria-label="heatmap"]'
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_heatmaps
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jack Reed
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.16'
+        version: 7.17.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.16'
+        version: 7.17.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -176,10 +176,12 @@ files:
 - app/assets/javascripts/blacklight_heatmaps/basemaps.js
 - app/assets/javascripts/blacklight_heatmaps/blacklight_heatmaps.js
 - app/assets/javascripts/blacklight_heatmaps/default.js
-- app/assets/javascripts/blacklight_heatmaps/icons.js.erb
+- app/assets/javascripts/blacklight_heatmaps/icons.js
 - app/assets/javascripts/blacklight_heatmaps/viewers/index.js
 - app/assets/javascripts/blacklight_heatmaps/viewers/show.js
+- app/assets/javascripts/index.js
 - app/assets/stylesheets/blacklight_heatmaps/default.scss
+- app/components/blacklight_heatmaps/icons/heatmaps_component.rb
 - app/controllers/blacklight_heatmaps/application_controller.rb
 - app/helpers/blacklight/maps_helper.rb
 - app/models/concerns/blacklight_heatmaps/bounding_box.rb
@@ -192,6 +194,7 @@ files:
 - app/views/catalog/_show_leaflet_map_default.html.erb
 - app/views/catalog/index.heatmaps.jbuilder
 - app/views/layouts/blacklight_heatmaps/application.html.erb
+- config/importmap.rb
 - config/locales/blacklight-heatmaps.en.yml
 - config/locales/blacklight-heatmaps.es.yml
 - config/locales/blacklight-heatmaps.pt-BR.yml
@@ -203,7 +206,6 @@ files:
 - lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.js
 - lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.scss
 - lib/tasks/blacklight_heatmaps_tasks.rake
-- spec/examples.txt
 - spec/features/configurable_basemap_spec.rb
 - spec/features/index_page_map_spec.rb
 - spec/features/show_page_map_spec.rb
@@ -241,12 +243,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Search and view Blacklight resources on a map.
 test_files:
-- spec/examples.txt
 - spec/features/configurable_basemap_spec.rb
 - spec/features/index_page_map_spec.rb
 - spec/features/show_page_map_spec.rb

data/spec/examples.txt

@@ -1,31 +0,0 @@
-example_id                                                                              | status | run_time        |
---------------------------------------------------------------------------------------- | ------ | --------------- |
-./spec/features/configurable_basemap_spec.rb[1:1]                                       | failed | 2.14 seconds    |
-./spec/features/configurable_basemap_spec.rb[1:2:1]                                     | failed | 2.14 seconds    |
-./spec/features/configurable_basemap_spec.rb[1:3:1]                                     | failed | 2.17 seconds    |
-./spec/features/index_page_map_spec.rb[1:1]                                             | failed | 2.33 seconds    |
-./spec/features/show_page_map_spec.rb[1:1]                                              | failed | 2.15 seconds    |
-./spec/features/show_page_map_spec.rb[1:2]                                              | failed | 13.26 seconds   |
-./spec/helpers/blacklight/maps_helper_spec.rb[1:1:1]                                    | passed | 0.0061 seconds  |
-./spec/helpers/blacklight/maps_helper_spec.rb[1:2:1]                                    | passed | 0.00302 seconds |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:1:1]                  | passed | 0.00009 seconds |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:2:1]                  | passed | 0.00028 seconds |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:3:1]                  | passed | 0.0001 seconds  |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:4:1]                  | passed | 0.00018 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:1:1]             | passed | 0.00016 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:2:1]             | passed | 0.00236 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:3:1]             | passed | 0.00194 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:1:1]        | passed | 0.00093 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:2:1]        | passed | 0.00011 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:3:1]        | passed | 0.00107 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:4:1]        | passed | 0.00033 seconds |
-./spec/models/concerns/blacklight_heatmaps/point_spec.rb[1:1:1]                         | passed | 0.00006 seconds |
-./spec/models/concerns/blacklight_heatmaps/point_spec.rb[1:2:1]                         | passed | 0.0004 seconds  |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:1:1:1] | passed | 0.00184 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:1:2:1] | passed | 0.01369 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:2:1]   | passed | 0.00369 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:3:1]   | passed | 0.00426 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:4:1]   | passed | 0.00213 seconds |
-./spec/views/catalog/_document_heatmaps.html.erb_spec.rb[1:1]                           | passed | 0.01306 seconds |
-./spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb[1:1:1]                  | passed | 0.00263 seconds |
-./spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb[1:2:1]                  | passed | 0.00492 seconds |