sql-jarvis 2.1 → 2.1.5

data/lib/blazer.rb

@@ -12,6 +12,7 @@ require "blazer/data_source"
 require "blazer/result"
 require "blazer/excel_parser"
 require "blazer/run_statement"
+require "blazer/run_integration"
 
 # adapters
 require "blazer/adapters/base_adapter"
@@ -42,15 +43,18 @@ module Blazer
     attr_accessor :before_action
     attr_accessor :from_email
     attr_accessor :host
+    attr_accessor :preview_rows_number
     attr_accessor :cache
     attr_accessor :transform_statement
     attr_accessor :transform_variable
     attr_accessor :check_schedules
     attr_accessor :mapbox_access_token
     attr_accessor :assignees
+    attr_accessor :teams
     attr_accessor :anomaly_checks
     attr_accessor :forecasting
     attr_accessor :async
+    attr_accessor :integration
     attr_accessor :images
     attr_accessor :query_viewable
     attr_accessor :query_editable
@@ -58,12 +62,15 @@ module Blazer
     attr_accessor :slack_webhook_url
     attr_accessor :query_creatable
   end
+
   self.audit = true
   self.user_name = :name
   self.check_schedules = ["5 minutes", "1 hour", "1 day"]
   self.mapbox_access_token = nil
   self.assignees = []
+  self.teams = []
   self.host = nil
+  self.preview_rows_number = 365
   self.anomaly_checks = false
   self.forecasting = false
   self.async = false
@@ -86,6 +93,11 @@ module Blazer
     @time_zone = time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone.to_s]
   end
 
+  def self.integration
+    return @integration if defined?(@integration)
+    @integration = settings.key?("integration") ? settings["integration"] : false
+  end
+
   def self.user_class
     if !defined?(@user_class)
       @user_class = settings.key?("user_class") ? settings["user_class"] : (User.name rescue nil)

data/lib/blazer/adapters/sql_adapter.rb

@@ -52,11 +52,11 @@ module Blazer
 
       def preview_statement
         if postgresql?
-          "SELECT * FROM \"{table}\" LIMIT 10"
+          "SELECT * FROM \"{table}\" LIMIT 30"
         elsif sqlserver?
-          "SELECT TOP (10) * FROM {table}"
+          "SELECT TOP (30) * FROM {table}"
         else
-          "SELECT *\nFROM {table}\nORDER BY id DESC\nLIMIT 10"
+          "SELECT *\nFROM {table}\nORDER BY id DESC\nLIMIT 30"
         end
       end
 

data/lib/blazer/data_source.rb

@@ -37,6 +37,10 @@ module Blazer
       settings["variable_defaults"] || {}
     end
 
+    def select_all_variables
+      settings["select_all_variables"] || {}
+    end
+
     def timeout
       settings["timeout"]
     end

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 = "tmp/#{filename}"
+      tmp_file = Tempfile.new.path
       excel.serialize(tmp_file)
       return tmp_file
     end

data/lib/blazer/run_integration.rb

@@ -0,0 +1,24 @@
+module Blazer
+  class RunIntegration
+
+    def initialize(results, integration)
+      @results = results
+      @integration = integration
+    end
+
+    def call
+      return if integration.blank?
+      eval integration
+      return {
+        headers: @headers,
+        rows: @rows
+      }
+    end
+
+    private
+
+    attr_reader :results
+    attr_reader :integration
+
+  end
+end

data/lib/blazer/version.rb

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

data/lib/generators/blazer/templates/config.yml.tt

@@ -61,6 +61,7 @@ audit: true
 # mapbox_access_token: <%= ENV["MAPBOX_ACCESS_TOKEN"] %>
 
 # assignees: 'SELECT id, name FROM users ORDER BY id ASC'
+# teams: 'SELECT id, name FROM teams'
 
 check_schedules:
   - "1 day"

data/lib/generators/blazer/templates/install.rb.tt

@@ -7,6 +7,8 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
       t.text :statement
       t.string :data_source
       t.string :assignee_ids
+      t.string :team_ids
+      t.text :integration
       t.timestamps null: false
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-jarvis
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: 2.1.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -171,9 +171,11 @@ files:
 - app/assets/javascripts/blazer/ace.js
 - app/assets/javascripts/blazer/ace/ace.js
 - app/assets/javascripts/blazer/ace/ext-language_tools.js
+- app/assets/javascripts/blazer/ace/mode-ruby.js
 - app/assets/javascripts/blazer/ace/mode-sql.js
 - app/assets/javascripts/blazer/ace/snippets/sql.js
 - app/assets/javascripts/blazer/ace/snippets/text.js
+- app/assets/javascripts/blazer/ace/theme-ambiance.js
 - app/assets/javascripts/blazer/ace/theme-twilight.js
 - app/assets/javascripts/blazer/application.js
 - app/assets/javascripts/blazer/bootstrap.js
@@ -227,6 +229,7 @@ files:
 - app/views/blazer/dashboards/edit.html.haml
 - app/views/blazer/dashboards/new.html.haml
 - app/views/blazer/dashboards/show.html.haml
+- app/views/blazer/queries/_chart.html.haml
 - app/views/blazer/queries/_form.html.haml
 - app/views/blazer/queries/_tips.html.haml
 - app/views/blazer/queries/docs.html.haml
@@ -255,6 +258,7 @@ files:
 - lib/blazer/engine.rb
 - lib/blazer/excel_parser.rb
 - lib/blazer/result.rb
+- lib/blazer/run_integration.rb
 - lib/blazer/run_statement.rb
 - lib/blazer/run_statement_job.rb
 - lib/blazer/version.rb
@@ -281,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Fork from ankane! Explore your data with SQL. Easily create charts and dashboards,