blazer 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cdb1f1e5abc2ac4d6e02a1726c8f681b09e6f29
-  data.tar.gz: 8e9b44772f5f47c74f746ca5a82288c45205f9fe
+  metadata.gz: 7d498bb03f6c2cdf408e73065449df3d27f7d2e4
+  data.tar.gz: b23b774a851a748277ffd1a1b33a420ca75f35ed
 SHA512:
-  metadata.gz: 630ba5e2d23c39f6a7e782d67e077e38b2c3450c64b7cff0576a6d9237d701ab6d1a7c87b90ae52590fcc9ffd8921e3a53159b87f49c2570fc45df52bcb5d283
-  data.tar.gz: 10841c3aa381ebe11c471abcf3bff15e5d2023f4ec28aecbf0eebc1703317f039f532095723fa10ff1b729a936a56388c92dc2af991f3b1096df315193f613f1
+  metadata.gz: 6f551893a6c87914244c745aa481e01339465b7c59b97caac8a3c323dc378be92bf8ec39ed8d2ad64012880be5cbb909bdf6c8f5278bd3b85930aa1ab17f5b5a
+  data.tar.gz: 3fe76a4cb97e6b8f55a338b5c0bbde9564a972bee3fba93bc6b04b9f7bc7331b975abf87fd514b18c5ab6c72039ef2398449539747e9271d1a235fb97a1c236e

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.1.1
+
+- Added `before_action` option
+- Added invert option for checks
+- Added targets
+- Friendlier error message for timeouts
+- Fixed request URI too large
+- Prevent accidental backspace nav on query page
+
 ## 1.1.0
 
 - Replaced pie charts with column charts

data/README.md

