whoops 0.3.5 → 0.4.0

data/Gemfile

@@ -10,6 +10,7 @@ group :development do
     gem 'ruby-debug-base19', '0.11.23' if RUBY_VERSION.include? '1.9.1'
     gem 'ruby-debug19', :platforms => :ruby_19
     gem 'ruby-debug', :platforms => :mri_18
+    gem 'pry'
   end
 end
 

data/README.asciidoc

@@ -3,7 +3,7 @@ Whoops
 Daniel Higginbotham <daniel@flyingmachinestudios.com>
 2011-07-09
 
-image::https://secure.travis-ci.org/driv3r/whoops.png?branch=master[]
+image::https://secure.travis-ci.org/driv3r/whoops.png?branch=master[link="https://secure.travis-ci.org/driv3r/whoops"]
 
 == What is Whoops?
 

data/app/assets/javascripts/whoops.js

@@ -1,8 +1,36 @@
 Whoops = {
   setupFilters: function() {
-    $("#new_whoops_filter input").change(function(){
-      $("#new_whoops_filter").submit()
-    })
+    function checkboxBehavior(afterChecked) {
+      if (afterChecked === undefined) {
+        afterChecked = function(){}
+      }
+      
+      return function(i, list){
+        var all = $($(list).find("input").get(0));
+        var allowedValues = $(list).find("input").slice(1);
+        var form = $(this).parents("form");
+        
+        all.change(function(event){
+          if ($(this).attr("checked")) {
+            allowedValues.attr("checked", false);
+            afterChecked(form);
+          } else {
+            $(this).attr("checked", true);
+          }
+        })
+
+        $(allowedValues).change(function(event){
+          if ($(this).attr("checked")) {
+            all.attr("checked", false);
+          }
+          afterChecked(form);
+        })
+      }
+    }
+
+    $("#new_whoops_filter ul").each(checkboxBehavior(function(form){form.submit()}));
+    $("#new-notification-rule .filters ul").each(checkboxBehavior());
+    
     $("#reset").click(function(){
       window.location = window.location.pathname
       return false

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

@@ -25,6 +25,10 @@ li {
   }
 }
 
+#main {
+  padding-bottom:1em;
+}
+
 /* sidebar */
 .container-fluid .sidebar {
   margin-left:-20px;  
@@ -37,24 +41,28 @@ li {
   input[type=text] {
     width:190px;
   }
-    
-
 }
 
 /* for kaminari pagination */
-.sidebar .pagination {
-  margin:0;
+.sidebar {
+  .pagination {
+    margin:0;
+
+    a, .current {
+      line-height: ($baseline * 2) - 2;
+      padding:0;
+      border:none;
+      display:block;
+      float:left;
+      margin-right:2px;  
+    }
 
-  a, .current {
-    line-height: ($baseline * 2) - 2;
-    padding:0;
-    border:none;
-    display:block;
-    float:left;
-    margin-right:2px;  
+    .next, .first, .prev, .last { display:none; }
   }
+}
 
-  .next, .first, .prev, .last { display:none; }
+.nofloat {
+  float:none;
 }
 
 .content .pagination {
@@ -122,8 +130,19 @@ li {
   }
 }
 
-.filter_selects label {
-  cursor: pointer;
+.filter-selects {
+  hr {
+    margin:0;
+    border-bottom: 1px dotted #ccc;
+  }
+
+  li.filter-option:hover {
+    background:#e8e5cc;
+  }
+
+  label {
+    cursor: pointer;
+  }
 }
 
 /* events for event group */
@@ -163,4 +182,17 @@ ul.detail {
 
 header form {
   float:right;
+}
+
+#notification-subscriptions {
+  .email {
+    width: 20%;
+  }
+
+  span {
+    padding:0 3px;
+    background: #cbdbe5;
+    margin-right:4px;
+    border-radius:3px;
+  }
 }

data/app/controllers/notification_subscriptions_controller.rb

@@ -0,0 +1,33 @@
+class NotificationSubscriptionsController < ApplicationController
+  layout 'whoops'
+
+  def index
+    @notification_subscription = Whoops::NotificationSubscription.new
+    @notification_subscription.build_filter
+    @notification_subscriptions = Whoops::NotificationSubscription.asc(:email)
+    @filter = Whoops::Filter.new
+  end
+
+  def create
+    ns = Whoops::NotificationSubscription.create(params[:notification_subscription])
+    ns.filter = Whoops::Filter.new_from_params(params[:whoops_filter])
+    ns.filter.save
+    redirect_to whoops_notification_subscriptions_path
+  end
+
+  def edit
+    @notification_subscription = Whoops::NotificationSubscription.find(params[:id])
+  end
+
+  def update
+    @notification_subscription = Whoops::NotificationSubscription.find(params[:id])
+    @notification_subscription.update_attributes(params[:notification_subscription])
+    @notification_subscription.filter.update_from_params(params[:whoops_filter])
+    redirect_to whoops_notification_subscriptions_path
+  end
+
+  def destroy
+    Whoops::NotificationSubscription.find(params[:id]).destroy
+    redirect_to whoops_notification_subscriptions_path
+  end
+end

data/app/helpers/event_groups_helper.rb

@@ -3,29 +3,36 @@ module EventGroupsHelper
     new_filter  = {:whoops_filter => event_group_filter.to_query_document.merge(scope => event_group.send(scope))}
     link_to(event_group.send(scope), whoops_event_groups_path(new_filter))
   end
-  
-  # meant for consumption by options_from_collection_for_select
-  def filter_options
-    all_event_groups = Whoops::EventGroup.all
-    return @filter_options if @filter_options
 
-    @filter_options = Hash.new{|h, k| h[k] = []}
-    
-    @filter_options["service"] = Whoops::EventGroup.services.to_a
-    @filter_options["environment"] = Whoops::EventGroup.all.distinct("environment")
-    @filter_options["event_type"] = Whoops::EventGroup.all.distinct("event_type")
+  def filter_field_allowed_values
+    return @filter_field_allowed_values if @filter_field_allowed_values
+    @filter_field_allowed_values = Hash.new{|h, k| h[k] = [["all"]]}
 
-    # add the field name as an empty option
-    @filter_options.keys.each do |field_name|
-      @filter_options[field_name].compact!
-      @filter_options[field_name].sort!{|a, b| a.first <=> b.first}.uniq! if @filter_options[field_name]
-    end
+    # group services by root, eg "sv1.web" and "sv1.resque" are in the
+    # same sub array
+    previous_service_root = ""
+    Whoops::EventGroup.services.to_a.sort.each { |service|
+      service_root = (/(.*?)\./ =~ service && $~[1]) || service
+      if service_root == previous_service_root
+        @filter_field_allowed_values["service"].last << service
+      else
+        @filter_field_allowed_values["service"] << ["#{service_root}.*", service]
+        previous_service_root = service_root
+      end
+    }
 
-    @filter_options
+    @filter_field_allowed_values["environment"] << Whoops::EventGroup.all.distinct("environment")
+    @filter_field_allowed_values["event_type"] << Whoops::EventGroup.all.distinct("event_type")
+    @filter_field_allowed_values
   end
 
-  def filter_checked?(field_name, option)
-    filtered_field = session[:event_group_filter].send(field_name)
-    filtered_field && filtered_field.include?(option)
+  def allowed_value_checked?(field_name, allowed_value, filter)
+    filtered_field = filter.send(field_name)
+    (allowed_value == "all" && filtered_field_allows_all?(filtered_field)) ||
+      filtered_field.try(:include?, allowed_value)
+  end
+
+  def filtered_field_allows_all?(filtered_field)
+    filtered_field.blank?
   end
 end

data/app/helpers/filters_helper.rb

@@ -0,0 +1,5 @@
+module FiltersHelper
+  def summarize_filter(arr)
+    arr.blank? ? "all" : arr.sort.collect{|x| "<span>#{x}</span>".html_safe }.join(" ").html_safe 
+  end
+end

data/app/mailers/whoops/notification_mailer.rb

@@ -2,11 +2,16 @@ class Whoops::NotificationMailer < ActionMailer::Base
   def event_notification(event_group, addresses)
     @event_group = event_group
     @addresses = addresses
+    body = <<-BODY
+#{whoops_event_group_events_url(event_group.id)}
+
+#{event_group.service}: #{event_group.environment}: #{event_group.message}
+    BODY
     mail(
       :to      => addresses.join(", "),
       :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}"
+      :body    => body
     )
   end
 end

data/app/models/whoops/event_group.rb

@@ -59,7 +59,7 @@ class Whoops::EventGroup
   
   def send_notifications
     return unless should_send_notifications?
-    matcher = Whoops::NotificationRule::Matcher.new(self)
-    Whoops::NotificationMailer.event_notification(self, matcher.matches.collect(&:email)).deliver unless matcher.matches.empty?
+    matcher = Whoops::NotificationSubscription::Matcher.new(self)
+    Whoops::NotificationMailer.event_notification(self, matcher.matching_emails).deliver unless matcher.matching_emails.empty?
   end
 end

data/app/models/whoops/filter.rb

@@ -1,13 +1,17 @@
 class Whoops::Filter
   include Mongoid::Document
   include FieldNames
+
+  FILTERED_FIELDS = [:service, :environment, :event_type, :message, :details]
   
-  [:service, :environment, :event_type, :message, :details].each do |document_field|
+  FILTERED_FIELDS.each do |document_field|
     field document_field, :type => Array
   end
+
+  belongs_to :filterable, :polymorphic => true
     
   def to_query_document
-    doc = attributes.except(:_id, "_id").delete_if{|k, v| v.blank?}
+    doc = attributes.except(:_id, "_id", :_type, "_type").delete_if{|k, v| v.blank?}
     # match all services under namespace. ie, if "app" given, match "app.web", "app.backend" etc
     doc["service"] = doc["service"].collect{ |d| /^#{d}/ } if doc["service"]
     doc.inject({}) do |hash, current|
@@ -16,13 +20,35 @@ class Whoops::Filter
     end
   end
 
+  def matches_event_group?(event_group)
+    FILTERED_FIELDS.all? do |field|
+      if self.send(field).blank?
+        true
+      else
+        /^(#{self.send(field).join("|")})$/ =~ event_group.send(field)
+      end
+    end
+  end
+
+  def update_from_params(params)
+    update_attributes(self.class.clean_params(params))
+  end
+
   class << self
     def new_from_params(params)
       if params
-        new(params.inject({}){|hash, current| hash[current.first] = current.last.keys; hash})
+        f = new(clean_params(params))
       else
         new
       end
     end
-  end   
+
+    def clean_params(params)
+      params.inject({}){ |hash, current|
+        allowed_values = current.last.keys
+        hash[current.first] = allowed_values.include?("all") ? [] : allowed_values
+        hash
+      }
+    end
+  end
 end

data/app/models/whoops/notification_subscription.rb

@@ -0,0 +1,27 @@
+class Whoops::NotificationSubscription
+  include Mongoid::Document
+
+  has_one :filter, :as => :filterable, :class_name => "Whoops::Filter"
+  validates_presence_of :email
+  
+  field :email, :type => String
+
+  before_save :downcase_email
+  
+  def downcase_email
+    self.email.downcase!
+  end
+
+  class Matcher
+    attr_accessor :event_group
+    
+    # @param [ Whoops::EventGroup ]
+    def initialize(event_group)
+      self.event_group = event_group
+    end
+    
+    def matching_emails
+      Whoops::NotificationSubscription.all.select{ |ns| ns.filter.matches_event_group?(self.event_group) }.collect(&:email)
+    end
+  end
+end

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

@@ -3,14 +3,7 @@
     %h3 Filters
     = form_for event_group_filter, :url => whoops_event_groups_path, :html => {:method => "get"} do |f|
       = hidden_field_tag 'updating_filters', true
-      - filter_options.each do |field_name, options|
-        %h4= field_name
-        %ul.filter_selects.inputs-list
-          - options.each do |option|
-            %li
-              %label
-                %input{:type => 'checkbox', :name => "whoops_filter[#{field_name}][#{option}]", :checked => filter_checked?(field_name, option)}
-                = option
+      = render(:partial => "filters/filters", :locals => {:filter => session[:event_group_filter]} )
   .space
     %h3 Keyword Search
     = form_tag whoops_event_groups_path, :method => "get" do |f|

data/app/views/filters/_filters.html.haml

@@ -0,0 +1,12 @@
+- filter_field_allowed_values.each do |field_name, allowed_value_groups|
+  %h4= field_name
+  %ul.filter-selects.inputs-list
+    - allowed_value_groups.each do |allowed_values|
+      - allowed_values.each do |allowed_value|
+        %li.filter-option
+          %label
+            %input{:type => 'checkbox', :name => "whoops_filter[#{field_name}][#{allowed_value}]", :checked => allowed_value_checked?(field_name, allowed_value, filter)}
+            = allowed_value
+      - unless allowed_values == allowed_value_groups.last
+        %li.divider
+          %hr

data/app/views/filters/_summary.html.haml

@@ -0,0 +1,9 @@
+.services
+  %strong services:
+  = summarize_filter(filter.service)
+.environments
+  %strong environments:
+  = summarize_filter(filter.environment)
+.event_types
+  %strong event types:
+  = summarize_filter(filter.event_type)

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

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

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

@@ -0,0 +1,11 @@
+- new_record = @notification_subscription.new_record?
+- options = new_record ? {:url => whoops_notification_subscriptions_path, :method => :post} : {:url => whoops_notification_subscription_path(@notification_subscription), :method => :put}
+= form_for :notification_subscription, options do |f|
+  #new-notification-rule
+    %label.nofloat
+      Email
+      %br
+      =f.text_field :email
+    .filters
+      = render(:partial => "filters/filters", :locals => {:filter => @notification_subscription.filter} )
+    = submit_tag (new_record ? "Create" : "Update"), :class => "btn primary"

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

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

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

@@ -0,0 +1,19 @@
+%h3 Notification Subscriptions
+
+- content_for :sidebar do
+  .space
+    %h3 New Subscription
+    = render :partial => "form"
+    
+
+%table#notification-subscriptions
+  %tr
+    %th.email Email Address
+    %th.filter Filter
+  - @notification_subscriptions.each do |ns|
+    %tr
+      %td.email= ns.email
+      %td.filter= render :partial => "filters/summary", :locals => {:filter => ns.filter}
+      %td.update= link_to "update", edit_whoops_notification_subscription_path(ns)
+
+      

data/config/routes.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whoops
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 5
-  version: 0.3.5
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Daniel Higginbotham
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-29 00:00:00 Z
+date: 2012-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -175,7 +175,6 @@ files:
 - app/assets/stylesheets/bootstrap.scss
 - app/assets/stylesheets/forms.scss
 - app/assets/stylesheets/ie.css
-- app/assets/stylesheets/main.css.scss
 - app/assets/stylesheets/mixins.scss
 - app/assets/stylesheets/patterns.scss
 - app/assets/stylesheets/reset.scss
@@ -187,9 +186,10 @@ 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/controllers/notification_subscriptions_controller.rb
 - app/helpers/event_groups_helper.rb
 - app/helpers/events_helper.rb
+- app/helpers/filters_helper.rb
 - app/helpers/notifications_helper.rb
 - app/lib/field_names.rb
 - app/mailers/whoops/notification_mailer.rb
@@ -198,15 +198,18 @@ files:
 - app/models/whoops/filter.rb
 - app/models/whoops/mongoid_search_parser.rb
 - app/models/whoops/notification_rule.rb
+- app/models/whoops/notification_subscription.rb
 - app/views/event_groups/_list.html.haml
 - app/views/event_groups/index.html.haml
 - app/views/events/_detail.html.haml
 - app/views/events/_details.html.haml
 - app/views/events/index.html.haml
+- app/views/filters/_filters.html.haml
+- app/views/filters/_summary.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
+- app/views/notification_subscriptions/_form.html.haml
+- app/views/notification_subscriptions/edit.html.haml
+- app/views/notification_subscriptions/index.html.haml
 - lib/tasks/whoops.rake
 - lib/whoops/engine.rb
 - lib/whoops.rb
@@ -251,3 +254,4 @@ specification_version: 3
 summary: A Rails engine which receives logs and provides an interface for them
 test_files: []
 
+has_rdoc: 

data/app/controllers/notification_rules_controller.rb

@@ -1,29 +0,0 @@
-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/views/notification_rules/_form.html.haml

@@ -1,15 +0,0 @@
-%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

@@ -1,8 +0,0 @@
-%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

@@ -1,21 +0,0 @@
-%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)
-
-