snitch_reporting 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 838bbd8f834c1c4a99d9457021ac12648d020d725fb60b3a28f6072fe7fac847
-  data.tar.gz: 017ad1b8375de6b1c3b12c5a96e239aa4ec81e44144ea01289bcb995142225f1
+  metadata.gz: 13ca38a1a092ebfb990a2dcd85bf75973cf69fee709e2111ad1eb546626d83b6
+  data.tar.gz: cda6e441fffb8a0c0691456b3327325ca0d36dd2816f5552cc56aec8bf90256e
 SHA512:
-  metadata.gz: d4c27dbc258ac2e021c0812e90150f9e587c72a3082b1790fd38056151bef45a46ca5b600de4312b9b2e91b8dfddfceb612b46ec57856cc9002d1c5fc4ae6a9d
-  data.tar.gz: 15a25a05a742dbe1d434d4b19e4f8b9d148a1cd83b769e038226dc866432b0fbd41e12063b48cbd83eb6955f49d45e85c73f6697d390176152b4c978926d46b4
+  metadata.gz: ece5f42bcd69b1813f8492a5d98f24df398e044d0b2dec2b23667096d93cdc6d742916f99e651659eb0adb559b985b35fb42df6c5e26b226ec4039a3f012c7cb
+  data.tar.gz: 77f89fafa5dd29bb2fdbc1e506ed9e03cf3cbb4a39f98fbd2de6b16e84d848db9c2b4158df6dff1074cad8c49856ad237b84029d3c367258686f90171977993e

data/app/assets/stylesheets/snitch_reporting/components.scss

@@ -74,6 +74,13 @@ todo {
   white-space: pre;
 }
 
+.snitch-tag {
+  border-radius: 4px;
+  background: $border-grey;
+  padding: 3px 5px;
+  white-space: nowrap;
+}
+
 .snitch-resolution-switch {
   -webkit-appearance: none;
   -moz-appearance: none;

data/app/controllers/snitch_reporting/snitch_reports_controller.rb

@@ -112,7 +112,7 @@ class ::SnitchReporting::SnitchReportsController < ApplicationController
         status: {
           default: :unresolved,
           values: [:all, :resolved, :unresolved]
-        },
+        }
         # assignee: {
         #   default: :any,
         #   values: [:any, :me, :not_me, :not_assigned]

data/app/models/snitch_reporting/snitch_occurrence.rb

@@ -118,6 +118,12 @@ class SnitchReporting::SnitchOccurrence < ApplicationRecord
   #   temp_details
   # end
 
+  def notify_occurrence
+    return unless notify?
+
+    SnitchReporting.notify(self)
+  end
+
   def notify?
     @should_notify ||= always_notify || report.resolved? || report.occurrence_count == 1
   end
@@ -125,7 +131,7 @@ class SnitchReporting::SnitchOccurrence < ApplicationRecord
   private
 
   def mark_occurrence
-    notify? # Store ivar
+    notify_occurrence
     report_updates = { last_occurrence_at: Time.current, resolved_at: nil }
     report_updates[:first_occurrence_at] = Time.current if report.first_occurrence_at.nil?
     report_updates[:occurrence_count] = report.occurrence_count.to_i + 1

data/app/models/snitch_reporting/snitch_report.rb

@@ -24,6 +24,8 @@ class SnitchReporting::SnitchReport < ApplicationRecord
   # belongs_to :resolved_by
   # belongs_to :ignored_by
 
+  serialize :tags, ::SnitchReporting::Service::JSONWrapper
+
   scope :resolved,      -> { where.not(resolved_at: nil) }
   scope :unresolved,    -> { where(resolved_at: nil) }
   scope :ignored,       -> { where.not(ignored_at: nil) }
@@ -199,7 +201,9 @@ class SnitchReporting::SnitchReport < ApplicationRecord
       # Not using find or create because the slug might be `nil`- in these
       #   cases, we want to create a new report so that we don't falsely group
       #   unrelated errors together.
-      report || create(report_identifiable_data)
+      report ||= create(report_identifiable_data)
+      report.add_tags(arg_hash.delete(:tags))
+      report
     end
 
     def gather_report_data(env, exceptions, arg_hash, arg_values)
@@ -262,6 +266,20 @@ class SnitchReporting::SnitchReport < ApplicationRecord
     trackers.tracker_for_date(date)
   end
 
+  def tags
+    super || []
+  end
+
+  def tags=(new_tags)
+    super((new_tags.try(:to_a) || [new_tags]).compact.flatten)
+  end
+
+  def add_tags(new_tags)
+    return if new_tags.blank?
+
+    update(tags: tags + [new_tags])
+  end
+
   def resolved?; resolved_at?; end
   def ignored?; ignored_at?; end
 

data/app/views/snitch_reporting/snitch_reports/index.html.erb

@@ -1,13 +1,9 @@
 <div class="snitch-reporting">
-  <!-- <div class="snitch-nav">
+  <!--
     <div class="nav-tab">
       <input type="search" name="search" value="<%= params[:search] %>" placeholder="Search">
     </div>
-    <a href="<%#  %>">Status</a>
-    <a href="<%#  %>">Assignee</a>
-    <a href="<%#  %>">Occurred</a>
-    <a href="<%#  %>">Ignored</a>
-  </div> -->
+   -->
   <div class="filters">
     <% @filter_sets.each do |filter_name, filter_set| %>
       <div class="snitch-table filter-table">
@@ -44,7 +40,7 @@
             <div class="snitch-th">Error</div>
             <div class="snitch-th" style="width: 150px;">Last</div>
             <div class="snitch-th" style="width: 1px;">Times</div>
-            <div class="snitch-th" style="width: 1px;">Assigned</div>
+            <div class="snitch-th" style="width: 1px;">Tags</div>
             <div class="snitch-th" style="width: 1px;">Status</div>
           </div>
         </div>
@@ -62,7 +58,12 @@
               <% end %>
               <div class="snitch-td"><%= report.last_occurrence_at %></div>
               <div class="snitch-td"><%= number_with_delimiter(report.occurrence_count) %></div>
-              <div class="snitch-td"><%= report.assigned_to.try(:name).presence || "-" %></div>
+              <div class="snitch-td">
+                <% report.tags.each_with_index do |tag, idx| %>
+                  <span class="snitch-tag"><%= tag %></span><%= ', ' if idx < report.tags.length - 1 %>
+                <% end %>
+              </div>
+              <!-- <div class="snitch-td"><%= report.assigned_to.try(:name).presence || "-" %></div> -->
               <div class="snitch-td">
                 <%= content_tag :input, "", type: :checkbox, name: :resolved, class: "snitch-resolution-switch", checked: report.resolved?, data: { mark_resolution_url: snitch_report_url(report) } %>
               </div>

data/app/views/snitch_reporting/snitch_reports/show.html.erb

@@ -91,10 +91,14 @@
           </todo>
         </div>
       </div> -->
-      <!-- <div class="snitch-tr">
-        <div class="snitch-td">Tags <todo>(edit)</todo></div>
-        <div class="snitch-td"><%= @report.tags %></div>
-      </div> -->
+      <div class="snitch-tr">
+        <div class="snitch-td">Tags</div>
+        <div class="snitch-td">
+          <% @report.tags.each_with_index do |tag, idx| %>
+            <span class="snitch-tag"><%= tag %></span><%= ', ' if idx < @report.tags.length - 1 %>
+          <% end %>
+        </div>
+      </div>
     </div>
   </div>
 

data/config/initializers/snitch_reporting.rb

@@ -0,0 +1,5 @@
+::SnitchReporting::SnitchReport.log_levels.symbolize_keys.keys.each do |log_level|
+  ::SnitchReporting.define_singleton_method(log_level) do |*args|
+    ::SnitchReporting::SnitchReport.report(log_level, args)
+  end
+end

data/lib/snitch_reporting/rack.rb

@@ -4,7 +4,12 @@ class SnitchReporting::Rack
 
   def initialize(app, notify_callback=nil)
     @app = app
-    @notify_callback = notify_callback
+
+    return unless notify_callback.present?
+
+    ::SnitchReporting.define_singleton_method :notify do |occurrence|
+      notify_callback.call(occurrence)
+    end
   end
 
   def call(env)
@@ -20,7 +25,6 @@ class SnitchReporting::Rack
     response
   rescue Exception => exception
     occurrence = ::SnitchReporting::SnitchReport.fatal(exception, env: env)
-    notify_callback.call(occurrence) if occurrence.notify?
 
     raise exception unless exception.is_a?(SnitchException)
 

data/lib/snitch_reporting/version.rb

@@ -1,3 +1,3 @@
 module SnitchReporting
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snitch_reporting
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Rocco Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,6 +102,7 @@ files:
 - app/views/snitch_reporting/snitch_reports/edit.html.erb
 - app/views/snitch_reporting/snitch_reports/index.html.erb
 - app/views/snitch_reporting/snitch_reports/show.html.erb
+- config/initializers/snitch_reporting.rb
 - config/routes.rb
 - lib/generators/snitch_reporting/install/install_generator.rb
 - lib/generators/snitch_reporting/install/templates/install_snitch_reporting.rb