blazer 1.7.8 → 1.7.9

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

@@ -95,7 +95,7 @@
       return parseInt(a.replace(/,/g, ''), 10) - parseInt(b.replace(/,/g, ''), 10);
     },
     "float": function(a, b) {
-      return parseFloat(a) - parseFloat(b);
+      return (parseFloat(a) || 0) - (parseFloat(b) || 0);
     },
     "string": function(a, b) {
       if (a < b) return -1;

data/app/helpers/blazer/base_helper.rb

@@ -33,7 +33,7 @@ module Blazer
     end
 
     def blazer_js_var(name, value)
-      "var #{name} = #{blazer_json_escape(value.to_json)}".html_safe
+      "var #{name} = #{blazer_json_escape(value.to_json(root: false))};".html_safe
     end
 
     JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003e', '<' => '\u003c', "\u2028" => '\u2028', "\u2029" => '\u2029' }

data/app/models/blazer/check.rb

@@ -4,6 +4,7 @@ module Blazer
     belongs_to :query
 
     validates :query_id, presence: true
+    validate :validate_emails
 
     before_validation :set_state
     before_validation :fix_emails
@@ -72,7 +73,16 @@ module Blazer
       def fix_emails
         # some people like doing ; instead of ,
         # but we know what they mean, so let's fix it
-        self.emails = emails.gsub(";", ",") if emails.present?
+        # also, some people like to use whitespace
+        if emails.present?
+          self.emails = emails.strip.gsub(/[;\s]/, ",").gsub(/,+/, ", ")
+        end
+      end
+
+      def validate_emails
+        unless split_emails.all? { |e| e =~ /\A\S+@\S+\.\S+\z/ }
+          errors.add(:base, "Invalid emails")
+        end
       end
   end
 end

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

@@ -19,7 +19,7 @@
         <td><%= link_to check.query.name, check.query %> <span class="text-muted"><%= check.try(:check_type).to_s.gsub("_", " ") %></span></td>
         <td>
           <% if check.state %>
-            <small class="check-state <%= check.state.parameterize("_") %>"><%= check.state.upcase %></small>
+            <small class="check-state <%= check.state.parameterize.gsub("-", "_") %>"><%= check.state.upcase %></small>
           <% end %>
         </td>
         <td><%= check.schedule if check.respond_to?(:schedule) %></td>

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

@@ -28,7 +28,7 @@
       <%= pluralize(@rows.size, "row") %>
 
       <% @checks.select(&:state).each do |check| %>
-        &middot; <small class="check-state <%= check.state.parameterize("_") %>"><%= link_to check.state.upcase, edit_check_path(check) %></small>
+        &middot; <small class="check-state <%= check.state.parameterize.gsub("-", "_") %>"><%= link_to check.state.upcase, edit_check_path(check) %></small>
         <% if check.try(:message) %>
           &middot; <%= check.message %>
         <% end %>

data/lib/blazer.rb

@@ -7,6 +7,7 @@ require "blazer/data_source"
 require "blazer/result"
 require "blazer/run_statement"
 require "blazer/adapters/base_adapter"
+require "blazer/adapters/drill_adapter"
 require "blazer/adapters/elasticsearch_adapter"
 require "blazer/adapters/mongodb_adapter"
 require "blazer/adapters/presto_adapter"
@@ -158,6 +159,7 @@ module Blazer
   end
 end
 
+Blazer.register_adapter "drill", Blazer::Adapters::DrillAdapter
 Blazer.register_adapter "elasticsearch", Blazer::Adapters::ElasticsearchAdapter
 Blazer.register_adapter "mongodb", Blazer::Adapters::MongodbAdapter
 Blazer.register_adapter "presto", Blazer::Adapters::PrestoAdapter

data/lib/blazer/adapters/drill_adapter.rb

@@ -0,0 +1,34 @@
+module Blazer
+  module Adapters
+    class DrillAdapter < BaseAdapter
+      def run_statement(statement, comment)
+        columns = []
+        rows = []
+        error = nil
+
+        header = {"Content-Type" => "application/json", "Accept" => "application/json"}
+        data = {
+          queryType: "sql",
+          query: statement
+        }
+
+        uri = URI.parse("#{settings["url"]}/query.json")
+        http = Net::HTTP.new(uri.host, uri.port)
+
+        begin
+          response = JSON.parse(http.post(uri.request_uri, data.to_json, header).body)
+          if response["errorMessage"]
+            error = response["errorMessage"]
+          else
+            columns = response["columns"]
+            rows = response["rows"].map { |r| r.values }
+          end
+        rescue => e
+          error = e.message
+        end
+
+        [columns, rows, error]
+      end
+    end
+  end
+end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.7.8"
+  VERSION = "1.7.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.7.9
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,7 @@ files:
 - config/routes.rb
 - lib/blazer.rb
 - lib/blazer/adapters/base_adapter.rb
+- lib/blazer/adapters/drill_adapter.rb
 - lib/blazer/adapters/elasticsearch_adapter.rb
 - lib/blazer/adapters/mongodb_adapter.rb
 - lib/blazer/adapters/presto_adapter.rb