blazer 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc87353b5a9b96402e82c59b497929b5544f320d6c9f82316b92d005c18f74d
-  data.tar.gz: 19b1a0697e3901e25c8b77f2ce769d427849c97f8012240fdce26a74f069c03d
+  metadata.gz: 160f3a7275160ebbeb9446cfacbe2c24d7882820f3548e10239cfdf383b3af87
+  data.tar.gz: 809bb498a6c00217e10239f87352c3051b3bb95d956910aa8f39a610e6adf58d
 SHA512:
-  metadata.gz: c090577a5e80ac9ae9a870e096d1317b78cd7815fb6f9e65a1e59bb41fb779d2cbac6f37ec3cb3854351069d57b52b5937fa7cb1e0a85d73919ee59229501d8a
-  data.tar.gz: 1590b68605c634a98a3ee4794eae49c5b19b9d683ff453871117983684e70c3b0c3222298e63a312719b9a676aa3d364a56dcc1664c10c2146800736103e4638
+  metadata.gz: 81ad8488e41e590d3deba688200ec253f3d1f42c00794ce4c6819aa9c9e765d54b692f1172116a30d098877d80a2c07c38814adef07650ac6d56c1bd605d79cc
+  data.tar.gz: 88917858d1aea93202f411f5becd420e49d71b6619fd91cd5580760fbb0a5a8c9bdc8eb0fc604264effd9334ca78d9d111d3bd42067d1b7e1eb5bc8e35562e4e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.0.4 (2024-09-04)
+
+- Improved CSP support
+- Fixed error with Trilogy and Rails 7.2
+
 ## 3.0.3 (2024-01-10)
 
 - Fixed error with Trilogy, non-ASCII column names, and charts

data/README.md

@@ -1026,51 +1026,6 @@ override_csp: true
 
 Maps now use Mapbox GL JS v1 instead of Mapbox.js, which affects Mapbox billing.
 
-### 2.6
-
-Custom adapters now need to specify how to quote variables in queries (there is no longer a default)
-
-```ruby
-class FooAdapter < Blazer::Adapters::BaseAdapter
-  def quoting
-    :backslash_escape # single quote strings and convert ' to \' and \ to \\
-    # or
-    :single_quote_escape # single quote strings and convert ' to ''
-    # or
-    ->(value) { ... } # custom method
-  end
-end
-```
-
-### 2.3
-
-To archive queries, create a migration
-
-```sh
-rails g migration add_status_to_blazer_queries
-```
-
-with:
-
-```ruby
-add_column :blazer_queries, :status, :string
-Blazer::Query.update_all(status: "active")
-```
-
-### 2.0
-
-To use Slack notifications, create a migration
-
-```sh
-rails g migration add_slack_channels_to_blazer_checks
-```
-
-with:
-
-```ruby
-add_column :blazer_checks, :slack_channels, :text
-```
-
 ## History
 
 View the [changelog](https://github.com/ankane/blazer/blob/master/CHANGELOG.md)

data/app/controllers/blazer/base_controller.rb

@@ -71,9 +71,9 @@ module Blazer
       if smart_var_data_source
         query = smart_var_data_source.smart_variables[var]
 
-        if query.is_a? Hash
-          smart_var = query.map { |k,v| [v, k] }
-        elsif query.is_a? Array
+        if query.is_a?(Hash)
+          smart_var = query.map { |k, v| [v, k] }
+        elsif query.is_a?(Array)
           smart_var = query.map { |v| [v, v] }
         elsif query
           result = smart_var_data_source.run_statement(query)

data/app/views/blazer/_variables.html.erb

@@ -1,6 +1,6 @@
 <% if @bind_vars.any? %>
   <% var_params = request.query_parameters %>
-  <script>
+  <%= javascript_tag nonce: true do %>
     <%= blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name %>
     var now = moment.tz(timeZone)
     var format = "YYYY-MM-DD"
@@ -8,7 +8,7 @@
     function toDate(time) {
       return moment.tz(time.format(format), timeZone)
     }
-  </script>
+  <% end %>
   <form id="bind" method="get" action="<%= action %>" class="form-inline" style="margin-bottom: 15px;">
     <% date_vars = ["start_time", "end_time"] %>
     <% if (date_vars - @bind_vars).empty? %>
@@ -21,11 +21,11 @@
       <%= label_tag var, var %>
       <% if (data = @smart_vars[var]) %>
         <%= select_tag var, options_for_select([[nil, nil]] + data, selected: var_params[var]), style: "margin-right: 20px; width: 200px; display: none;" %>
-        <script>
+        <%= javascript_tag nonce: true do %>
           $("#<%= var %>").selectize({
             create: true
           });
-        </script>
+        <% end %>
       <% elsif var.end_with?("_at") || var == "start_time" || var == "end_time" %>
         <%= hidden_field_tag var, var_params[var] %>
 
@@ -35,7 +35,7 @@
           </div>
         </div>
 
-        <script>
+        <%= javascript_tag nonce: true do %>
           (function() {
             var input = $("#<%= var %>")
             var datePicker = $("#<%= var %>-select")
@@ -57,7 +57,7 @@
               datePicker.find("span").html(toDate(picker.startDate).format("MMMM D, YYYY"))
             }
           })()
