Skip to content

Business intelligence made simple

Fixed deprecation warnings in Ruby 2.7

Andrew Kane8fec154fa6cc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f89c4854..8e66ae3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.2.7 (unreleased)
+
+- Fixed deprecation warnings in Ruby 2.7
+
## 2.2.6 (2020-07-21)
- Added experimental support for InfluxDB
diff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erb
index 0936c43c..824f2f43 100644
--- a/app/views/blazer/queries/run.html.erb
+++ b/app/views/blazer/queries/run.html.erb
@@ -107,13 +107,13 @@
</script>
<% 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 %>
+ <%= line_chart chart_data, **chart_options %>
<% elsif chart_type == "line2" %>
- <%= line_chart @rows.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.map { |v2| [v2[0], v2[2]] }, library: series_library[i]} }, chart_options %>
+ <%= line_chart @rows.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.map { |v2| [v2[0], v2[2]] }, library: series_library[i]} }, **chart_options %>
<% elsif chart_type == "pie" %>
- <%= pie_chart @rows.map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[1]] }, chart_options %>
+ <%= pie_chart @rows.map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[1]] }, **chart_options %>
<% elsif chart_type == "bar" %>
- <%= column_chart (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: blazer_series_name(name), data: @rows.first(20).map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } }, chart_options %>
+ <%= column_chart (values.size - 1).times.map { |i| name = @columns[i + 1]; {name: blazer_series_name(name), data: @rows.first(20).map { |r| [(@boom[@columns[0]] || {})[r[0].to_s] || r[0], r[i + 1]] } } }, **chart_options %>
<% elsif chart_type == "bar2" %>
<% first_20 = @rows.group_by { |r| r[0] }.values.first(20).flatten(1) %>
<% labels = first_20.map { |r| r[0] }.uniq %>
@@ -123,7 +123,7 @@
<% first_20 << [l, s, 0] unless first_20.find { |r| r[0] == l && r[1] == s } %>
<% end %>
<% end %>
- <%= column_chart first_20.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.sort_by { |r2| labels.index(r2[0]) }.map { |v2| v3 = v2[0]; [(@boom[@columns[0]] || {})[v3.to_s] || v3, v2[2]] }} }, chart_options %>
+ <%= column_chart first_20.group_by { |r| v = r[1]; (@boom[@columns[1]] || {})[v.to_s] || v }.each_with_index.map { |(name, v), i| {name: blazer_series_name(name), data: v.sort_by { |r2| labels.index(r2[0]) }.map { |v2| v3 = v2[0]; [(@boom[@columns[0]] || {})[v3.to_s] || v3, v2[2]] }} }, **chart_options %>
<% elsif chart_type == "scatter" %>
<%= scatter_chart @rows, xtitle: @columns[0], ytitle: @columns[1], **chart_options %>
<% elsif @only_chart %>