blazer 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e454795e47e3b6103e6940b3e7a3e80f90ea70a10d9c46b4d76fb29ca0fd049c
-  data.tar.gz: f12283029d39197c71a4d77d808d732fe9de54992f9125fd79d2c425d93a4573
+  metadata.gz: 7bc246636d4907ea33d0194ed415aaa5669013ee3e71728ef024f89ac9860feb
+  data.tar.gz: 3c4d7cf6b528716d80578aea44ef733e8e30c040785d585b4abf183251b87e3e
 SHA512:
-  metadata.gz: 482d111ab41fa64901addcc45bd7b7113c25c2582a72ff6ef706b09da3d760229eadf258c85a78ed905e6c20f040ba78ef9bc2896d417f3ffcbd6dc4d092aaa5
-  data.tar.gz: 321795b87920b085fb5167d4799a129081aa1bdd34adc3251173471bd18e5d66a78262e549972347c60da0b16eba969777229adbef80e846d79e1fbcb7de65b9
+  metadata.gz: 66e86f97070e03626320557b119666898db9ffbf812edd6b4c502384d6ad1b1e4b428d9d832be83ba0eaa004188403db2f66cc7b6a76c70dd351c1861fd8d6b5
+  data.tar.gz: df1eeee72f609e1c4b5a19da492803bc86737ff26d3fce9ef86490cb54b3444baecd2ceaa4dc2fa5c1773d68462e28927142f67878ee6284de97a4cb7743cf63

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.5 (2020-06-03)
+
+- Updated maps to fix deprecation error
+
 ## 2.2.4 (2020-05-30)
 
 - Fixed error with new queries

data/app/controllers/blazer/queries_controller.rb

@@ -249,7 +249,9 @@ module Blazer
                 r[lat_index] && r[lon_index]
               end.map do |r|
                 {
-                  title: r.each_with_index.map{ |v, i| i == lat_index || i == lon_index ? nil : "<strong>#{@columns[i]}:</strong> #{v}" }.compact.join("<br />").truncate(140),
+                  # Mapbox.js does sanitization with https://github.com/mapbox/sanitize-caja
+                  # but we should do it here as well
+                  title: r.each_with_index.map { |v, i| i == lat_index || i == lon_index ? nil : "<strong>#{ERB::Util.html_escape(@columns[i])}:</strong> #{ERB::Util.html_escape(v)}" }.compact.join("<br />").truncate(140),
                   latitude: r[lat_index],
                   longitude: r[lon_index]
                 }

data/app/views/blazer/queries/run.html.erb

@@ -80,7 +80,8 @@
         <%= blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token %>
         <%= blazer_js_var "markers", @markers %>
         L.mapbox.accessToken = mapboxAccessToken;
-        var map = L.mapbox.map('map', 'mapbox.streets');
+        var map = L.mapbox.map('map')
+          .addLayer(L.mapbox.styleLayer('mapbox://styles/mapbox/streets-v11'));
         var featureLayer = L.mapbox.featureLayer().addTo(map);
         var geojson = [];
         for (var i = 0; i < markers.length; i++) {

data/app/views/layouts/blazer/application.html.erb

@@ -11,8 +11,8 @@
       <%= blazer_js_var "rootPath", root_path %>
     </script>
     <% if blazer_maps? %>
-      <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/v3.2.1/mapbox.css", integrity: "sha384-vxzdEt+wZRPNQbhChjmiaFMLWg86IGuq1NGDehJHsD2mphYkxXll/eSs16WWi6Dq", crossorigin: "anonymous" %>
-      <%= javascript_include_tag "https://api.mapbox.com/mapbox.js/v3.2.1/mapbox.js", integrity: "sha384-dRMjy8ZlKk6czEwpaK3yySKItGPpGOplDM1+osgTwGhmxeTPpjB4kmRbDr2Y7lfQ", crossorigin: "anonymous" %>
+      <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/v3.3.1/mapbox.css", integrity: "sha384-vxzdEt+wZRPNQbhChjmiaFMLWg86IGuq1NGDehJHsD2mphYkxXll/eSs16WWi6Dq", crossorigin: "anonymous" %>
+      <%= javascript_include_tag "https://api.mapbox.com/mapbox.js/v3.3.1/mapbox.js", integrity: "sha384-CTBEiDLiZJ8gkAQ3fYGoeiRp81/ecNiBkGz11jXFALOZ6++rbnqmdo6OImkmr1MO", crossorigin: "anonymous" %>
     <% end %>
     <%= csrf_meta_tags %>
   </head>

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.2.4"
+  VERSION = "2.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties