whoops 0.2.4 → 0.3

data/app/assets/stylesheets/whoops.css.scss

@@ -146,4 +146,21 @@ ul.detail {
     font-weight:normal;
     color:$blue;
   }
+}
+
+/* Notification rules! */
+#new-notification-rule {
+  textarea {
+    height: 100px;
+    width:190px;
+  }
+}
+
+.topbar .documentation {
+  float: right;
+  @extend .brand;
+}
+
+header form {
+  float:right;
 }

data/app/controllers/event_groups_controller.rb

@@ -5,6 +5,7 @@ class EventGroupsController < ApplicationController
   
   def index
     query_document = event_group_filter.to_query_document
+    query_document.merge!(:archived => false) unless params[:show_archived]
     query_document.merge!(:_id.in => Whoops::Event.where(:keywords => /#{params[:query]}/i).distinct(:event_group_id)) unless params[:query].blank?
     
     @event_groups = Whoops::EventGroup.where(query_document).desc(:last_recorded_at).page(params[:page]).per(30)
@@ -30,5 +31,11 @@ class EventGroupsController < ApplicationController
   def event_group_filter=(filter)
     session[:event_group_filter] = Whoops::Filter.new_from_params(filter)
   end
+
+  def update
+    @event_group = Whoops::EventGroup.find(params[:id])
+    @event_group.update_attributes(:archived => params[:event_group][:archived] == "true")
+    redirect_to whoops_event_group_events_path(@event_group)
+  end
   
 end

data/app/controllers/notification_rules_controller.rb

@@ -0,0 +1,29 @@
+class NotificationRulesController < ApplicationController
+  layout 'whoops'
+
+  def index
+    @notification_rule = Whoops::NotificationRule.new
+    @notification_rules = Whoops::NotificationRule.asc(:email)
+  end
+
+  def create
+    Whoops::NotificationRule.add_rules(params[:notification_rule])
+    redirect_to whoops_notification_rules_path
+  end
+
+  def edit
+    @notification_rule = Whoops::NotificationRule.find(params[:id])
+  end
+
+  def update
+    @notification_rule = Whoops::NotificationRule.find(params[:id])
+    @notification_rule.update_attributes(params[:notification_rule])
+    notification_rules = Whoops::NotificationRule.asc(:email)
+    redirect_to whoops_notification_rules_path
+  end
+
+  def destroy
+    Whoops::NotificationRule.find(params[:id]).destroy
+    redirect_to whoops_notification_rules_path
+  end
+end

data/app/mailers/whoops/notification_mailer.rb

@@ -1,10 +1,12 @@
 class Whoops::NotificationMailer < ActionMailer::Base
-  def event_notification(event_group, *addresses)
+  def event_notification(event_group, addresses)
     @event_group = event_group
     @addresses = addresses
     mail(
       :to      => addresses.join(", "),
-      :subject => "Whoops Notification | #{event_group.service}: #{event_group.environment}: #{event_group.message}"
+      :from    => Rails.application.config.whoops_sender,
+      :subject => "Whoops Notification | #{event_group.service}: #{event_group.environment}: #{event_group.message}",
+      :body    => "#{event_group.service}: #{event_group.environment}: #{event_group.message}"
     )
   end
-end
+end

data/app/models/whoops/event_group.rb

@@ -31,6 +31,7 @@ class Whoops::EventGroup
       end
       
       if event_group.valid?
+        event_group.event_count += 1
         event_group.send_notifications
         event_group.save
       end
@@ -62,13 +63,13 @@ class Whoops::EventGroup
         self.notify_on_next_occurrence = true
       end
     end
+    true
   end
   
-  
   def send_notifications
-    return unless self.notify_on_next_occurrence
+    return if !self.notify_on_next_occurrence || !Rails.application.config.whoops_sender
     matcher = Whoops::NotificationRule::Matcher.new(self)
-    Whoops::NotificationMailer.event_notification(self, matcher.matches).deliver unless matcher.matches.empty?
+    Whoops::NotificationMailer.event_notification(self, matcher.matches.collect(&:email)).deliver unless matcher.matches.empty?
     self.notify_on_next_occurrence = false
   end
 end

data/app/models/whoops/notification_rule.rb

@@ -4,6 +4,8 @@ class Whoops::NotificationRule
   field :email, :type => String
   field :matchers, :type => Array
 
+  validates_presence_of :email
+
   # This might come in handy in the future?
   # class << self.fields["matchers"]
   #   def set(object)
@@ -19,11 +21,26 @@ class Whoops::NotificationRule
   end
   
   def matchers=(matchers)
-    write_attribute(:matchers, matchers.split("\n").collect{ |m| m.strip })
+    write_attribute(:matchers, split_matchers(matchers).sort)
   end
-  
-  def self.matches(event)
-    
+
+  def add_matchers(new_matchers)
+    split = split_matchers(new_matchers)
+    write_attribute(:matchers, (self.matchers | split).sort)
+    self.save
+  end
+
+  def split_matchers(new_matchers)
+    new_matchers.split("\n").collect{ |m| m.strip }
+  end
+
+  def self.add_rules(params)
+    params[:email] = params[:email].downcase
+    if rule = first(:conditions => {:email => params[:email]})
+      rule.add_matchers(params[:matchers])
+    else
+      create(params)
+    end
   end
   
   class Matcher
@@ -42,4 +59,4 @@ class Whoops::NotificationRule
       @matches ||= Whoops::NotificationRule.where(:matchers => /^#{event_group.service}/)
     end
   end
-end
+end

data/app/views/events/index.html.haml

@@ -24,7 +24,15 @@
 
 %article
   %header
-    %h3= @event_group.message
+    = form_for :event_group, :url => whoops_event_group_path(@event_group), :method => :put do |f|
+      - if @event_group.archived
+        = f.hidden_field :archived, :value => false
+        = f.submit :class => "btn", :value => "unarchive"
+      - else 
+        = f.hidden_field :archived, :value => true
+        = f.submit :class => "btn", :value => "archive"
+    %h3
+      = @event_group.message
   %table.span8.bordered-table
     %thead
       %tr

data/app/views/layouts/whoops.html.haml

@@ -14,9 +14,12 @@
     .topbar
       .listfill
         .container-fluid
-          = link_to "Whoops", whoops_event_groups_path, :class => "brand"
+          = link_to "Event Groups", whoops_event_groups_path, :class => "brand"
+          = link_to "Notification Rules", whoops_notification_rules_path, :class => "brand"
+          = link_to "Whoops Documentation", "http://www.whoopsapp.com/", :class => "documentation"
     .container-fluid
       .sidebar
         = yield :sidebar
       .content
-        = yield
+        = yield
+          

data/app/views/notification_rules/_form.html.haml

@@ -0,0 +1,15 @@
+%h3 New
+- options = @notification_rule.new_record? ? {:url => whoops_notification_rules_path, :method => :post} : {:url => whoops_notification_rule_path(@notification_rule), :method => :put}
+= form_for :notification_rule, options do |f|
+  #new-notification-rule
+    %p
+      Email
+      %br
+      =f.text_field :email
+    %p
+      Matchers
+      %br
+      = f.text_area :matchers, :value => @notification_rule.matchers.to_a.join("\n")
+    %p= f.submit(:class => "primary btn", :value => "Save Notification Rule")
+
+%p= link_to "Back to notification rules", whoops_notification_rules_path

data/app/views/notification_rules/edit.html.haml

@@ -0,0 +1,8 @@
+%h3 Edit Notification Rules for #{@notification_rule.email}
+
+= render :partial => "form"
+
+%h4 Delete This Rule
+
+= form_for :notification_rule, :method => :delete, :url => whoops_notification_rule_path(@notification_rule) do |f|
+  = f.submit :class => "btn", :value => "Delete it Forever! There's no going back!"

data/app/views/notification_rules/index.html.haml

@@ -0,0 +1,21 @@
+%h3 Notification Rules
+
+- content_for :sidebar do
+  .space
+    = render :partial => "form"
+
+
+
+%table
+  %tr
+    %th Email Address
+    %th Services to Monitor
+    %th
+  
+  - @notification_rules.each do |nr|
+    %tr
+      %td= nr.email
+      %td= nr.matchers.sort.join(", ")
+      %td= link_to "update", edit_whoops_notification_rule_path(nr)
+
+      

data/config/routes.rb

@@ -4,4 +4,5 @@ Rails.application.routes.draw do
   end
   
   resources :events, :as => "whoops_events"
-end
+  resources :notification_rules, :as => "whoops_notification_rules"
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: whoops
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Daniel Higginbotham
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-03 00:00:00 Z
+date: 2012-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -186,6 +185,7 @@ files:
 - app/assets/stylesheets/whoops.css.scss
 - app/controllers/event_groups_controller.rb
 - app/controllers/events_controller.rb
+- app/controllers/notification_rules_controller.rb
 - app/helpers/event_groups_helper.rb
 - app/helpers/events_helper.rb
 - app/helpers/notifications_helper.rb
@@ -202,6 +202,9 @@ files:
 - app/views/events/_details.html.haml
 - app/views/events/index.html.haml
 - app/views/layouts/whoops.html.haml
+- app/views/notification_rules/_form.html.haml
+- app/views/notification_rules/edit.html.haml
+- app/views/notification_rules/index.html.haml
 - lib/tasks/whoops.rake
 - lib/whoops/engine.rb
 - lib/whoops.rb