blazer 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63faea5b7fa9ad8d4365931c80851e33d80553e8
-  data.tar.gz: 30b6a8d2dd631512a5cd82a6fabe119e7e9d5963
+  metadata.gz: af24e4d2d3a7574a1b6e03186ea77d54dcb4f4b5
+  data.tar.gz: 3d9b34fd4cb0c26cb7516d75cfe2eab85a2d3b8f
 SHA512:
-  metadata.gz: 69a08a57180385ed46ae3bd776fa3e67bf885ed9845dc7508f70d1d7d883d940120c4b03167800726fe6d0dcb728518e4cfbdc32b6fc2647813d381eea0d1670
-  data.tar.gz: 681fdbe806cfc7675335802166199ed11124e6c443c4d8da31e279c47b48ed847a5d2061d24d657d5c343c47a284b929dc93f4188ca7fa7fcae4d47bcd225d67
+  metadata.gz: 5c9590d8f9798d5cef1ca335ba38f990ae51d021d2a04d4fa01929b43a032a823988ddc39b697e36888d62a84fe663d9a974fdbd9c6339fa00d50b15688aa899
+  data.tar.gz: 55fe87e6539b8f9b776c68bb18dd9b20564151f3b5dbb47ad3a0380e811914f4c4b5e6f8202dd891406e6c790c4f17ddfc21abd1f97ff05b65fd160950231cef

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.5.1
+
+- Added anomaly detection for data less than 2 weeks
+- Added autolinking urls
+- Added support for images
+
 ## 1.5.0
 
 - Added new bar chart format

data/README.md

@@ -154,7 +154,7 @@ Create queries with variables.
 SELECT * FROM users WHERE gender = {gender}
 ```
 
-Use `{start_time}` and `{end_time}` for time ranges. [Example](https://blazerme.herokuapp.com/queries/8-ratings-by-time-range?start_time=1997-10-03T05%3A00%3A00%2B00%3A00&end_time=1997-10-04T04%3A59%3A59%2B00%3A00)
+Use `{start_time}` and `{end_time}` for time ranges. [Example](https://blazerme.herokuapp.com/queries/9-time-range-selector?start_time=1997-10-03T05%3A00%3A00%2B00%3A00&end_time=1997-10-04T04%3A59%3A59%2B00%3A00)
 
 ```sql
 SELECT * FROM ratings WHERE rated_at >= {start_time} AND rated_at <= {end_time}
@@ -162,7 +162,7 @@ SELECT * FROM ratings WHERE rated_at >= {start_time} AND rated_at <= {end_time}
 
 ### Smart Variables
 
-[Example](https://blazerme.herokuapp.com/queries/3-users-by-occupation)
+[Example](https://blazerme.herokuapp.com/queries/1-smart-variable)
 
 Suppose you have the query:
 
@@ -183,7 +183,7 @@ The first column is the value of the variable, and the second column is the labe
 
 ### Linked Columns
 
-[Example](https://blazerme.herokuapp.com/queries/4-highest-rated-movies) - title column
+[Example](https://blazerme.herokuapp.com/queries/3-linked-column) - title column
 
 Link results to other pages in your apps or around the web. Specify a column name and where it should link to. You can use the value of the result with `{value}`.
 
@@ -195,7 +195,7 @@ linked_columns:
 
 ### Smart Columns
 
-[Example](https://blazerme.herokuapp.com/queries/10-users) - occupation_id column
+[Example](https://blazerme.herokuapp.com/queries/2-smart-column) - occupation_id column
 
 Suppose you have the query:
 
@@ -239,13 +239,13 @@ Blazer will automatically generate charts based on the types of the columns retu
 
 There are two ways to generate line charts.
 
-2+ columns - timestamp, numeric(s) - [Example](https://blazerme.herokuapp.com/queries/1-new-ratings-per-week)
+2+ columns - timestamp, numeric(s) - [Example](https://blazerme.herokuapp.com/queries/4-line-chart-format-1)
 
 ```sql
 SELECT date_trunc('week', created_at), COUNT(*) FROM users GROUP BY 1
 ```
 
-3 columns - timestamp, string, numeric - [Example](https://blazerme.herokuapp.com/queries/7-new-ratings-by-gender-per-month)
+3 columns - timestamp, string, numeric - [Example](https://blazerme.herokuapp.com/queries/5-line-chart-format-2)
 
 
 ```sql
@@ -256,13 +256,13 @@ SELECT date_trunc('week', created_at), gender, COUNT(*) FROM users GROUP BY 1, 2
 
 There are also two ways to generate column charts.
 
-2+ columns - string, numeric(s) - [Example](https://blazerme.herokuapp.com/queries/2-top-genres)
+2+ columns - string, numeric(s) - [Example](https://blazerme.herokuapp.com/queries/6-column-chart-format-1)
 
 ```sql
 SELECT gender, COUNT(*) FROM users GROUP BY 1
 ```
 
-3 columns - string, string, numeric
+3 columns - string, string, numeric - [Example](https://blazerme.herokuapp.com/queries/7-column-chart-format-2)
 
 ```sql
 SELECT gender, zip_code, COUNT(*) FROM users GROUP BY 1, 2
@@ -270,7 +270,7 @@ SELECT gender, zip_code, COUNT(*) FROM users GROUP BY 1, 2
 
 ### Maps
 
-Columns named `latitude` and `longitude` or `lat` and `lon` - [Example](https://blazerme.herokuapp.com/queries/11-airports-in-pacific-time-zone)
+Columns named `latitude` and `longitude` or `lat` and `lon` - [Example](https://blazerme.herokuapp.com/queries/15-map)
 
 ```sql
 SELECT name, latitude, longitude FROM cities
@@ -280,7 +280,7 @@ To enable, get an access token from [Mapbox](https://www.mapbox.com/) and set `E
 
 ### Targets
 
-Use the column name `target` to draw a line for goals.
+Use the column name `target` to draw a line for goals. [Example](https://blazerme.herokuapp.com/queries/8-target-line)
 
 ```sql
 SELECT date_trunc('week', created_at), COUNT(*) AS new_users, 100000 AS target FROM users GROUP BY 1
@@ -288,7 +288,7 @@ SELECT date_trunc('week', created_at), COUNT(*) AS new_users, 100000 AS target F
 
 ## Dashboards
 
-Create a dashboard with multiple queries. [Example](https://blazerme.herokuapp.com/dashboards/1-movielens)
+Create a dashboard with multiple queries. [Example](https://blazerme.herokuapp.com/dashboards/1-dashboard-demo)
 
 If the query has a chart, the chart is shown. Otherwise, you’ll see a table.
 
@@ -325,6 +325,8 @@ anomaly_checks: true
 
 If upgrading from version 1.4 or below, also follow the [upgrade instructions](#15).
 
+If you’re on Heroku, follow [these additional instructions](#anomaly-detection-on-heroku).
+
 ## Data Sources
 
 Blazer supports multiple data sources :tada:
@@ -363,6 +365,25 @@ Have team members who want to learn SQL? Here are a few great, free resources.
 
 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).
 
+## Anomaly Detection on Heroku
+
+Add the [R buildpack](https://github.com/virtualstaticvoid/heroku-buildpack-r) to your app.
+
+```sh
+heroku buildpacks:add --index 1 https://github.com/ankane/heroku-buildpack-r.git\#cedar-14
+```
+
+And create an `init.r` with:
+
+```sh
+if (!"AnomalyDetection" %in% installed.packages()) {
+  install.packages("devtools")
+  devtools::install_github("twitter/AnomalyDetection")
+}
+```
+
+Commit and deploy away. The first deploy may take a few minutes.
+
 ## Upgrading
 
 ### 1.5

data/app/assets/stylesheets/blazer/application.css

@@ -24,6 +24,11 @@ body {
   background-color: #fff;
 }
 
+.results-table img {
+  max-width: 200px;
+  max-height: 200px;
+}
+
 input.search {
   border: none;
   box-shadow: none;

data/app/controllers/blazer/queries_controller.rb

@@ -199,7 +199,7 @@ module Blazer
       @filename = @query.name.parameterize if @query
       @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
+      @boom = @result.boom if @result
 
       @linked_columns = @data_source.linked_columns
 

data/app/helpers/blazer/base_helper.rb

@@ -8,9 +8,21 @@ module Blazer
       end
     end
 
+    BLAZER_URL_REGEX = /\Ahttps?:\/\/[\S]+\z/
+    BLAZER_IMAGE_EXT = %w[png jpg jpeg gif]
+
     def blazer_format_value(key, value)
       if value.is_a?(Integer) && !key.to_s.end_with?("id")
         number_with_delimiter(value)
+      elsif value =~ BLAZER_URL_REGEX
+        # see if image or link
+        if Blazer.images && (key.include?("image") || BLAZER_IMAGE_EXT.include?(value.split(".").last.split("?").first.try(:downcase)))
+          link_to value, target: "_blank" do
+            image_tag value, referrerpolicy: "no-referrer"
+          end
+        else
+          link_to value, value, target: "_blank"
+        end
       else
         value
       end

data/app/models/blazer/check.rb

@@ -60,7 +60,7 @@ module Blazer
       end
 
       # do not notify on creation, except when not passing
-      if (state_was || state != "passing") && state != state_was && emails.present?
+      if (state_was != "new" || state != "passing") && state != state_was && emails.present?
         Blazer::CheckMailer.state_change(self, state, state_was, result.rows.size, message).deliver_later
       end
       save! if changed?

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

@@ -16,7 +16,7 @@
   <tbody>
     <% @checks.each do |check| %>
       <tr>
-        <td><%= link_to check.query.name, check.query %></td>
+        <td><%= link_to check.query.name, check.query %> <span class="text-muted"><%= check.try(:check_type).to_s.gsub("_", " ") %></span></td>
         <td>
           <% if check.state %>
             <small class="check-state <%= check.state.parameterize("_") %>"><%= check.state.upcase %></small>

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

@@ -102,10 +102,22 @@
 
   function getSQL() {
     var selectedText = editor.getSelectedText();
-    var text = selectedText.length == 0 ? editor.getValue() : selectedText;
+    var text = selectedText.length < 10 ? editor.getValue() : selectedText;
     return text.replace(/\n/g, "\r\n");
   }
 
+  function getErrorLine() {
+    var error_line = /LINE (\d+)/g.exec($("#results").find('.alert-danger').text());
+
+    if (error_line) {
+      error_line = parseInt(error_line[1], 10);
+      if (editor.getSelectedText().length >= 10) {
+        error_line += editor.getSelectionRange().start.row;
+      }
+      return error_line;
+    }
+  }
+
   editor.getSession().on("change", adjustHeight);
   adjustHeight();
   $("#editor").show();
@@ -133,10 +145,8 @@
     xhr = runQuery(data, function (data) {
       $("#results").html(data);
 
-      error_line = /LINE (\d+)/g.exec($("#results").find('.alert-danger').text());
-
+      error_line = getErrorLine();
       if (error_line) {
-        error_line = parseInt(error_line[1], 10);
         editor.getSession().addGutterDecoration(error_line - 1, "error");
         editor.scrollToLine(error_line, true, true, function () {});
         editor.gotoLine(error_line, 0, true);

data/lib/blazer.rb

@@ -24,12 +24,14 @@ module Blazer
     attr_accessor :check_schedules
     attr_accessor :anomaly_checks
     attr_accessor :async
+    attr_accessor :images
   end
   self.audit = true
   self.user_name = :name
   self.check_schedules = ["5 minutes", "1 hour", "1 day"]
   self.anomaly_checks = false
   self.async = false
+  self.images = false
 
   TIMEOUT_MESSAGE = "Query timed out :("
   TIMEOUT_ERRORS = [

data/lib/blazer/detect_anomalies.R

@@ -3,11 +3,16 @@ tryCatch({
 
   args <- commandArgs(trailingOnly = TRUE)
 
-  con <- textConnection(args[1])
+  con <- textConnection(args[2])
   data <- read.csv(con, stringsAsFactors = FALSE)
   data$timestamp <- as.POSIXct(data$timestamp)
 
-  res = AnomalyDetectionTs(data, direction = "both", alpha = 0.05)
+  if (identical(args[1], "ts")) {
+    res = AnomalyDetectionTs(data, direction = "both", alpha = 0.05)
+  } else {
+    res = AnomalyDetectionVec(data$count, direction = "both", alpha = 0.05, period = length(data$count) / 2 - 1)
+  }
+
   write.csv(res$anoms)
 }, error = function (e) {
   write.csv(geterrmessage())

data/lib/blazer/engine.rb

@@ -35,6 +35,8 @@ module Blazer
       if Blazer.async
         require "blazer/run_statement_job"
       end
+
+      Blazer.images = Blazer.settings["images"] || false
     end
   end
 end

data/lib/blazer/result.rb

@@ -106,6 +106,7 @@ module Blazer
             end
           rescue => e
             message = "#{current_series}: #{e.message}"
+            raise e if Rails.env.development?
           end
         else
           message = "Bad format"
@@ -126,10 +127,12 @@ module Blazer
           end
         end
 
-      timestamps = []
       r_script = %x[which Rscript].chomp
+      type = series.any? && series.last.first.to_time - series.first.first.to_time >= 2.weeks ? "ts" : "vec"
+      args = [type, csv_str]
       raise "R not found" if r_script.empty?
-      output = %x[#{r_script} --vanilla #{File.expand_path("../detect_anomalies.R", __FILE__)} #{Shellwords.escape(csv_str)}]
+      command = "#{r_script} --vanilla #{File.expand_path("../detect_anomalies.R", __FILE__)} #{args.map { |a| Shellwords.escape(a) }.join(" ")}"
+      output = %x[#{command}]
       if output.empty?
         raise "Unknown R error"
       end
@@ -138,10 +141,18 @@ module Blazer
       error = rows.first && rows.first["x"]
       raise error if error
 
-      rows.each do |row|
-        timestamps << Time.parse(row["timestamp"])
+      timestamps = []
+      if type == "ts"
+        rows.each do |row|
+          timestamps << Time.parse(row["timestamp"])
+        end
+        timestamps.include?(series.last[0].to_time)
+      else
+        rows.each do |row|
+          timestamps << row["index"].to_i
+        end
+        timestamps.include?(series.length)
       end
-      timestamps.include?(series.last[0].to_time)
     end
   end
 end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -189,8 +189,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Share data effortlessly with your team
 test_files: []
+has_rdoc: