blazer 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c76491b2936f131b04b198dbd1a36a0e10ba0500
-  data.tar.gz: 5cbfff8d2d610da3ed0352328b05de7e8a04bb16
+  metadata.gz: 51e43730bc19587ab66d3136921b7c630fe623ba
+  data.tar.gz: 16e489763b19ffd3cc8cb8965215c83665faab8f
 SHA512:
-  metadata.gz: 1b2e877250e2f1088e34ed5f541b25c133ed2b8ec4b6fac34e468ea233a90a4d4b96568d4cd599de4f4d701578a2eeef21c68d13c3143d331a3bf0d7180cea32
-  data.tar.gz: 1aea7e790bd9c65b66ebd2e9d93a7b427ebe50140832e9e8cb6b7d7057e81b7ca7a7e7e2955bb6ed44ecf59f8427761c9d4a15a9b1bcc465812539c4c2c7a58d
+  metadata.gz: 9758237b705407208a9264f35d4e33debb43611759d5827ae36305a4ee8789e0538506554319b7cfb739947eb91d53655f25ecf9bc73639c4b44c2a01a3a33ef
+  data.tar.gz: 2f6a6e50e22f9cd4963782ae7ef54efb89f2310892bccb0d5949c4060d0459d818a43d38d6ce8b519c5fec3629082a35b3c9aec33a8e802deb91b24f5cf0d516

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.4
+
+- Added recently viewed queries and dashboards to home page
+- Fixed refresh when transform statement is used
+- Fixed error when no user model
+
 ## 1.0.3
 
 - Added maps

data/README.md

@@ -10,6 +10,8 @@ Explore your data with SQL. Easily create charts and dashboards, and share them
 
 **Blazer 1.0 was recently released!** See the [instructions for upgrading](#10).
 
+:envelope: [Subscribe to releases](https://libraries.io/rubygems/blazer)
+
 ## Features
 
 - **Multiple data sources** - works with PostgreSQL, MySQL, and Redshift
@@ -232,7 +234,7 @@ SELECT gender, COUNT(*) FROM users GROUP BY 1
 
 ### Maps
 
-Columns named `latitude` and `longitude` or `lat` and `lon`.
+Columns named `latitude` and `longitude` or `lat` and `lon` - [Example](https://blazerme.herokuapp.com/queries/11-airports-in-pacific-time-zone)
 
 ```sql
 SELECT name, latitude, longtitude FROM cities

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

@@ -83,3 +83,7 @@ input.search:focus {
   overflow: scroll;
   text-align: left;
 }
+
+.dashboard a {
+  font-weight: bold;
+}

data/app/controllers/blazer/base_controller.rb

@@ -42,7 +42,7 @@ module Blazer
     helper_method :extract_vars
 
     def variable_params
-      params.except(:controller, :action, :id, :host, :query, :query_id, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source)
+      params.except(:controller, :action, :id, :host, :query, :query_id, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name)
     end
     helper_method :variable_params
 

data/app/controllers/blazer/queries_controller.rb

@@ -1,23 +1,27 @@
 module Blazer
   class QueriesController < BaseController
-    before_action :set_queries, only: [:home, :index]
     before_action :set_query, only: [:show, :edit, :update, :destroy, :refresh]
 
     def home
-      @queries = @queries.limit(1000)
+      set_queries(1000)
     end
 
     def index
+      set_queries
       render partial: "index", layout: false
     end
 
     def new
-      @query = Blazer::Query.new(statement: params[:statement], data_source: params[:data_source])
+      @query = Blazer::Query.new(
+        statement: params[:statement],
+        data_source: params[:data_source],
+        name: params[:name]
+      )
     end
 
     def create
       @query = Blazer::Query.new(query_params)
-      @query.creator = blazer_user
+      @query.creator = blazer_user if @query.respond_to?(:creator)
 
       if @query.save
         redirect_to query_path(@query, variable_params)
@@ -140,6 +144,7 @@ module Blazer
       data_source = Blazer.data_sources[@query.data_source]
       @statement = @query.statement.dup
       process_vars(@statement)
+      Blazer.transform_statement.call(data_source, @statement) if Blazer.transform_statement
       data_source.clear_cache(@statement)
       redirect_to query_path(@query, variable_params)
     end
@@ -164,11 +169,23 @@ module Blazer
 
     private
 
-    def set_queries
+    def set_queries(limit = nil)
+      @my_queries =
+        if blazer_user
+          recent_query_ids = Blazer::Audit.where(user_id: blazer_user.id).where("query_id IS NOT NULL").order("created_at desc").limit(100).pluck(:query_id).uniq.first(20)
+          queries = Blazer::Query.where(id: recent_query_ids).index_by(&:id)
+          recent_query_ids.map { |query_id| queries[query_id] }.compact
+        else
+          []
+        end
+
       @queries = Blazer::Query.order(:name)
+      @queries = @queries.where("id NOT IN (?)", @my_queries.map(&:id)) if @my_queries.any?
       @queries = @queries.includes(:creator) if Blazer.user_class
+      @queries = @queries.limit(limit) if limit
       @trending_queries = Blazer::Audit.group(:query_id).where("created_at > ?", 2.days.ago).having("COUNT(DISTINCT user_id) >= 3").uniq.count(:user_id)
       @checks = Blazer::Check.group(:query_id).count
+      @dashboards = Blazer::Dashboard.order(:name)
     end
 
     def set_query

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 :audits
 
     validates :name, presence: true
     validates :statement, presence: true

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

@@ -45,7 +45,7 @@
         <% if @query.persisted? %>
           <%= link_to "Delete", query_path(@query), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>
         <% end %>
-        <%= f.submit "Save", class: "btn btn-success" %>
+        <%= f.submit @query.persisted? ? "Update" : "Create", class: "btn btn-success" %>
       </div>
     </div>
   </div>

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

@@ -1,18 +1,21 @@
-<% @queries.each do |query| %>
+<% (@my_queries + @dashboards + @queries).each do |query| %>
+  <% is_query = query.is_a?(Blazer::Query) %>
   <tr>
-    <td class="query">
+    <td class="query <%= "dashboard" unless is_query %>">
       <%= link_to query.name, query %>
-      <span style="color: #ccc;"><%= extract_vars(query.statement).join(", ") %></span>
-      <% if @queries.size < 1000 && query.created_at > 2.days.ago %>
-        <small style="font-weight: bold; color: #5cb85c;">NEW</small>
-      <% end %>
-      <% if @trending_queries[query.id] %>
-        <small style="font-weight: bold; color: #f60;">TRENDING</small>
-      <% end %>
-      <% if @checks[query.id] %>
-        <small style="font-weight: bold; color: #f60;">CHECK</small>
+      <% if is_query %>
+        <span style="color: #ccc;"><%= extract_vars(query.statement).join(", ") %></span>
+        <% if @queries.size < 1000 && query.created_at > 2.days.ago %>
+          <small style="font-weight: bold; color: #5cb85c;">NEW</small>
+        <% end %>
+        <% if @trending_queries[query.id] %>
+          <small style="font-weight: bold; color: #f60;">TRENDING</small>
+        <% end %>
+        <% if @checks[query.id] %>
+          <small style="font-weight: bold; color: #f60;">CHECK</small>
+        <% end %>
+        <div class="hide"><%= query.name.gsub(/\s+/, "") %></div>
       <% 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/home.html.erb

@@ -20,7 +20,7 @@
   <table class="table">
     <thead>
       <tr>
-        <th>Query</th>
+        <th>Name</th>
         <th style="width: 20%; text-align: right;">Mastermind</th>
       </tr>
     </thead>

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

@@ -26,15 +26,7 @@
   <% if @rows.any? %>
     <% values = @rows.first.values %>
     <% chart_id = SecureRandom.hex %>
-    <% if values.size >= 2 && (values.first.is_a?(Time) || values.first.is_a?(Date)) && 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]] }} }, 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) %>
-      <% 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 %>
-    <% elsif blazer_maps? && @markers.any? %>
+    <% if blazer_maps? && @markers.any? %>
       <div id="map" style="height: <%= @only_chart ? 300 : 500 %>px;"></div>
       <script>
         L.mapbox.accessToken = '<%= ENV["MAPBOX_ACCESS_TOKEN"] %>';
@@ -56,13 +48,21 @@
             properties: {
               description: marker.title,
               'marker-color': '#f86767',
-              'marker-symbol': 'star'
+              'marker-size': 'medium'
             }
           });
         }
         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) } %>
+      <% 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) %>
+      <% 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 %>
     <% 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>

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

@@ -25,7 +25,7 @@
       </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)), class: "btn btn-info" %>
+        <%= 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" %>
 
         <% if !@error && @success %>
           <%= button_to "Download", run_queries_path(statement: @statement, query_id: @query.id, format: "csv"), class: "btn btn-primary" %>

data/lib/blazer/engine.rb

@@ -11,7 +11,7 @@ module Blazer
       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.user_class ||= Blazer.settings["user_class"] || User rescue nil
+      Blazer.user_class ||= Blazer.settings.key?("user_class") ? Blazer.settings["user_class"] : (User rescue nil)
       Blazer.user_method = Blazer.settings["user_method"]
       if Blazer.user_class
         Blazer.user_method ||= "current_#{Blazer.user_class.to_s.downcase.singularize}"

data/lib/blazer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails