blazer 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bdae12ea224ba2311ce33fdbc05dffbbc938cee
-  data.tar.gz: 635a76501e3608e8a188cdfdc3186b497e6337fd
+  metadata.gz: cb091c8d95137cd458bfffee889e305a70dbed00
+  data.tar.gz: 338d05021f268691eb51b2861b41eff1a4b9135a
 SHA512:
-  metadata.gz: 9e81386804c7030a74a75f959f936e3ff0053c9e8e2a17f78cff84897850942f124a989f7258d429e836b0aeacf8a138f59e47ed5a35ac8686f37ecdfbd77222
-  data.tar.gz: f1c1da1a30477aae06877313f2130b6a6140962a31c29761938b04fad93baad8cb036fcd79a24f91c52212690f0cecd3dde7d563ecde799370fa61aac2a70353
+  metadata.gz: ec12d42ac8fb5618abb2849860178c0ccd3778f8ceef897a3073f9fa9339ddf38149bf39c970bd0c1b12c91e82f88ef27bcd8fcc5b9530f725e20dead78794b1
+  data.tar.gz: e863ec4b74f606885ffc15dd095cd5ee14fc9cc2283085fdf2fb04e6cbaaeb83a899cebe9a62eb17399c45f8c28aa2979e1355b308ae15b61cccc097ddde6d56

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.7.4
+
+- Removed extra dependencies added in 1.7.1
+- Fixed `send_failing_checks` for default Rails 5 ActiveJob adapter
+
 ## 1.7.3
 
 - Fixed JavaScript errors

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

@@ -0,0 +1,23 @@
+var Routes = {
+  run_queries_path: function() {
+    return rootPath + "queries/run"
+  },
+  cancel_queries_path: function() {
+    return rootPath + "queries/cancel"
+  },
+  schema_queries_path: function(params) {
+    return rootPath + "queries/schema?" + $.param(params)
+  },
+  tables_queries_path: function(params) {
+    return rootPath + "queries/tables?" + $.param(params)
+  },
+  queries_path: function() {
+    return rootPath + "queries"
+  },
+  query_path: function(id) {
+    return rootPath + "queries/" + id
+  },
+  dashboard_path: function(id) {
+    return rootPath + "dashboards/" + id
+  }
+}

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

@@ -151,6 +151,8 @@ input.search:focus {
   cursor: pointer;
   color: #d9534f;
   display: none;
+  float: right;
+  margin-top: 3px;
 }
 
 .list-group li:hover .glyphicon-remove {
@@ -190,3 +192,7 @@ input.search:focus {
 .chart-container h4 a {
   color: inherit;
 }
+
+.query-error {
+  color: red;
+}

data/app/controllers/blazer/base_controller.rb

@@ -19,94 +19,87 @@ module Blazer
     if Blazer.before_action
       before_action Blazer.before_action.to_sym
     end
-    before_action :set_js_routes
 
     layout "blazer/application"
 
     private
 
-    def process_vars(statement, data_source)
-      (@bind_vars ||= []).concat(extract_vars(statement)).uniq!
-      @bind_vars.each do |var|
-        params[var] ||= Blazer.data_sources[data_source].variable_defaults[var]
-      end
-      @success = @bind_vars.all? { |v| params[v] }
-
-      if @success
+      def process_vars(statement, data_source)
+        (@bind_vars ||= []).concat(extract_vars(statement)).uniq!
         @bind_vars.each do |var|
-          value = params[var].presence
-          if value
-            if ["start_time", "end_time"].include?(var)
-              value = value.to_s.gsub(" ", "+") # fix for Quip bug
-            end
+          params[var] ||= Blazer.data_sources[data_source].variable_defaults[var]
+        end
+        @success = @bind_vars.all? { |v| params[v] }
+
+        if @success
+          @bind_vars.each do |var|
+            value = params[var].presence
+            if value
+              if ["start_time", "end_time"].include?(var)
+                value = value.to_s.gsub(" ", "+") # fix for Quip bug
+              end
 
-            if var.end_with?("_at")
-              begin
-                value = Blazer.time_zone.parse(value)
-              rescue
-                # do nothing
+              if var.end_with?("_at")
+                begin
+                  value = Blazer.time_zone.parse(value)
+                rescue
+                  # do nothing
+                end
               end
-            end
 
-            if value =~ /\A\d+\z/
-              value = value.to_i
-            elsif value =~ /\A\d+\.\d+\z/
-              value = value.to_f
+              if value =~ /\A\d+\z/
+                value = value.to_i
+              elsif value =~ /\A\d+\.\d+\z/
+                value = value.to_f
+              end
             end
+            statement.gsub!("{#{var}}", ActiveRecord::Base.connection.quote(value))
           end
-          statement.gsub!("{#{var}}", ActiveRecord::Base.connection.quote(value))
         end
       end
-    end
 
-    def parse_smart_variables(var, data_source)
-      smart_var_data_source =
-        ([data_source] + Array(data_source.settings["inherit_smart_settings"]).map { |ds| Blazer.data_sources[ds] }).find { |ds| ds.smart_variables[var] }
-
-      if smart_var_data_source
-        query = smart_var_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 = smart_var_data_source.run_statement(query)
-          smart_var = result.rows.map { |v| v.reverse }
-          error = result.error if result.error
+      def parse_smart_variables(var, data_source)
+        smart_var_data_source =
+          ([data_source] + Array(data_source.settings["inherit_smart_settings"]).map { |ds| Blazer.data_sources[ds] }).find { |ds| ds.smart_variables[var] }
+
+        if smart_var_data_source
+          query = smart_var_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 = smart_var_data_source.run_statement(query)
+            smart_var = result.rows.map { |v| v.reverse }
+            error = result.error if result.error
+          end
         end
-      end
-
-      [smart_var, error]
-    end
 
-    def extract_vars(statement)
-      # strip commented out lines
-      # and regex {1} or {1,2}
-      statement.gsub(/\-\-.+/, "").gsub(/\/\*.+\*\//m, "").scan(/\{\w*?\}/i).map { |v| v[1...-1] }.reject { |v| /\A\d+(\,\d+)?\z/.match(v) || v.empty? }.uniq
-    end
-    helper_method :extract_vars
+        [smart_var, error]
+      end
 
-    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, :fork_query_id, :blazer, :run_id).permit!
-    end
-    helper_method :variable_params
+      def extract_vars(statement)
+        # strip commented out lines
+        # and regex {1} or {1,2}
+        statement.gsub(/\-\-.+/, "").gsub(/\/\*.+\*\//m, "").scan(/\{\w*?\}/i).map { |v| v[1...-1] }.reject { |v| /\A\d+(\,\d+)?\z/.match(v) || v.empty? }.uniq
+      end
+      helper_method :extract_vars
 
-    def blazer_user
-      send(Blazer.user_method) if Blazer.user_method && respond_to?(Blazer.user_method)
-    end
-    helper_method :blazer_user
+      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, :fork_query_id, :blazer, :run_id).permit!
+      end
+      helper_method :variable_params
 
-    def render_errors(resource)
-      @errors = resource.errors
-      action = resource.persisted? ? :edit : :new
-      render action, status: :unprocessable_entity
-    end
+      def blazer_user
+        send(Blazer.user_method) if Blazer.user_method && respond_to?(Blazer.user_method)
+      end
+      helper_method :blazer_user
 
-    def set_js_routes
-      gon.push(
-        root_path: root_path
-      )
-    end
+      def render_errors(resource)
+        @errors = resource.errors
+        action = resource.persisted? ? :edit : :new
+        render action, status: :unprocessable_entity
+      end
   end
 end

data/app/controllers/blazer/checks_controller.rb

@@ -45,12 +45,12 @@ module Blazer
 
     private
 
-    def check_params
-      params.require(:check).permit(:query_id, :emails, :invert, :check_type, :schedule)
-    end
+      def check_params
+        params.require(:check).permit(:query_id, :emails, :invert, :check_type, :schedule)
+      end
 
-    def set_check
-      @check = Blazer::Check.find(params[:id])
-    end
+      def set_check
+        @check = Blazer::Check.find(params[:id])
+      end
   end
 end

data/app/controllers/blazer/dashboards_controller.rb

@@ -69,37 +69,37 @@ module Blazer
       redirect_to dashboard_path(@dashboard, variable_params)
     end
 
-    protected
+    private
 
-    def dashboard_params
-      params.require(:dashboard).permit(:name)
-    end
+      def dashboard_params
+        params.require(:dashboard).permit(:name)
+      end
 
-    def set_dashboard
-      @dashboard = Blazer::Dashboard.find(params[:id])
-    end
+      def set_dashboard
+        @dashboard = Blazer::Dashboard.find(params[:id])
+      end
 
-    def update_dashboard(dashboard)
-      dashboard.assign_attributes(dashboard_params)
-      Blazer::Dashboard.transaction do
-        if params[:query_ids].is_a?(Array)
-          query_ids = params[:query_ids].map(&:to_i)
-          @queries = Blazer::Query.find(query_ids).sort_by { |q| query_ids.index(q.id) }
-        end
-        if dashboard.save
-          if @queries
-            @queries.each_with_index do |query, i|
-              dashboard_query = dashboard.dashboard_queries.where(query_id: query.id).first_or_initialize
-              dashboard_query.position = i
-              dashboard_query.save!
-            end
-            if dashboard.persisted?
-              dashboard.dashboard_queries.where.not(query_id: query_ids).destroy_all
+      def update_dashboard(dashboard)
+        dashboard.assign_attributes(dashboard_params)
+        Blazer::Dashboard.transaction do
+          if params[:query_ids].is_a?(Array)
+            query_ids = params[:query_ids].map(&:to_i)
+            @queries = Blazer::Query.find(query_ids).sort_by { |q| query_ids.index(q.id) }
+          end
+          if dashboard.save
+            if @queries
+              @queries.each_with_index do |query, i|
+                dashboard_query = dashboard.dashboard_queries.where(query_id: query.id).first_or_initialize
+                dashboard_query.position = i
+                dashboard_query.save!
+              end
+              if dashboard.persisted?
+                dashboard.dashboard_queries.where.not(query_id: query_ids).destroy_all
+              end
             end
+            true
           end
-          true
         end
       end
-    end
   end
 end

data/app/controllers/blazer/queries_controller.rb

@@ -26,12 +26,6 @@ module Blazer
             dashboard: true
           }
         end
-
-      gon.push(
-        dashboards: @dashboards,
-        queries: @queries,
-        more: @more
-      )
     end
 
     def index
@@ -194,138 +188,138 @@ module Blazer
 
     private
 
-    def continue_run
-      render json: {run_id: @run_id, timestamp: @timestamp}, status: :accepted
-    end
-
-    def render_run
-      @checks = @query ? @query.checks.order(:id) : []
-
-      @first_row = @rows.first || []
-      @column_types = []
-      if @rows.any?
-        @columns.each_with_index do |column, i|
-          @column_types << (
-            case @first_row[i]
-            when Integer
-              "int"
-            when Float, BigDecimal
-              "float"
-            else
-              "string-ins"
-            end
-          )
-        end
+      def continue_run
+        render json: {run_id: @run_id, timestamp: @timestamp}, status: :accepted
       end
 
-      @filename = @query.name.parameterize if @query
-      @min_width_types = @columns.each_with_index.select { |c, i| @first_row[i].is_a?(Time) || @first_row[i].is_a?(String) || @data_source.smart_columns[c] }.map(&:last)
-
-      @boom = @result.boom if @result
-
-      @linked_columns = @data_source.linked_columns
-
-      @markers = []
-      [["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
-          @markers =
-            @rows.select do |r|
-              r[lat_index] && r[lon_index]
-            end.map do |r|
-              {
-                title: r.each_with_index.map{ |v, i| i == lat_index || i == lon_index ? nil : "<strong>#{@columns[i]}:</strong> #{v}" }.compact.join("<br />").truncate(140),
-                latitude: r[lat_index],
-                longitude: r[lon_index]
-              }
-            end
+      def render_run
+        @checks = @query ? @query.checks.order(:id) : []
+
+        @first_row = @rows.first || []
+        @column_types = []
+        if @rows.any?
+          @columns.each_with_index do |column, i|
+            @column_types << (
+              case @first_row[i]
+              when Integer
+                "int"
+              when Float, BigDecimal
+                "float"
+              else
+                "string-ins"
+              end
+            )
+          end
         end
-      end
 
-      respond_to do |format|
-        format.html do
-          render layout: false
+        @filename = @query.name.parameterize if @query
+        @min_width_types = @columns.each_with_index.select { |c, i| @first_row[i].is_a?(Time) || @first_row[i].is_a?(String) || @data_source.smart_columns[c] }.map(&:last)
+
+        @boom = @result.boom if @result
+
+        @linked_columns = @data_source.linked_columns
+
+        @markers = []
+        [["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
+            @markers =
+              @rows.select do |r|
+                r[lat_index] && r[lon_index]
+              end.map do |r|
+                {
+                  title: r.each_with_index.map{ |v, i| i == lat_index || i == lon_index ? nil : "<strong>#{@columns[i]}:</strong> #{v}" }.compact.join("<br />").truncate(140),
+                  latitude: r[lat_index],
+                  longitude: r[lon_index]
+                }
+              end
+          end
         end
-        format.csv do
-          send_data csv_data(@columns, @rows, @data_source), type: "text/csv; charset=utf-8; header=present", disposition: "attachment; filename=\"#{@query.try(:name).try(:parameterize).presence || 'query'}.csv\""
+
+        respond_to do |format|
+          format.html do
+            render layout: false
+          end
+          format.csv do
+            send_data csv_data(@columns, @rows, @data_source), type: "text/csv; charset=utf-8; header=present", disposition: "attachment; filename=\"#{@query.try(:name).try(:parameterize).presence || 'query'}.csv\""
+          end
         end
       end
-    end
 
-    def set_queries(limit = nil)
-      @my_queries =
-        if limit && blazer_user && !params[:filter] && Blazer.audit
-          queries_by_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)
-        else
-          []
-        end
+      def set_queries(limit = nil)
+        @my_queries =
+          if limit && blazer_user && !params[:filter] && Blazer.audit
+            queries_by_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)
+          else
+            []
+          end
 
-      @queries = Blazer::Query.named.select(:id, :name, :creator_id, :statement)
-      @queries = @queries.includes(:creator) if Blazer.user_class
+        @queries = Blazer::Query.named.select(:id, :name, :creator_id, :statement)
+        @queries = @queries.includes(:creator) if Blazer.user_class
 
-      if blazer_user && params[:filter] == "mine"
-        @queries = @queries.where(creator_id: blazer_user.id).reorder(updated_at: :desc)
-      elsif blazer_user && params[:filter] == "viewed" && Blazer.audit
-        @queries = queries_by_ids(Blazer::Audit.where(user_id: blazer_user.id).order(created_at: :desc).limit(500).pluck(:query_id).uniq)
-      else
-        @queries = @queries.where("id NOT IN (?)", @my_queries.map(&:id)) if @my_queries.any?
-        @queries = @queries.limit(limit) if limit
-        @queries = @queries.order(:name)
-      end
-      @queries = @queries.to_a
+        if blazer_user && params[:filter] == "mine"
+          @queries = @queries.where(creator_id: blazer_user.id).reorder(updated_at: :desc)
+        elsif blazer_user && params[:filter] == "viewed" && Blazer.audit
+          @queries = queries_by_ids(Blazer::Audit.where(user_id: blazer_user.id).order(created_at: :desc).limit(500).pluck(:query_id).uniq)
+        else
+          @queries = @queries.where("id NOT IN (?)", @my_queries.map(&:id)) if @my_queries.any?
+          @queries = @queries.limit(limit) if limit
+          @queries = @queries.order(:name)
+        end
+        @queries = @queries.to_a
 
-      @more = limit && @queries.size >= limit
+        @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).select { |q| !q.name.to_s.start_with?("#") || q.try(:creator).try(:id) == blazer_user.try(:id) }
 
-      @queries =
-        @queries.map do |q|
-          {
-            id: q.id,
-            name: q.name,
-            creator: blazer_user && q.try(:creator) == blazer_user ? "You" : q.try(:creator).try(Blazer.user_name),
-            vars: extract_vars(q.statement).join(", "),
-            to_param: q.to_param
-          }
-        end
-    end
+        @queries =
+          @queries.map do |q|
+            {
+              id: q.id,
+              name: q.name,
+              creator: blazer_user && q.try(:creator) == blazer_user ? "You" : q.try(:creator).try(Blazer.user_name),
+              vars: extract_vars(q.statement).join(", "),
+              to_param: q.to_param
+            }
+          end
+      end
 
-    def queries_by_ids(favorite_query_ids)
-      queries = Blazer::Query.named.where(id: favorite_query_ids)
-      queries = queries.includes(:creator) if Blazer.user_class
-      queries = queries.index_by(&:id)
-      favorite_query_ids.map { |query_id| queries[query_id] }.compact
-    end
+      def queries_by_ids(favorite_query_ids)
+        queries = Blazer::Query.named.where(id: favorite_query_ids)
+        queries = queries.includes(:creator) if Blazer.user_class
+        queries = queries.index_by(&:id)
+        favorite_query_ids.map { |query_id| queries[query_id] }.compact
+      end
 
-    def set_query
-      @query = Blazer::Query.find(params[:id].to_s.split("-").first)
-    end
+      def set_query
+        @query = Blazer::Query.find(params[:id].to_s.split("-").first)
+      end
 
-    def query_params
-      params.require(:query).permit(:name, :description, :statement, :data_source)
-    end
+      def query_params
+        params.require(:query).permit(:name, :description, :statement, :data_source)
+      end
 
-    def blazer_params
-      params[:blazer] || {}
-    end
+      def blazer_params
+        params[:blazer] || {}
+      end
 
-    def csv_data(columns, rows, data_source)
-      CSV.generate do |csv|
-        csv << columns
-        rows.each do |row|
-          csv << row.each_with_index.map { |v, i| v.is_a?(Time) ? blazer_time_value(data_source, columns[i], v) : v }
+      def csv_data(columns, rows, data_source)
+        CSV.generate do |csv|
+          csv << columns
+          rows.each do |row|
+            csv << row.each_with_index.map { |v, i| v.is_a?(Time) ? blazer_time_value(data_source, columns[i], v) : v }
+          end
         end
       end
-    end
 
-    def blazer_time_value(data_source, k, v)
-      data_source.local_time_suffix.any? { |s| k.ends_with?(s) } ? v.to_s.sub(" UTC", "") : v.in_time_zone(Blazer.time_zone)
-    end
-    helper_method :blazer_time_value
+      def blazer_time_value(data_source, k, v)
+        data_source.local_time_suffix.any? { |s| k.ends_with?(s) } ? v.to_s.sub(" UTC", "") : v.in_time_zone(Blazer.time_zone)
+      end
+      helper_method :blazer_time_value
 
-    def blazer_run_id
-      params[:run_id].to_s.gsub(/[^a-z0-9\-]/i, "")
-    end
+      def blazer_run_id
+        params[:run_id].to_s.gsub(/[^a-z0-9\-]/i, "")
+      end
   end
 end

data/app/helpers/blazer/base_helper.rb

@@ -32,6 +32,10 @@ module Blazer
       ENV["MAPBOX_ACCESS_TOKEN"].present?
     end
 
+    def blazer_js_var(name, value)
+      "var #{name} = #{blazer_json_escape(value.to_json)}".html_safe
+    end
+
     JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003e', '<' => '\u003c', "\u2028" => '\u2028', "\u2029" => '\u2029' }
     JSON_ESCAPE_REGEXP = /[\u2028\u2029&><]/u
 

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

@@ -44,24 +44,24 @@
       </div>
 
       <script>
-        var timeZone = "<%= Blazer.time_zone.tzinfo.name %>";
-        var format = "YYYY-MM-DD";
-        var now = moment.tz(timeZone);
+        <%= blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name %>
+        var format = "YYYY-MM-DD"
+        var now = moment.tz(timeZone)
 
         function dateStr(daysAgo) {
-          return now.clone().subtract(daysAgo || 0, "days").format(format);
+          return now.clone().subtract(daysAgo || 0, "days").format(format)
         }
 
         function toDate(time) {
-          return moment.tz(time.format(format), timeZone);
+          return moment.tz(time.format(format), timeZone)
         }
 
         function setTimeInputs(start, end) {
-          $("#start_time").val(toDate(start).utc().format());
-          $("#end_time").val(toDate(end).endOf("day").utc().format());
+          $("#start_time").val(toDate(start).utc().format())
+          $("#end_time").val(toDate(end).endOf("day").utc().format())
         }
 
-        $('#reportrange').daterangepicker(
+        $("#reportrange").daterangepicker(
           {
             ranges: {
              "Today": [dateStr(), dateStr()],
@@ -76,23 +76,23 @@
             opens: "right"
           },
           function(start, end) {
-            setTimeInputs(start, end);
-            submitIfCompleted($("#start_time").closest("form"));
+            setTimeInputs(start, end)
+            submitIfCompleted($("#start_time").closest("form"))
           }
-        ).on('apply.daterangepicker', function(ev, picker) {
-          setTimeInputs(picker.startDate, picker.endDate);
-          $('#reportrange span').html(toDate(picker.startDate).format('MMMM D, YYYY') + ' - ' + toDate(picker.endDate).format('MMMM D, YYYY'));
+        ).on("apply.daterangepicker", function(ev, picker) {
+          setTimeInputs(picker.startDate, picker.endDate)
+          $("#reportrange span").html(toDate(picker.startDate).format("MMMM D, YYYY") + " - " + toDate(picker.endDate).format("MMMM D, YYYY"))
         })
 
         if ($("#start_time").val().length > 0) {
-          var picker = $("#reportrange").data('daterangepicker');
-          picker.setStartDate(moment.tz($("#start_time").val(), timeZone));
-          picker.setEndDate(moment.tz($("#end_time").val(), timeZone));
-          $("#reportrange").trigger('apply.daterangepicker', picker)
+          var picker = $("#reportrange").data("daterangepicker")
+          picker.setStartDate(moment.tz($("#start_time").val(), timeZone))
+          picker.setEndDate(moment.tz($("#end_time").val(), timeZone))
+          $("#reportrange").trigger("apply.daterangepicker", picker)
         } else {
-          var picker = $("#reportrange").data('daterangepicker');
-          $("#reportrange").trigger('apply.daterangepicker', picker);
-          submitIfCompleted($("#start_time").closest("form"));
+          var picker = $("#reportrange").data("daterangepicker")
+          $("#reportrange").trigger("apply.daterangepicker", picker)
+          submitIfCompleted($("#start_time").closest("form"))
         }
       </script>
     <% end %>

data/app/views/blazer/check_mailer/state_change.html.erb

@@ -6,15 +6,22 @@
     <% if @error %>
       <p><%= @error %></p>
     <% elsif @rows_count > 0 && @check_type == "bad_data" %>
-      <p><%= pluralize(@rows_count, "row") %></p>
-      <p><strong>Sample</strong></p>
+      <p>
+        <% if @rows_count <= 10 %>
+          <%= pluralize(@rows_count, "row") %>
+        <% else %>
+          Showing 10 of <%= @rows_count %> rows
+        <% end %>
+      </p>
       <table style="width: 100%; border-spacing: 0; border-collapse: collapse;">
         <thead>
-          <% @columns.first(5).each do |column| %>
-            <th style="padding: 8px; line-height: 1.4; text-align: left; vertical-align: bottom; border-bottom: 2px solid #ddd; width: <%= (100 / @columns.size).round(2) %>%;">
-              <%= column %>
-            </th>
-          <% end %>
+          <tr>
+            <% @columns.first(5).each do |column| %>
+              <th style="padding: 8px; line-height: 1.4; text-align: left; vertical-align: bottom; border-bottom: 2px solid #ddd; width: <%= (100 / @columns.size).round(2) %>%;">
+                <%= column %>
+              </th>
+            <% end %>
+          </tr>
         </thead>
         <tbody>
           <% @rows.first(10).each do |row| %>
@@ -32,6 +39,9 @@
           <% end %>
         </tbody>
       </table>
+      <% if @columns.size > 5 %>
+        <p style="color: #999;">Only first 5 columns shown</p>
+      <% end %>
     <% end %>
   </body>
 </html>

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

@@ -13,8 +13,8 @@
       <%= f.select :query_id, [], {include_blank: true} %>
     </div>
     <script>
-      var queries = <%= blazer_json_escape(Blazer::Query.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} }.to_json).html_safe %>;
-      var items = <%= blazer_json_escape([@check.query_id].compact.to_json).html_safe %>;
+      <%= blazer_js_var "queries", Blazer::Query.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} } %>
+      <%= blazer_js_var "items", [@check.query_id].compact %>
 
       $("#check_query_id").selectize({options: queries, items: items, highlight: false, maxOptions: 100}).parents(".hide").removeClass("hide");
     </script>

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

@@ -2,46 +2,26 @@
   <div class="alert alert-danger"><%= @dashboard.errors.full_messages.first %></div>
 <% end %>
 
-<%= form_for @dashboard, url: (@dashboard.persisted? ? dashboard_path(@dashboard, variable_params) : dashboards_path(variable_params)) do |f| %>
+<%= form_for @dashboard, url: (@dashboard.persisted? ? dashboard_path(@dashboard, variable_params) : dashboards_path(variable_params)), html: {id: "app"} do |f| %>
   <div class="form-group">
     <%= f.label :name %>
     <%= f.text_field :name, class: "form-control" %>
   </div>
-  <div class="form-group <%= "hide" if (@queries || @dashboard.queries).empty? %>">
+  <div class="form-group" v-if="queries.length">
     <%= f.label :charts %>
-    <ul class="list-group">
-      <% (@queries || @dashboard.dashboard_queries.order(:position).map(&:query)).each do |query| %>
-        <li class="list-group-item">
-          <span class="glyphicon glyphicon-remove" aria-hidden="true" style="float: right; margin-top: 3px;"></span>
-          <%= query.name %>
-          <%= hidden_field_tag "query_ids[]", query.id %>
-        </li>
-      <% end %>
+    <ul id="queries" class="list-group">
+      <li class="list-group-item" v-for="(query, index) in queries" :key="query.id" v-cloak>
+        <span class="glyphicon glyphicon-remove" aria-hidden="true" v-on:click="remove(index)"></span>
+        {{ query.name }}
+        <input type="hidden" name="query_ids[]" :value="query.id">
+      </li>
     </ul>
   </div>
-  <div class="form-group">
+  <div class="form-group" v-cloak>
     <%= f.label :query_id, "Add Chart" %>
-    <div class="hide">
-      <%= select_tag :query_id, nil, {include_blank: true, placeholder: "Select chart"} %>
-    </div>
-    <script>
-      var queries = <%= blazer_json_escape(Blazer::Query.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} }.to_json).html_safe %>;
-      $("#query_id").selectize({options: queries, highlight: false, maxOptions: 100}).parents(".hide").removeClass("hide");
-      $("#query_id").change( function () {
-        var $option = $(this).find("option:selected");
-        if ($option.val() !== "") {
-          var $li = $("<li></li>");
-          $li.addClass("list-group-item");
-          $li.text($option.text());
-          $li.prepend('<span class="glyphicon glyphicon-remove" aria-hidden="true" style="float: right; margin-top: 3px;"></span><input type="hidden" name="query_ids[]" id="query_ids_" value="' + $option.val() + '">');
-          $(".list-group").append($li);
-          $(this)[0].selectize.setValue("");
-          $(".form-group").removeClass("hide");
-        }
-      });
-    </script>
+    <%= select_tag :query_id, nil, {include_blank: true, placeholder: "Select chart"} %>
   </div>
-  <p>
+  <p style="padding-bottom: 140px;" v-cloak>
     <% if @dashboard.persisted? %>
       <%= link_to "Delete", dashboard_path(@dashboard), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger"%>
     <% end %>
@@ -51,8 +31,46 @@
 <% end %>
 
 <script>
-  $(".list-group").on("click", ".glyphicon-remove", function () {
-    $(this).parents("li:first").remove();
-  });
-  Sortable.create($(".list-group").get(0));
+  <%= blazer_js_var "queries", Blazer::Query.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} } %>
+  <%= blazer_js_var "dashboardQueries", @queries || @dashboard.dashboard_queries.order(:position).map(&:query) %>
+
+  var app = new Vue({
+    el: "#app",
+    data: {
+      queries: dashboardQueries
+    },
+    methods: {
+      remove: function(index) {
+        this.queries.splice(index, 1)
+      }
+    },
+    mounted: function() {
+      $("#query_id").selectize({
+        options: queries,
+        highlight: false,
+        maxOptions: 100,
+        onChange: function(val) {
+          if (val) {
+            var item = this.getItem(val)
+
+            // if duplicate query is added, remove the first one
+            for (var i = 0; i < app.queries.length; i++) {
+              if (app.queries[i].id == val) {
+                app.queries.splice(i, 1)
+                break
+              }
+            }
+
+            app.queries.push({id: val, name: item.text()})
+            this.setValue("")
+          }
+        }
+      })
+    }
+  })
+  Sortable.create($("#queries").get(0), {
+    onEnd: function(e) {
+      app.queries.splice(e.newIndex, 0, app.queries.splice(e.oldIndex, 1)[0])
+    }
+  })
 </script>

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