-        </script>
+        <% end %>
       <% else %>
         <%= text_field_tag var, var_params[var], style: "width: 120px; margin-right: 20px;", autofocus: i == 0 && !var.end_with?("_at") && !var_params[var], class: "form-control" %>
       <% end %>
@@ -75,7 +75,7 @@
         </div>
       </div>
 
-      <script>
+      <%= javascript_tag nonce: true do %>
         function dateStr(daysAgo) {
           return now.clone().subtract(daysAgo || 0, "days").format(format)
         }
@@ -119,7 +119,7 @@
           $("#reportrange").trigger("apply.daterangepicker", picker)
           submitIfCompleted($("#start_time").closest("form"))
         }
-      </script>
+      <% end %>
     <% end %>
 
     <input type="submit" class="btn btn-success" value="Run" style="vertical-align: top;" />

data/app/views/blazer/checks/_form.html.erb

@@ -12,12 +12,12 @@
     <div class="hide">
       <%= f.select :query_id, [], {include_blank: true} %>
     </div>
-    <script>
+    <%= javascript_tag nonce: true do %>
       <%= blazer_js_var "queries", Blazer::Query.active.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} } %>
       <%= blazer_js_var "items", [@check.query_id].compact %>
 
       $("#check_query_id").selectize({options: queries, items: items, highlight: false, maxOptions: 100}).parents(".hide").removeClass("hide");
-    </script>
+    <% end %>
   </div>
 
   <% if @check.respond_to?(:check_type) %>
@@ -28,9 +28,9 @@
         <% check_options << ["Anomaly (most recent data point)", "anomaly"] if Blazer.anomaly_checks %>
         <%= f.select :check_type, check_options %>
       </div>
-      <script>
+      <%= javascript_tag nonce: true do %>
         $("#check_check_type").selectize({}).parent().removeClass("hide");
-      </script>
+      <% end %>
     </div>
   <% elsif @check.respond_to?(:invert) %>
     <div class="form-group">
@@ -38,9 +38,9 @@
       <div class="hide">
         <%= f.select :invert, [["Any results (bad data)", false], ["No results (missing data)", true]] %>
       </div>
-      <script>
+      <%= javascript_tag nonce: true do %>
         $("#check_invert").selectize({}).parent().removeClass("hide");
-      </script>
+      <% end %>
     </div>
   <% end %>
 
@@ -50,9 +50,9 @@
       <div class="hide">
         <%= f.select :schedule, Blazer.check_schedules.map { |v| [v, v] } %>
       </div>
-      <script>
+      <%= javascript_tag nonce: true do %>
         $("#check_schedule").selectize({}).parent().removeClass("hide");
-      </script>
+      <% end %>
     </div>
   <% end %>
 

data/app/views/blazer/checks/index.html.erb

@@ -62,11 +62,11 @@
   </tbody>
 </table>
 
