blazer 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c31bc7010e3093044d6a2983172c97ed52f3009
-  data.tar.gz: a40086b84c9964fec00038bd4c4a2b2128ee7bf7
+  metadata.gz: 72563e8886e9e04823f21ad5e7ca11f5cc112b81
+  data.tar.gz: 51c6ed0f30b9eafc05a77aa3dff44ae44f2092e9
 SHA512:
-  metadata.gz: 51b03a70d9acc454fe316edaacd87b102e3d832e420190037d674fe67d675e1a569c6a8055d7ee4c5be6237c53c2143f153bee6b5a31711567e2554f7c0cbfaa
-  data.tar.gz: 814bd7bd06a5d42ba29504a4d1511890df47d9ae89076b2580532211f5aa9b54f59b0cc2d9b98a4d72fac17ce538e66d3e2d09d78858f48c45ae43e4ab45a446
+  metadata.gz: 50a816c915b87433037a0eff3e7477708a6c99e8197638a1a5f1a04865d59a70ce45feab5dfdefe864012e15835d556145fe0ae05ce3f4c903c23b068aafb04b
+  data.tar.gz: 0fc76958a41ebd094be658cd429ecb2c3984e67d152c067540fb921c3b93e6790c3c56b8e7eda1d2753c18a05d9b37658383ab9b2daa6c3cc81597125b79e16a

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.6.2
+
+- Added basic query permissions
+- Added ability to use arrays and hashes for smart variables
+- Added cancel button for queries
+- Added `lat` and `lng` as map keys
+
 ## 1.6.1
 
 - Added support for Presto [beta]

data/README.md

@@ -191,6 +191,14 @@ smart_variables:
 
 The first column is the value of the variable, and the second column is the label.
 
+You can also use an array or hash for static data and enums.
+
+```yml
+smart_variables:
+  period: ["day", "week", "month"]
+  status: {0: "Active", 1: "Archived"}
+```
+
 ### Linked Columns
 
 [Example](https://blazerme.herokuapp.com/queries/3-linked-column) - title column
@@ -280,7 +288,7 @@ SELECT gender, zip_code, COUNT(*) FROM users GROUP BY 1, 2
 
 ### Maps
 
-Columns named `latitude` and `longitude` or `lat` and `lon` - [Example](https://blazerme.herokuapp.com/queries/15-map)
+Columns named `latitude` and `longitude` or `lat` and `lon` or `lat` and `lng` - [Example](https://blazerme.herokuapp.com/queries/15-map)
 
 ```sql
 SELECT name, latitude, longitude FROM cities
@@ -420,6 +428,14 @@ data_sources:
     url: presto://user@hostname:8080/catalog
 ```
 
+## Permissions [master]
+
+Blazer supports a simple permissions model.
+
+1. Queries without a name are unlisted
+2. Queries whose name starts with `#` are only listed to the creator
+3. Queries whose name starts with `*` can only be edited by the creator
+
 ## Learn SQL
 
 Have team members who want to learn SQL? Here are a few great, free resources.

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

@@ -25,8 +25,16 @@ $( function () {
   });
 });
 
-function runQuery(data, success, error) {
-  return $.ajax({
+function cancelQuery(runningQuery) {
+  runningQuery.canceled = true;
+  var xhr = runningQuery.xhr;
+  if (xhr) {
+    xhr.abort();
+  }
+}
+
+function runQuery(data, success, error, runningQuery) {
+  var xhr = $.ajax({
     url: window.runQueriesPath,
     method: "POST",
     data: data,
@@ -36,7 +44,9 @@ function runQuery(data, success, error) {
       var response = $.parseJSON(d);
       data.blazer = response;
       setTimeout( function () {
-        runQuery(data, success, error);
+        if (!(runningQuery && runningQuery.canceled)) {
+          runQuery(data, success, error, runningQuery);
+        }
       }, 1000);
     } else {
       success(d);
@@ -45,6 +55,22 @@ function runQuery(data, success, error) {
     var message = (typeof errorThrown === "string") ? errorThrown : errorThrown.message;
     error(message);
   });
+  if (runningQuery) {
+    runningQuery.xhr = xhr;
+  }
+  return xhr;
+}
+
+function submitIfCompleted($form) {
+  var completed = true;
+  $form.find("input[name], select").each( function () {
+    if ($(this).val() == "") {
+      completed = false;
+    }
+  });
+  if (completed) {
+    $form.submit();
+  }
 }
 
 // Prevent backspace from navigating backwards.

data/app/assets/stylesheets/blazer/application.css

@@ -55,6 +55,10 @@ input.search:focus {
   text-align: left;
 }
 
+#statement-box .selectize-control {
+  margin-right: 0;
+}
+
 #editor-container {
   background-color: #141414;
   padding-top: 10px;
@@ -133,3 +137,31 @@ input.search:focus {
 .check-state.disabled {
   color: #000;
 }
+
+.topbar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  background-color: whitesmoke;
+  height: 60px;
+  z-index: 1001;
+}
+
+.glyphicon-remove {
+  cursor: pointer;
+  color: #d9534f;
+  display: none;
+}
+
+.list-group li:hover .glyphicon-remove {
+  display: inline;
+}
+
+.list-group {
+  cursor: move;
+}
+
+#header a.active {
+  color: #999;
+}

data/app/controllers/blazer/base_controller.rb

@@ -50,6 +50,20 @@ module Blazer
       end
     end
 
+    def parse_smart_variables(var, data_source)
+      query = data_source.smart_variables[var]
+      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 = data_source.run_statement(query)
+        smart_var = result.rows.map { |v| v.reverse }
+        error = result.error if result.error
+      end
+      return smart_var, error
+    end
+
     def extract_vars(statement)
       # strip commented out lines
       # and regex {1} or {1,2}

data/app/controllers/blazer/dashboards_controller.rb

@@ -35,12 +35,9 @@ module Blazer
       @data_sources = @queries.map { |q| Blazer.data_sources[q.data_source] }.uniq
       @bind_vars.each do |var|
         @data_sources.each do |data_source|
-          query = data_source.smart_variables[var]
-          if query
-            result = data_source.run_statement(query)
-            ((@smart_vars[var] ||= []).concat(result.rows.map { |v| v.reverse })).uniq!
-            @sql_errors << result.error if result.error
-          end
+          smart_var, error = parse_smart_variables(var, data_source)
+          ((@smart_vars[var] ||= []).concat(smart_var)).uniq! if smart_var
+          @sql_errors << error if error
         end
       end
     end

data/app/controllers/blazer/queries_controller.rb

@@ -7,6 +7,9 @@ module Blazer
 
       @dashboards = Blazer::Dashboard.order(:name)
       @dashboards = @dashboards.includes(:creator) if Blazer.user_class
+      if params[:filter] == "mine"
+        @dashboards = [] # TODO show my dashboards
+      end
       @dashboards =
         @dashboards.map do |d|
           {
@@ -52,12 +55,9 @@ module Blazer
       @sql_errors = []
       data_source = Blazer.data_sources[@query.data_source]
       @bind_vars.each do |var|
-        query = data_source.smart_variables[var]
-        if query
-          result = data_source.run_statement(query)
-          @smart_vars[var] = result.rows.map { |v| v.reverse }
-          @sql_errors << result.error if result.error
-        end
+        smart_var, error = parse_smart_variables(var, data_source)
+        @smart_vars[var] = smart_var if smart_var
+        @sql_errors << error if error
       end
 
       Blazer.transform_statement.call(data_source, @statement) if Blazer.transform_statement
@@ -170,6 +170,10 @@ module Blazer
       render partial: "tables", layout: false
     end
 
+    def schema
+      @schema = Blazer.data_sources[params[:data_source]].schema
+    end
+
     private
 
     def continue_run
@@ -204,7 +208,7 @@ module Blazer
       @linked_columns = @data_source.linked_columns
 
       @markers = []
-      [["latitude", "longitude"], ["lat", "lon"]].each do |keys|
+      [["latitude", "longitude"], ["lat", "lon"], ["lat", "lng"]].each do |keys|
         lat_index = @columns.index(keys.first)
         lon_index = @columns.index(keys.last)
         if lat_index && lon_index
@@ -233,7 +237,7 @@ module Blazer
 
     def set_queries(limit = nil)
       @my_queries =
-        if limit && blazer_user
+        if limit && blazer_user && !params[:filter]
           favorite_query_ids = Blazer::Audit.where(user_id: blazer_user.id).where("created_at > ?", 30.days.ago).where("query_id IS NOT NULL").group(:query_id).order("count_all desc").count.keys
           queries = Blazer::Query.named.where(id: favorite_query_ids)
           queries = queries.includes(:creator) if Blazer.user_class
@@ -244,12 +248,21 @@ module Blazer
         end
 
       @queries = Blazer::Query.named.order(:name)
+      if params[:filter] == "mine"
+        @queries = @queries.where(creator_id: blazer_user.try(:id)).reorder(updated_at: :desc)
+        limit = nil
+      end
       @queries = @queries.where("id NOT IN (?)", @my_queries.map(&:id)) if @my_queries.any?
       @queries = @queries.includes(:creator) if Blazer.user_class
       @queries = @queries.limit(limit) if limit
+      @queries = @queries.to_a
+
+      @more = limit && @queries.size >= limit
+
+      @queries = (@my_queries + @queries).select { |q| !q.name.to_s.start_with?("#") || q.try(:creator).try(:id) == blazer_user.try(:id) }
 
       @queries =
-        (@my_queries + @queries).map do |q|
+        @queries.map do |q|
           {
             id: q.id,
             name: view_context.link_to(q.name, q),

data/app/models/blazer/query.rb

@@ -19,7 +19,7 @@ module Blazer
     end
 
     def editable?(user)
-      (name.present? && name.first != "*") || user == creator
+      !persisted? || (name.present? && name.first != "*" && name.first != "#") || user == creator
     end
   end
 end

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

@@ -2,22 +2,6 @@
   <div class="alert alert-danger"><%= @dashboard.errors.full_messages.first %></div>
 <% end %>
 
-<style>
-.glyphicon-remove {
-  cursor: pointer;
-  color: #d9534f;
-  display: none;
-}
-
-li:hover .glyphicon-remove {
-  display: inline;
-}
-
-.list-group {
-  cursor: move;
-}
-</style>
-
 <%= form_for @dashboard, url: (@dashboard.persisted? ? dashboard_path(@dashboard, variable_params) : dashboards_path(variable_params)) do |f| %>
   <div class="form-group">
     <%= f.label :name %>

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

@@ -1,20 +1,6 @@
 <% blazer_title @dashboard.name %>
 
-<script>
-  function submitIfCompleted($form) {
-    var completed = true;
-    $form.find("input[name], select").each( function () {
-      if ($(this).val() == "") {
-        completed = false;
-      }
-    });
-    if (completed) {
-      $form.submit();
-    }
-  }
-</script>
-
-<div style="position: fixed; top: 0; left: 0; right: 0; background-color: whitesmoke; height: 60px; z-index: 1001;">
+<div class="topbar">
   <div class="container">
     <div class="row" style="padding-top: 13px;">
       <div class="col-sm-9">

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

@@ -4,7 +4,7 @@
 
 <%= form_for @query, url: (@query.persisted? ? query_path(@query, variable_params) : queries_path(variable_params)), html: {class: "the_form", autocomplete: "off"} do |f| %>
   <div class="row">
-    <div class="col-xs-8">
+    <div id="statement-box" class="col-xs-8">
       <div class= "form-group">
         <%= f.hidden_field :statement %>
         <div id="editor-container">
@@ -16,7 +16,7 @@
           <%= link_to "Back", :back %>
         </div>
         <%= f.select :data_source, Blazer.data_sources.values.map { |ds| [ds.name, ds.id] }, {}, class: ("hide" if Blazer.data_sources.size == 1), style: "width: 140px;" %>
-        <div id="tables" style="display: inline-block; width: 260px; margin-right: 10px;" class="hide">
+        <div id="tables" style="display: inline-block; width: 250px; margin-right: 10px;" class="hide">
           <%= render partial: "tables" %>
         </div>
         <script>
@@ -26,7 +26,8 @@
           updatePreviewSelect();
           $("#query_data_source").selectize().change(updatePreviewSelect);
         </script>
-        <%= link_to "Run", "#", class: "btn btn-info", id: "run", style: "vertical-align: top;" %>
+        <%= link_to "Run", "#", class: "btn btn-info", id: "run", style: "vertical-align: top; width: 70px;" %>
+        <%= link_to "Cancel", "#", class: "btn btn-danger hide", id: "cancel", style: "vertical-align: top; width: 70px;" %>
       </div>
     </div>
     <div class="col-xs-4">
@@ -124,26 +125,45 @@
   editor.focus();
 
   var error_line = null;
-  var xhr;
+  var runningQuery;
   var params = <%= raw blazer_json_escape(variable_params.to_json) %>;
   var previewStatement = <%= raw blazer_json_escape(Hash[Blazer.data_sources.map { |k, v| [k, v.preview_statement] }].to_json) %>;
 
-  $("#run").click(function (e) {
+
+  function queryDone() {
+    $("#run").removeClass("hide")
+    $("#cancel").addClass("hide")
+  }
+
+  $("#cancel").click( function (e) {
+    e.preventDefault()
+
+    cancelQuery(runningQuery)
+    queryDone()
+
+    $("#results").html("")
+  })
+
+  $("#run").click( function (e) {
     e.preventDefault();
 
+    $(this).addClass("hide")
+    $("#cancel").removeClass("hide")
+
     if (error_line) {
       editor.getSession().removeGutterDecoration(error_line - 1, "error");
       error_line = null;
     }
 
     $("#results").html('<p class="text-muted">Loading...</p>');
-    if (xhr) {
-      xhr.abort();
-    }
 
     var data = $.extend({}, params, {statement: getSQL(), data_source: $("#query_data_source").val()});
 
-    xhr = runQuery(data, function (data) {
+    runningQuery = {};
+
+    runQuery(data, function (data) {
+      queryDone()
+
       $("#results").html(data);
 
       error_line = getErrorLine();
@@ -153,18 +173,17 @@
         editor.gotoLine(error_line, 0, true);
         editor.focus();
       }
-    });
+    }, function (data) {
+      // TODO show error
+      queryDone()
+    }, runningQuery);
   });
 
-  if ($("#query_statement").val() != "") {
-    $("#run").click();
-  }
-
   $(document).on("change", "#table_names", function () {
     var val = $(this).val();
     if (val.length > 0) {
       var dataSource = $("#query_data_source").val();
-      editor.setValue(previewStatement[dataSource].replace("{table}", val));
+      editor.setValue(previewStatement[dataSource].replace("{table}", val), 1);
       $("#run").click();
     }
   });

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

@@ -1,18 +1,22 @@
 <div id="queries">
   <div id="header" style="margin-bottom: 20px;">
-    <div class="btn-group pull-right">
-      <%= link_to "New Query", new_query_path, class: "btn btn-info" %>
-      <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 class="pull-right">
+      <%= link_to "All", root_path, class: params[:filter] != "mine" ? "active" : nil, style: "margin-right: 40px;" %>
+      <%= link_to "Mine", root_path(filter: "mine"), class: params[:filter] == "mine" ? "active" : nil, style: "margin-right: 40px;" %>
+      <div class="btn-group">
+        <%= link_to "New Query", new_query_path, class: "btn btn-info" %>
+        <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>
     </div>
     <input type="text" placeholder="Start typing a query or person" style="width: 300px; display: inline-block;" autofocus=true class="search form-control" />
   </div>
@@ -55,7 +59,7 @@
   }
 </script>
 
-<% if @queries.size >= 200 %>
+<% if @more %>
   <p id="loading" class="text-muted">Loading...</p>
   <script>
     $.getJSON("<%= queries_path %>", function (data) {

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

@@ -0,0 +1,18 @@
+<% @schema.each do |table| %>
+  <h4>
+    <%= table[:table] %>
+    <% if table[:schema] != "public" %>
+      <small><%= table[:schema] %></small>
+    <% end %>
+  </h4>
+  <table class="table" style="max-width: 500px;">
+    <tbody>
+      <% table[:columns].each do |column| %>
+        <tr>
+          <td style="width: 60%;"><%= column[:name] %></td>
+          <td class="text-muted"><%= column[:data_type] %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

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

@@ -1,20 +1,6 @@
 <% blazer_title @query.name %>
 
-<script>
-  function submitIfCompleted($form) {
-    var completed = true;
-    $form.find("input[name], select").each( function () {
-      if ($(this).val() == "") {
-        completed = false;
-      }
-    });
-    if (completed) {
-      $form.submit();
-    }
-  }
-</script>
-
-<div style="position: fixed; top: 0; left: 0; right: 0; background-color: whitesmoke; height: 60px; z-index: 1001;">
+<div class="topbar">
   <div class="container">
     <div class="row" style="padding-top: 13px;">
       <div class="col-sm-9">

data/config/routes.rb

@@ -3,6 +3,7 @@ Blazer::Engine.routes.draw do
     post :run, on: :collection # err on the side of caution
     post :refresh, on: :member
     get :tables, on: :collection
+    get :schema, on: :collection
   end
   resources :checks, except: [:show] do
     get :run, on: :member

data/lib/blazer/adapters/base_adapter.rb

@@ -15,6 +15,10 @@ module Blazer
         [] # optional, but nice to have
       end
 
+      def schema
+        [] # optional, but nice to have
+      end
+
       def preview_statement
         "" # also optional, but nice to have
       end

data/lib/blazer/adapters/mongodb_adapter.rb

@@ -28,7 +28,7 @@ module Blazer
       protected
 
       def client
-        @client ||= Mongo::Client.new(settings["url"])
+        @client ||= Mongo::Client.new(settings["url"], connect_timeout: 1, socket_timeout: 1, server_selection_timeout: 1)
       end
 
       def db

data/lib/blazer/adapters/sql_adapter.rb

@@ -44,6 +44,11 @@ module Blazer
         result.rows.map(&:first)
       end
 
+      def schema
+        result = data_source.run_statement(connection_model.send(:sanitize_sql_array, ["SELECT table_schema, table_name, column_name, data_type, ordinal_position FROM information_schema.columns WHERE table_schema IN (?) ORDER BY 1, 2", schemas]))
+        result.rows.group_by { |r| [r[0], r[1]] }.map { |k, vs| {schema: k[0], table: k[1], columns: vs.sort_by { |v| v[4].to_i }.map { |v| {name: v[2], data_type: v[3]} }} }
+      end
+
       def preview_statement
         "SELECT * FROM {table} LIMIT 10"
       end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/lib/generators/blazer/templates/config.yml

@@ -23,6 +23,8 @@ data_sources:
 
     smart_variables:
       # zone_id: "SELECT id, name FROM zones ORDER BY name ASC"
+      # period: ["day", "week", "month"]
+      # status: {0: "Active", 1: "Archived"}
 
     linked_columns:
       # user_id: "/admin/users/{value}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -154,6 +154,7 @@ files:
 - app/views/blazer/queries/home.html.erb
 - app/views/blazer/queries/new.html.erb
 - app/views/blazer/queries/run.html.erb
+- app/views/blazer/queries/schema.html.erb
 - app/views/blazer/queries/show.html.erb
 - app/views/layouts/blazer/application.html.erb
 - blazer.gemspec