@@ -35,13 +35,13 @@
     </div>
   </div>
   <script>
-    var data = <%= blazer_json_escape({statement: query.statement, query_id: query.id, only_chart: true}.to_json).html_safe %>;
+    <%= blazer_js_var "data", {statement: query.statement, query_id: query.id, only_chart: true} %>
 
     runQuery(data, function (data) {
-      $("#chart-<%= i %>").html(data);
-      $("#chart-<%= i %> table").stupidtable();
+      $("#chart-<%= i %>").html(data)
+      $("#chart-<%= i %> table").stupidtable()
     }, function (message) {
-      $("#chart-<%= i %>").css("color", "red").html(message);
+      $("#chart-<%= i %>").addClass("query-error").html(message)
     });
   </script>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <div id="app" v-cloak>
-  <%= form_for @query, url: (@query.persisted? ? query_path(@query, variable_params) : queries_path(variable_params)), html: {class: "the_form", autocomplete: "off"} do |f| %>
+  <%= form_for @query, url: (@query.persisted? ? query_path(@query, variable_params) : queries_path(variable_params)), html: {autocomplete: "off"} do |f| %>
     <div class="row">
       <div id="statement-box" class="col-xs-8">
         <div class= "form-group">
@@ -60,19 +60,20 @@
 
   <div id="results">
     <p class="text-muted" v-if="running">Loading...</p>
-    <div id="results-html" v-if="!running"></div>
+    <div id="results-html" v-if="!running" :class="{ 'query-error': error }"></div>
   </div>
 </div>
 
 <script>
-  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) %>;
+  <%= blazer_js_var "params", variable_params %>
+  <%= blazer_js_var "previewStatement", Hash[Blazer.data_sources.map { |k, v| [k, v.preview_statement] }] %>
 
   var app = new Vue({
     el: "#app",
     data: {
       running: false,
       results: "",
+      error: false,
       dataSource: "",
       selectize: null,
       editorHeight: "180px"
@@ -86,6 +87,7 @@
       run: function(e) {
         this.running = true
         this.results = ""
+        this.error = false
         cancelAllQueries()
 
         var data = $.extend({}, params, {statement: this.getSQL(), data_source: $("#query_data_source").val()})
@@ -105,6 +107,7 @@
           }
         }, function (data) {
           _this.running = false
+          _this.error = true
           _this.showResults(data)
         })
       },
@@ -114,14 +117,18 @@
       },
       updateDataSource: function(dataSource) {
         this.dataSource = dataSource
-        var _this = this
+        var selectize = this.selectize
+        selectize.clearOptions()
+
+        if (this.tablesXhr) {
+          this.tablesXhr.abort()
+        }
 
-        $.getJSON(Routes.tables_queries_path({data_source: this.dataSource}), function(data) {
+        this.tablesXhr = $.getJSON(Routes.tables_queries_path({data_source: this.dataSource}), function(data) {
           var newOptions = []
           for (var i = 0; i < data.length; i++) {
             newOptions.push({text: data[i], value: data[i]})
           }
-          var selectize = _this.selectize
           selectize.clearOptions()
           selectize.addOption(newOptions)
           selectize.refreshOptions(false)

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

@@ -38,7 +38,7 @@
     <tbody class="list" v-cloak>
       <tr v-for="query in visibleItems">
         <td>
-          <a :href="itemPath(query)" :class="{dashboard: query.dashboard}">{{ query.name }}</a>
+          <a :href="itemPath(query)" :class="{ dashboard: query.dashboard }">{{ query.name }}</a>
           <span class="vars">{{ query.vars }}</span>
         </td>
         <td class="creator">{{ query.creator }}</td>
@@ -50,6 +50,10 @@
 </div>
 
 <script>
+  <%= blazer_js_var "dashboards", @dashboards %>
+  <%= blazer_js_var "queries", @queries %>
+  <%= blazer_js_var "more", @more %>
+
   var prepareSearch = function (list) {
     var i, q, searchStr
     for (i = 0; i < list.length; i++) {
@@ -70,17 +74,17 @@
     el: "#queries",
     data: {
       searchTerm: "",
-      more: gon.more,
+      more: more,
       updateCounter: 0
     },
     created: function() {
-      this.listItems = gon.dashboards.concat(gon.queries)
+      this.listItems = dashboards.concat(queries)
 
       prepareSearch(this.listItems)
 
       this.queryIds = {}
-      for (i = 0; i < gon.queries.length; i++) {
-        this.queryIds[gon.queries[i].id] = true
+      for (i = 0; i < queries.length; i++) {
+        this.queryIds[queries[i].id] = true
       }
 
       if (this.more) {

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

@@ -51,7 +51,7 @@
       <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 %>;
+        <%= blazer_js_var "markers", @markers %>
         var featureLayer = L.mapbox.featureLayer().addTo(map);
         var geojson = [];
         for (var i = 0; i < markers.length; i++) {

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

@@ -48,17 +48,17 @@
 
   <script>
     function showRun(data) {
-      $("#results").html(data);
-      $("#results table").stupidtable().stickyTableHeaders({fixedOffset: 60});
+      $("#results").html(data)
+      $("#results table").stupidtable().stickyTableHeaders({fixedOffset: 60})
     }
 
     function showError(message) {
-      $("#results").css("color", "red").html(message);
+      $("#results").addClass("query-error").html(message)
     }
 
-    var data = <%= blazer_json_escape(variable_params.merge(statement: @statement, query_id: @query.id).to_json).html_safe %>;
+    <%= blazer_js_var "data", variable_params.merge(statement: @statement, query_id: @query.id) %>
 
-    runQuery(data, showRun, showError);
+    runQuery(data, showRun, showError)
   </script>
 <% end %>
 

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

@@ -7,7 +7,9 @@
 
     <%= stylesheet_link_tag "blazer/application" %>
     <%= javascript_include_tag "blazer/application" %>
-    <%= Gon::Base.render_data %>
+    <script>
+      <%= blazer_js_var "rootPath", root_path %>
+    </script>
     <% if blazer_maps? %>
       <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/v2.4.0/mapbox.css" %>
       <%= javascript_include_tag "https://api.mapbox.com/mapbox.js/v2.4.0/mapbox.js" %>

data/blazer.gemspec

@@ -20,8 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rails"
   spec.add_dependency "chartkick"
   spec.add_dependency "safely_block", ">= 0.1.1"
-  spec.add_dependency "js-routes"
-  spec.add_dependency "gon"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/blazer.rb

@@ -2,8 +2,6 @@ require "csv"
 require "yaml"
 require "chartkick"
 require "safely/core"
-require "js-routes"
-require "gon"
 require "blazer/version"
 require "blazer/data_source"
 require "blazer/result"
@@ -78,6 +76,13 @@ module Blazer
       ]
       ds.default = ds.values.first
       ds
+
+      # TODO Blazer 2.0
+      # ds2 = Hash.new { |hash, key| raise Blazer::Error, "Unknown data source: #{key}" }
+      # ds.each do |k, v|
+      #   ds2[k] = v
+      # end
+      # ds2
     end
   end
 
@@ -138,7 +143,9 @@ module Blazer
     end
 
     emails.each do |email, checks|
-      Blazer::CheckMailer.failing_checks(email, checks).deliver_later
+      Safely.safely do
+        Blazer::CheckMailer.failing_checks(email, checks).deliver_now
+      end
     end
   end
 end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.7.3"
+  VERSION = "1.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,34 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: js-routes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +119,7 @@ files:
 - app/assets/javascripts/blazer/moment-timezone.js
 - app/assets/javascripts/blazer/moment.js
 - app/assets/javascripts/blazer/queries.js
-- app/assets/javascripts/blazer/routes.js.erb
+- app/assets/javascripts/blazer/routes.js
 - app/assets/javascripts/blazer/selectize.js
 - app/assets/javascripts/blazer/stupidtable.js
 - app/assets/javascripts/blazer/vue.js

data/app/assets/javascripts/blazer/routes.js.erb

@@ -1,26 +0,0 @@
-<%#= JsRoutes.generate(engine: Blazer::Engine, prefix: Blazer::Engine.app.url_helpers.root_path) %>
-
-// temp fix
-var Routes = {
-  run_queries_path: function() {
-    return gon.root_path + "queries/run"
-  },
-  cancel_queries_path: function() {
-    return gon.root_path + "queries/cancel"
-  },
-  schema_queries_path: function(params) {
-    return gon.root_path + "queries/schema?data_source=" + params.data_source
-  },
-  tables_queries_path: function(params) {
-    return gon.root_path + "queries/tables?data_source=" + params.data_source
-  },
-  queries_path: function() {
-    return gon.root_path + "queries"
-  },
-  query_path: function(id) {
-    return gon.root_path + "queries/" + id
-  },
-  dashboard_path: function(id) {
-    return gon.root_path + "dashboards/" + id
-  }
-}