blazer 1.0.2 → 1.0.3

data/app/controllers/blazer/queries_controller.rb

@@ -41,6 +41,8 @@ module Blazer
           @sql_errors << error if error
         end
       end
+
+      Blazer.transform_statement.call(data_source, @statement) if Blazer.transform_statement
     end
 
     def edit
@@ -56,6 +58,8 @@ module Blazer
 
         data_source = params[:data_source]
         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
@@ -66,7 +70,6 @@ module Blazer
           audit.save!
         end
 
-        @data_source = Blazer.data_sources[data_source]
         @rows, @error, @cached_at = @data_source.run_statement(@statement, user: blazer_user, query: @query, refresh_cache: params[:check])
 
         if @query && !@error.to_s.include?("canceling statement due to statement timeout")
@@ -105,6 +108,22 @@ module Blazer
         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
       end
 
       respond_to do |format|

data/app/helpers/blazer/base_helper.rb

@@ -1,6 +1,6 @@
 module Blazer
   module BaseHelper
-    def title(title = nil)
+    def blazer_title(title = nil)
       if title
         content_for(:title) { title }
       else
@@ -8,12 +8,30 @@ module Blazer
       end
     end
 
-    def format_value(key, value)
+    def blazer_format_value(key, value)
       if value.is_a?(Integer) && !key.to_s.end_with?("id")
         number_with_delimiter(value)
       else
         value
       end
     end
+
+    def blazer_maps?
+      ENV["MAPBOX_ACCESS_TOKEN"].present?
+    end
+
+    JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003e', '<' => '\u003c', "\u2028" => '\u2028', "\u2029" => '\u2029' }
+    JSON_ESCAPE_REGEXP = /[\u2028\u2029&><]/u
+
+    # Prior to version 4.1 of rails double quotes were inadventently removed in json_escape.
+    # This adds the correct json_escape functionality to rails versions < 4.1
+    def blazer_json_escape(s)
+      if Rails::VERSION::STRING < "4.1"
+        result = s.to_s.gsub(JSON_ESCAPE_REGEXP, JSON_ESCAPE)
+        s.html_safe? ? result.html_safe : result
+      else
+        json_escape(s)
+      end
+    end
   end
 end

data/app/models/blazer/query.rb

@@ -2,6 +2,7 @@ module Blazer
   class Query < ActiveRecord::Base
     belongs_to :creator, class_name: Blazer.user_class.to_s if Blazer.user_class
     has_many :checks, dependent: :destroy
+    has_many :dashboard_queries, dependent: :destroy
 
     validates :name, presence: true
     validates :statement, presence: true

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

@@ -0,0 +1,15 @@
+<div class="btn-group" style="vertical-align: top; margin-right: 5px;">
+  <%= link_to "Home", root_path, class: "btn btn-primary" %>
+  <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    <span class="caret"></span>
+    <span class="sr-only">Toggle Dropdown</span>
+  </button>
+  <ul class="dropdown-menu">
+    <li><%= link_to "Dashboards", dashboards_path %></li>
+    <li><%= link_to "Checks", checks_path %></li>
+    <li role="separator" class="divider"></li>
+    <li><%= link_to "New Query", new_query_path %></li>
+    <li><%= link_to "New Dashboard", new_dashboard_path %></li>
+    <li><%= link_to "New Check", new_check_path %></li>
+  </ul>
+</div>

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

@@ -1,9 +1,7 @@
-<% title "Checks" %>
+<% blazer_title "Checks" %>
 
 <p style="float: right;"><%= link_to "New Check", new_check_path, class: "btn btn-info" %></p>
-<p>
-  <%= link_to "Home", root_path, class: "btn btn-primary", style: "margin-right: 10px;" %>
-</p>
+<%= render partial: "blazer/nav" %>
 
 <% colors = {failing: "red", passing: "#5cb85c", error: "#666"} %>
 <table class="table">

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

@@ -1,7 +1,7 @@
 <p style="text-muted">Running check...</p>
 
 <script>
