blazer 1.3.5 → 1.4.0

data/app/assets/javascripts/blazer/application.js

@@ -25,6 +25,18 @@ $( function () {
   });
 });
 
+function runQuery(data, success, error) {
+  return $.ajax({
+    url: window.runQueriesPath,
+    method: "POST",
+    data: data,
+    dataType: "html"
+  }).done(success).fail( function(jqXHR, textStatus, errorThrown) {
+    var message = (typeof errorThrown === "string") ? errorThrown : errorThrown.message;
+    error(message);
+  });
+}
+
 // Prevent backspace from navigating backwards.
 // Adapted from Biff MaGriff: http://stackoverflow.com/a/7895814/1196499
 function preventBackspaceNav() {

data/app/assets/javascripts/blazer/chartkick.js

@@ -2,7 +2,7 @@
  * Chartkick.js
  * Create beautiful JavaScript charts with minimal code
  * https://github.com/ankane/chartkick.js
- * v1.5.1
+ * v2.0.0
  * MIT License
  */
 
@@ -14,7 +14,7 @@
   var config = window.Chartkick || {};
   var Chartkick, ISO8601_PATTERN, DECIMAL_SEPARATOR, adapters = [];
   var DATE_PATTERN = /^(\d\d\d\d)(\-)?(\d\d)(\-)?(\d\d)$/i;
-  var adapters = [];
+  var GoogleChartsAdapter, HighchartsAdapter, ChartjsAdapter;
 
   // helpers
 
@@ -68,7 +68,8 @@
     if (type !== '[object String]') {
       return;
     }
-    if (matches = input.match(ISO8601_PATTERN)) {
+    matches = input.match(ISO8601_PATTERN);
+    if (matches) {
       year = parseInt(matches[1], 10);
       month = parseInt(matches[3], 10) - 1;
       day = parseInt(matches[5], 10);
@@ -211,7 +212,7 @@
     if (typeof n !== "object") {
       if (typeof n === "number") {
         n = new Date(n * 1000); // ms
-      } else if (config.smarterDates && (matches = n.match(DATE_PATTERN))) {
+      } else if ((matches = n.match(DATE_PATTERN))) {
         year = parseInt(matches[1], 10);
         month = parseInt(matches[3], 10) - 1;
         day = parseInt(matches[5], 10);
@@ -249,7 +250,7 @@
 
   function loadAdapters() {
     if (!HighchartsAdapter && "Highcharts" in window) {
-      var HighchartsAdapter = new function () {
+      HighchartsAdapter = new function () {
         var Highcharts = window.Highcharts;
 
         this.name = "highcharts";
@@ -385,7 +386,7 @@
         };
 
         this.renderColumnChart = function (chart, chartType) {
-          var chartType = chartType || "column";
+          chartType = chartType || "column";
           var series = chart.data;
           var options = jsOptions(series, chart.options), i, j, s, d, rows = [];
           options.chart.type = chartType;
@@ -441,7 +442,7 @@
       adapters.push(HighchartsAdapter);
     }
     if (!GoogleChartsAdapter && window.google && window.google.setOnLoadCallback) {
-      var GoogleChartsAdapter = new function () {
+      GoogleChartsAdapter = new function () {
         var google = window.google;
 
         this.name = "google";
@@ -453,7 +454,7 @@
           var cb, call;
           for (var i = 0; i < callbacks.length; i++) {
             cb = callbacks[i];
-            call = google.visualization && ((cb.pack === "corechart" && google.visualization.LineChart) || (cb.pack === "timeline" && google.visualization.Timeline))
+            call = google.visualization && ((cb.pack === "corechart" && google.visualization.LineChart) || (cb.pack === "timeline" && google.visualization.Timeline));
             if (call) {
               cb.callback();
               callbacks.splice(i, 1);
@@ -557,7 +558,7 @@
         var setXtitle = function (options, title) {
           options.hAxis.title = title;
           options.hAxis.titleTextStyle.italic = false;
-        }
+        };
 
         var setYtitle = function (options, title) {
           options.vAxis.title = title;
@@ -769,7 +770,7 @@
       adapters.push(GoogleChartsAdapter);
     }
     if (!ChartjsAdapter && "Chart" in window) {
-      var ChartjsAdapter = new function () {
+      ChartjsAdapter = new function () {
         var Chart = window.Chart;
 
         this.name = "chartjs";
@@ -832,6 +833,16 @@
           options.scales.yAxes[0].ticks.max = max;
         };
 
+        var setBarMin = function (options, min) {
+          if (min !== null) {
+            options.scales.xAxes[0].ticks.min = min;
+          }
+        };
+
+        var setBarMax = function (options, max) {
+          options.scales.xAxes[0].ticks.max = max;
+        };
+
         var setStacked = function (options, stacked) {
           options.scales.xAxes[0].stacked = !!stacked;
           options.scales.yAxes[0].stacked = !!stacked;
@@ -866,6 +877,9 @@
 
         var setLabelSize = function (chart, data, options) {
           var maxLabelSize = Math.ceil(chart.element.offsetWidth / 4.0 / data.labels.length);
+          if (maxLabelSize > 25) {
+            maxLabelSize = 25;
+          }
           options.scales.xAxes[0].ticks.callback = function (value) {
             value = toStr(value);
             if (value.length > maxLabelSize) {
@@ -889,6 +903,8 @@
           var dayOfWeek;
           var month = true;
           var year = true;
+          var hour = true;
+          var minute = true;
           var detectType = (chartType === "line" || chartType === "area") && !chart.options.discrete;
 
           var series = chart.data;
@@ -917,11 +933,10 @@
           }
 
           var rows2 = [];
-          for (var j = 0; j < series.length; j++) {
+          for (j = 0; j < series.length; j++) {
             rows2.push([]);
           }
 
-          var day = true;
           var value;
           var k;
           for (k = 0; k < sortedLabels.length; k++) {
@@ -936,17 +951,19 @@
               week = week && isWeek(value, dayOfWeek);
               month = month && isMonth(value);
               year = year && isYear(value);
+              hour = hour && isHour(value);
+              minute = minute && isMinute(value);
             } else {
               value = i;
             }
             labels.push(value);
-            for (var j = 0; j < series.length; j++) {
-              rows2[j].push(rows[i][j])
+            for (j = 0; j < series.length; j++) {
+              rows2[j].push(rows[i][j]);
             }
           }
 
-          for (var i = 0; i < series.length; i++) {
-            var s = series[i];
+          for (i = 0; i < series.length; i++) {
+            s = series[i];
 
             var backgroundColor = chartType !== "line" ? addOpacity(colors[i], 0.5) : colors[i];
 
@@ -989,19 +1006,33 @@
               } else if (day || timeDiff > 10) {
                 options.scales.xAxes[0].time.unit = "day";
                 step = 1;
+              } else if (hour) {
+                options.scales.xAxes[0].time.unit = "hour";
+                step = 1 / 24.0;
+              } else if (minute) {
+                options.scales.xAxes[0].time.displayFormats = {minute: "h:mm a"};
+                options.scales.xAxes[0].time.unit = "minute";
+                step = 1 / 24.0 / 60.0;
               }
 
+
               if (step && timeDiff > 0) {
                 var unitStepSize = Math.ceil(timeDiff / step / (chart.element.offsetWidth / 100.0));
-                if (week) {
+                if (week && step === 1) {
                   unitStepSize = Math.ceil(unitStepSize / 7.0) * 7;
                 }
                 options.scales.xAxes[0].time.unitStepSize = unitStepSize;
               }
             }
 
-            if (!options.scales.xAxes[0].time.tooltipFormat && day) {
-              options.scales.xAxes[0].time.tooltipFormat = "ll";
+            if (!options.scales.xAxes[0].time.tooltipFormat) {
+              if (day) {
+                options.scales.xAxes[0].time.tooltipFormat = "ll";
+              } else if (hour) {
+                options.scales.xAxes[0].time.tooltipFormat = "MMM D, h a";
+              } else if (minute) {
+                options.scales.xAxes[0].time.tooltipFormat = "h:mm a";
+              }
             }
           }
 
@@ -1019,6 +1050,11 @@
             // TODO fix area stacked
             // areaOptions.stacked = true;
           }
+          // fix for https://github.com/chartjs/Chart.js/issues/2441
+          if (!chart.options.max && allZeros(chart.data)) {
+            chart.options.max = 1;
+          }
+
           var options = jsOptions(chart.data, merge(areaOptions, chart.options));
 
           var data = createDataTable(chart, options, chartType || "line");
@@ -1026,7 +1062,7 @@
           options.scales.xAxes[0].type = chart.options.discrete ? "category" : "time";
 
           drawChart(chart, "line", data, options);
-        }
+        };
 
         this.renderPieChart = function (chart) {
           var options = merge(baseOptions, chart.options.library || {});
@@ -1050,14 +1086,19 @@
           };
 
           drawChart(chart, "pie", data, options);
-        }
+        };
 
         this.renderColumnChart = function (chart, chartType) {
-          var options = jsOptions(chart.data, chart.options);
+          var options;
+          if (chartType === "bar") {
+            options = jsOptionsFunc(merge(baseOptions, defaultOptions), hideLegend, setBarMin, setBarMax, setStacked)(chart.data, chart.options);
+          } else {
+            options = jsOptions(chart.data, chart.options);
+          }
           var data = createDataTable(chart, options, "column");
           setLabelSize(chart, data, options);
           drawChart(chart, (chartType === "bar" ? "horizontalBar" : "bar"), data, options);
-        }
+        };
 
         var self = this;
 
@@ -1066,11 +1107,11 @@
         };
 
         this.renderBarChart = function (chart) {
-          self.renderColumnChart(chart, "bar")
-        }
-      }
+          self.renderColumnChart(chart, "bar");
+        };
+      };
 
-      adapters.push(ChartjsAdapter);
+      adapters.unshift(ChartjsAdapter);
     }
   }
 
@@ -1081,9 +1122,7 @@
     fnName = "render" + chartType;
     adapterName = chart.options.adapter;
 
-    if (adapters.length == 0) {
-      loadAdapters();
-    }
+    loadAdapters();
 
     for (i = 0; i < adapters.length; i++) {
       adapter = adapters[i];
@@ -1119,8 +1158,16 @@
     return r;
   };
 
+  function isMinute(d) {
+    return d.getMilliseconds() === 0 && d.getSeconds() === 0;
+  }
+
+  function isHour(d) {
+    return isMinute(d) && d.getMinutes() === 0;
+  }
+
   function isDay(d) {
-    return d.getMilliseconds() + d.getSeconds() + d.getMinutes() + d.getHours() === 0;
+    return isHour(d) && d.getHours() === 0;
   }
 
   function isWeek(d, dayOfWeek) {
@@ -1139,6 +1186,19 @@
     return !isNaN(toDate(obj)) && toStr(obj).length >= 6;
   }
 
+  function allZeros(data) {
+    var i, j, d;
+    for (i = 0; i < data.length; i++) {
+      d = data[i].data;
+      for (j = 0; j < d.length; j++) {
+        if (d[j][1] != 0) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
   function detectDiscrete(series) {
     var i, j, data;
     for (i = 0; i < series.length; i++) {
@@ -1162,7 +1222,7 @@
     } else {
       opts.hideLegend = false;
     }
-    if (config.smarterDiscrete && (opts.discrete === null || opts.discrete === undefined)) {
+    if ((opts.discrete === null || opts.discrete === undefined)) {
       opts.discrete = detectDiscrete(series);
     }
     if (opts.discrete) {
@@ -1236,12 +1296,29 @@
   }
 
   function setElement(chart, element, dataSource, opts, callback) {
+    var elementId;
     if (typeof element === "string") {
+      elementId = element;
       element = document.getElementById(element);
+      if (!element) {
+        throw new Error("No element with id " + elementId);
+      }
     }
     chart.element = element;
     chart.options = opts || {};
     chart.dataSource = dataSource;
+    chart.getElement = function () {
+      return element;
+    };
+    chart.getData = function () {
+      return chart.data;
+    };
+    chart.getOptions = function () {
+      return opts || {};
+    };
+    chart.getChartObject = function () {
+      return chart.chart;
+    };
     Chartkick.charts[element.id] = chart;
     fetchDataSource(chart, callback);
   }
@@ -1276,5 +1353,9 @@
     charts: {}
   };
 
-  window.Chartkick = Chartkick;
+  if (typeof module === "object" && typeof module.exports === "object") {
+    module.exports = Chartkick;
+  } else {
+    window.Chartkick = Chartkick;
+  }
 }(window));

data/app/controllers/blazer/base_controller.rb

@@ -15,14 +15,8 @@ module Blazer
 
     layout "blazer/application"
 
-    before_action :ensure_database_url
-
     private
 
-    def ensure_database_url
-      render text: "BLAZER_DATABASE_URL required" if !ENV["BLAZER_DATABASE_URL"] && !Rails.env.development?
-    end
-
     def process_vars(statement, data_source)
       (@bind_vars ||= []).concat(extract_vars(statement)).uniq!
       @bind_vars.each do |var|

data/app/controllers/blazer/checks_controller.rb

@@ -3,7 +3,8 @@ module Blazer
     before_action :set_check, only: [:edit, :update, :destroy, :run]
 
     def index
-      @checks = Blazer::Check.joins(:query).includes(:query).order("state, blazer_queries.name, blazer_checks.id").to_a
+      state_order = [nil, "disabled", "error", "timed out", "failing", "passing"]
+      @checks = Blazer::Check.joins(:query).includes(:query).order("blazer_queries.name, blazer_checks.id").to_a.sort_by { |q| state_order.index(q.state) || 99 }
       @checks.select! { |c| "#{c.query.name} #{c.emails}".downcase.include?(params[:q]) } if params[:q]
     end
 
@@ -15,7 +16,7 @@ module Blazer
       @check = Blazer::Check.new(check_params)
       # use creator_id instead of creator
       # since we setup association without checking if column exists
-      @check.creator = blazer_user if @check.respond_to?(:creator_id=)
+      @check.creator = blazer_user if @check.respond_to?(:creator_id=) && blazer_user
 
       if @check.save
         redirect_to run_check_path(@check)

data/app/controllers/blazer/dashboards_controller.rb

@@ -14,7 +14,7 @@ module Blazer
       @dashboard = Blazer::Dashboard.new
       # use creator_id instead of creator
       # since we setup association without checking if column exists
-      @dashboard.creator = blazer_user if @dashboard.respond_to?(:creator_id=)
+      @dashboard.creator = blazer_user if @dashboard.respond_to?(:creator_id=) && blazer_user
 
       if update_dashboard(@dashboard)
         redirect_to dashboard_path(@dashboard)
@@ -37,8 +37,8 @@ module Blazer
         @data_sources.each do |data_source|
           query = data_source.smart_variables[var]
           if query
-            rows, error, cached_at = data_source.run_statement(query)
-            ((@smart_vars[var] ||= []).concat(rows.map { |v| v.values.reverse })).uniq!
+            columns, rows, error, cached_at = data_source.run_statement(query)
+            ((@smart_vars[var] ||= []).concat(rows.map { |v| v.reverse })).uniq!
             @sql_errors << error if error
           end
         end

data/app/controllers/blazer/queries_controller.rb

@@ -51,8 +51,8 @@ module Blazer
       @bind_vars.each do |var|
         query = data_source.smart_variables[var]
         if query
-          rows, error, cached_at = data_source.run_statement(query)
-          @smart_vars[var] = rows.map { |v| v.values.reverse }
+          columns, rows, error, cached_at = data_source.run_statement(query)
+          @smart_vars[var] = rows.map { |v| v.reverse }
           @sql_errors << error if error
         end
       end
@@ -74,71 +74,10 @@ module Blazer
 
         data_source = @query.data_source if @query && @query.data_source
         @data_source = Blazer.data_sources[data_source]
-        Blazer.transform_statement.call(@data_source, @statement) if Blazer.transform_statement
-
-        # audit
-        if Blazer.audit
-          audit = Blazer::Audit.new(statement: @statement)
-          audit.query = @query
-          audit.data_source = data_source
-          audit.user = blazer_user
-          audit.save!
-        end
-
-        @rows, @error, @cached_at = @data_source.run_statement(@statement, user: blazer_user, query: @query, refresh_cache: params[:check])
-
-        if @query && @error != Blazer::TIMEOUT_MESSAGE
-          @query.checks.each do |check|
-            check.update_state(@rows, @error)
-          end
-        end
-
-        @columns = {}
-        if @rows.any?
-          @rows.first.each do |key, value|
-            @columns[key] =
-              case value
-              when Integer
-                "int"
-              when Float
-                "float"
-              else
-                "string-ins"
-              end
-          end
-        end
 
-        @filename = @query.name.parameterize if @query
+        @columns, @rows, @error, @cached_at, @just_cached = @data_source.run_main_statement(@statement, user: blazer_user, query: @query, refresh_cache: params[:check])
 
-        @min_width_types = (@rows.first || {}).select { |k, v| v.is_a?(Time) || v.is_a?(String) || @data_source.smart_columns[k] }.keys
-
-        @boom = {}
-        @columns.keys.each do |key|
-          query = @data_source.smart_columns[key]
-          if query
-            values = @rows.map { |r| r[key] }.compact.uniq
-            rows, error, cached_at = @data_source.run_statement(ActiveRecord::Base.send(:sanitize_sql_array, [query.sub("{value}", "(?)"), values]))
-            @boom[key] = Hash[rows.map(&:values).map { |k, v| [k.to_s, v] }]
-          end
-        end
-
-        @linked_columns = @data_source.linked_columns
-
-        @markers = []
-        [["latitude", "longitude"], ["lat", "lon"]].each do |keys|
-          if (keys - (@rows.first || {}).keys).empty?
-            @markers =
-              @rows.select do |r|
-                r[keys.first] && r[keys.last]
-              end.map do |r|
-                {
-                  title: r.except(*keys).map{ |k, v| "<strong>#{k}:</strong> #{v}" }.join("<br />").truncate(140),
-                  latitude: r[keys.first],
-                  longitude: r[keys.last]
-                }
-              end
-          end
-        end
+        render_run
       end
 
       respond_to do |format|
@@ -146,7 +85,7 @@ module Blazer
           render layout: false
         end
         format.csv do
-          send_data csv_data(@rows), type: "text/csv; charset=utf-8; header=present", disposition: "attachment; filename=\"#{@query.try(:name).try(:parameterize).presence || 'query'}.csv\""
+          send_data csv_data(@columns, @rows, @data_source), type: "text/csv; charset=utf-8; header=present", disposition: "attachment; filename=\"#{@query.try(:name).try(:parameterize).presence || 'query'}.csv\""
         end
       end
     end
@@ -181,12 +120,64 @@ module Blazer
     end
 
     def tables
-      @tables = Blazer.data_sources[params[:data_source]].tables.keys
+      @tables = Blazer.data_sources[params[:data_source]].tables
       render partial: "tables", layout: false
     end
 
     private
 
+    def render_run
+      @first_row = @rows.first || []
+      @column_types = []
+      if @rows.any?
+        @columns.each_with_index do |column, i|
+          @column_types << (
+            case @first_row[i]
+            when Integer
+              "int"
+            when Float
+              "float"
+            else
+              "string-ins"
+            end
+          )
+        end
+      end
+
+      @filename = @query.name.parameterize if @query
+      @min_width_types = @columns.each_with_index.select { |c, i| @first_row[i].is_a?(Time) || @first_row[i].is_a?(String) || @data_source.smart_columns[c] }
+
+      @boom = {}
+      @columns.each_with_index do |key, i|
+        query = @data_source.smart_columns[key]
+        if query
+          values = @rows.map { |r| r[i] }.compact.uniq
+          columns, rows, error, cached_at = @data_source.run_statement(ActiveRecord::Base.send(:sanitize_sql_array, [query.sub("{value}", "(?)"), values]))
+          @boom[key] = Hash[rows.map { |k, v| [k.to_s, v] }]
+        end
+      end
+
+      @linked_columns = @data_source.linked_columns
+
+      @markers = []
+      [["latitude", "longitude"], ["lat", "lon"]].each do |keys|
+        lat_index = @columns.index(keys.first)
+        lon_index = @columns.index(keys.last)
+        if lat_index && lon_index
+          @markers =
+            @rows.select do |r|
+              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),
+                latitude: r[lat_index],
+                longitude: r[lon_index]
+              }
+            end
+        end
+      end
+    end
+
     def set_queries(limit = nil)
       @my_queries =
         if limit && blazer_user
@@ -224,20 +215,17 @@ module Blazer
       params.require(:query).permit(:name, :description, :statement, :data_source)
     end
 
-    def csv_data(rows)
+    def csv_data(columns, rows, data_source)
       CSV.generate do |csv|
-        if rows.any?
-          csv << rows.first.keys
-        end
+        csv << columns
         rows.each do |row|
-          csv << row.map { |k, v| v.is_a?(Time) ? blazer_time_value(k, v) : v }
+          csv << row.each_with_index.map { |v, i| v.is_a?(Time) ? blazer_time_value(data_source, columns[i], v) : v }
         end
       end
     end
 
-    def blazer_time_value(k, v)
-      # yuck, instance var
-      @data_source.local_time_suffix.any? { |s| k.ends_with?(s) } ? v.to_s.sub(" UTC", "") : v.in_time_zone(Blazer.time_zone)
+    def blazer_time_value(data_source, k, v)
+      data_source.local_time_suffix.any? { |s| k.ends_with?(s) } ? v.to_s.sub(" UTC", "") : v.in_time_zone(Blazer.time_zone)
     end
     helper_method :blazer_time_value
   end

data/app/helpers/blazer/base_helper.rb

@@ -17,8 +17,8 @@ module Blazer
     end
 
     def blazer_column_types(columns, rows, boom)
-      columns.map do |k, _|
-        v = (rows.find { |r| r[k] } || {})[k]
+      columns.each_with_index.map do |k, i|
+        v = (rows.find { |r| r[i] } || {})[i]
         if boom[k]
           "string"
         elsif v.is_a?(Numeric)

data/app/models/blazer/check.rb

@@ -5,21 +5,34 @@ module Blazer
     validates :query_id, presence: true
 
     def split_emails
-      emails.to_s.split(",").map(&:strip)
+      emails.to_s.downcase.split(",").map(&:strip)
     end
 
     def update_state(rows, error)
-      invert = self.respond_to?(:invert) && self.invert
+      invert = respond_to?(:invert) && self.invert
       self.state =
         if error
-          "error"
+          if error == Blazer::TIMEOUT_MESSAGE
+            "timed out"
+          else
+            "error"
+          end
         elsif rows.any?
           invert ? "passing" : "failing"
         else
           invert ? "failing" : "passing"
         end
 
-      self.last_run_at = Time.now if self.respond_to?(:last_run_at=)
+      self.last_run_at = Time.now if respond_to?(:last_run_at=)
+
+      if respond_to?(:timeouts=)
+        if state == "timed out"
+          self.timeouts += 1
+          self.state = "disabled" if timeouts >= 3
+        else
+          self.timeouts = 0
+        end
+      end
 
       # do not notify on creation, except when not passing
       if (state_was || state != "passing") && state != state_was && emails.present?

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

@@ -3,7 +3,7 @@
 <p style="float: right;"><%= link_to "New Check", new_check_path, class: "btn btn-info" %></p>
 <%= render partial: "blazer/nav" %>
 
-<% colors = {failing: "red", passing: "#5cb85c", error: "#666"} %>
+<% colors = {failing: "red", passing: "#5cb85c", error: "#666", timed_out: "orange", disabled: "#000"} %>
 <table class="table">
   <thead>
     <tr>
@@ -20,7 +20,7 @@
         <td><%= link_to check.query.name, check.query %></td>
         <td>
           <% if check.state %>
-            <small style="font-weight: bold; color: <%= colors[check.state.to_sym] %>;"><%= check.state.upcase %></small>
+            <small style="font-weight: bold; color: <%= colors[check.state.parameterize("_").to_sym] %>;"><%= check.state.upcase %></small>
           <% end %>
         </td>
         <td><%= check.schedule if check.respond_to?(:schedule) %></td>