whoops 0.1.7 → 0.1.8

data/app/models/whoops/event.rb

@@ -15,19 +15,13 @@ class Whoops::Event
   
   def self.record(params)
     params = params.with_indifferent_access
-        
-    event_group_params = params.slice(*Whoops::EventGroup.field_names)
-    event_group_params[:identifier] = params[:event_group_identifier]
+    
+    event_group_params                    = params.slice(*Whoops::EventGroup.field_names)
+    event_group_params[:identifier]       = params[:event_group_identifier]
     event_group_params[:last_recorded_at] = params[:event_time]
+    event_group_params
+    event_group = Whoops::EventGroup.handle_new_event(event_group_params)
     
-    event_group = Whoops::EventGroup.first(:conditions => event_group_params.slice(*Whoops::EventGroup.identifying_fields))
-    if event_group
-      event_group.attributes = event_group_params
-      event_group.save
-    else
-      event_group = Whoops::EventGroup.create(event_group_params)
-    end
-        
     event_params = params.slice(*Whoops::Event.field_names)
     event_group.events.create(event_params)
   end 

data/app/models/whoops/event_group.rb

@@ -3,17 +3,46 @@ class Whoops::EventGroup
   include Mongoid::Document
   include FieldNames
   
-  [:service, :environment, :event_type, :message, :identifier, :logging_strategy_name].each do |string_field|
+  [
+    :service,
+    :environment,
+    :event_type,
+    :message,
+    :identifier,
+    :logging_strategy_name
+  ].each do |string_field|
     field string_field, :type => String
   end
+  
   field :last_recorded_at, :type => DateTime
+  field :archived, :type => Boolean, :default => false
   field :notify_on_next_occurrence, :type => Boolean, :default => true
 
+  class << self
+    def handle_new_event(params)
+      identifying_params = params.slice(*Whoops::EventGroup.identifying_fields)
+      event_group = Whoops::EventGroup.first(:conditions => identifying_params)
+      
+      if event_group
+        event_group.attributes = params
+      else
+        event_group = Whoops::EventGroup.new(params)
+      end
+      
+      if event_group.valid?
+        event_group.send_notifications
+        event_group.save
+      end
+      
+      event_group
+    end
+  end
+  
   has_many :events, :class_name => "Whoops::Event"
   
   validates_presence_of :identifier, :event_type, :service, :message
   
-  after_validation :send_notifications
+  before_save :handle_archival
   
   def self.identifying_fields
     field_names - ["message", "last_recorded_at"]
@@ -32,11 +61,22 @@ class Whoops::EventGroup
     end
     services
   end
+
+  def handle_archival
+    if self.archived_change && !self.new_record?
+      if self.archived
+        self.notify_on_next_occurrence = false
+      else
+        self.notify_on_next_occurrence = true
+      end
+    end
+  end
+  
   
   def send_notifications
+    return unless self.notify_on_next_occurrence
     matcher = Whoops::NotificationRule::Matcher.new(self)
-    Whoops::NotificationMailer.event_notification(self, matcher.matches)
+    Whoops::NotificationMailer.event_notification(self, matcher.matches).deliver unless matcher.matches.empty?
     self.notify_on_next_occurrence = false
   end
-  
 end

data/app/models/whoops/notification_rule.rb

@@ -39,7 +39,7 @@ class Whoops::NotificationRule
     end
     
     def matches
-      Whoops::NotificationRule.where(:matchers => /^#{event_group.service}/)
+      @matches ||= Whoops::NotificationRule.where(:matchers => /^#{event_group.service}/)
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whoops
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Daniel Higginbotham
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 -04:00
+date: 2011-08-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,7 +151,7 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: fabrication
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -165,7 +165,7 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: fabrication
+  name: faker
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -178,24 +178,10 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: faker
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -207,7 +193,7 @@ dependencies:
         - 0
         version: 0.4.0
   type: :development
-  version_requirements: *id013
+  version_requirements: *id012
 description: A Rails engine which receives logs and provides an interface for them
 email: 
 executables: []