blacklight_heatmaps 1.4.0 → 2.0.0

data/lib/generators/blacklight_heatmaps/install_generator.rb

@@ -2,18 +2,51 @@ require 'rails/generators'
 
 module BlacklightHeatmaps
   class Install < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
+    class_option :test, type: :boolean, default: false, aliases: '-t', desc: 'Indicates that app will be installed in a test environment'
 
     def copy_styles
-      copy_file 'blacklight_heatmaps.scss', 'app/assets/stylesheets/blacklight_heatmaps.scss'
+      copy_file 'blacklight_heatmaps.css', 'app/assets/stylesheets/blacklight_heatmaps.css'
     end
 
     def inject_js
-      inject_into_file 'app/assets/javascripts/application.js', after: '//= require blacklight/blacklight' do
-        "\n// Required by BlacklightHeatmaps" \
-        "\n//= require leaflet" \
-        "\n//= require L.Control.Sidebar" \
-        "\n//= require blacklight_heatmaps/default"
+      return unless File.exist?('app/javascript/application.js')
+
+      inject_into_file 'app/javascript/application.js' do
+        <<~JS
+          import BlacklightHeatmaps from 'blacklight-heatmaps/app/assets/javascripts/blacklight_heatmaps/default.esm.js'
+          window.BlacklightHeatmaps = BlacklightHeatmaps
+
+          Blacklight.onLoad(function () {
+            BlacklightHeatmaps.init()
+          })
+
+        JS
+      end
+    end
+
+    def add_packages
+      run 'yarn add leaflet'
+      run 'yarn add leaflet-sidebar@"^0.2.4"'
+
+      if ENV['CI']
+        run "yarn add file:#{BlacklightHeatmaps::Engine.root}"
+      elsif options[:test]
+        run 'yarn link "blacklight-heatmaps"'
+      else
+        run 'yarn add "blacklight-heatmaps"'
+      end
+    end
+
+    def add_styles
+      return unless File.exist?('app/assets/stylesheets/application.bootstrap.scss')
+
+      append_to_file 'app/assets/stylesheets/application.bootstrap.scss' do
+        <<~CONTENT
+          @import "leaflet/dist/leaflet";
+          @import "leaflet-sidebar/src/L.Control.Sidebar";
+          @import "./blacklight_heatmaps";
+        CONTENT
       end
     end
 

data/lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.css

@@ -0,0 +1,11 @@
+.blacklight-heatmaps-show-map {
+  height: 500px;
+}
+
+.blacklight-heatmaps-index-map {
+  height: 500px;
+}
+
+.view-icon-heatmaps {
+  &:before { content: "\e135"; }
+}

data/spec/examples.txt

@@ -1,31 +1,7 @@
-example_id                                                                              | status | run_time        |
---------------------------------------------------------------------------------------- | ------ | --------------- |
-./spec/features/configurable_basemap_spec.rb[1:1]                                       | passed | 0.17827 seconds |
-./spec/features/configurable_basemap_spec.rb[1:2:1]                                     | passed | 0.13454 seconds |
-./spec/features/configurable_basemap_spec.rb[1:3:1]                                     | passed | 0.20226 seconds |
-./spec/features/index_page_map_spec.rb[1:1]                                             | passed | 6.44 seconds    |
-./spec/features/show_page_map_spec.rb[1:1]                                              | passed | 3.96 seconds    |
-./spec/features/show_page_map_spec.rb[1:2]                                              | passed | 0.3658 seconds  |
-./spec/helpers/blacklight/maps_helper_spec.rb[1:1:1]                                    | passed | 0.00472 seconds |
-./spec/helpers/blacklight/maps_helper_spec.rb[1:2:1]                                    | passed | 0.00154 seconds |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:1:1]                  | passed | 0.00006 seconds |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:2:1]                  | passed | 0.00006 seconds |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:3:1]                  | passed | 0.00011 seconds |
-./spec/models/concerns/blacklight_heatmaps/bounding_box_spec.rb[1:4:1]                  | passed | 0.00006 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:1:1]             | passed | 0.00008 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:2:1]             | passed | 0.00006 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_parser_spec.rb[1:1:3:1]             | passed | 0.00099 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:1:1]        | passed | 0.00017 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:2:1]        | passed | 0.00007 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:3:1]        | passed | 0.00883 seconds |
-./spec/models/concerns/blacklight_heatmaps/geometry_solr_document_spec.rb[1:4:1]        | passed | 0.00012 seconds |
-./spec/models/concerns/blacklight_heatmaps/point_spec.rb[1:1:1]                         | passed | 0.01197 seconds |
-./spec/models/concerns/blacklight_heatmaps/point_spec.rb[1:2:1]                         | passed | 0.00049 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:1:1:1] | passed | 0.00126 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:1:2:1] | passed | 0.02643 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:2:1]   | passed | 0.00102 seconds |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:3:1]   | passed | 0.001 seconds   |
-./spec/models/concerns/blacklight_heatmaps/solr_facet_heatmap_behavior_spec.rb[1:4:1]   | passed | 0.00108 seconds |
-./spec/views/catalog/_document_heatmaps.html.erb_spec.rb[1:1]                           | passed | 0.02604 seconds |
-./spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb[1:1:1]                  | passed | 0.00276 seconds |
-./spec/views/catalog/_show_leaflet_map_default.html.erb_spec.rb[1:2:1]                  | passed | 0.00097 seconds |
+example_id                                          | status | run_time        |
+--------------------------------------------------- | ------ | --------------- |
+./spec/features/configurable_basemap_spec.rb[1:1]   | failed | 6.26 seconds    |
+./spec/features/configurable_basemap_spec.rb[1:2:1] | failed | 0.04107 seconds |
+./spec/features/configurable_basemap_spec.rb[1:3:1] | failed | 0.06812 seconds |
+./spec/features/show_page_map_spec.rb[1:1]          | failed | 0.04444 seconds |
+./spec/features/show_page_map_spec.rb[1:2]          | failed | 1.43 seconds    |

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

