sql-jarvis 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24ed2c70edf15bae48775f619ff637bfa3db00239852fbaf79c8a667b26a961e
-  data.tar.gz: 6d0d28395c191a6a7608bc5f563a66d5105cedd072598938056feb9183c64343
+  metadata.gz: bd81a249e949ad7c6fe925701c4221f5d7466aa1a3503b2f3444ceda82282e2f
+  data.tar.gz: aa56786392647652e110c5405f5aa67660f29fa822da7c7f09df88fdeacad836
 SHA512:
-  metadata.gz: 73b065819fc2940e99088611839aa3e8bb3e985e814d4f7a4abdad7076bf162ba1af07e3c7f0c84b3e7925a201e7834340b72137bfdafdc84b0e87c68c9f8e80
-  data.tar.gz: f820f5fee92e60340df80180829565f8dfc1df8415c2375842c5a834a0bbbe7abbb420936179682314ad9f094ade304fea39a46bc47b089afc1e5efe36d7bd02
+  metadata.gz: d4c04a6cda8473b157f6605bd2187ef52383e8d2cfb9661f657095bbc22e9653c7570302b756a932d165970f11b466c811244560ccc2eb5355da5dc01606dcff
+  data.tar.gz: 66d479f3aada4eae9e7656e030b805aefb9ed14fb2b04445793899c084a381e39917dcad6ac725ffb012acd1bdaccc1c8c4ea6a418924396224a0dc26b8ce83f

data/app/controllers/blazer/queries_controller.rb

@@ -61,6 +61,15 @@ module Blazer
       @statement = @query.statement.dup
       process_vars(@statement, @query.data_source)
 
+      filename = []
+      filename << @query.name.parameterize if @query
+      filename << params[:start_time].to_s.to_date
+      if params[:end_time]
+        filename << 'to'
+        filename << params[:end_time].to_s.to_date
+      end
+      @filename = filename.compact.join('-')
+
       @smart_vars = {}
       @sql_errors = []
       data_source = Blazer.data_sources[@query.data_source]
@@ -253,7 +262,8 @@ module Blazer
         end
       end
 
-      @filename = @query.name.parameterize if @query
+      @filename = params[:filename] || @query&.name&.parameterize
+
       @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
@@ -278,7 +288,6 @@ module Blazer
         end
       end
 
-      filename = @query.try(:name).try(:parameterize).presence || 'query'
       respond_to do |format|
         format.html do
           render layout: false
@@ -286,10 +295,14 @@ module Blazer
         format.xlsx do
           parser = ::Blazer::ExcelParser.new(@query, @columns, @rows)
           tmp_file = parser.export
-          send_file tmp_file, type: "application/xlsx; charset=utf-8; header=present", disposition: "attachment; filename=\"#{parser.filename}\""
+          send_file tmp_file,
+            type: 'application/xlsx; charset=utf-8; header=present',
+            disposition: "attachment; filename=\"#{@filename}.xlsx\""
         end
         format.csv do
-          send_data csv_data(@columns, @rows, @data_source), type: "text/csv; charset=utf-8; header=present", disposition: "attachment; filename=\"#{filename}.csv\""
+          send_data csv_data(@columns, @rows, @data_source),
+            type: 'text/csv; charset=utf-8; header=present',
+            disposition: "attachment; filename=\"#{@filename}.csv\""
         end
       end
     end

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

@@ -1,4 +1,5 @@
 - blazer_title @query.name
+
 .topbar
   .container
     .row{:style => "padding-top: 13px;"}
@@ -10,8 +11,9 @@
         = 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
-          = button_to "⤓ .csv", run_queries_path(query_id: @query.id, format: "csv", forecast: params[:forecast]), params: {statement: @statement}, class: "btn btn-primary"
-          = button_to "⤓ .xlsx", run_queries_path(query_id: @query.id, format: "xlsx"), params: {statement: @statement}, class: "btn btn-primary"
+          = button_to "⤓ .csv", run_queries_path(query_id: @query.id, format: "csv", forecast: params[:forecast]), params: { statement: @statement, filename: @filename }, class: "btn btn-primary"
+          = button_to "⤓ .xlsx", run_queries_path(query_id: @query.id, format: "xlsx"), params: { statement: @statement, filename: @filename }, class: "btn btn-primary"
+
 %div{:style => "margin-bottom: 60px;"}
 - if @sql_errors.any?
   .alert.alert-danger

data/lib/blazer/excel_parser.rb

@@ -13,10 +13,6 @@ module Blazer
       save_file!
     end
 
-    def filename
-      "#{query.name.to_s.parameterize}-#{Time.current.strftime('%y-%m-%d')}.xlsx"
-    end
-
     private
 
     attr_reader :query, :excel
@@ -31,7 +27,7 @@ module Blazer
     end
 
     def save_file!
-      tmp_file = Tempfile.new(filename).path
+      tmp_file = Tempfile.new.path
       excel.serialize(tmp_file)
       return tmp_file
     end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = '2.1.4'
+  VERSION = '2.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-jarvis
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Fork from ankane! Explore your data with SQL. Easily create charts and dashboards,