@@ -127,6 +127,14 @@ authenticate :user, lambda { |user| user.admin? } do
 end
 ```
 
+### Other
+
+Specify a `before_action` method to run in `blazer.yml`.
+
+```yml
+before_action: require_admin
+```
+
 ## Queries
 
 ### Variables

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

@@ -23,3 +23,35 @@ $( function () {
     $(this).parent().addClass('open');
   });
 });
+
+// Prevent backspace from navigating backwards.
+// Adapted from Biff MaGriff: http://stackoverflow.com/a/7895814/1196499
+function preventBackspaceNav() {
+  $(document).keydown(function (e) {
+    var preventKeyPress;
+    if (e.keyCode == 8) {
+      var d = e.srcElement || e.target;
+      switch (d.tagName.toUpperCase()) {
+        case 'TEXTAREA':
+          preventKeyPress = d.readOnly || d.disabled;
+          break;
+        case 'INPUT':
+          preventKeyPress = d.readOnly || d.disabled || (d.attributes["type"] && $.inArray(d.attributes["type"].value.toLowerCase(), ["radio", "reset", "checkbox", "submit", "button"]) >= 0);
+          break;
+        case 'DIV':
+          preventKeyPress = d.readOnly || d.disabled || !(d.attributes["contentEditable"] && d.attributes["contentEditable"].value == "true");
+          break;
+        default:
+          preventKeyPress = true;
+          break;
+      }
+    }
+    else {
+      preventKeyPress = false;
+    }
+
+    if (preventKeyPress) {
+      e.preventDefault();
+    }
+  });
+}

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

@@ -5,9 +5,8 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 */
 
 .hljs {
-  display: block; padding: 0.5em;
+  display: block;
   color: #333;
-  background: #f8f8f8
 }
 
 .hljs-comment,

data/app/controllers/blazer/base_controller.rb

@@ -9,6 +9,10 @@ module Blazer
       http_basic_authenticate_with name: ENV["BLAZER_USERNAME"], password: ENV["BLAZER_PASSWORD"]
     end
 
+    if Blazer.before_action
+      before_action Blazer.before_action
+    end
+
     layout "blazer/application"
 
     before_action :ensure_database_url
@@ -42,7 +46,7 @@ module Blazer
     helper_method :extract_vars
 
     def variable_params
-      params.except(:controller, :action, :id, :host, :query, :dashboard, :query_id, :query_ids, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name)
+      params.except(:controller, :action, :id, :host, :query, :dashboard, :query_id, :query_ids, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name, :fork_query_id)
     end
     helper_method :variable_params
 

data/app/controllers/blazer/checks_controller.rb

@@ -41,7 +41,7 @@ module Blazer
     private
 
     def check_params
-      params.require(:check).permit(:query_id, :emails)
+      params.require(:check).permit(:query_id, :emails, :invert)
     end
 
     def set_check

data/app/controllers/blazer/queries_controller.rb

@@ -17,6 +17,9 @@ module Blazer
         data_source: params[:data_source],
         name: params[:name]
       )
+      if params[:fork_query_id]
+        @query.statement ||= Blazer::Query.find(params[:fork_query_id]).try(:statement)
+      end
     end
 
     def create
@@ -76,7 +79,7 @@ module Blazer
 
         @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")
+        if @query && @error != Blazer::TIMEOUT_MESSAGE
           @query.checks.each do |check|
             check.update_state(@rows, @error)
           end

data/app/helpers/blazer/base_helper.rb

@@ -25,6 +25,8 @@ module Blazer
           "numeric"
         elsif v.is_a?(Time) || v.is_a?(Date)
           "time"
+        elsif v.nil?
+          nil
         else
           "string"
         end

data/app/models/blazer/check.rb

@@ -9,13 +9,14 @@ module Blazer
     end
 
     def update_state(rows, error)
+      invert = self.respond_to?(:invert) && self.invert
       self.state =
         if error
           "error"
         elsif rows.any?
-          "failing"
+          invert ? "passing" : "failing"
         else
-          "passing"
+          invert ? "failing" : "passing"
         end
 
       # do not notify on creation, except when not passing

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

@@ -1,4 +1,6 @@
-<p class="text-muted">Checks are designed to identify bad data. A check fails if there are any results.</p>
+<% unless @check.respond_to?(:invert) %>
+  <p class="text-muted">Checks are designed to identify bad data. A check fails if there are any results.</p>
+<% end %>
 
 <% if @check.errors.any? %>
   <div class="alert alert-danger"><%= @check.errors.full_messages.first %></div>
@@ -14,6 +16,19 @@
       $("#check_query_id").selectize().parents(".hide").removeClass("hide");
     </script>
   </div>
+
+<% if @check.respond_to?(:invert) %>
+  <div class="form-group">
+    <%= f.label "Fails if" %>
+    <div class="hide">
+      <%= f.select :invert, [["Any results (bad data)", false], ["No results (missing data)", true]], {}, {id: "select-invert"} %>
+    </div>
+    <script>
+      $("#select-invert").selectize({}).parent().removeClass("hide");
+    </script>
+  </div>
+<% end %>
+
   <div class="form-group">
     <%= f.label :emails %>
     <%= f.text_field :emails, placeholder: "Optional, comma separated", class: "form-control" %>

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

@@ -136,7 +136,7 @@
 <% end %>
 
 <% @queries.each_with_index do |query, i| %>
-  <div style="padding-top: 10px;">
+  <div style="padding-top: 10px; clear: both;">
     <h4 style="text-align: center;"><%= link_to query.friendly_name, query_path(query, variable_params), target: "_blank", style: "color: inherit;" %></h4>
     <div id="chart-<%= i %>" class="chart">
       <p class="text-muted">Loading...</p>

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

@@ -146,4 +146,6 @@
     $("#query_statement").val(editor.getValue());
     return true;
   });
+
+  preventBackspaceNav();
 </script>

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

@@ -27,6 +27,10 @@
     <% values = @rows.first.values %>
     <% chart_id = SecureRandom.hex %>
     <% column_types = blazer_column_types(@columns, @rows, @boom) %>
+    <% chart_options = {id: chart_id, min: nil} %>
+    <% if (target_index = @columns.keys.map(&:downcase).index("target")) %>
+      <% chart_options[:library] = {series: {(target_index - 1) => {pointSize: 0, lineWidth: 3, color: "#109618"}}} %>
+    <% end %>
     <% if blazer_maps? && @markers.any? %>
       <div id="map" style="height: <%= @only_chart ? 300 : 500 %>px;"></div>
       <script>
@@ -56,12 +60,12 @@
         featureLayer.setGeoJSON(geojson);
         map.fitBounds(featureLayer.getBounds());
       </script>
-    <% elsif values.size >= 2 && column_types == ["time"] + (values.size - 1).times.map { "numeric" } %>
+    <% elsif values.size >= 2 && column_types.compact == ["time"] + (column_types.compact.size - 1).times.map { "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]] }} }, id: chart_id, min: nil %>
+      <%= line_chart @columns.keys[1..-1].map{|k| {name: k, data: @rows.map{|r| [r[time_k], r[k]] }} }, chart_options %>
     <% elsif values.size == 3 && column_types == ["time", "string", "numeric"] %>
       <% keys = @columns.keys %>
-      <%= line_chart @rows.group_by { |r| k = keys[1]; v = r[k]; (@boom[k] || {})[v.to_s] || v }.map { |name, v| {name: name, data: v.map { |v2| [v2[keys[0]], v2[keys[2]]] } } }, id: chart_id, min: nil %>
+      <%= line_chart @rows.group_by { |r| k = keys[1]; v = r[k]; (@boom[k] || {})[v.to_s] || v }.map { |name, v| {name: name, data: v.map { |v2| [v2[keys[0]], v2[keys[2]]] } } }, chart_options %>
     <% elsif values.size >= 2 && column_types == ["string"] + (values.size - 1).times.map { "numeric" } %>
       <% keys = @columns.keys %>
       <%= column_chart (values.size - 1).times.map { |i| name = @columns.keys[i + 1]; {name: name, data: @rows.first(20).map { |r| [(@boom[keys[0]] || {})[r[keys[0]].to_s] || r[keys[0]], r[keys[i + 1]]] } } }, id: chart_id %>

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

@@ -25,10 +25,10 @@
       </div>
       <div class="col-sm-3 text-right">
         <%= 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, data_source: @query.data_source, name: "Fork of #{@query.name}")), class: "btn btn-info" %>
+        <%= link_to "Fork", new_query_path(variable_params.merge(fork_query_id: @query.id, data_source: @query.data_source, name: @query.name)), class: "btn btn-info" %>
 
         <% if !@error && @success %>
-          <%= button_to "Download", run_queries_path(statement: @statement, query_id: @query.id, format: "csv"), class: "btn btn-primary" %>
+          <%= button_to "Download", run_queries_path(query_id: @query.id, format: "csv"), params: {statement: @statement}, class: "btn btn-primary" %>
         <% end %>
       </div>
     </div>

data/lib/blazer.rb

@@ -13,6 +13,7 @@ module Blazer
     attr_accessor :user_name
     attr_accessor :user_class
     attr_accessor :user_method
+    attr_accessor :before_action
     attr_accessor :from_email
     attr_accessor :cache
     attr_accessor :transform_statement
@@ -20,6 +21,8 @@ module Blazer
   self.audit = true
   self.user_name = :name
 
+  TIMEOUT_MESSAGE = "Query timed out :("
+
   def self.time_zone=(time_zone)
     @time_zone = time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone.to_s]
   end

data/lib/blazer/data_source.rb

@@ -82,6 +82,7 @@ module Blazer
             end
           rescue ActiveRecord::StatementInvalid => e
             error = e.message.sub(/.+ERROR: /, "")
+            error = Blazer::TIMEOUT_MESSAGE if error.include?("canceling statement due to statement timeout") || error.include?("cancelled on user's request")
           end
         end
 

data/lib/blazer/engine.rb

@@ -11,6 +11,7 @@ module Blazer
       Blazer.audit = Blazer.settings.key?("audit") ? Blazer.settings["audit"] : true
       Blazer.user_name = Blazer.settings["user_name"] if Blazer.settings["user_name"]
       Blazer.from_email = Blazer.settings["from_email"] if Blazer.settings["from_email"]
+      Blazer.before_action = Blazer.settings["before_action"] if Blazer.settings["before_action"]
 
       Blazer.user_class ||= Blazer.settings.key?("user_class") ? Blazer.settings["user_class"] : (User rescue nil)
       Blazer.user_method = Blazer.settings["user_method"]

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

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

@@ -40,5 +40,8 @@ audit: true
 # method name for the user model
 # user_name: name
 
+# optional auth method to use as a before_action (default: nil)
+# before_action: :authenticate!
+
 # email to send checks from
 # from_email: blazer@example.org

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -173,8 +173,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Share data effortlessly with your team
 test_files: []
+has_rdoc: