sql-jarvis 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17e9fc90e06d4ce4b4697388ffcc1cc7354344eda424f8eb325d3a05e1ecbae9
-  data.tar.gz: 5777e0cf364e307cc5914d1753bf8f7d0d2ebb8c9a3541c982085969d275343f
+  metadata.gz: 9773e38d1a1c2c0c16a2b29975123204eb42159922b81e5144c9ed585b27a573
+  data.tar.gz: 1038744af4afa79645d42630a4788d6012f99ee4d3bab734f6905898495446f4
 SHA512:
-  metadata.gz: 61685abff8d8f41652123b2d65eda3be1b652433c74b574b03112b254ca711e88bf34f18e4e84381c06ca99ac20b129e8f400f232023a70fbb44025b7191df58
-  data.tar.gz: f31e00ff500173fdeac4c5a8c2b884567d11171102ae9943aa2258bc6768009bcd31884c579df07dcaec638519802ab63e9848baa4cc95c96e399e859e909e6d
+  metadata.gz: 4e4d6bb6cbbb890522bc157f6edb6873ac140203ed0c11eb0094d4d12132fd1a51b3e7cbf311a6dd99c42f3cdc6df926a7052a38d2fe9940011aa6bdfae4c669
+  data.tar.gz: 0e6250d227218b5929ad30dd6ef27827dd74bb26995789a809a485da512b61aade48996b5694cc3729bb24a43e833ce8ee99e5f3011be145578ec495999e2e72

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

@@ -233,3 +233,7 @@ h2 {
 .schema-table {
   max-width: 500px;
 }
+
+ul#proTip li {
+  display: none;
+}

data/app/controllers/blazer/queries_controller.rb

@@ -1,7 +1,7 @@
 module Blazer
   class QueriesController < BaseController
     before_action :set_query, only: [:show, :edit, :update, :destroy, :refresh]
-    before_action :set_data_source, only: [:tables, :docs, :schema, :cancel, :columns]
+    before_action :set_data_source, only: [:new, :edit, :tables, :docs, :schema, :cancel, :columns]
     before_action :set_assignees, only: [:new, :create, :show, :edit, :update, :destroy, :refresh]
 
     def home
@@ -39,6 +39,9 @@ module Blazer
       )
       if params[:fork_query_id]
         @query.statement ||= Blazer::Query.find(params[:fork_query_id]).try(:statement)
+      else
+        statement_from_cache = Rails.cache.read [:jarvis, blazer_user, request.url.parameterize]
+        @query.statement ||= statement_from_cache
       end
     end
 
@@ -71,6 +74,13 @@ module Blazer
     end
 
     def edit
+      statement_from_cache = Rails.cache.read [:jarvis, blazer_user, request.url.parameterize]
+      @query.statement = statement_from_cache
+    end
+
+    def backup
+      Rails.cache.write [:jarvis, blazer_user, request.referrer.parameterize], params[:sql_query]
+      render json: { success: true }, status: 200
     end
 
     def run

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

@@ -15,7 +15,6 @@
         <div class="form-group text-right" style="margin-bottom: 8px;">
           <div class="pull-left" style="margin-top: 8px;">
             <%= link_to "Back", :back %>
-            <a :href="docsPath" target="_blank" style="margin-left: 40px;">Docs</a>
             <a :href="schemaPath" target="_blank" style="margin-left: 40px;">Schema</a>
           </div>
 
@@ -62,6 +61,8 @@
             </div>
           <% end %>
         <% end %>
+        <hr>
+        <%= render partial: "tips" %>
       </div>
     </div>
   <% end %>
@@ -305,8 +306,32 @@
     }
   })
 
+  function backupSQL() {
+    $.ajax({
+      url: "<%= backup_queries_path %>",
+      method: 'POST',
+      data: {
+        sql_query: $('#query_statement').val()
+      }
+    })
+  }
+
   $(document).ready(function() {
     $('#query_assignee_ids').select2();
+    setInterval(function() {
+      var lastVersion = $('#query_statement').val();
+      if (localStorage.getItem('lastVersion') !== lastVersion) {
+        localStorage.setItem('lastVersion', lastVersion);
+      }
+    }, 10000);
+  });
+
+  $(document).keydown(function(event) {
+    if ((event.ctrlKey || event.metaKey) && event.which == 83) {
+      backupSQL();
+      event.preventDefault();
+      return false;
+    }
   });
 
 </script>

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

@@ -0,0 +1,69 @@
+<small class='text-muted'>
+  <h5>
+    <i class="far fa-lightbulb"></i>
+    ProTip!
+    <%= link_to 'more...', docs_queries_path, target: :_blank, style: "float: right; font-weight: 200" %>
+  </h5>
+  <ul class='list-unstyled' id='proTip'>
+    <li>
+      <strong>Command + S</strong> to backup your SQL string.
+    </li>
+    <li>
+      Set column name to <strong>*_date</strong> to format DateTime to <strong><%= Time.current.strftime('%Y/%m/%d') %></strong>
+    </li>
+    <li>
+      Set column name to <strong>*_time</strong> to format DateTime to <strong><%= Time.current.strftime('%H:%M') %></strong>
+    </li>
+
+    <% if @data_source.smart_variables.any? %>
+      <% @data_source.smart_variables.keys.each do |key| %>
+        <li>
+          <strong><i class="fas fa-caret-square-down"></i></strong>
+          Use <code>{<%= key %>}</code> to get a dropdown of values.
+        </li>
+      <% end %>
+      <li>
+        <strong><i class="fas fa-caret-square-down"></i></strong>
+        Use <code>{start_time}</code> and <code>{end_time}</code> for a date range selector.
+      </li>
+      <li>
+        <strong><i class="fas fa-caret-square-down"></i></strong>
+        End a variable name with <code>_at</code> for a date selector.
+      </li>
+    <% end %>
+
+    <li>
+      <strong><i class="fas fa-chart-line"></i> Chart:</strong>
+      2+ columns - timestamp, numeric(s)</li>
+    <li>
+      <strong><i class="fas fa-chart-line"></i> Chart:</strong>
+      3 columns - timestamp, string, numeric
+    </li>
+    <li>
+      <strong><i class="far fa-chart-bar"></i> Chart:</strong>
+      2+ columns - string, numeric(s)
+    </li>
+    <li>
+      <strong><i class="far fa-chart-bar"></i> Chart:</strong>
+      3 columns - string, string, numeric
+    </li>
+    <li>
+      <strong>Scatter Chart:</strong>
+      2 columns - both numeric
+    </li>
+    <li>
+      <strong><i class="fas fa-chart-pie"></i> Chart:</strong>
+      2 columns - string, numeric - and last column named <code>pie</code>
+    </li>
+    <li>
+      <strong><i class="fas fa-globe-americas"></i> Chart:</strong>
+      Named <code>latitude</code> and <code>longitude</code>, or <code>lat</code> and <code>lon</code>, or <code>lat</code> and <code>lng</code>
+    </li>
+  <ul>
+</small>
+
+<script>
+  var itemCount = $('ul#proTip li').length;
+  var showIndex = Math.floor(Math.random() * Math.floor(itemCount)) + 1;
+  $("ul#proTip li:nth-child(" + showIndex + ")").show();
+</script>

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

@@ -10,6 +10,7 @@
     <script>
       <%= blazer_js_var "rootPath", root_path %>
     </script>
+    <script defer src="https://use.fontawesome.com/releases/v5.8.2/js/all.js" integrity="sha384-DJ25uNYET2XCl5ZF++U8eNxPWqcKohUUBUpKGlNLMchM7q4Wjg2CUpjHLaL8yYPH" crossorigin="anonymous"></script>
     <% if blazer_maps? %>
       <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.css", integrity: "sha384-o8tecBIfqi9yU5yYK2Ne/9A9hlOGFV9MBvCpmemvJH1XxqOe6h8Bl4mLxMi6PgjG", crossorigin: "anonymous" %>
       <%= javascript_include_tag "https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.js", integrity: "sha384-j81LqvtvYigFzGSUgAoFijpvoq4yGoCJSOXI9DFaUEpenR029MBE3E/X5Gr+WdO0", crossorigin: "anonymous" %>

data/config/routes.rb

@@ -1,8 +1,9 @@
 Blazer::Engine.routes.draw do
   resources :queries do
+    post :refresh, on: :member
     post :run, on: :collection # err on the side of caution
     post :cancel, on: :collection
-    post :refresh, on: :member
+    post :backup, on: :collection
     get :tables, on: :collection
     get :columns, on: :collection
     get :schema, on: :collection
@@ -17,5 +18,5 @@ Blazer::Engine.routes.draw do
     post :refresh, on: :member
   end
 
-  root to: "queries#home"
+  root to: 'queries#home'
 end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-jarvis
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -211,6 +211,7 @@ files:
 - app/views/blazer/dashboards/new.html.erb
 - app/views/blazer/dashboards/show.html.erb
 - app/views/blazer/queries/_form.html.erb
+- app/views/blazer/queries/_tips.html.erb
 - app/views/blazer/queries/docs.html.erb
 - app/views/blazer/queries/edit.html.erb
 - app/views/blazer/queries/home.html.erb
@@ -263,7 +264,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Fork from ankane! Explore your data with SQL. Easily create charts and dashboards,