blazer 1.0.4 → 1.1.0

data/app/controllers/blazer/queries_controller.rb

@@ -107,7 +107,7 @@ module Blazer
           if query
             values = @rows.map { |r| r[key] }.compact.uniq
             rows, error, cached_at = @data_source.run_statement(ActiveRecord::Base.send(:sanitize_sql_array, [query.sub("{value}", "(?)"), values]))
-            @boom[key] = Hash[rows.map(&:values)]
+            @boom[key] = Hash[rows.map(&:values).map { |k, v| [k.to_s, v] }]
           end
         end
 
@@ -150,6 +150,10 @@ module Blazer
     end
 
     def update
+      if params[:commit] == "Fork"
+        @query = Blazer::Query.new
+        @query.creator = blazer_user if @query.respond_to?(:creator)
+      end
       if @query.update(query_params)
         redirect_to query_path(@query, variable_params)
       else
@@ -202,7 +206,7 @@ module Blazer
           csv << rows.first.keys
         end
         rows.each do |row|
-          csv << row.values
+          csv << row.values.map { |v| v.is_a?(Time) ? v.in_time_zone(Blazer.time_zone) : v }
         end
       end
     end

data/app/helpers/blazer/base_helper.rb

@@ -16,6 +16,21 @@ module Blazer
       end
     end
 
+    def blazer_column_types(columns, rows, boom)
+      columns.map do |k, _|
+        v = (rows.find { |r| r[k] } || {})[k]
+        if boom[k]
+          "string"
+        elsif v.is_a?(Numeric)
+          "numeric"
+        elsif v.is_a?(Time) || v.is_a?(Date)
+          "time"
+        else
+          "string"
+        end
+      end
+    end
+
     def blazer_maps?
       ENV["MAPBOX_ACCESS_TOKEN"].present?
     end

data/app/models/blazer/query.rb

@@ -3,6 +3,7 @@ module Blazer
     belongs_to :creator, class_name: Blazer.user_class.to_s if Blazer.user_class
     has_many :checks, dependent: :destroy
     has_many :dashboard_queries, dependent: :destroy
+    has_many :dashboards, through: :dashboard_queries
     has_many :audits
 
     validates :name, presence: true

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

@@ -12,9 +12,13 @@
 li:hover .glyphicon-remove {
   display: inline;
 }
+
+.list-group {
+  cursor: move;
+}
 </style>
 
-<%= form_for @dashboard do |f| %>
+<%= form_for @dashboard, url: (@dashboard.persisted? ? dashboard_path(@dashboard, variable_params) : dashboards_path(variable_params)) do |f| %>
   <div class="form-group">
     <%= f.label :name %>
     <%= f.text_field :name, class: "form-control" %>

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

@@ -24,7 +24,7 @@
         </h3>
       </div>
       <div class="col-sm-3 text-right">
-        <%= link_to "Edit", edit_dashboard_path(@dashboard), class: "btn btn-info" %>
+        <%= link_to "Edit", edit_dashboard_path(@dashboard, variable_params), class: "btn btn-info" %>
       </div>
     </div>
   </div>
@@ -32,6 +32,13 @@
 
 <div style="margin-bottom: 60px;"></div>
 
+<% if @data_sources.any? { |ds| ds.cache } %>
+  <p class="text-muted" style="float: right;">
+    Some queries are cached
+    <%= link_to "Refresh", refresh_dashboard_path(@dashboard, variable_params), method: :post %>
+  </p>
+<% end %>
+
 <% if @bind_vars.any? %>
   <form id="bind" method="get" action="<%= url_for(params) %>" class="form-inline" style="margin-bottom: 10px;">
     <% date_vars = ["start_time", "end_time"] %>
@@ -54,7 +61,7 @@
         <%= text_field_tag var, params[var], style: "width: 120px; margin-right: 20px;", autofocus: i == 0 && !var.end_with?("_at") && !params[var], class: "form-control" %>
         <% if var.end_with?("_at") %>
           <script>
-            $("#<%= var %>").datepicker({format: "yyyy-mm-dd", autoclose: true, todayBtn: "linked"})
+            $("#<%= var %>").daterangepicker({singleDatePicker: true, locale: {format: "YYYY-MM-DD"}});
           </script>
         <% end %>
       <% end %>
@@ -97,7 +104,9 @@
              "Last 7 Days": [dateStr(6), dateStr()],
              "Last 30 Days": [dateStr(29), dateStr()]
             },
-            format: format,
+            locale: {
+              format: format
+            },
             startDate: dateStr(29),
             endDate: dateStr(),
             opens: "left"

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

@@ -44,9 +44,13 @@
       <div class="text-right">
         <% if @query.persisted? %>
           <%= link_to "Delete", query_path(@query), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>
+          <%= f.submit "Fork", class: "btn btn-info" %>
         <% end %>
         <%= f.submit @query.persisted? ? "Update" : "Create", class: "btn btn-success" %>
       </div>
+      <% if @query.persisted? && (dashboards_count = @query.dashboards.count) > 0 %>
+        <div class="alert alert-info" style="margin-top: 10px; padding: 8px 12px;">Part of <%= pluralize(dashboards_count, "dashboard") %>. Be careful when editing.</div>
+      <% end %>
     </div>
   </div>
 <% end %>

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

@@ -26,6 +26,7 @@
   <% if @rows.any? %>
     <% values = @rows.first.values %>
     <% chart_id = SecureRandom.hex %>
+    <% column_types = blazer_column_types(@columns, @rows, @boom) %>
     <% if blazer_maps? && @markers.any? %>
       <div id="map" style="height: <%= @only_chart ? 300 : 500 %>px;"></div>
       <script>
@@ -55,14 +56,15 @@
         featureLayer.setGeoJSON(geojson);
         map.fitBounds(featureLayer.getBounds());
       </script>
-    <% elsif values.size >= 2 && (values.first.is_a?(Time) || values.first.is_a?(Date)) && values[1..-1].all?{|v| v.is_a?(Numeric) } %>
+    <% elsif values.size >= 2 && column_types == ["time"] + (values.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 %>
-    <% elsif values.size == 3 && (values.first.is_a?(Time) || values.first.is_a?(Date)) && values[1].is_a?(String) && values[2].is_a?(Numeric) %>
+    <% elsif values.size == 3 && column_types == ["time", "string", "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]]] } } }, id: chart_id, min: nil %>
-    <% elsif values.size == 2 && values.first.is_a?(String) && values.last.is_a?(Numeric) %>
-      <%= pie_chart @rows.map(&:values), library: {sliceVisibilityThreshold: 1 / 40.0}, id: chart_id %>
+      <%= 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 %>
+    <% 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 %>
     <% elsif @only_chart %>
       <% if @rows.size == 1 && @rows.first.size == 1 %>
         <p style="font-size: 160px;"><%= blazer_format_value(@rows.first.keys.first, @rows.first.values.first) %></p>
@@ -104,7 +106,7 @@
                         <%= blazer_format_value(k, v) %>
                       <% end %>
 
-                      <% if v2 = (@boom[k] || {})[v] %>
+                      <% if v2 = (@boom[k] || {})[v.to_s] %>
                         <div class="text-muted"><%= v2 %></div>
                       <% end %>
                     <% end %>

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

@@ -73,7 +73,7 @@
         <%= text_field_tag var, params[var], style: "width: 120px; margin-right: 20px;", autofocus: i == 0 && !var.end_with?("_at") && !params[var], class: "form-control" %>
         <% if var.end_with?("_at") %>
           <script>
-            $("#<%= var %>").datepicker({format: "yyyy-mm-dd", autoclose: true, todayBtn: "linked"})
+            $("#<%= var %>").daterangepicker({singleDatePicker: true, locale: {format: "YYYY-MM-DD"}});
           </script>
         <% end %>
       <% end %>
@@ -116,10 +116,12 @@
              "Last 7 Days": [dateStr(6), dateStr()],
              "Last 30 Days": [dateStr(29), dateStr()]
             },
-            format: format,
+            locale: {
+              format: format
+            },
             startDate: dateStr(29),
             endDate: dateStr(),
-            opens: "left"
+            opens: "right"
           },
           function(start, end) {
             setTimeInputs(start, end);

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

@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
 
     <%= stylesheet_link_tag "blazer/application" %>
-    <%= javascript_include_tag "//www.google.com/jsapi", "blazer/application" %>
+    <%= javascript_include_tag "https://www.google.com/jsapi", "blazer/application" %>
     <% if blazer_maps? %>
       <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/v2.2.2/mapbox.css" %>
       <%= javascript_include_tag "https://api.mapbox.com/mapbox.js/v2.2.2/mapbox.js" %>

data/config/routes.rb

@@ -7,6 +7,8 @@ Blazer::Engine.routes.draw do
   resources :checks, except: [:show] do
     get :run, on: :member
   end
-  resources :dashboards
+  resources :dashboards do
+    post :refresh, on: :member
+  end
   root to: "queries#home"
 end

data/lib/blazer.rb

@@ -1,4 +1,5 @@
 require "csv"
+require "yaml"
 require "chartkick"
 require "blazer/version"
 require "blazer/data_source"

data/lib/blazer/engine.rb

@@ -5,6 +5,7 @@ module Blazer
     initializer "blazer" do |app|
       # use a proc instead of a string
       app.config.assets.precompile << proc { |path| path =~ /\Ablazer\/application\.(js|css)\z/ }
+      app.config.assets.precompile << proc { |path| path =~ /\Ablazer\/.+\.(eot|svg|ttf|woff)\z/ }
 
       Blazer.time_zone ||= Blazer.settings["time_zone"] || Time.zone
       Blazer.audit = Blazer.settings.key?("audit") ? Blazer.settings["audit"] : true

data/lib/blazer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -79,6 +79,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/fonts/blazer/glyphicons-halflings-regular.eot
+- app/assets/fonts/blazer/glyphicons-halflings-regular.svg
+- app/assets/fonts/blazer/glyphicons-halflings-regular.ttf
+- app/assets/fonts/blazer/glyphicons-halflings-regular.woff
+- app/assets/fonts/blazer/glyphicons-halflings-regular.woff2
 - app/assets/javascripts/blazer/Sortable.js
 - app/assets/javascripts/blazer/ace/ace.js
 - app/assets/javascripts/blazer/ace/ext-language_tools.js
@@ -100,7 +105,7 @@ files:
 - app/assets/javascripts/blazer/selectize.js
 - app/assets/javascripts/blazer/stupidtable.js
 - app/assets/stylesheets/blazer/application.css
-- app/assets/stylesheets/blazer/bootstrap.css
+- app/assets/stylesheets/blazer/bootstrap.css.erb
 - app/assets/stylesheets/blazer/daterangepicker-bs3.css
 - app/assets/stylesheets/blazer/github.css
 - app/assets/stylesheets/blazer/selectize.default.css
@@ -168,9 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Share data effortlessly with your team
 test_files: []
-has_rdoc: