sql-jarvis 1.9.9 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3232731e4d33526a1e36b5d7b14e143a535097ec826163326fec0bb8d7f9add
-  data.tar.gz: a64d8ea6bb11dbd6dab1b6e74b36c144d5effba442d68eef7f7dd095789b7327
+  metadata.gz: a692d1fe0f09c3fe9865e2a2c4b3f1835899672aa6accbbf150b90e43fbbdc5b
+  data.tar.gz: fb1c04bed559e70e7afa3207769a60700e91aa6400b68eadd0d5a4774b1c0c5b
 SHA512:
-  metadata.gz: 71f0f0ea4e2229ef1dd6d09d7f92e65b883ad657fd07f1ef05c6370cd9b19d52e7fc5154440ceb3a5a9e58990dc9ce21ad90d9bb117dc4adbcead2fc4045c3d8
-  data.tar.gz: ef24ade3db2314f19a02276ed0874112e4ac458052fa1f24b22f83e7130ed9f56f962251ef400be4bba4b02a81b977b2eea1836be5bb6f3e92d67e7f06851206
+  metadata.gz: e17d107a062ccf874485e39ec1893f15a2c7986c1f6667f360a75cc04a7f7b5b6154704dc5f1a20a481a566410f009db9aa445448541fdb0194321b1f0381de8
+  data.tar.gz: 2dd68c65560fa2e01e3b402df83bf1b2b1929163d4b01e323e3499664b077f6fb8edbe743d42dfc32981abf795586952a8a28fd1cab3fc4f03c442b04904659d

data/Gemfile

@@ -1,4 +1,7 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
+
+gem 'zip-zip'
+gem 'axlsx'
+gem 'axlsx_rails'
 
-# Specify your gem's dependencies in blazer.gemspec
 gemspec

data/app/controllers/blazer/queries_controller.rb

@@ -262,12 +262,18 @@ module Blazer
           end
         end
 
+        filename = @query.try(:name).try(:parameterize).presence || 'query'
         respond_to do |format|
           format.html do
             render layout: false
           end
+          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}\""
+          end
           format.csv do
-            send_data csv_data(@columns, @rows, @data_source), type: "text/csv; charset=utf-8; header=present", disposition: "attachment; filename=\"#{@query.try(:name).try(:parameterize).presence || 'query'}.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.erb

@@ -3,18 +3,19 @@
 <div class="topbar">
   <div class="container">
     <div class="row" style="padding-top: 13px;">
-      <div class="col-sm-9">
+      <div class="col-sm-8">
         <%= render partial: "blazer/nav" %>
         <h3 style="margin: 0; line-height: 34px; display: inline;">
           <%= @query.name %>
         </h3>
       </div>
-      <div class="col-sm-3 text-right">
+      <div class="col-sm-4 text-right">
         <%= 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 "Download", run_queries_path(query_id: @query.id, format: "csv"), params: {statement: @statement}, class: "btn btn-primary" %>
+          <%= button_to "⤓ .csv", run_queries_path(query_id: @query.id, format: "csv"), 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" %>
         <% end %>
       </div>
     </div>

data/blazer.gemspec

@@ -17,6 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "zip-zip"
+  spec.add_dependency "axlsx"
+  spec.add_dependency "axlsx_rails"
   spec.add_dependency "railties", ">= 4"
   spec.add_dependency "activerecord", ">= 4"
   spec.add_dependency "chartkick"

data/lib/blazer.rb

@@ -1,10 +1,13 @@
 require "csv"
 require "yaml"
 require "chartkick"
+require "zip/zip"
+require "axlsx"
 require "safely/core"
 require "blazer/version"
 require "blazer/data_source"
 require "blazer/result"
+require "blazer/excel_parser"
 require "blazer/run_statement"
 require "blazer/adapters/base_adapter"
 require "blazer/adapters/athena_adapter"
@@ -215,3 +218,6 @@ Blazer.register_adapter "presto", Blazer::Adapters::PrestoAdapter
 Blazer.register_adapter "mongodb", Blazer::Adapters::MongodbAdapter
 Blazer.register_adapter "sql", Blazer::Adapters::SqlAdapter
 Blazer.register_adapter "snowflake", Blazer::Adapters::SnowflakeAdapter
+
+Mime::Type.register "application/xlsx", :xlsx
+Mime::Type.register "application/xls", :xlsx

data/lib/blazer/excel_parser.rb

@@ -0,0 +1,40 @@
+module Blazer
+  class ExcelParser
+
+    def initialize(query, columns, rows)
+      @query = query
+      @columns = columns
+      @rows = rows
+      @excel = ::Axlsx::Package.new
+    end
+
+    def export
+      load_data!
+      save_file!
+    end
+
+    def filename
+      "#{query.name.to_s.parameterize}-#{Time.current.strftime('%y-%m-%d')}.xlsx"
+    end
+
+    private
+
+    attr_reader :query, :excel
+
+    def load_data!
+      excel.workbook.add_worksheet(name: "ID #{query.id}") do |sheet|
+        sheet.add_row @columns
+        @rows.each do |row|
+          sheet.add_row row
+        end
+      end
+    end
+
+    def save_file!
+      tmp_file = "tmp/#{filename}"
+      excel.serialize(tmp_file)
+      return tmp_file
+    end
+
+  end
+end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.9.9"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: sql-jarvis
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 2.0.1
 platform: ruby
 authors:
 - ThanhKhoaIT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: zip-zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: axlsx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: axlsx_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +239,7 @@ files:
 - lib/blazer/data_source.rb
 - lib/blazer/detect_anomalies.R
 - lib/blazer/engine.rb
+- lib/blazer/excel_parser.rb
 - lib/blazer/result.rb
 - lib/blazer/run_statement.rb
 - lib/blazer/run_statement_job.rb
@@ -225,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Fork from ankane! Explore your data with SQL. Easily create charts and dashboards,