-<script>
+<%= javascript_tag nonce: true do %>
   $("#search").on("keyup", function() {
     var value = $(this).val().toLowerCase()
     $("#checks tbody tr").filter( function() {
       $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
     })
   }).focus()
-</script>
+<% end %>

data/app/views/blazer/dashboards/_form.html.erb

@@ -30,7 +30,7 @@
   </p>
 <% end %>
 
-<script>
+<%= javascript_tag nonce: true do %>
   <%= blazer_js_var "queries", Blazer::Query.active.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} } %>
   <%= blazer_js_var "dashboardQueries", @queries || @dashboard.dashboard_queries.order(:position).map(&:query) %>
 
@@ -79,4 +79,4 @@
       app.queries.splice(e.newIndex, 0, app.queries.splice(e.oldIndex, 1)[0])
     }
   })
-</script>
+<% end %>

data/app/views/blazer/dashboards/show.html.erb

@@ -38,7 +38,7 @@
       <p class="text-muted">Loading...</p>
     </div>
   </div>
-  <script>
+  <%= javascript_tag nonce: true do %>
     <% data = {statement: query.statement, query_id: query.id, data_source: query.data_source, variables: variable_params(query), only_chart: true} %>
     <% data.merge!(cohort_period: params[:cohort_period]) if params[:cohort_period] %>
     <%= blazer_js_var "data", data %>
@@ -49,5 +49,5 @@
     }, function (message) {
       $("#chart-<%= i %>").addClass("query-error").html(message)
     });
-  </script>
+  <% end %>
 <% end %>

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

@@ -68,7 +68,7 @@
   </div>
 </div>
 
-<script>
+<%= javascript_tag nonce: true do %>
   <%= blazer_js_var "variableParams", @variable_params %>
   <%= blazer_js_var "previewStatement", Blazer.data_sources.to_h { |k, v| [k, (v.preview_statement rescue "")] } %>
 
@@ -252,4 +252,4 @@
   })
   app.config.compilerOptions.whitespace = "preserve"
   app.mount("#app")
-</script>
+<% end %>

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

@@ -56,7 +56,7 @@
   <p v-if="more" class="text-muted">Loading...</p>
 </div>
 
-<script>
+<%= javascript_tag nonce: true do %>
   <%= blazer_js_var "dashboards", @dashboards %>
   <%= blazer_js_var "queries", @queries %>
   <%= blazer_js_var "more", @more %>
@@ -166,4 +166,4 @@
   })
   app.config.compilerOptions.whitespace = "preserve"
   app.mount("#queries")
-</script>
+<% end %>

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

@@ -75,21 +75,21 @@
     <% if @markers.any? %>
       <% map_id = SecureRandom.hex %>
       <%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %>
-      <script>
+      <%= javascript_tag nonce: true do %>
         <%= blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token %>
         <%= blazer_js_var "markers", @markers %>
         <%= blazer_js_var "mapId", map_id %>
         new Mapkick.Map(mapId, markers, {accessToken: mapboxAccessToken, tooltips: {hover: false, html: true}});
-      </script>
+      <% end %>
     <% elsif @geojson.any? %>
       <% map_id = SecureRandom.hex %>
       <%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %>
-      <script>
+      <%= javascript_tag nonce: true do %>
         <%= blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token %>
         <%= blazer_js_var "geojson", @geojson %>
         <%= blazer_js_var "mapId", map_id %>
         new Mapkick.AreaMap(mapId, geojson, {accessToken: mapboxAccessToken, tooltips: {hover: false, html: true}});
-      </script>
+      <% end %>
     <% elsif chart_type == "line" %>
       <% chart_data = @columns[1..-1].each_with_index.map{ |k, i| {name: blazer_series_name(k), data: @rows.map{ |r| [r[0], r[i + 1]] }, library: series_library[i]} } %>
       <%= line_chart chart_data, **chart_options %>

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

@@ -28,7 +28,7 @@
   </table>
 <% end %>
 
-<script>
+<%= javascript_tag nonce: true do %>
   $("#search").on("keyup", function() {
     var value = $(this).val().toLowerCase()
     $(".schema-table").filter(function() {
@@ -52,4 +52,4 @@
       $(this).toggle(found)
     })
   }).focus()
-</script>
+<% end %>

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

@@ -46,7 +46,7 @@
     <p class="text-muted">Loading...</p>
   </div>
 
-  <script>
+  <%= javascript_tag nonce: true do %>
     function showRun(data) {
       $("#results").html(data)
       $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 60})
@@ -59,14 +59,14 @@
     <%= blazer_js_var "data", @run_data %>
 
     runQuery(data, showRun, showError)
-  </script>
+  <% end %>
 <% end %>
 
-<script>
+<%= javascript_tag nonce: true do %>
   // do not highlight really long queries
   // this can lead to performance issues
   var code = $("#code code")
   if (code.text().length < 10000) {
     hljs.highlightElement(code.get(0))
   }
-</script>
+<% end %>

data/app/views/blazer/uploads/index.html.erb

@@ -45,11 +45,11 @@
   </tbody>
 </table>
 
-<script>
+<%= javascript_tag nonce: true do %>
   $("#search").on("keyup", function() {
     var value = $(this).val().toLowerCase()
     $("#uploads tbody tr").filter( function() {
       $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
     })
   }).focus()
-</script>
+<% end %>

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

@@ -7,14 +7,14 @@
     <%= favicon_link_tag "blazer/favicon.png" %>
     <% if defined?(Propshaft::Railtie) %>
       <%= stylesheet_link_tag "blazer/bootstrap-propshaft", "blazer/bootstrap", "blazer/selectize", "blazer/github", "blazer/daterangepicker", "blazer/application" %>
-      <%= javascript_include_tag "blazer/jquery", "blazer/rails-ujs", "blazer/stupidtable", "blazer/stupidtable-custom-settings", "blazer/jquery.stickytableheaders", "blazer/selectize", "blazer/highlight.min", "blazer/moment", "blazer/moment-timezone-with-data", "blazer/daterangepicker", "blazer/chart.umd", "blazer/chartjs-adapter-date-fns.bundle", "blazer/chartkick", "blazer/mapkick.bundle", "blazer/ace/ace", "blazer/ace/ext-language_tools", "blazer/ace/theme-twilight", "blazer/ace/mode-sql", "blazer/ace/snippets/text", "blazer/ace/snippets/sql", "blazer/Sortable", "blazer/bootstrap", "blazer/vue.global.prod", "blazer/routes", "blazer/queries", "blazer/fuzzysearch", "blazer/application" %>
+      <%= javascript_include_tag "blazer/jquery", "blazer/rails-ujs", "blazer/stupidtable", "blazer/stupidtable-custom-settings", "blazer/jquery.stickytableheaders", "blazer/selectize", "blazer/highlight.min", "blazer/moment", "blazer/moment-timezone-with-data", "blazer/daterangepicker", "blazer/chart.umd", "blazer/chartjs-adapter-date-fns.bundle", "blazer/chartkick", "blazer/mapkick.bundle", "blazer/ace/ace", "blazer/ace/ext-language_tools", "blazer/ace/theme-twilight", "blazer/ace/mode-sql", "blazer/ace/snippets/text", "blazer/ace/snippets/sql", "blazer/Sortable", "blazer/bootstrap", "blazer/vue.global.prod", "blazer/routes", "blazer/queries", "blazer/fuzzysearch", "blazer/application", nonce: true %>
     <% else %>
       <%= stylesheet_link_tag "blazer/application" %>
-      <%= javascript_include_tag "blazer/application" %>
+      <%= javascript_include_tag "blazer/application", nonce: true %>
     <% end %>
-    <script>
+    <%= javascript_tag nonce: true do %>
       <%= blazer_js_var "rootPath", root_path %>
-    </script>
+    <% end %>
     <%= csrf_meta_tags %>
   </head>
   <body>

data/lib/blazer/adapters/athena_adapter.rb

@@ -33,7 +33,7 @@ module Blazer
             # use token so we fetch cached results after query is run
             client_request_token: request_token,
             query_execution_context: {
-              database: database,
+              database: database
             }
           }
 

data/lib/blazer/adapters/hive_adapter.rb

@@ -45,7 +45,7 @@ module Blazer
             port: uri.port,
             username: uri.user,
             password: uri.password,
-            database: uri.path.sub(/\A\//, ""),
+            database: uri.path.delete_prefix("/"),
             mode: uri.scheme.to_sym
           )
         end

data/lib/blazer/adapters/presto_adapter.rb

@@ -39,10 +39,10 @@ module Blazer
       def client
         @client ||= begin
           uri = URI.parse(settings["url"])
-          query = uri.query ? CGI::parse(uri.query) : {}
+          query = uri.query ? CGI.parse(uri.query) : {}
           Presto::Client.new(
             server: "#{uri.host}:#{uri.port}",
-            catalog: uri.path.to_s.sub(/\A\//, ""),
+            catalog: uri.path.to_s.delete_prefix("/"),
             schema: query["schema"] || "public",
             user: uri.user,
             http_debug: false

data/lib/blazer/adapters/sql_adapter.rb

@@ -29,13 +29,22 @@ module Blazer
           end
 
           columns = result.columns
-          result.rows.each do |untyped_row|
-            rows << (result.column_types.empty? ? untyped_row : columns.each_with_index.map { |c, i| untyped_row[i] && result.column_types[c] ? result.column_types[c].send(:cast_value, untyped_row[i]) : untyped_row[i] })
+          rows = result.rows
+
+          # cast values
+          if result.column_types.any?
+            types = columns.map { |c| result.column_types[c] }
+            rows =
+              rows.map do |row|
+                row.map.with_index do |v, i|
+                  v && (t = types[i]) ? t.send(:cast_value, v) : v
+                end
+              end
           end
 
           # fix for non-ASCII column names and charts
           if adapter_name == "Trilogy"
-            columns.map! { |k| k.dup.force_encoding(Encoding::UTF_8) }
+            columns = columns.map { |k| k.dup.force_encoding(Encoding::UTF_8) }
           end
         rescue => e
           error = e.message.sub(/.+ERROR: /, "")
@@ -141,7 +150,7 @@ module Blazer
       def cohort_analysis_statement(statement, period:, days:)
         raise "Cohort analysis not supported" unless supports_cohort_analysis?
 
-        cohort_column = statement =~ /\bcohort_time\b/ ? "cohort_time" : "conversion_time"
+        cohort_column = statement.match?(/\bcohort_time\b/) ? "cohort_time" : "conversion_time"
         tzname = Blazer.time_zone.tzinfo.name
 
         if mysql?

data/lib/blazer/data_source.rb

@@ -107,7 +107,7 @@ module Blazer
       end
 
       unless result
-        comment = "blazer"
+        comment = "blazer".dup
         if options[:user].respond_to?(:id)
           comment << ",user_id:#{options[:user].id}"
         end

data/lib/blazer/result.rb

@@ -131,7 +131,7 @@ module Blazer
 
           if chart_type == "line"
             columns[1..-1].each_with_index.each do |k, i|
-              series << {name: k, data: rows.map{ |r| [r[0], r[i + 1]] }}
+              series << {name: k, data: rows.map { |r| [r[0], r[i + 1]] }}
             end
           else
             rows.group_by { |r| v = r[1]; (smart_values[columns[1]] || {})[v.to_s] || v }.each_with_index.map do |(name, v), i|

data/lib/blazer/statement.rb

@@ -33,9 +33,9 @@ module Blazer
           end
 
           unless value.is_a?(ActiveSupport::TimeWithZone)
-            if value =~ /\A\d+\z/
+            if value.match?(/\A\d+\z/)
               value = value.to_i
-            elsif value =~ /\A\d+\.\d+\z/
+            elsif value.match?(/\A\d+\.\d+\z/)
               value = value.to_f
             end
           end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Explore your data with SQL. Easily create charts and dashboards, and share