errdo 0.12.7 → 0.12.8

data/app/assets/stylesheets/errdo/errdo.scss

@@ -1,87 +1,6 @@
-@import "bootstrap-sprockets";
-@import "bootstrap";
-
-.errdo-status {
-    display: block;
-    height: 20px;
-    width: 4.5em;
-    line-height: 12px;
-
-    background-color: green;
-    color: white;
-    text-align: center;
-    margin-top: 1px;
-    padding-top: 4px;
-
-    float: right;
-}
-
-.errdo-active {
-  @extend .errdo-status;
-
-  background-color: #e74c3c;
-}
-
-.errdo-resolved {
-  @extend .errdo-status;
-
-  background-color: #2ecc71;
-}
-
-.errdo-wontfix {
-  @extend .errdo-status;
-
-  background-color: #f1c40f;
-}
-
-
-.status-column {
-  max-width: 0.5em;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  text-align: right;
-}
-
-.time-column {
-  max-width: 1em;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.user-column {
-  max-width: 1.2em;
-  text-overflow: ellipsis;
-}
-
-.class-column {
-  max-width: 2em;
-  text-overflow: ellipsis;
-}
-
-.message-column {
-  max-width: 2em;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-.count-column {
-  max-width: 0.5em;
-  text-overflow: ellipsis;
-  text-align: right;
-}
-
-table tr td a {
-  &.errdo {
-    display:block;
-    height:100%;
-    width:100%;
-  }
-}
-
 .errdo-backtrace-box {
   white-space: nowrap;
-  overflow: scroll;
+  overflow-y: scroll;
   background-color: #f8f8f8;
   padding: 10px;
   max-height: 500px;
@@ -91,8 +10,14 @@ table tr td a {
   @extend .errdo-backtrace-box;
 }
 
-.errdo-status-select {
-  // margin-top: 10px;
-  margin-bottom: 5px;
-  width: 100%;
+td {
+  vertical-align: middle !important;
+}
+
+.errdo-nav-brand {
+  color: white;
+}
+
+.errdo-nav-link {
+  color: lightgray;
 }

data/app/controllers/errdo/application_controller.rb

@@ -1,6 +1,8 @@
 module Errdo
   class ApplicationController < ::ApplicationController
 
+    layout "errdo/errdo_layout"
+
     before_action :_authenticate!
     before_action :_authorize!
 

data/app/controllers/errdo/errors_controller.rb

@@ -8,13 +8,30 @@ module Errdo
 
     before_action :authorize_user
 
+    DEFAULT_SCOPE = "active"
+
     def index
-      @errors = Errdo::Error.order(last_occurred_at: :desc).includes(:last_experiencer).page params[:page]
+      @scope = get_whitelisted_scope
+
+      if @scope == "all"
+        base_query = Errdo::Error
+      else
+        base_query = Errdo::Error.send(@scope)
+      end
+
+      @errors = base_query.order(last_occurred_at: :desc)
+                          .includes(:last_experiencer)
+                          .page(params[:page])
+
+      @chart_data = {
+        errors:      Error.grouped_by_time(2.weeks),
+        occurrences: ErrorOccurrence.grouped_by_time(2.weeks)
+      }
     end
 
     def show
       @error = Errdo::Error.find(params[:id])
-      @occurrence = selected_occurrence(@error)
+      @occurrence, @index, @total = selected_occurrence(@error)
     end
 
     def update
@@ -24,7 +41,7 @@ module Errdo
       else
         flash[:alert] = "Updating failed"
       end
-      @occurrence = selected_occurrence(@error)
+      @occurrence, @index, @total = selected_occurrence(@error)
       render :show
     end
 
@@ -40,10 +57,28 @@ module Errdo
     end
 
     def selected_occurrence(error)
+      occurrences = error.error_occurrences.order(created_at: :desc)
       if params[:occurrence_id]
-        Errdo::ErrorOccurrence.find(params[:occurrence_id])
+        id = occurrences.find { |o| o.id == params[:occurrence_id] } || 0
+        return occurrences[id], id, occurrences.length
+      elsif params[:occurrence_index]
+        return occurrences[params[:occurrence_index].to_i], params[:occurrence_index].to_i, occurrences.length
+      else
+        return occurrences.last, 0, occurrences.length
+      end
+    end
+
+    def get_whitelisted_scope
+      if params[:scope] == "active"
+        "active"
+      elsif params[:scope] == "resolved"
+        "resolved"
+      elsif params[:scope] == "wontfix"
+        "wontfix"
+      elsif params[:scope] == "all"
+        "all"
       else
-        error.error_occurrences.last
+        DEFAULT_SCOPE
       end
     end
 

data/app/helpers/errdo/histogram_helper.rb

@@ -0,0 +1,24 @@
+module Errdo
+  module HistogramHelper
+    def hist(data, num_bins, time_start, time_range)
+      times = {}
+      (0..num_bins).each do |num|
+        bin_start = (time_start + ((num.to_f / num_bins.to_f) * time_range))
+        bin_end =   (time_start + (((num + 1) / num_bins.to_f) * time_range)).beginning_of_hour
+        bin_start = bin_start.beginning_of_hour
+        times[bin_start.strftime("%m/%d %I%p")] = data.select { |d| (d.created_at > bin_start) && (d.created_at <= bin_end) }.count
+      end
+      return times
+    end
+
+    def useful_time(time)
+      if time < 1.day
+        1.day
+      elsif time < 1.week
+        1.week
+      else
+        2.weeks
+      end
+    end
+  end
+end

data/app/models/errdo/error.rb

@@ -1,3 +1,5 @@
+include Errdo::HistogramHelper
+
 module Errdo
   class Error < ActiveRecord::Base
 
@@ -29,7 +31,7 @@ module Errdo
     # I need a more elegant way to do this
     def self.create_unique_string_from_params(params)
       Digest::SHA1.hexdigest(
-        params[:backtrace].reject { |l| l[%r{\/ruby-[0-9]\.[0-9]\.[0-9]\/|_test.rb}] }.join("") +
+        params[:backtrace].reject { |l| l[%r{\/ruby-[0-9]*\.[0-9]*\.[0-9]*\/|_test.rb}] }.join("") +
         params[:exception_message].to_s.gsub(/:0x[0-f]{14}/, "") +
         params[:exception_class_name].to_s
       ).to_s
@@ -46,11 +48,35 @@ module Errdo
       return params
     end
 
+    def affected_users
+      error_occurrences.group("experiencer_id, experiencer_type").map(&:experiencer).compact
+    end
+
+    def oldest_occurrence
+      error_occurrences.order(created_at: :asc).limit(1).first
+    end
+
+    def newest_occurrence
+      error_occurrences.order(created_at: :desc).limit(1).first
+    end
+
+    def grouped_error_occurrences(timeframe = nil)
+      errors = error_occurrences.where("created_at > ?", 2.weeks.ago)
+      timeframe = useful_time(Time.now - errors.first.created_at) if timeframe.nil?
+      hist(errors, 24, Time.now - timeframe, timeframe)
+    end
+
+    def self.grouped_by_time(timeframe = nil)
+      errors = Errdo::Error.where("created_at > ?", 2.weeks.ago)
+      timeframe = useful_time(Time.now - errors.first.created_at) if timeframe.nil?
+      hist(errors, 24, Time.now - timeframe, timeframe)
+    end
+
     private
 
     def create_unique_string
       self.backtrace_hash =
-        Digest::SHA1.hexdigest(backtrace.to_a.reject { |l| l[%r{\/ruby-[0-9]\.[0-9]\.[0-9]\/|_test.rb}] }.join("") +
+        Digest::SHA1.hexdigest(backtrace.to_a.reject { |l| l[%r{\/ruby-[0-9]*\.[0-9]*\.[0-9]*\/|_test.rb}] }.join("") +
                                exception_message.to_s.gsub(/:0x[0-f]{14}/, "") +
                                exception_class_name.to_s).to_s
     end

data/app/models/errdo/error_occurrence.rb

@@ -13,6 +13,12 @@ module Errdo
     after_create :update_last_occurrence
     after_create :update_last_experiencer
 
+    def self.grouped_by_time(timeframe = nil)
+      errors = Errdo::ErrorOccurrence.where("created_at > ?", 2.weeks.ago)
+      timeframe = useful_time(Time.now - errors.first.created_at) if timeframe.nil?
+      hist(errors, 24, Time.now - timeframe, timeframe)
+    end
+
     private
 
     def update_last_occurrence

data/app/views/errdo/errors/index.html.slim

@@ -1,45 +1,66 @@
-#list
-  .container-fluid
-    .col-sm-10.col-sm-offset-1
-      h1
-        | All errors
+.container
+  = line_chart [{name: "Errors", data: @chart_data[:errors]}, {name: "Occurrences", data: @chart_data[:occurrences]}], discrete: true, height: "200px", colors: ["#000", "#00d1b2"]
 
-      - total_count = @errors.total_count.to_i
-      .row
-        .col-md-6
-          .clearfix.total-count= "#{total_count} #{"error".pluralize(total_count)}"
+  .tabs.is-boxed
+    ul
+      li class=("is-active" if !params[:scope] || params[:scope] == "active")
+        = link_to "Active", errdo.root_path(scope: "active")
+      li class=("is-active" if params[:scope] == "resolved")
+        = link_to "Resolved", errdo.root_path(scope: "resolved")
+      li class=("is-active" if params[:scope] == "wontfix")
+        = link_to "Wontfix", errdo.root_path(scope: "wontfix")
+      li class=("is-active" if params[:scope] == "all")
+        = link_to "All", errdo.root_path(scope: "all")
 
+  table.table.is-bordered.is-striped.is-fullwidth
+    thead
+      th
+        | ID
+      th
+        | Last seen
+      th
+        | By
+      th
+        | Class name
+      th
+        | Message
+      th
+        | Count
+      th
+        | Status
+    tbody
+      - @errors.each do |error|
+        tr
+          td
+            strong
+              = link_to "##{error.id}", error
+          td
+            - time = error.last_occurred_at ? time_ago_in_words(error.last_occurred_at) : "Error"
+            = time + " ago"
+          td
+            - if user_show_path(error.last_experiencer)
+              = link_to user_show_string(error.last_experiencer),
+                user_show_path(error.last_experiencer), class: "errdo"
+            - else
+              = user_show_string(error.last_experiencer)
+          td
+            = error.exception_class_name
+          td
+            = error.exception_message
+          td
+            = error.occurrence_count
+          td
+            - if error.active?
+              span.tag.is-danger.is-medium
+                | Active
+            - elsif error.resolved?
+              span.tag.is-success.is-medium
+                | Resolved
+            - else
+              span.tag.is-warning.is-medium
+                | Wontfix
 
-      table.table.table-condensed.table-striped
-        thead
-          tr
-            th.time-column Last seen
-            th.user-column By
-            th.class-column Class Name
-            th.message-column Message
-            th.count-column Count
-            th.status-column Status
-        tbody
-          - @errors.each do |error|
-            tr.errdo
-              td.errdo.time-column
-                - time = error.last_occurred_at ? time_ago_in_words(error.last_occurred_at) : "Error"
-                = link_to time + " ago", error, class: "errdo"
-              td.errdo.user-column
-                - if user_show_path(error.last_experiencer)
-                  = link_to user_show_string(error.last_experiencer),
-                    user_show_path(error.last_experiencer), class: "errdo"
-                - else
-                  = user_show_string(error.last_experiencer)
-              td.errdo.class-column
-                = link_to error.exception_class_name, error, class: "errdo"
-              td.errdo.message-column
-                = link_to error.exception_message, error, class: "errdo"
-              td.errdo.count-column
-                = link_to error.occurrence_count, error, class: "errdo"
-              td.errdo.status-column
-                span class="errdo-#{error.status}"
-                  = error.status
-
-      .row
-        .col-md-6 = paginate(@errors)
+.container
+  .columns.is-centered
+    .column.is-half
+      = paginate(@errors)

data/app/views/errdo/errors/show.html.slim

@@ -1,75 +1,143 @@
-.container-fluid
-  .row
-    .col-md-3.col-md-offset-1
-      h1
-        | Last 5 occurrences
-      - @error.error_occurrences.order(created_at: :desc).last(5).each do |occurrence|
-        div
-          = link_to error_path(id: @error.id, occurrence_id: occurrence.id)
-            = time_ago_in_words(occurrence.created_at) + " ago "
-            | to
-            = " " + user_show_string(occurrence.experiencer)
-
-      h1
-        | Status
-      = form_for @error do |f|
-        = f.select(:status, Errdo::Error.statuses.keys, {}, class: "form-control errdo-status-select")
-        = f.submit "Update status", class: "btn btn-primary"
-
-    .col-md-7
-
-      h3 Occurrence Time
-      div = @occurrence.created_at
-
-      h3 Number of times this error occurred
-      = @error.occurrence_count
-
-      h3 Exception Class
-      div = @error.exception_class_name
-
-      h3 Exception message
-      div = @error.exception_message
-
-      h3 Experiencer
+.container
+  .columns
+    .column.is-one-fifth.box
       div
-        - if user_show_path(@occurrence.experiencer)
-          = link_to user_show_string(@occurrence.experiencer),
-            user_show_path(@occurrence.experiencer), class: "errdo"
-        - else
-          = user_show_string(@occurrence.experiencer)
-
-      h3 Param Values
-      div = @occurrence.param_values
-
-      h3 Backtrace
-      .errdo-backtrace-box
-        - @error.backtrace.each do |line|
-          div
-            = line
-
-      h3 IP address
-      div = @occurrence.ip
+        b Total Occurrences
+      = @error.error_occurrences.count
 
-      h3 User Agent
-      div = @occurrence.user_agent
-
-      h3 Referer
-      div = @occurrence.referer || "None"
-
-      h3 Cookie Values
-      .errdo-backtrace-box
-        = @occurrence.cookie_values
-
-      h3 Header Values
-      div = @occurrence.header_values
+      div
+        b Affected Users
+        br
+        .level
+          = @error.affected_users.length
+          - if @error.affected_users.any?
+            a#affected-users-button.button.is-inverted
+              | Expand
+      #affected-users.is-hidden
+        - for user in @error.affected_users
+          = link_to user_show_string(user), user_show_path(user)
+          | ,
 
-      h3 HTTP Method
-      div = @error.http_method
+      div
+        b Oldest
+      = @error.oldest_occurrence.created_at.in_time_zone("EST").to_s(:time_in_zone)
+      div
+        b Newest
+      = @error.newest_occurrence.created_at.in_time_zone("EST").to_s(:time_in_zone)
+      div
+        b Span
+      = distance_of_time_in_words(@error.newest_occurrence.created_at - @error.oldest_occurrence.created_at)
 
-      h3 Requested URL
-      div = @error.url
+      div
+        b Status
+      = form_for @error do |f|
+        .field.has-addons
+          .control.is-expanded
+            .select.is-fullwidth
+              = f.select(:status, Errdo::Error.statuses.keys, {})
+          .control
+            = f.submit "Update status", class: "button is-primary"
+
+    .column.is-three-quarters
+      = column_chart @error.grouped_error_occurrences, discrete: true, height: "200px", colors: ["#00d1b2"]
+      .columns
+        .column.is-three-quarters
+          span.tabs.is-boxed
+            ul
+              li.is-active
+                a[container='#tab0'] Debug
+              li
+                a[container='#tab1'] User
+        .column
+          .level
+            - ind = [@index-1, 0].max
+            = link_to "<", error_path(@error, occurrence_index: ind), class: "button", disabled: (@index == 0)
+            span
+              = @index + 1
+              | &nbsp;of&nbsp;
+              = @total
+            - ind = [@index+1, @total-1].min
+            = link_to ">", error_path(@error, occurrence_index: ind), class: "button", disabled: (@index == @total-1)
+
+      #tab0.tabbed
+        table.table.is-striped.is-bordered
+          tbody
+            tr
+              td
+                b Exception Class
+              td = @error.exception_class_name
+
+            tr
+              td
+                b Exception message
+              td = @error.exception_message
+
+            tr
+              td
+                b Occurrence Time
+              td = @occurrence.created_at
+
+            tr
+              td
+                b Param Values
+              td = @occurrence.param_values
+
+
+            tr
+              td
+                b Referer
+              td = @occurrence.referer || "None"
+
+
+            tr
+              td
+                b Header Values
+              td = @occurrence.header_values
+
+            tr
+              td
+                b HTTP Method
+              td = @error.http_method
+
+            tr
+              td
+                b Requested URL
+              td = @error.url
 
-      br
-      br
-      br
-      br
+        div
+          b Cookie Values
+          .errdo-backtrace-box
+            = @occurrence.cookie_values
+        br
+        div
+          b Backtrace
+          .errdo-cookies-box
+            - @error.backtrace.each do |line|
+              div
+                - if line =~ /\/ruby-[0-9]*\.[0-9]*\.[0-9]*\//
+                  span.has-text-grey = line
+                - else
+                  b = line
+
+      #tab1.tabbed.is-hidden
+        table.table.is-striped.is-bordered
+          tbody
+            tr
+              td
+                b Experiencer
+              td
+                - if user_show_path(@occurrence.experiencer)
+                  = link_to user_show_string(@occurrence.experiencer),
+                    user_show_path(@occurrence.experiencer), class: "errdo"
+                - else
+                  = user_show_string(@occurrence.experiencer)
+
+            tr
+              td
+                b IP Address
+              td = @occurrence.ip
+
+            tr
+              td
+                b User Agent
+              td = @occurrence.user_agent

data/app/views/layouts/errdo/_navbar.html.slim

@@ -1,8 +1,9 @@
-nav.navbar.navbar-default.navbar-fixed-top
-  .container-fluid
-    .navbar-header
-      = link_to "Errdo", root_path, class: "navbar-brand"
-    ul.nav.navbar-nav.navbar-right
-      li = link_to "Errors", root_path
-      - if main_app_root_path = (main_app.root_path rescue false)
-        li = link_to "App Home", main_app_root_path
+nav.navbar.is-primary
+  .navbar-brand
+    strong.navbar-item
+      = link_to "Errdo", root_path, class: "errdo-nav-brand"
+  .navbar-end
+    - if main_app_root_path = (main_app.root_path rescue false)
+      .navbar-item
+        | return to 
+        = link_to "app home", main_app_root_path, class: "errdo-nav-link"

data/app/views/layouts/errdo/errdo_layout.html.slim

@@ -0,0 +1,13 @@
+html
+  head
+    meta name="viewport" content="width=device-width, initial-scale=1"
+    = csrf_meta_tag
+    = stylesheet_link_tag "errdo/errdo", media: :all
+    = javascript_include_tag "https://code.jquery.com/jquery-3.2.1.min.js"
+    = stylesheet_link_tag "https://cdnjs.cloudflare.com/ajax/libs/bulma/0.5.2/css/bulma.min.css", media: :all
+    = javascript_include_tag "errdo/errdo"
+
+body
+  = render partial: "layouts/errdo/navbar"
+  section.section
+    == yield

data/lib/errdo/engine.rb

@@ -1,4 +1,4 @@
-require 'bootstrap-sass'
+require 'chartkick'
 
 module Errdo
   class Engine < Rails::Engine
@@ -7,14 +7,14 @@ module Errdo
 
     require "kaminari"
 
-    config.autoload_paths += %W(#{config.root}/lib)
+    config.autoload_paths += %W[#{config.root}/lib]
 
     config.before_initialize do |app|
       app.config.exceptions_app = Errdo::ExceptionsController.new(Rails.public_path)
     end
 
     initializer 'Errdo precompile hook', group: :all do |app|
-      app.config.assets.precompile += %w(errdo/errdo.css)
+      app.config.assets.precompile += %w[errdo/errdo.css errdo/errdo.js errdo/logo.png]
     end
 
   end

data/lib/errdo/version.rb

@@ -1,3 +1,3 @@
 module Errdo
-  VERSION = '0.12.7'.freeze
+  VERSION = '0.12.8'.freeze
 end

data/test/dummy/app/views/layouts/application.html.slim

@@ -0,0 +1,4 @@
+html
+  | Stuff
+  == yield
+