@@ -4,17 +4,25 @@ class TestAppGenerator < Rails::Generators::Base
   source_root './spec/test_app_templates'
 
   def add_gems
-    gem 'blacklight', ENV.fetch('BLACKLIGHT_VERSION', '~> 7.0')
+    gem 'blacklight', ENV.fetch('BLACKLIGHT_VERSION', '~> 8.0')
 
     Bundler.with_clean_env do
       run 'bundle install'
     end
   end
 
+  # This makes the assets available in the test app so that changes made in
+  # local development can be picked up automatically
+  def link_frontend
+    inside('..') do
+      run 'yarn unlink ; yarn link'
+    end
+  end
+
   def run_blacklight_generator
     say_status('warning', 'GENERATING BL', :yellow)
 
-    generate 'blacklight:install', '--devise'
+    generate 'blacklight:install'
   end
 
   # if you need to generate any additional configuration
@@ -22,15 +30,6 @@ class TestAppGenerator < Rails::Generators::Base
   # after setting up the application
 
   def install_engine
-    generate 'blacklight_heatmaps:install'
-  end
-
-  # Temporarily force js assets to fall back to sprockets
-  def clean_up_js_builds
-    return unless File.exist?('app/assets/builds')
-
-    append_to_file 'app/assets/config/manifest.js', "\n//= link application.js\n" if File.exist?('app/assets/config/manifest.js')
-    gsub_file 'app/assets/config/manifest.js', '//= link_tree ../builds', ''
-    remove_dir 'app/assets/builds'
+    generate 'blacklight_heatmaps:install', '--test'
   end
 end

metadata

@@ -1,42 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_heatmaps
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jack Reed
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-12-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.17.1
+        version: '8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -46,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.17.1
+        version: '8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -79,21 +59,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 7.1.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.1.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -121,7 +107,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: solr_wrapper
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -135,7 +121,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.11'
+- !ruby/object:Gem::Dependency
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -149,19 +149,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.11'
+        version: '0'
 description: Search and view Blacklight resources on a map.
 email:
 - phillipjreed@gmail.com
@@ -205,8 +205,7 @@ files:
 - lib/blacklight_heatmaps/engine.rb
 - lib/blacklight_heatmaps/version.rb
 - lib/generators/blacklight_heatmaps/install_generator.rb
-- lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.js
-- lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.scss
+- lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.css
 - lib/tasks/blacklight_heatmaps_tasks.rake
 - spec/examples.txt
 - spec/features/configurable_basemap_spec.rb
@@ -246,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Search and view Blacklight resources on a map.

data/lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.js

@@ -1 +0,0 @@
-//= require blacklight_heatmaps/default

data/lib/generators/blacklight_heatmaps/templates/blacklight_heatmaps.scss

@@ -1 +0,0 @@
-@import 'blacklight_heatmaps/default';