blazer 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67ee6e1cfb35a8d4629d04a7628f5ed381aa6404
-  data.tar.gz: 1d678a64b0674a896d7fb55a972707fdff578f47
+  metadata.gz: 58310083acc765c7f14b7c361d6dd5c845aa37f4
+  data.tar.gz: 32cee84631c9ac472909833eae6eb8ad4a911e50
 SHA512:
-  metadata.gz: 6f53f4290b16da1acd024ed52e310ee664badc3fe5d88e78d441b4283b799e96eb17080d31245d75b194cc3baa4958da6672323115abb23c70efe8be6f96572a
-  data.tar.gz: 254440602381a960167d8697d041a412d3c5c01674935abd33cd78a7bbfce0b6c6e21d48973375af35df8d48eadfb9b3241545ab392a4edf00f21b5e267aae56
+  metadata.gz: 568ecb2c3426f3656221de13be4d00584de68148767b1dd02f2b7534aa1400110a2e0ecdbbd5df0ba85c4f761c21febd8bd12fe58fb69f3484c052afc323b393
+  data.tar.gz: 65d08be78a40077860e6ecdafc9182c4cf35eb61aebf22817932669fccc012a3df502321f569d4f049f1f1827ad158c93dae4c184a34b93ec23e6246ed529a31

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.8
+
+- Easier to edit queries with variables
+- Dynamically expand editor height as needed
+- No need for spaces in search
+
 ## 0.0.7
 
 - Fixed error when no `User` class

data/app/controllers/blazer/queries_controller.rb

@@ -29,7 +29,7 @@ module Blazer
       @query.creator = current_user if respond_to?(:current_user) && Blazer.user_class
 
       if @query.save
-        redirect_to @query
+        redirect_to query_path(@query, variable_params)
       else
         render :new
       end
@@ -115,7 +115,7 @@ module Blazer
 
     def update
       if @query.update(query_params)
-        redirect_to query_path(@query)
+        redirect_to query_path(@query, variable_params)
       else
         render :edit
       end
@@ -193,6 +193,11 @@ module Blazer
       end
     end
 
+    def variable_params
+      params.except(:controller, :action, :id, :host, :query, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement)
+    end
+    helper_method :variable_params
+
     def settings
       YAML.load(File.read(Rails.root.join("config", "blazer.yml")))
     end

data/app/models/blazer/query.rb

@@ -1,5 +1,7 @@
 module Blazer
   class Query < ActiveRecord::Base
+    belongs_to :creator, class_name: Blazer.user_class.to_s if Blazer.user_class
+
     validates :name, presence: true
     validates :statement, presence: true
 

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

@@ -2,7 +2,7 @@
   <div class="alert alert-danger"><%= @query.errors.full_messages.first %></div>
 <% end %>
 
-<%= form_for @query, html: {class: "the_form", autocomplete: "off"} do |f| %>
+<%= 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 class= "form-group">
@@ -61,16 +61,31 @@
     name: 'run',
     bindKey: {win: 'Ctrl-Enter',  mac: 'Command-Enter'},
     exec: function(editor) {
-        $("#run").click();
+      $("#run").click();
     },
     readOnly: false // false if this command should not apply in readOnly mode
   });
 
-  editor.resize();
+ // http://stackoverflow.com/questions/11584061/
+ function adjustHeight() {
+    var lines = editor.getSession().getScreenLength();
+    if (lines < 9) {
+      lines = 9;
+    }
+
+    var newHeight = (lines + 1) * 16;
+    $("#editor").height(newHeight.toString() + "px");
+    editor.resize();
+  };
+
+  editor.getSession().on("change", adjustHeight);
+  adjustHeight();
   $("#editor").show();
   editor.focus();
 
   var error_line = null;
+  var xhr;
+  var params = <%= raw json_escape(variable_params.to_json) %>;
 
   $("#run").click(function (e) {
     e.preventDefault();
@@ -81,7 +96,10 @@
     }
 
     $("#results").html('<p class="text-muted">Loading...</p>');
-    $.post("<%= run_queries_path %>", {statement: editor.getValue()}, function (data) {
+    if (xhr) {
+      xhr.abort();
+    }
+    xhr = $.post("<%= run_queries_path %>", $.extend({}, params, {statement: editor.getValue()}), function (data) {
       $("#results").html(data);
 
       error_line = /LINE (\d+)/g.exec($("#results").find('.alert-danger').text());

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

@@ -24,6 +24,7 @@
             <% if @trending_queries[query.id] %>
               <small style="font-weight: bold; color: #f60;">TRENDING</small>
             <% end %>
+            <div class="hide"><%= query.name.gsub(/\s+/, "") %></div>
           </td>
           <td class="creator text-right text-muted">
             <% if query.respond_to?(:creator) && (creator = query.creator) && creator.respond_to?(Blazer.user_name) %>

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

@@ -6,10 +6,13 @@
   <p class="text-muted"><%= pluralize(@rows.size, "row") %></p>
   <% if @rows.any? %>
     <% values = @rows.first.values %>
-    <% if values.size >= 2 and values.first.is_a?(Time) and values[1..-1].all?{|v| v.is_a?(Numeric) } %>
+    <% if values.size >= 2 && values.first.is_a?(Time) && values[1..-1].all?{|v| v.is_a?(Numeric) } %>
       <% time_k = @columns.keys.first %>
       <%= line_chart @columns.keys[1..-1].map{|k| {name: k, data: @rows.map{|r| [r[time_k], r[k]] }} } %>
-    <% elsif values.size == 2 and values.first.is_a?(String) and values.last.is_a?(Numeric) %>
+    <% elsif values.size == 3 && values.first.is_a?(Time) && values[1].is_a?(String) && values[2].is_a?(Numeric) %>
+      <% keys = @columns.keys %>
+      <%= line_chart @rows.group_by { |v| v[keys[1]] }.map { |name, v| {name: name, data: v.map { |v2| [v2[keys[0]], v2[keys[2]]] } } } %>
+    <% elsif values.size == 2 && values.first.is_a?(String) && values.last.is_a?(Numeric) %>
       <%= pie_chart @rows.map(&:values), library: {sliceVisibilityThreshold: 1 / 40.0} %>
     <% end %>
 

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

@@ -10,10 +10,10 @@
         </h3>
       </div>
       <div class="col-sm-3 text-right">
-        <%= link_to "Edit", edit_query_path(@query), class: "btn btn-default" %>
-        <%= link_to "Fork", new_query_path(statement: @query.statement), class: "btn btn-info" %>
+        <%= link_to "Edit", edit_query_path(@query, variable_params), class: "btn btn-default" %>
+        <%= link_to "Fork", new_query_path(variable_params.merge(statement: @query.statement)), class: "btn btn-info" %>
 
-        <% if !@error and @success %>
+        <% if !@error && @success %>
           <%= button_to "Download", run_queries_path(statement: @statement, query_id: @query.id, format: "csv"), class: "btn btn-primary" %>
         <% end %>
       </div>

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails