blazer 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d498bb03f6c2cdf408e73065449df3d27f7d2e4
-  data.tar.gz: b23b774a851a748277ffd1a1b33a420ca75f35ed
+  metadata.gz: f2b31d4024bff8e0f4945c686632c39dfb689b04
+  data.tar.gz: 7c5a623ae6bf5522199336a1525935e19b25b548
 SHA512:
-  metadata.gz: 6f551893a6c87914244c745aa481e01339465b7c59b97caac8a3c323dc378be92bf8ec39ed8d2ad64012880be5cbb909bdf6c8f5278bd3b85930aa1ab17f5b5a
-  data.tar.gz: 3fe76a4cb97e6b8f55a338b5c0bbde9564a972bee3fba93bc6b04b9f7bc7331b975abf87fd514b18c5ab6c72039ef2398449539747e9271d1a235fb97a1c236e
+  metadata.gz: 2ecc965c3c9b524056f8a87bd5032d5fc21a7de1ecc44803fae87171121534c2fee557a24582653b76ccd20b44407dad0fd5946bfd6ed26770978f6de0ee250e
+  data.tar.gz: 06785c76f5862dbcd4b1a7537ce0246df5b7fec64677ca6d603375ed83ef4070371fb5fbbd9e155b0eae0477f769ff35bd88ca4fe4aa379013e515e3d5b1ee57

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.2.0
+
+- Added non-editable queries
+- Added variable defaults
+- Added `local_time_suffix` setting
+- Better timeout message
+- Hide variables from commented out lines
+- Fixed regex as variable names
+
 ## 1.1.1
 
 - Added `before_action` option

data/app/controllers/blazer/base_controller.rb

@@ -23,8 +23,11 @@ module Blazer
       render text: "BLAZER_DATABASE_URL required" if !ENV["BLAZER_DATABASE_URL"] && !Rails.env.development?
     end
 
-    def process_vars(statement)
+    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
@@ -41,7 +44,9 @@ module Blazer
     end
 
     def extract_vars(statement)
-      statement.scan(/\{.*?\}/).map { |v| v[1...-1] }.uniq
+      # strip commented out lines
+      # and regex {1} or {1,2}
+      statement.gsub(/\-\-.+/, "").gsub(/\/\*.+\*\//m, "").scan(/\{.*?\}/).map { |v| v[1...-1] }.reject { |v| /\A\d+(\,\d+)?\z/.match(v) }.uniq
     end
     helper_method :extract_vars
 

data/app/controllers/blazer/dashboards_controller.rb

@@ -23,7 +23,7 @@ module Blazer
     def show
       @queries = @dashboard.dashboard_queries.order(:position).preload(:query).map(&:query)
       @queries.each do |query|
-        process_vars(query.statement)
+        process_vars(query.statement, query.data_source)
       end
       @bind_vars ||= []
 
@@ -62,7 +62,7 @@ module Blazer
       @dashboard.queries.each do |query|
         data_source = Blazer.data_sources[query.data_source]
         statement = query.statement.dup
-        process_vars(statement)
+        process_vars(statement, query.data_source)
         Blazer.transform_statement.call(data_source, statement) if Blazer.transform_statement
         data_source.clear_cache(statement)
       end

data/app/controllers/blazer/queries_controller.rb

@@ -13,7 +13,6 @@ module Blazer
 
     def new
       @query = Blazer::Query.new(
-        statement: params[:statement],
         data_source: params[:data_source],
         name: params[:name]
       )
@@ -35,7 +34,7 @@ module Blazer
 
     def show
       @statement = @query.statement.dup
-      process_vars(@statement)
+      process_vars(@statement, @query.data_source)
 
       @smart_vars = {}
       @sql_errors = []
@@ -57,13 +56,13 @@ module Blazer
 
     def run
       @statement = params[:statement]
-      process_vars(@statement)
+      data_source = params[:data_source]
+      process_vars(@statement, data_source)
       @only_chart = params[:only_chart]
 
       if @success
         @query = Query.find_by(id: params[:query_id]) if params[:query_id]
 
-        data_source = params[:data_source]
         data_source = @query.data_source if @query && @query.data_source
         @data_source = Blazer.data_sources[data_source]
         Blazer.transform_statement.call(@data_source, @statement) if Blazer.transform_statement
@@ -138,7 +137,7 @@ module Blazer
           render layout: false
         end
         format.csv do
-          send_data csv_data(@rows), type: "text/csv; charset=utf-8; header=present", disposition: "attachment; filename=\"#{@query ? @query.name.parameterize : 'query'}.csv\""
+          send_data csv_data(@rows), type: "text/csv; charset=utf-8; header=present", disposition: "attachment; filename=\"#{@query.try(:name).try(:parameterize).presence || 'query'}.csv\""
         end
       end
     end
@@ -146,7 +145,7 @@ module Blazer
     def refresh
       data_source = Blazer.data_sources[@query.data_source]
       @statement = @query.statement.dup
-      process_vars(@statement)
+      process_vars(@statement, @query.data_source)
       Blazer.transform_statement.call(data_source, @statement) if Blazer.transform_statement
       data_source.clear_cache(@statement)
       redirect_to query_path(@query, variable_params)
@@ -157,7 +156,10 @@ module Blazer
         @query = Blazer::Query.new
         @query.creator = blazer_user if @query.respond_to?(:creator)
       end
-      if @query.update(query_params)
+      unless @query.editable?(blazer_user)
+        @query.errors.add(:base, "Sorry, permission denied")
+      end
+      if @query.errors.empty? && @query.update(query_params)
         redirect_to query_path(@query, variable_params)
       else
         render :edit
@@ -165,7 +167,7 @@ module Blazer
     end
 
     def destroy
-      @query.destroy
+      @query.destroy if @query.editable?(blazer_user)
       redirect_to root_url
     end
 
@@ -179,14 +181,16 @@ module Blazer
     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
+          favorite_query_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
+          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
         else
           []
         end
 
-      @queries = Blazer::Query.order(:name)
+      @queries = Blazer::Query.named.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
@@ -209,9 +213,15 @@ module Blazer
           csv << rows.first.keys
         end
         rows.each do |row|
-          csv << row.values.map { |v| v.is_a?(Time) ? v.in_time_zone(Blazer.time_zone) : v }
+          csv << row.map { |k, v| v.is_a?(Time) ? blazer_time_value(k, v) : v }
         end
       end
     end
+
+    def blazer_time_value(k, v)
+      # yuck, instance var
+      @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
   end
 end

data/app/models/blazer/query.rb

@@ -6,15 +6,20 @@ module Blazer
     has_many :dashboards, through: :dashboard_queries
     has_many :audits
 
-    validates :name, presence: true
     validates :statement, presence: true
 
+    scope :named, -> { where("name <> ''") }
+
     def to_param
-      [id, name.gsub("'", "").parameterize].join("-")
+      [id, name].compact.join("-").gsub("'", "").parameterize
     end
 
     def friendly_name
-      name.gsub(/\[.+\]/, "").strip
+      name.to_s.gsub(/\[.+\]/, "").strip
+    end
+
+    def editable?(user)
+      (name.present? && name.first != "*") || user == creator
     end
   end
 end

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

@@ -10,7 +10,7 @@
   <div class="form-group">
     <%= f.label :query_id, "Query" %>
     <div class="hide">
-      <%= f.select :query_id, Blazer::Query.order(:name).map { |q| [q.name, q.id] }, {include_blank: true} %>
+      <%= f.select :query_id, Blazer::Query.named.order(:name).map { |q| [q.name, q.id] }, {include_blank: true} %>
     </div>
     <script>
       $("#check_query_id").selectize().parents(".hide").removeClass("hide");

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

@@ -38,7 +38,7 @@ li:hover .glyphicon-remove {
   <div class="form-group">
     <%= f.label :query_id, "Add Chart" %>
     <div class="hide">
-      <%= select_tag :query_id, options_for_select(Blazer::Query.order(:name).map { |q| [q.name, q.id] }), {include_blank: true, placeholder: "Select chart"} %>
+      <%= select_tag :query_id, options_for_select(Blazer::Query.named.order(:name).map { |q| [q.name, q.id] }), {include_blank: true, placeholder: "Select chart"} %>
     </div>
     <script>
       $("#query_id").selectize().parents(".hide").removeClass("hide");

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

@@ -1,4 +1,4 @@
-<% (@my_queries + @dashboards + @queries).each do |query| %>
+<% (@dashboards + @my_queries + @queries).each do |query| %>
   <% is_query = query.is_a?(Blazer::Query) %>
   <tr>
     <td class="query <%= "dashboard" unless is_query %>">

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

@@ -32,7 +32,8 @@
 
 <script>
   var options = {
-    valueNames: ['query', 'creator']
+    valueNames: ['query', 'creator'],
+    page: 200
   };
 
   function updateList() {

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

@@ -98,7 +98,7 @@
                 <% row.each do |k, v| %>
                   <td>
                     <% if v.is_a?(Time) %>
-                      <% v = v.in_time_zone(Blazer.time_zone) %>
+                      <% v = blazer_time_value(k, v) %>
                     <% end %>
 
                     <% unless v.nil? %>

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

@@ -24,7 +24,7 @@
         </h3>
       </div>
       <div class="col-sm-3 text-right">
-        <%= link_to "Edit", edit_query_path(@query, variable_params), class: "btn btn-default" %>
+        <%= link_to "Edit", edit_query_path(@query, variable_params), class: "btn btn-default", disabled: !@query.editable?(blazer_user) %>
         <%= link_to "Fork", new_query_path(variable_params.merge(fork_query_id: @query.id, data_source: @query.data_source, name: @query.name)), class: "btn btn-info" %>
 
         <% if !@error && @success %>

data/lib/blazer.rb

@@ -56,10 +56,16 @@ module Blazer
       error = nil
       tries = 0
       # try 3 times on timeout errors
-      begin
-        rows, error, cached_at = data_sources[check.query.data_source].run_statement(check.query.statement, refresh_cache: true)
-        tries += 1
-      end while error && error.include?("canceling statement due to statement timeout") && tries < 3
+      while tries < 3
+        columns, rows, error, cached_at = data_sources[check.query.data_source].run_statement(check.query.statement, refresh_cache: true)
+        if error == Blazer::TIMEOUT_MESSAGE
+          Rails.logger.info "[blazer timeout] #{check.query.name}"
+          tries += 1
+          sleep(10)
+        else
+          break
+        end
+      end
       check.update_state(rows, error)
     end
   end

data/lib/blazer/data_source.rb

@@ -32,6 +32,10 @@ module Blazer
       settings["smart_variables"] || {}
     end
 
+    def variable_defaults
+      settings["variable_defaults"] || {}
+    end
+
     def timeout
       settings["timeout"]
     end
@@ -40,6 +44,10 @@ module Blazer
       settings["cache"]
     end
 
+    def local_time_suffix
+      @local_time_suffix ||= Array(settings["local_time_suffix"])
+    end
+
     def use_transaction?
       settings.key?("use_transaction") ? settings["use_transaction"] : true
     end
@@ -82,7 +90,7 @@ module Blazer
             end
           rescue ActiveRecord::StatementInvalid => e
             error = e.message.sub(/.+ERROR: /, "")
-            error = Blazer::TIMEOUT_MESSAGE if error.include?("canceling statement due to statement timeout") || error.include?("cancelled on user's request")
+            error = Blazer::TIMEOUT_MESSAGE if error.include?("canceling statement due to statement timeout") || error.include?("cancelled on user's request") || error.include?("system requested abort query")
           end
         end
 

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails