blazer 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f1910484a7cc50172c7b6dface23cc593514fcf9382abc726da8b08169af1e9
-  data.tar.gz: 98db8372f805a616a944d7c4bf595c3a6cf4d9ee138e150eb54e7a27fed5dd48
+  metadata.gz: 4a6731164b551f139951303884ca6531d336249299f5ff6e295160348540a687
+  data.tar.gz: 784d957116c412f9ac526661e0ca7252d62c43ffd51a67bb106d1a401da44f25
 SHA512:
-  metadata.gz: 373a56a0559c54617a03d18df7849d68840fb6275f5b3150bc35d800ee5f3efaca15bd5d3aaec5e4df25c3a3c450e2c98673ec9a5242979ed02565fc9c6c66e3
-  data.tar.gz: b8118434afa964ff808252e4cb2bf2855d3088b718e18675c9efb32a7be3934082558b703354f1f160687a8416fd068c60bf88af905dd5ebe8326c9919788b7b
+  metadata.gz: be8f6f7713953e505d76170f1e0e81284f0dd99b35ed28d42932542de702fd0e541e1a8b86e6428c47324d66f58ae98df2732221ad49ac512db221d0c664de07
+  data.tar.gz: 0e3c7202af0c73b9070e81c922167d46f387aea34d47797333aa3a1d89f8f6a7710a47f1a1eb61fe7d20e880d7183e2e7019263547b78d01124ebd80cd849d13

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.0.2
+
+- Added support for variable transformation for blind indexing
+- Added experimental support for Neo4j
+- Added experimental support for Salesforce
+- Fixed JavaScript sorting for numbers with commas
+
 ## 2.0.1
 
 - Added favicon

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2018 Andrew Kane
+Copyright (c) 2014-2019 Andrew Kane
 
 MIT License
 

data/README.md

@@ -175,6 +175,19 @@ Also, make sure authorization is enabled when you start the server.
 
 If your database contains sensitive or personal data, check out [Hypershield](https://github.com/ankane/hypershield) to shield it.
 
+## Encrypted Data
+
+If you need to search encrypted data, use [blind indexing](https://github.com/ankane/blind_index).
+
+You can have Blazer transform specific variables with:
+
+```ruby
+Blazer.transform_variable = lambda do |name, value|
+  value = User.compute_email_bidx(value) if name == "email_bidx"
+  value
+end
+```
+
 ## Queries
 
 ### Variables
@@ -397,8 +410,8 @@ R is harder to set up but doesn’t use an external service. It uses Twitter’s
 First, [install R](https://cloud.r-project.org/). Then, run:
 
 ```R
-install.packages("devtools")
-devtools::install_github("twitter/AnomalyDetection")
+install.packages("remotes")
+remotes::install_github("twitter/AnomalyDetection")
 ```
 
 And add to `config/blazer.yml`:
@@ -462,9 +475,11 @@ data_sources:
 - [IBM DB2 and Informix](#ibm-db2-and-informix)
 - [MongoDB](#mongodb-1)
 - [MySQL](#mysql-1)
+- [Neo4j](#neo4j-experimental)
 - [Oracle](#oracle)
 - [PostgreSQL](#postgresql-1)
 - [Presto](#presto)
+- [Salesforce](#salesforce-experimental)
 - [Snowflake](#snowflake)
 - [SQLite](#sqlite)
 - [SQL Server](#sql-server)
@@ -582,6 +597,17 @@ data_sources:
     url: mysql2://user:password@hostname:3306/database
 ```
 
+### Neo4j [experimental]
+
+Add [neo4j-core](https://github.com/neo4jrb/neo4j-core) to your Gemfile and set:
+
+```yml
+data_sources:
+  my_source:
+    adapter: neo4j
+    url: http://user:password@hostname:7474
+```
+
 ### Oracle
 
 Use [activerecord-oracle_enhanced-adapter](https://github.com/rsim/oracle-enhanced).
@@ -606,6 +632,29 @@ data_sources:
     url: presto://user@hostname:8080/catalog
 ```
 
+### Salesforce [experimental]
+
+Add [restforce](https://github.com/restforce/restforce) to your Gemfile and set:
+
+```yml
+data_sources:
+  my_source:
+    adapter: salesforce
+```
+
+And set the appropriate environment variables:
+
+```sh
+SALESFORCE_USERNAME="username"
+SALESFORCE_PASSWORD="password"
+SALESFORCE_SECURITY_TOKEN="security token"
+SALESFORCE_CLIENT_ID="client id"
+SALESFORCE_CLIENT_SECRET="client secret"
+SALESFORCE_API_VERSION="41.0"
+```
+
+Supports [SOQL](https://developer.salesforce.com/docs/atlas.en-us.soql_sosl.meta/soql_sosl/sforce_api_calls_soql.htm)
+
 ### Snowflake
 
 First, install the [ODBC driver](https://docs.snowflake.net/manuals/user-guide/odbc.html). Add [odbc_adapter](https://github.com/localytics/odbc_adapter) to your Gemfile and set:
@@ -675,7 +724,7 @@ Have team members who want to learn SQL? Here are a few great, free resources.
 
 ## Useful Tools
 
-For an easy way to group by day, week, month, and more with correct time zones, check out [Groupdate](https://github.com/ankane/groupdate.sql).
+For an easy way to group by day, week, month, and more with correct time zones, check out [Groupdate.sql](https://github.com/ankane/groupdate.sql).
 
 ## Standalone Version
 

data/app/assets/javascripts/blazer/application.js

@@ -1,6 +1,7 @@
 //= require ./jquery
 //= require ./jquery-ujs
 //= require ./stupidtable
+//= require ./stupidtable-custom-settings
 //= require ./jquery.stickytableheaders
 //= require ./selectize
 //= require ./highlight.min

data/app/assets/javascripts/blazer/stupidtable-custom-settings.js

@@ -0,0 +1,13 @@
+function removeCommas(string) {
+  return string.replace(/,/g, "")
+}
+
+// Remove commas for integers and floats to fix issues with sorting in the stupidtable plugin
+var stupidtableCustomSettings = {
+  "int": function(a, b) {
+    return parseInt(removeCommas(a), 10) - parseInt(removeCommas(b), 10);
+  },
+  "float": function(a, b) {
+    return parseFloat(removeCommas(a)) - parseFloat(removeCommas(b));
+  }
+}

data/app/controllers/blazer/base_controller.rb

@@ -63,6 +63,7 @@ module Blazer
                 value = value.to_f
               end
             end
+            value = Blazer.transform_variable.call(var, value) if Blazer.transform_variable
             statement.gsub!("{#{var}}", ActiveRecord::Base.connection.quote(value))
           end
         end
@@ -95,7 +96,7 @@ module Blazer
       helper_method :variable_params
 
       def blazer_user
-        send(Blazer.user_method) if Blazer.user_method && respond_to?(Blazer.user_method)
+        send(Blazer.user_method) if Blazer.user_method && respond_to?(Blazer.user_method, true)
       end
       helper_method :blazer_user
 

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

@@ -43,7 +43,7 @@
 
     runQuery(data, function (data) {
       $("#chart-<%= i %>").html(data)
-      $("#chart-<%= i %> table").stupidtable()
+      $("#chart-<%= i %> table").stupidtable(stupidtableCustomSettings)
     }, function (message) {
       $("#chart-<%= i %>").addClass("query-error").html(message)
     });

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

@@ -49,7 +49,7 @@
   <script>
     function showRun(data) {
       $("#results").html(data)
-      $("#results table").stupidtable().stickyTableHeaders({fixedOffset: 60})
+      $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 60})
     }
 
     function showError(message) {

data/lib/blazer.rb

@@ -19,7 +19,9 @@ require "blazer/adapters/drill_adapter"
 require "blazer/adapters/druid_adapter"
 require "blazer/adapters/elasticsearch_adapter"
 require "blazer/adapters/mongodb_adapter"
+require "blazer/adapters/neo4j_adapter"
 require "blazer/adapters/presto_adapter"
+require "blazer/adapters/salesforce_adapter"
 require "blazer/adapters/sql_adapter"
 require "blazer/adapters/snowflake_adapter"
 
@@ -40,6 +42,7 @@ module Blazer
     attr_accessor :from_email
     attr_accessor :cache
     attr_accessor :transform_statement
+    attr_accessor :transform_variable
     attr_accessor :check_schedules
     attr_accessor :anomaly_checks
     attr_accessor :forecasting
@@ -217,7 +220,9 @@ Blazer.register_adapter "cassandra", Blazer::Adapters::CassandraAdapter
 Blazer.register_adapter "drill", Blazer::Adapters::DrillAdapter
 Blazer.register_adapter "druid", Blazer::Adapters::DruidAdapter
 Blazer.register_adapter "elasticsearch", Blazer::Adapters::ElasticsearchAdapter
+Blazer.register_adapter "neo4j", Blazer::Adapters::Neo4jAdapter
 Blazer.register_adapter "presto", Blazer::Adapters::PrestoAdapter
 Blazer.register_adapter "mongodb", Blazer::Adapters::MongodbAdapter
+Blazer.register_adapter "salesforce", Blazer::Adapters::SalesforceAdapter
 Blazer.register_adapter "sql", Blazer::Adapters::SqlAdapter
 Blazer.register_adapter "snowflake", Blazer::Adapters::SnowflakeAdapter

data/lib/blazer/adapters/athena_adapter.rb

@@ -13,7 +13,7 @@ module Blazer
             client.start_query_execution(
               query_string: statement,
               # use token so we fetch cached results after query is run
-              client_request_token: Digest::MD5.hexdigest(statement),
+              client_request_token: Digest::MD5.hexdigest([statement,data_source.id].join("/")),
               query_execution_context: {
                 database: database,
               },

data/lib/blazer/adapters/neo4j_adapter.rb

@@ -0,0 +1,47 @@
+module Blazer
+  module Adapters
+    class Neo4jAdapter < BaseAdapter
+      def run_statement(statement, comment)
+        columns = []
+        rows = []
+        error = nil
+
+        begin
+          result = session.query("#{statement} /*#{comment}*/")
+          columns = result.columns.map(&:to_s)
+          rows = []
+          result.each do |row|
+            rows << columns.map do |c|
+              v = row.send(c)
+              v = v.properties if v.respond_to?(:properties)
+              v
+            end
+          end
+        rescue => e
+          error = e.message
+        end
+
+        [columns, rows, error]
+      end
+
+      def tables
+        result = session.query("CALL db.labels()")
+        result.rows.map(&:first)
+      end
+
+      def preview_statement
+        "MATCH (n:{table}) RETURN n LIMIT 10"
+      end
+
+      protected
+
+      def session
+        @session ||= begin
+          require "neo4j/core/cypher_session/adaptors/http"
+          http_adaptor = Neo4j::Core::CypherSession::Adaptors::HTTP.new(settings["url"])
+          Neo4j::Core::CypherSession.new(http_adaptor)
+        end
+      end
+    end
+  end
+end

data/lib/blazer/adapters/salesforce_adapter.rb

@@ -0,0 +1,45 @@
+module Blazer
+  module Adapters
+    class SalesforceAdapter < BaseAdapter
+      def run_statement(statement, comment)
+        columns = []
+        rows = []
+        error = nil
+
+        # remove comments manually
+        statement = statement.gsub(/--.+/, "")
+        # only supports single line /* */ comments
+        # regex not perfect, but should be good enough
+        statement = statement.gsub(/\/\*.+\*\//, "")
+
+        # remove trailing semicolon
+        statement = statement.sub(/;\s*\z/, "")
+
+        begin
+          response = client.query(statement)
+          rows = response.map { |r| r.to_hash.except("attributes").values }
+          columns = rows.any? ? response.first.to_hash.except("attributes").keys : []
+        rescue => e
+          error = e.message
+        end
+
+        [columns, rows, error]
+      end
+
+      def tables
+        # cache
+        @tables ||= client.describe.select { |r| r.queryable }.map(&:name)
+      end
+
+      def preview_statement
+        "SELECT Id FROM {table} LIMIT 10"
+      end
+
+      protected
+
+      def client
+        @client ||= Restforce.new
+      end
+    end
+  end
+end

data/lib/blazer/data_source.rb

@@ -144,7 +144,7 @@ module Blazer
 
     def adapter_instance
       @adapter_instance ||= begin
-        unless settings["url"] || Rails.env.development? || ["bigquery", "athena", "snowflake"].include?(settings["adapter"])
+        unless settings["url"] || Rails.env.development? || ["bigquery", "athena", "snowflake", "salesforce"].include?(settings["adapter"])
           raise Blazer::Error, "Empty url for data source: #{id}"
         end
 

data/lib/blazer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -133,6 +133,7 @@ files:
 - app/assets/javascripts/blazer/queries.js
 - app/assets/javascripts/blazer/routes.js
 - app/assets/javascripts/blazer/selectize.js
+- app/assets/javascripts/blazer/stupidtable-custom-settings.js
 - app/assets/javascripts/blazer/stupidtable.js
 - app/assets/javascripts/blazer/vue.js
 - app/assets/stylesheets/blazer/application.css
@@ -185,7 +186,9 @@ files:
 - lib/blazer/adapters/druid_adapter.rb
 - lib/blazer/adapters/elasticsearch_adapter.rb
 - lib/blazer/adapters/mongodb_adapter.rb
+- lib/blazer/adapters/neo4j_adapter.rb
 - lib/blazer/adapters/presto_adapter.rb
+- lib/blazer/adapters/salesforce_adapter.rb
 - lib/blazer/adapters/snowflake_adapter.rb
 - lib/blazer/adapters/sql_adapter.rb
 - lib/blazer/data_source.rb
@@ -218,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Explore your data with SQL. Easily create charts and dashboards, and share