-  $.post("<%= run_queries_path %>", <%= json_escape({statement: @query.statement, query_id: @query.id, check: true}.to_json).html_safe %>, function (data) {
+  $.post("<%= run_queries_path %>", <%= blazer_json_escape({statement: @query.statement, query_id: @query.id, check: true}.to_json).html_safe %>, function (data) {
     setTimeout( function () {
       window.location.href = "<%= checks_path %>";
     }, 200);

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

@@ -1,9 +1,7 @@
-<% title "Dashboards" %>
+<% blazer_title "Dashboards" %>
 
 <p style="float: right;"><%= link_to "New Dashboard", new_dashboard_path, class: "btn btn-info" %></p>
-<p>
-  <%= link_to "Home", root_path, class: "btn btn-primary", style: "margin-right: 10px;" %>
-</p>
+<%= render partial: "blazer/nav" %>
 
 <table class="table">
   <thead>

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

@@ -1,4 +1,4 @@
-<% title @dashboard.name %>
+<% blazer_title @dashboard.name %>
 
 <script>
   function submitIfCompleted($form) {
@@ -18,7 +18,7 @@
   <div class="container">
     <div class="row" style="padding-top: 13px;">
       <div class="col-sm-9">
-        <%= link_to "Back", dashboards_path, class: "btn btn-primary", style: "vertical-align: top; margin-right: 5px;" %>
+        <%= render partial: "blazer/nav" %>
         <h3 style="margin: 0; line-height: 34px; display: inline-block;">
           <%= @dashboard.name %>
         </h3>
@@ -137,7 +137,7 @@
     var request = $.ajax({
       url: "<%= run_queries_path %>",
       method: "POST",
-      data: <%= json_escape({statement: query.statement, query_id: query.id, only_chart: true}.to_json).html_safe %>,
+      data: <%= blazer_json_escape({statement: query.statement, query_id: query.id, only_chart: true}.to_json).html_safe %>,
       dataType: "html"
     }).done(function(data) {
       $("#chart-<%= i %>").html(data);

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

@@ -97,7 +97,7 @@
 
   var error_line = null;
   var xhr;
-  var params = <%= raw json_escape(variable_params.to_json) %>;
+  var params = <%= raw blazer_json_escape(variable_params.to_json) %>;
 
   $("#run").click(function (e) {
     e.preventDefault();

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

@@ -1 +1,2 @@
+<% blazer_title "Edit - #{@query.name}" %>
 <%= render partial: "form" %>

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

@@ -1,9 +1,18 @@
 <div id="queries">
   <div id="header" style="margin-bottom: 20px;">
-    <div class="pull-right">
+    <div class="btn-group pull-right">
       <%= link_to "New Query", new_query_path, class: "btn btn-info" %>
-      <%= link_to "Dashboards", dashboards_path, class: "btn btn-primary" %>
-      <%= link_to "Checks", checks_path, class: "btn btn-primary" %>
+      <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <span class="caret"></span>
+        <span class="sr-only">Toggle Dropdown</span>
+      </button>
+      <ul class="dropdown-menu">
+        <li><%= link_to "Dashboards", dashboards_path %></li>
+        <li><%= link_to "Checks", checks_path %></li>
+        <li role="separator" class="divider"></li>
+        <li><%= link_to "New Dashboard", new_dashboard_path %></li>
+        <li><%= link_to "New Check", new_check_path %></li>
+      </ul>
     </div>
     <input type="text" placeholder="Start typing a query or person" style="width: 300px; display: inline-block;" autofocus=true class="search form-control" />
   </div>
@@ -34,7 +43,11 @@
 </script>
 
 <% if @queries.size == 1000 %>
+  <p id="loading" class="text-muted">Loading...</p>
   <script>
-    $(".list").load("<%= queries_path %>", updateList);
+    $(".list").load("<%= queries_path %>", function () {
+      updateList();
+      $("#loading").remove();
+    });
   </script>
 <% end %>

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

@@ -1 +1,2 @@
+<% blazer_title "New Query" %>
 <%= render partial: "form" %>

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

@@ -34,9 +34,38 @@
       <%= line_chart @rows.group_by { |v| v[keys[1]] }.map { |name, v| {name: name, data: v.map { |v2| [v2[keys[0]], v2[keys[2]]] } } }, id: chart_id, min: nil %>
     <% elsif values.size == 2 && values.first.is_a?(String) && values.last.is_a?(Numeric) %>
       <%= pie_chart @rows.map(&:values), library: {sliceVisibilityThreshold: 1 / 40.0}, id: chart_id %>
+    <% elsif blazer_maps? && @markers.any? %>
+      <div id="map" style="height: <%= @only_chart ? 300 : 500 %>px;"></div>
+      <script>
+        L.mapbox.accessToken = '<%= ENV["MAPBOX_ACCESS_TOKEN"] %>';
+        var map = L.mapbox.map('map', 'ankane.ioo8nki0');
+        var markers = <%= blazer_json_escape(@markers.to_json).html_safe %>;
+        var featureLayer = L.mapbox.featureLayer().addTo(map);
+        var geojson = [];
+        for (var i = 0; i < markers.length; i++) {
+          var marker = markers[i];
+          geojson.push({
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [
+                marker.longitude,
+                marker.latitude
+              ]
+            },
+            properties: {
+              description: marker.title,
+              'marker-color': '#f86767',
+              'marker-symbol': 'star'
+            }
+          });
+        }
+        featureLayer.setGeoJSON(geojson);
+        map.fitBounds(featureLayer.getBounds());
+      </script>
     <% elsif @only_chart %>
       <% if @rows.size == 1 && @rows.first.size == 1 %>
-        <p style="font-size: 160px;"><%= format_value(@rows.first.keys.first, @rows.first.values.first) %></p>
+        <p style="font-size: 160px;"><%= blazer_format_value(@rows.first.keys.first, @rows.first.values.first) %></p>
       <% else %>
         <% @no_chart = true %>
       <% end %>
@@ -70,9 +99,9 @@
                       <% if v == "" %>
                         <div class="text-muted">empty string</div>
                       <% elsif @linked_columns[k] %>
-                        <%= link_to format_value(k, v), @linked_columns[k].gsub("{value}", u(v.to_s)), target: "_blank" %>
+                        <%= link_to blazer_format_value(k, v), @linked_columns[k].gsub("{value}", u(v.to_s)), target: "_blank" %>
                       <% else %>
-                        <%= format_value(k, v) %>
+                        <%= blazer_format_value(k, v) %>
                       <% end %>
 
                       <% if v2 = (@boom[k] || {})[v] %>

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

@@ -1,4 +1,4 @@
-<% title @query.name %>
+<% blazer_title @query.name %>
 
 <script>
   function submitIfCompleted($form) {
@@ -18,7 +18,7 @@
   <div class="container">
     <div class="row" style="padding-top: 13px;">
       <div class="col-sm-9">
-        <%= link_to "Home", root_path, class: "btn btn-primary", style: "vertical-align: top; margin-right: 5px;" %>
+        <%= render partial: "blazer/nav" %>
         <h3 style="margin: 0; line-height: 34px; display: inline-block;">
           <%= @query.name %>
         </h3>
@@ -158,7 +158,7 @@
     var request = $.ajax({
       url: "<%= run_queries_path %>",
       method: "POST",
-      data: <%= json_escape(variable_params.merge(statement: @statement, query_id: @query.id).to_json).html_safe %>,
+      data: <%= blazer_json_escape(variable_params.merge(statement: @statement, query_id: @query.id).to_json).html_safe %>,
       dataType: "html"
     }).done(function(data) {
       $("#results").html(data);

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

@@ -1,12 +1,16 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= title ? title : "Blazer" %></title>
+    <title><%= blazer_title ? blazer_title : "Blazer" %></title>
 
     <meta charset="utf-8" />
 
     <%= stylesheet_link_tag "blazer/application" %>
     <%= javascript_include_tag "//www.google.com/jsapi", "blazer/application" %>
+    <% if blazer_maps? %>
+      <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/v2.2.2/mapbox.css" %>
+      <%= javascript_include_tag "https://api.mapbox.com/mapbox.js/v2.2.2/mapbox.js" %>
+    <% end %>
     <%= csrf_meta_tags %>
   </head>
   <body>

data/lib/blazer/data_source.rb

@@ -71,7 +71,7 @@ module Blazer
 
         in_transaction do
           begin
-            connection_model.connection.execute("SET statement_timeout = #{timeout.to_i * 1000}") if timeout && postgresql?
+            connection_model.connection.execute("SET statement_timeout = #{timeout.to_i * 1000}") if timeout && (postgresql? || redshift?)
             result = connection_model.connection.select_all("#{statement} /*#{comment}*/")
             result.each do |untyped_row|
               row = {}
@@ -100,7 +100,7 @@ module Blazer
     end
 
     def schemas
-      default_schema = postgresql? ? "public" : connection_model.connection_config[:database]
+      default_schema = (postgresql? || redshift?) ? "public" : connection_model.connection_config[:database]
       settings["schemas"] || [connection_model.connection_config[:schema] || default_schema]
     end
 
@@ -110,7 +110,11 @@ module Blazer
     end
 
     def postgresql?
-      ["PostgreSQL", "Redshift"].include?(connection_model.connection.adapter_name)
+      connection_model.connection.adapter_name == "PostgreSQL"
+    end
+
+    def redshift?
+      connection_model.connection.adapter_name == "Redshift"
     end
 
     protected

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/blazer.rb

@@ -14,6 +14,7 @@ module Blazer
     attr_accessor :user_method
     attr_accessor :from_email
     attr_accessor :cache
+    attr_accessor :transform_statement
   end
   self.audit = true
   self.user_name = :name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,7 @@ files:
 - app/assets/javascripts/blazer/ace/snippets/text.js
 - app/assets/javascripts/blazer/ace/theme-twilight.js
 - app/assets/javascripts/blazer/application.js
+- app/assets/javascripts/blazer/bootstrap.js
 - app/assets/javascripts/blazer/chartkick.js
 - app/assets/javascripts/blazer/daterangepicker.js
 - app/assets/javascripts/blazer/highlight.pack.js
@@ -115,6 +116,7 @@ files:
 - app/models/blazer/dashboard.rb
 - app/models/blazer/dashboard_query.rb
 - app/models/blazer/query.rb
+- app/views/blazer/_nav.html.erb
 - app/views/blazer/check_mailer/failing_checks.html.erb
 - app/views/blazer/check_mailer/state_change.html.erb
 - app/views/blazer/checks/_form.html.erb