moved Notices to a separate collection

Karol Hosiawa · Karol Hosiawa
1 parent bd17fa78
Showing 27 changed files with 342 additions and 167 deletions Show diff stats
.gitignore
Gemfile
Gemfile.lock
README.md
app/controllers/apps_controller.rb
app/controllers/errs_controller.rb
app/models/app.rb
app/models/err.rb
app/models/notice.rb
app/views/apps/index.html.haml
app/views/apps/show.html.haml
app/views/errs/_table.html.haml
app/views/errs/lighthouseapp_body.txt.erb
app/views/errs/redmine_body.txt.erb
app/views/errs/show.html.haml
app/views/mailer/err_notification.text.erb
app/views/notices/_atom_entry.html.haml
app/views/notices/_environment.html.haml
app/views/notices/_summary.html.haml
db/migrate/20110422152027_move_notices_to_separate_collection.rb
@@ -7,3 +7,4 @@ config/deploy.rb
 config/mongoid.yml
 .rvmrc
 *~
+*.rbc
@@ -2,12 +2,13 @@ source &#39;http://rubygems.org&#39;
 gem 'rails', '3.0.5'
 gem 'nokogiri'
-gem 'mongoid', '~> 2.0.0.rc.7'
+gem 'mongoid', '2.0.0.rc.8'
 gem 'haml'
 gem 'will_paginate'
 gem 'devise', '~> 1.1.8'
 gem 'lighthouse-api'
 gem 'redmine_client', :git => "git://github.com/oruen/redmine_client.git"
+gem 'mongoid_rails_migrations'
 platform :ruby do
   gem 'bson_ext', '~> 1.2'
@@ -35,15 +35,15 @@ GEM
       activemodel (= 3.0.5)
       activesupport (= 3.0.5)
     activesupport (3.0.5)
-    addressable (2.2.4)
+    addressable (2.2.5)
     arel (2.0.9)
     bcrypt-ruby (2.1.4)
-    bson (1.2.4)
-    bson_ext (1.2.4)
+    bson (1.3.0)
+    bson_ext (1.3.0)
     builder (2.1.2)
     crack (0.1.8)
-    database_cleaner (0.6.5)
-    devise (1.1.8)
+    database_cleaner (0.6.7)
+    devise (1.1.9)
       bcrypt-ruby (~> 2.1.2)
       warden (~> 1.0.2)
     diff-lcs (1.1.2)
@@ -58,23 +58,28 @@ GEM
     lighthouse-api (2.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
-    mail (2.2.15)
+    mail (2.2.17)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mongo (1.2.4)
-      bson (>= 1.2.4)
-    mongoid (2.0.0.rc.7)
+    mongo (1.3.0)
+      bson (>= 1.3.0)
+    mongoid (2.0.0.rc.8)
       activemodel (~> 3.0)
       mongo (~> 1.2)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
+    mongoid_rails_migrations (0.0.10)
+      activesupport (~> 3.0.0)
+      bundler (>= 0.9.19)
+      rails (~> 3.0.0)
+      railties (~> 3.0.0)
     nokogiri (1.4.4)
     polyglot (0.3.1)
     rack (1.2.2)
-    rack-mount (0.6.13)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
@@ -108,7 +113,7 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.25)
+    tzinfo (0.3.26)
     warden (1.0.3)
       rack (>= 1.0.0)
     webmock (1.6.2)
@@ -126,7 +131,8 @@ DEPENDENCIES
   factory_girl_rails
   haml
   lighthouse-api
-  mongoid (~> 2.0.0.rc.7)
+  mongoid (= 2.0.0.rc.8)
+  mongoid_rails_migrations
   nokogiri
   rails (= 3.0.5)
   redmine_client!
@@ -89,17 +89,24 @@ for you. Checkout [Hoptoad](http://hoptoadapp.com) from the guys over at
   4. Enjoy!
+Upgrading
+---------
+*Note*: If upgrading from a version of Errbit that used Notices embedded in Errs please run:
+
+         1. git pull origin master ( assuming origin is the github.com/jdpace/errbit repo )
+         2. rake db:migrate
+
 Lighthouseapp integration
 -------------------------
-* Account is the name of your subdomain, i.e. **litcafe** for project at http://litcafe.lighthouseapp.com/projects/73466-face/overview 
+* Account is the name of your subdomain, i.e. **litcafe** for project at http://litcafe.lighthouseapp.com/projects/73466-face/overview
 * Errbit uses token-based authentication. Get your API Token or visit [http://help.lighthouseapp.com/kb/api/how-do-i-get-an-api-token](http://help.lighthouseapp.com/kb/api/how-do-i-get-an-api-token) to learn how to get it.
 * Project id is number identifier of your project, i.e. **73466** for project at http://litcafe.lighthouseapp.com/projects/73466-face/overview
 Redmine integration
 -------------------------
-* Account is the host of your redmine installation, i.e. **http://redmine.org** 
+* Account is the host of your redmine installation, i.e. **http://redmine.org**
 * Errbit uses token-based authentication. Get your API Key or visit [http://www.redmine.org/projects/redmine/wiki/Rest_api#Authentication](http://www.redmine.org/projects/redmine/wiki/Rest_api#Authentication) to learn how to get it.
 * Project id is an identifier of your project, i.e. **chilliproject** for project at http://www.redmine.org/projects/chilliproject
 class AppsController < ApplicationController
-  
+
   before_filter :require_admin!, :except => [:index, :show]
   before_filter :find_app, :except => [:index, :new, :create]
-  
+
   def index
     @apps = current_user.admin? ? App.all : current_user.apps.all
   end
-  
+
   def show
     respond_to do |format|
       format.html do
@@ -18,21 +18,21 @@ class AppsController &lt; ApplicationController
       end
     end
   end
-  
+
   def new
     @app = App.new
     @app.watchers.build
     @app.issue_tracker = IssueTracker.new
   end
-  
+
   def edit
     @app.watchers.build if @app.watchers.none?
     @app.issue_tracker = IssueTracker.new if @app.issue_tracker.nil?
   end
-  
+
   def create
     @app = App.new(params[:app])
-    
+
     if @app.save
       flash[:success] = 'Great success! Configure your app with the API key below'
       redirect_to app_path(@app)
@@ -40,8 +40,8 @@ class AppsController &lt; ApplicationController
       render :new
     end
   end
-  
-  def update    
+
+  def update
     if @app.update_attributes(params[:app])
       flash[:success] = "Good news everyone! '#{@app.name}' was successfully updated."
       redirect_to app_path(@app)
@@ -49,18 +49,18 @@ class AppsController &lt; ApplicationController
       render :edit
     end
   end
-  
+
   def destroy
     @app.destroy
     flash[:success] = "'#{@app.name}' was successfully destroyed."
     redirect_to apps_path
   end
-  
+
   protected
-  
+
     def find_app
       @app = App.find(params[:id])
-      
+
       # Mongoid Bug: could not chain: current_user.apps.find_by_id!
       # apparently finding by 'watchers.email' and 'id' is broken
       raise(Mongoid::Errors::DocumentNotFound.new(App,@app.id)) unless current_user.admin? || current_user.watching?(@app)
 class ErrsController < ApplicationController
-  
+
   before_filter :find_app, :except => [:index, :all]
   before_filter :find_err, :except => [:index, :all]
-  
+
   def index
     app_scope = current_user.admin? ? App.all : current_user.apps
     respond_to do |format|
@@ -14,14 +14,14 @@ class ErrsController &lt; ApplicationController
       end
     end
   end
-  
+
   def all
     app_scope = current_user.admin? ? App.all : current_user.apps
     @errs = Err.for_apps(app_scope).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
   end
-  
+
   def show
-    page      = (params[:notice] || @err.notices.count)
+    page      = (params[:notice] || @err.notices_count)
     page      = 1 if page.to_i.zero?
     @notices  = @err.notices.ordered.paginate(:page => page, :per_page => 1)
     @notice   = @notices.first
@@ -46,25 +46,25 @@ class ErrsController &lt; ApplicationController
     @err.update_attribute :issue_link, nil
     redirect_to app_err_path(@app, @err)
   end
-  
+
   def resolve
-    # Deal with bug in mogoid where find is returning an Enumberable obj
+    # Deal with bug in mongoid where find is returning an Enumberable obj
     @err = @err.first if @err.respond_to?(:first)
-    
+
     @err.resolve!
-    
+
     flash[:success] = 'Great news everyone! The err has been resolved.'
     redirect_to :back
   rescue ActionController::RedirectBackError
     redirect_to app_path(@app)
   end
-  
+
   protected
-  
+
     def find_app
       @app = App.find(params[:app_id])
-      
+
       # Mongoid Bug: could not chain: current_user.apps.find_by_id!
       # apparently finding by 'watchers.email' and 'id' is broken
       raise(Mongoid::Errors::DocumentNotFound.new(App,@app.id)) unless current_user.admin? || current_user.watching?(@app)
@@ -79,5 +79,5 @@ class ErrsController &lt; ApplicationController
       IssueTracker.default_url_options[:port] = request.port
       IssueTracker.default_url_options[:protocol] = request.scheme
     end
-  
+
 end
 class App
   include Mongoid::Document
   include Mongoid::Timestamps
-  
+
   field :name, :type => String
   field :api_key
   field :resolve_errs_on_deploy, :type => Boolean, :default => false
@@ -21,29 +21,29 @@ class App
   embeds_many :deploys
   embeds_one :issue_tracker
   references_many :errs, :dependent => :destroy
-  
+
   before_validation :generate_api_key, :on => :create
-  
+
   validates_presence_of :name, :api_key
   validates_uniqueness_of :name, :allow_blank => true
   validates_uniqueness_of :api_key, :allow_blank => true
   validates_associated :watchers
   validate :check_issue_tracker
-  
+
   accepts_nested_attributes_for :watchers, :allow_destroy => true,
     :reject_if => proc { |attrs| attrs[:user_id].blank? && attrs[:email].blank? }
   accepts_nested_attributes_for :issue_tracker, :allow_destroy => true,
   :reject_if => proc { |attrs| !%w( lighthouseapp redmine ).include?(attrs[:issue_tracker_type]) }
-  
+
   # Mongoid Bug: find(id) on association proxies returns an Enumerator
   def self.find_by_id!(app_id)
     where(:_id => app_id).first || raise(Mongoid::Errors::DocumentNotFound.new(self,app_id))
   end
-  
+
   def self.find_by_api_key!(key)
     where(:api_key => key).first || raise(Mongoid::Errors::DocumentNotFound.new(self,key))
   end
-  
+
   def last_deploy_at
     deploys.last && deploys.last.created_at
   end
@@ -58,9 +58,9 @@ class App
     !(self[:notify_on_deploys] == false)
   end
   alias :notify_on_deploys? :notify_on_deploys
-  
+
   protected
-  
+
     def generate_api_key
       self.api_key ||= ActiveSupport::SecureRandom.hex
     end
 class Err
   include Mongoid::Document
   include Mongoid::Timestamps
-  
+
   field :klass
   field :component
   field :action
@@ -10,42 +10,44 @@ class Err
   field :last_notice_at, :type => DateTime
   field :resolved, :type => Boolean, :default => false
   field :issue_link, :type => String
+  field :notices_count, :type => Integer, :default => 0
+  field :message
   index :last_notice_at
   index :app_id
   referenced_in :app
-  embeds_many :notices
-  
+  references_many :notices
+
   validates_presence_of :klass, :environment
-  
+
   scope :resolved, where(:resolved => true)
   scope :unresolved, where(:resolved => false)
   scope :ordered, order_by(:last_notice_at.desc)
   scope :in_env, lambda {|env| where(:environment => env)}
   scope :for_apps, lambda {|apps| where(:app_id.in => apps.all.map(&:id))}
-  
+
   def self.for(attrs)
     app = attrs.delete(:app)
     app.errs.where(attrs).first || app.errs.create!(attrs)
   end
-  
+
   def resolve!
     self.update_attributes!(:resolved => true)
   end
-  
+
   def unresolved?
     !resolved?
   end
-  
+
   def where
     where = component.dup
     where << "##{action}" if action.present?
     where
   end
-  
+
   def message
-    notices.first.try(:message) || klass
+    super || klass
   end
-  
-end
 \ No newline at end of file
+
+end
 require 'hoptoad'
+require 'recurse'
 class Notice
   include Mongoid::Document
   include Mongoid::Timestamps
-  
+
   field :message
   field :backtrace, :type => Array
   field :server_environment, :type => Hash
   field :request, :type => Hash
   field :notifier, :type => Hash
-  
-  embedded_in :err, :inverse_of => :notices
-  
+
+  referenced_in :err
+  index :err_id
+
   after_create :cache_last_notice_at
   after_create :deliver_notification, :if => :should_notify?
-  
+  before_create :increase_counter_cache, :cache_message
+  before_save :sanitize
+  before_destroy :decrease_counter_cache
+
   validates_presence_of :backtrace, :server_environment, :notifier
-  
+
   scope :ordered, order_by(:created_at.asc)
-  
+
   def self.from_xml(hoptoad_xml)
     hoptoad_notice = Hoptoad::V2.parse_xml(hoptoad_xml)
     app = App.find_by_api_key!(hoptoad_notice['api-key'])
-    
+
     hoptoad_notice['request'] ||= {}
     hoptoad_notice['request']['component']  = 'unknown' if hoptoad_notice['request']['component'].blank?
     hoptoad_notice['request']['action']     = nil if hoptoad_notice['request']['action'].blank?
-    
+
     err = Err.for({
       :app      => app,
       :klass        => hoptoad_notice['error']['class'],
@@ -36,7 +41,7 @@ class Notice
       :fingerprint  => hoptoad_notice['fingerprint']
     })
     err.update_attributes(:resolved => false) if err.resolved?
-    
+
     err.notices.create!({
       :message            => hoptoad_notice['error']['message'],
       :backtrace          => hoptoad_notice['error']['backtrace']['line'],
@@ -45,35 +50,67 @@ class Notice
       :notifier           => hoptoad_notice['notifier']
     })
   end
-  
+
   def request
     read_attribute(:request) || {}
   end
-  
+
   def env_vars
     request['cgi-data'] || {}
   end
-  
+
   def params
     request['params'] || {}
   end
-  
+
   def session
     request['session'] || {}
   end
-  
+
   def deliver_notification
     Mailer.err_notification(self).deliver
   end
-  
+
   def cache_last_notice_at
     err.update_attributes(:last_notice_at => created_at)
   end
-  
+
   protected
-  
-    def should_notify?
-      err.app.notify_on_errs? && Errbit::Config.email_at_notices.include?(err.notices.count) && err.app.watchers.any?
+
+  def should_notify?
+    err.app.notify_on_errs? && Errbit::Config.email_at_notices.include?(err.notices.count) && err.app.watchers.any?
+  end
+
+
+  def increase_counter_cache
+    err.inc(:notices_count,1)
+  end
+
+  def decrease_counter_cache
+    err.inc(:notices_count,-1)
+  end
+
+  def cache_message
+    err.update_attribute(:message, message) if err.notices_count == 1
+  end
+
+  def sanitize
+    [:server_environment, :request, :notifier].each do |h|
+      send("#{h}=",sanitize_hash(send(h)))
     end
-  
-end
 \ No newline at end of file
+  end
+
+  def sanitize_hash(h)
+    h.recurse do
+      |h| h.inject({}) do |h,(k,v)|
+        if k.is_a?(String)
+          h[k.gsub(/\./,'&#46;').gsub(/^\$/,'&#36;')] = v
+        else
+          h[k] = v
+        end
+        h
+      end
+    end
+  end
+end
+
@@ -14,7 +14,7 @@
         %td.name= link_to app.name, app_path(app)
         %td.deploy= app.last_deploy_at ? link_to( app.last_deploy_at.to_s(:micro), app_deploys_path(app)) : 'n/a'
         %td.count
-          - if app.errs.any?
+          - if app.errs.count > 0
             = link_to app.errs.unresolved.count, app_errs_path(app)
           - else
             \-
@@ -50,7 +50,7 @@
 - else
   %h3 No deploys
-- if @app.errs.any?
+- if @app.errs.count > 0
   %h3.clear Errs
   = render 'errs/table', :errs => @errs
 - else
@@ -18,7 +18,7 @@
           %em= err.where
         %td.latest #{time_ago_in_words(last_notice_at err)} ago
         %td.deploy= err.app.last_deploy_at ? err.app.last_deploy_at.to_s(:micro) : 'n/a'
-        %td.count= link_to err.notices.count, app_err_path(err.app, err)
+        %td.count= link_to err.notices_count, app_err_path(err.app, err)
         %td.resolve= link_to image_tag("thumbs-up.png"), resolve_app_err_path(err.app, err), :title => "Resolve", :method => :put, :confirm => err_confirm, :class => 'resolve' if err.unresolved?
     - if errs.none?
       %tr
@@ -13,7 +13,7 @@
   <%= notice.created_at.to_s(:micro) %>
   ### Similar ###
-  <%= (notice.err.notices.count - 1).to_s %>
+  <%= (notice.err.notices_count - 1).to_s %>
   ## Params ##
   <code><%= pretty_hash(notice.params) %></code>
@@ -18,7 +18,7 @@ h3. Occured
 h3. Similar
-<%= (notice.err.notices.count - 1).to_s %>
+<%= (notice.err.notices_count - 1).to_s %>
 h2. Params
@@ -20,7 +20,7 @@
     %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve'
 %h4= @notice.try(:message)
-  
+
 = will_paginate @notices, :param_name => :notice, :page_links => false, :class => 'notice-pagination'
 viewing occurrence #{@notices.current_page} of #{@notices.total_pages}
@@ -36,19 +36,19 @@ viewing occurrence #{@notices.current_page} of #{@notices.total_pages}
   #summary
     %h3 Summary
     = render 'notices/summary', :notice => @notice
-  
+
   #backtrace
     %h3 Backtrace
     = render 'notices/backtrace', :lines => @notice.backtrace
-    
+
   #environment
     %h3 Environment
     = render 'notices/environment', :notice => @notice
-  
+
   #params
     %h3 Parameters
     = render 'notices/params', :notice => @notice
-  
+
   #session
     %h3 Session
     = render 'notices/session', :notice => @notice
 An err has just occurred in <%= @notice.err.environment %>: <%= @notice.err.message %>
-This err has occurred <%= pluralize @notice.err.notices.count, 'time' %>. You should really look into it here:
+This err has occurred <%= pluralize @notice.err.notices_count, 'time' %>. You should really look into it here:
   <%= app_err_url(@app, @notice.err) %>
-  
-<%= render :partial => 'signature' %>
 \ No newline at end of file
+
+<%= render :partial => 'signature' %>
@@ -6,13 +6,13 @@
     = link_to(notice.request['url'], notice.request['url'])
 %p
   %strong Where:
-  = notice.err.where  
+  = notice.err.where
 %p
   %strong Occured:
   = notice.created_at.to_s(:micro)
 %p
   %strong Similar:
-  = notice.err.notices.count - 1
+  = notice.err.notices_count - 1
 %h3 Params
 %p= pretty_hash(notice.params)
@@ -2,5 +2,5 @@
   %table.environment
     - notice.env_vars.each do |key,val|
       %tr
-        %th= key
+        %th= raw key
         %td.main= val
 \ No newline at end of file
@@ -15,4 +15,4 @@
       %td= notice.created_at.to_s(:micro)
     %tr
       %th Similar
-      %td= notice.err.notices.count - 1
 \ No newline at end of file
+      %td= notice.err.notices_count - 1
 \ No newline at end of file
@@ -0,0 +1,22 @@
+class MoveNoticesToSeparateCollection < Mongoid::Migration
+  def self.up
+    # copy embedded Notices into a separate collection
+    mongo_db = Err.db
+    errs = mongo_db.collection("errs").find({ }, :fields => ["notices"])
+    errs.each do |err|
+      next unless err['notices']
+      e = Err.find(err['_id'])
+      puts "Copying notices for Err #{err['_id']}"
+      err['notices'].each do |notice|
+        e.notices.create!(notice)
+      end
+      mongo_db.collection("errs").update({ "_id" => err['_id']}, { "$unset" => { "notices" => 1}})
+    end
+    Rake::Task["errbit:db:update_notices_count"].invoke
+    Rake::Task["errbit:db:update_err_message"].invoke
+  end
+
+  def self.down
+  end
+
+end
 module Hoptoad
   module V2
     require 'digest/md5'
-    
+
     class ApiVersionError < StandardError
       def initialize
         super "Wrong API Version: Expecting v2.0"
       end
     end
-    
+
     def self.parse_xml(xml)
       parsed  = ActiveSupport::XmlMini.backend.parse(xml)['notice']
       raise ApiVersionError unless parsed && parsed['version'] == '2.0'
@@ -15,9 +15,9 @@ module Hoptoad
       rekeyed['fingerprint'] = Digest::MD5.hexdigest(rekeyed['error']['backtrace'].to_s)
       rekeyed
     end
-    
+
     private
-      
+
       def self.rekey(node)
         if node.is_a?(Hash) && node.has_key?('var') && node.has_key?('key')
           {node['key'] => rekey(node['var'])}
@@ -42,4 +42,4 @@ module Hoptoad
         end
       end
   end
-end
 \ No newline at end of file
+end
@@ -0,0 +1,24 @@
+class Hash
+
+  # Apply a block to hash, and recursively apply that block
+  # to each sub-hash or +types+.
+  #
+  #   h = {:a=>1, :b=>{:b1=>1, :b2=>2}}
+  #   g = h.recurse{|h| h.inject({}){|h,(k,v)| h[k.to_s] = v; h} }
+  #   g  #=> {"a"=>1, "b"=>{"b1"=>1, "b2"=>2}}
+  #
+  def recurse(*types, &block)
+    types = [self.class] if types.empty?
+    h = inject({}) do |hash, (key, value)|
+      case value
+      when *types
+        hash[key] = value.recurse(*types, &block)
+      else
+        hash[key] = value
+      end
+      hash
+    end
+    yield h
+  end
+
+end
@@ -0,0 +1,12 @@
+namespace :errbit do
+
+  namespace :db do
+    desc "Updates Err#notices_count"
+    task :update_err_message => :environment do
+      puts "Updating err.message"
+      Err.all.each do |e|
+        e.update_attributes(:message => e.notices.first.message) if e.notices.first
+      end
+    end
+  end
+end
@@ -0,0 +1,12 @@
+namespace :errbit do
+
+  namespace :db do
+    desc "Updates Err#notices_count"
+    task :update_notices_count => :environment do
+      puts "Updating err.notices_count"
+      Err.all.each do |e|
+        e.update_attributes(:notices_count => e.notices.count)
+      end
+    end
+  end
+end
 require 'spec_helper'
 describe ErrsController do
-  
+
   it_requires_authentication :for => {
     :index => :get, :all => :get, :show => :get, :resolve => :put
   },
   :params => {:app_id => 'dummyid', :id => 'dummyid'}
-  
+
   let(:app) { Factory(:app) }
   let(:err) { Factory(:err, :app => app) }
-    
+
   describe "GET /errs" do
     render_views
     context 'when logged in as an admin' do
@@ -31,7 +31,7 @@ describe ErrsController do
         response.should be_success
         response.body.should match(@err.message)
       end
-      
+
       it "should handle lots of errors" do
         pending "Turning off long running spec"
         1000.times { Factory :notice }
@@ -55,7 +55,7 @@ describe ErrsController do
         end
       end
     end
-    
+
     context 'when logged in as a user' do
       it 'gets a paginated list of unresolved errs for the users apps' do
         sign_in(user = Factory(:user))
@@ -68,7 +68,7 @@ describe ErrsController do
       end
     end
   end
-  
+
   describe "GET /errs/all" do
     context 'when logged in as an admin' do
       it "gets a paginated list of all errs" do
@@ -83,7 +83,7 @@ describe ErrsController do
         assigns(:errs).should == errs
       end
     end
-    
+
     context 'when logged in as a user' do
       it 'gets a paginated list of all errs for the users apps' do
         sign_in(user = Factory(:user))
@@ -96,29 +96,29 @@ describe ErrsController do
       end
     end
   end
-  
+
   describe "GET /apps/:app_id/errs/:id" do
     render_views
-    
+
     before do
       3.times { Factory(:notice, :err => err)}
     end
-    
+
     context 'when logged in as an admin' do
       before do
         sign_in Factory(:admin)
       end
-    
+
       it "finds the app" do
         get :show, :app_id => app.id, :id => err.id
         assigns(:app).should == app
       end
-    
+
       it "finds the err" do
         get :show, :app_id => app.id, :id => err.id
         assigns(:err).should == err
       end
-    
+
       it "successfully render page" do
         get :show, :app_id => app.id, :id => err.id
         response.should be_success
@@ -131,9 +131,9 @@ describe ErrsController do
           err = Factory :err
           get :show, :app_id => err.app.id, :id => err.id
-          response.body.should_not button_matcher  
+          response.body.should_not button_matcher
         end
-  
+
         it "should exist for err's app with issue tracker" do
           tracker = Factory(:lighthouseapp_tracker)
           err = Factory(:err, :app => tracker.app)
@@ -141,7 +141,7 @@ describe ErrsController do
           response.body.should button_matcher
         end
-  
+
         it "should not exist for err with issue_link" do
           tracker = Factory(:lighthouseapp_tracker)
           err = Factory(:err, :app => tracker.app, :issue_link => "http://some.host")
@@ -151,7 +151,7 @@ describe ErrsController do
         end
       end
     end
-    
+
     context 'when logged in as a user' do
       before do
         sign_in(@user = Factory(:user))
@@ -160,12 +160,12 @@ describe ErrsController do
         @watcher = Factory(:user_watcher, :user => @user, :app => @watched_app)
         @watched_err = Factory(:err, :app => @watched_app)
       end
-      
+
       it 'finds the err if the user is watching the app' do
         get :show, :app_id => @watched_app.to_param, :id => @watched_err.id
         assigns(:err).should == @watched_err
       end
-      
+
       it 'raises a DocumentNotFound error if the user is not watching the app' do
         lambda {
           get :show, :app_id => @unwatched_err.app_id, :id => @unwatched_err.id
@@ -173,17 +173,17 @@ describe ErrsController do
       end
     end
   end
-  
+
   describe "PUT /apps/:app_id/errs/:id/resolve" do
     before do
       sign_in Factory(:admin)
-      
+
       @err = Factory(:err)
       App.stub(:find).with(@err.app.id).and_return(@err.app)
       @err.app.errs.stub(:find).and_return(@err)
       @err.stub(:resolve!)
     end
-    
+
     it 'finds the app and the err' do
       App.should_receive(:find).with(@err.app.id).and_return(@err.app)
       @err.app.errs.should_receive(:find).and_return(@err)
@@ -191,17 +191,17 @@ describe ErrsController do
       assigns(:app).should == @err.app
       assigns(:err).should == @err
     end
-    
+
     it "should resolve the issue" do
       @err.should_receive(:resolve!).and_return(true)
       put :resolve, :app_id => @err.app.id, :id => @err.id
     end
-    
+
     it "should display a message" do
       put :resolve, :app_id => @err.app.id, :id => @err.id
       request.flash[:success].should match(/Great news/)
     end
-    
+
     it "should redirect to the app page" do
       put :resolve, :app_id => @err.app.id, :id => @err.id
       response.should redirect_to(app_path(@err.app))
 require 'spec_helper'
 describe Err do
-  
+
   context 'validations' do
     it 'requires a klass' do
       err = Factory.build(:err, :klass => nil)
       err.should_not be_valid
       err.errors[:klass].should include("can't be blank")
     end
-    
+
     it 'requires an environment' do
       err = Factory.build(:err, :environment => nil)
       err.should_not be_valid
       err.errors[:environment].should include("can't be blank")
     end
   end
-  
+
   context '#for' do
     before do
       @app = Factory(:app)
@@ -27,16 +27,16 @@ describe Err do
         :environment  => 'production'
       }
     end
-    
+
     it 'returns the correct err if one already exists' do
       existing = Err.create(@conditions)
       Err.for(@conditions).should == existing
     end
-    
+
     it 'assigns the returned err to the given app' do
       Err.for(@conditions).app.should == @app
     end
-    
+
     it 'creates a new err if a matching one does not already exist' do
       Err.where(@conditions.except(:app)).exists?.should == false
       lambda {
@@ -44,36 +44,47 @@ describe Err do
       }.should change(Err,:count).by(1)
     end
   end
-  
+
   context '#last_notice_at' do
     it "returns the created_at timestamp of the latest notice" do
       err = Factory(:err)
       err.last_notice_at.should be_nil
-      
+
       notice1 = Factory(:notice, :err => err)
       err.last_notice_at.should == notice1.created_at
-      
+
       notice2 = Factory(:notice, :err => err)
       err.last_notice_at.should == notice2.created_at
     end
   end
-  
+
   context '#message' do
+    it "returns klass by default" do
+      err = Factory(:err)
+      err.message.should == err.klass
+    end
+
     it 'returns the message from the first notice' do
       err = Factory(:err)
       notice1 = Factory(:notice, :err => err, :message => 'ERR 1')
       notice2 = Factory(:notice, :err => err, :message => 'ERR 2')
       err.message.should == notice1.message
     end
+
+    it "adding a notice caches its message" do
+      err = Factory(:err)
+      lambda {
+        notice1 = Factory(:notice, :err => err, :message => 'ERR 1')}.should change(err, :message).from(err.klass).to('ERR 1')
+    end
   end
-  
+
   context "#resolved?" do
     it "should start out as unresolved" do
       err = Err.new
       err.should_not be_resolved
       err.should be_unresolved
     end
-    
+
     it "should be able to be resolved" do
       err = Factory(:err)
       err.should_not be_resolved
@@ -81,7 +92,7 @@ describe Err do
       err.reload.should be_resolved
     end
   end
-  
+
   context "resolve!" do
     it "marks the err as resolved" do
       err = Factory(:err)
@@ -89,7 +100,7 @@ describe Err do
       err.resolve!
       err.should be_resolved
     end
-    
+
     it "should throw an err if it's not successful" do
       err = Factory(:err)
       err.should_not be_resolved
@@ -100,7 +111,7 @@ describe Err do
       }.should raise_error(Mongoid::Errors::Validations)
     end
   end
-  
+
   context "Scopes" do
     context "resolved" do
       it 'only finds resolved Errs' do
@@ -110,7 +121,7 @@ describe Err do
         Err.resolved.all.should_not include(unresolved)
       end
     end
-    
+
     context "unresolved" do
       it 'only finds unresolved Errs' do
         resolved = Factory(:err, :resolved => true)
@@ -130,4 +141,30 @@ describe Err do
       end
     end
   end
-end
 \ No newline at end of file
+
+  context "notice counter cache" do
+
+    before do
+      @app = Factory(:app)
+      @err = Factory(:err, :app => @app)
+    end
+
+    it "#notices_count returns 0 by default" do
+      @err.notices_count.should == 0
+    end
+
+    it "adding a notice increases #notices_count by 1" do
+      lambda {
+        notice1 = Factory(:notice, :err => @err, :message => 'ERR 1')}.should change(@err, :notices_count).from(0).to(1)
+    end
+
+    it "removing a notice decreases #notices_count by 1" do
+      notice1 = Factory(:notice, :err => @err, :message => 'ERR 1')
+      lambda {
+        @err.notices.first.destroy
+      }.should change(@err, :notices_count).from(1).to(0)
+    end
+  end
+
+
+end
 require 'spec_helper'
 describe Notice do
-  
+
   context 'validations' do
     it 'requires a backtrace' do
       notice = Factory.build(:notice, :backtrace => nil)
       notice.should_not be_valid
       notice.errors[:backtrace].should include("can't be blank")
     end
-    
+
     it 'requires the server_environment' do
       notice = Factory.build(:notice, :server_environment => nil)
       notice.should_not be_valid
       notice.errors[:server_environment].should include("can't be blank")
     end
-    
+
     it 'requires the notifier' do
       notice = Factory.build(:notice, :notifier => nil)
       notice.should_not be_valid
       notice.errors[:notifier].should include("can't be blank")
     end
   end
-  
+
   context '#from_xml' do
     before do
       @xml = Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read
       @app = Factory(:app, :api_key => 'APIKEY')
       Digest::MD5.stub(:hexdigest).and_return('fingerprintdigest')
     end
-    
+
     it 'finds the correct app' do
       @notice = Notice.from_xml(@xml)
       @notice.err.app.should == @app
     end
-    
+
     it 'finds the correct err for the notice' do
       Err.should_receive(:for).with({
         :app      => @app,
@@ -46,7 +46,7 @@ describe Notice do
       err.notices.stub(:create!)
       @notice = Notice.from_xml(@xml)
     end
-    
+
     it 'marks the err as unresolve if it was previously resolved' do
       Err.should_receive(:for).with({
         :app      => @app,
@@ -61,56 +61,70 @@ describe Notice do
       @notice.err.should == err
       @notice.err.should_not be_resolved
     end
-    
+
     it 'should create a new notice' do
       @notice = Notice.from_xml(@xml)
       @notice.should be_persisted
     end
-    
+
     it 'assigns an err to the notice' do
       @notice = Notice.from_xml(@xml)
       @notice.err.should be_a(Err)
     end
-    
+
     it 'captures the err message' do
       @notice = Notice.from_xml(@xml)
       @notice.message.should == 'HoptoadTestingException: Testing hoptoad via "rake hoptoad:test". If you can see this, it works.'
     end
-    
+
     it 'captures the backtrace' do
       @notice = Notice.from_xml(@xml)
       @notice.backtrace.size.should == 73
       @notice.backtrace.last['file'].should == '[GEM_ROOT]/bin/rake'
     end
-    
+
     it 'captures the server_environment' do
       @notice = Notice.from_xml(@xml)
       @notice.server_environment['environment-name'].should == 'development'
     end
-    
+
     it 'captures the request' do
       @notice = Notice.from_xml(@xml)
       @notice.request['url'].should == 'http://example.org/verify'
       @notice.request['params']['controller'].should == 'application'
     end
-    
+
     it 'captures the notifier' do
       @notice = Notice.from_xml(@xml)
       @notice.notifier['name'].should == 'Hoptoad Notifier'
     end
-    it "should handle params withour 'request' section" do
+    it "should handle params without 'request' section" do
       @xml = Rails.root.join('spec','fixtures','hoptoad_test_notice_without_request_section.xml').read
       lambda { Notice.from_xml(@xml) }.should_not raise_error
     end
   end
-  
+
+  describe "key sanitization" do
+    before do
+      @hash = { "some.key" => { "$nested.key" => {"$Path" => "/", "some$key" => "key"}}}
+      @hash_sanitized = { "some&#46;key" => { "&#36;nested&#46;key" => {"&#36;Path" => "/", "some$key" => "key"}}}
+    end
+    [:server_environment, :request, :notifier].each do |key|
+      it "replaces . with &#46; and $ with &#36; in keys used in #{key}" do
+        err = Factory(:err)
+        notice = Factory(:notice, :err => err, key => @hash)
+        notice.send(key).should == @hash_sanitized
+      end
+    end
+  end
+
   describe "email notifications" do
     before do
       @app = Factory(:app_with_watcher)
       @err = Factory(:err, :app => @app)
     end
-    
+
     Errbit::Config.email_at_notices.each do |threshold|
       it "sends an email notification after #{threshold} notice(s)" do
         @err.notices.stub(:count).and_return(threshold)
@@ -120,5 +134,5 @@ describe Notice do
       end
     end
   end
-  
-end
 \ No newline at end of file
+
+end
	@@ -7,3 +7,4 @@ config/deploy.rb		@@ -7,3 +7,4 @@ config/deploy.rb
7	config/mongoid.yml	7	config/mongoid.yml
8	.rvmrc	8	.rvmrc
9	*~	9	*~
		10	+*.rbc
	@@ -35,15 +35,15 @@ GEM		@@ -35,15 +35,15 @@ GEM
35	activemodel (= 3.0.5)	35	activemodel (= 3.0.5)
36	activesupport (= 3.0.5)	36	activesupport (= 3.0.5)
37	activesupport (3.0.5)	37	activesupport (3.0.5)
38	- addressable (2.2.4)	38	+ addressable (2.2.5)
39	arel (2.0.9)	39	arel (2.0.9)
40	bcrypt-ruby (2.1.4)	40	bcrypt-ruby (2.1.4)
41	- bson (1.2.4)
42	- bson_ext (1.2.4)	41	+ bson (1.3.0)
		42	+ bson_ext (1.3.0)
43	builder (2.1.2)	43	builder (2.1.2)
44	crack (0.1.8)	44	crack (0.1.8)
45	- database_cleaner (0.6.5)
46	- devise (1.1.8)	45	+ database_cleaner (0.6.7)
		46	+ devise (1.1.9)
47	bcrypt-ruby (~> 2.1.2)	47	bcrypt-ruby (~> 2.1.2)
48	warden (~> 1.0.2)	48	warden (~> 1.0.2)
49	diff-lcs (1.1.2)	49	diff-lcs (1.1.2)
	@@ -58,23 +58,28 @@ GEM		@@ -58,23 +58,28 @@ GEM
58	lighthouse-api (2.0)	58	lighthouse-api (2.0)
59	activeresource (>= 3.0.0)	59	activeresource (>= 3.0.0)
60	activesupport (>= 3.0.0)	60	activesupport (>= 3.0.0)
61	- mail (2.2.15)	61	+ mail (2.2.17)
62	activesupport (>= 2.3.6)	62	activesupport (>= 2.3.6)
63	i18n (>= 0.4.0)	63	i18n (>= 0.4.0)
64	mime-types (~> 1.16)	64	mime-types (~> 1.16)
65	treetop (~> 1.4.8)	65	treetop (~> 1.4.8)
66	mime-types (1.16)	66	mime-types (1.16)
67	- mongo (1.2.4)
68	- bson (>= 1.2.4)
69	- mongoid (2.0.0.rc.7)	67	+ mongo (1.3.0)
		68	+ bson (>= 1.3.0)
		69	+ mongoid (2.0.0.rc.8)
70	activemodel (~> 3.0)	70	activemodel (~> 3.0)
71	mongo (~> 1.2)	71	mongo (~> 1.2)
72	tzinfo (~> 0.3.22)	72	tzinfo (~> 0.3.22)
73	will_paginate (~> 3.0.pre)	73	will_paginate (~> 3.0.pre)
		74	+ mongoid_rails_migrations (0.0.10)
		75	+ activesupport (~> 3.0.0)
		76	+ bundler (>= 0.9.19)
		77	+ rails (~> 3.0.0)
		78	+ railties (~> 3.0.0)
74	nokogiri (1.4.4)	79	nokogiri (1.4.4)
75	polyglot (0.3.1)	80	polyglot (0.3.1)
76	rack (1.2.2)	81	rack (1.2.2)
77	- rack-mount (0.6.13)	82	+ rack-mount (0.6.14)
78	rack (>= 1.0.0)	83	rack (>= 1.0.0)
79	rack-test (0.5.7)	84	rack-test (0.5.7)
80	rack (>= 1.0)	85	rack (>= 1.0)
	@@ -108,7 +113,7 @@ GEM		@@ -108,7 +113,7 @@ GEM
108	thor (0.14.6)	113	thor (0.14.6)
109	treetop (1.4.9)	114	treetop (1.4.9)
110	polyglot (>= 0.3.1)	115	polyglot (>= 0.3.1)
111	- tzinfo (0.3.25)	116	+ tzinfo (0.3.26)
112	warden (1.0.3)	117	warden (1.0.3)
113	rack (>= 1.0.0)	118	rack (>= 1.0.0)
114	webmock (1.6.2)	119	webmock (1.6.2)
	@@ -126,7 +131,8 @@ DEPENDENCIES		@@ -126,7 +131,8 @@ DEPENDENCIES
126	factory_girl_rails	131	factory_girl_rails
127	haml	132	haml
128	lighthouse-api	133	lighthouse-api
129	- mongoid (~> 2.0.0.rc.7)	134	+ mongoid (= 2.0.0.rc.8)
		135	+ mongoid_rails_migrations
130	nokogiri	136	nokogiri
131	rails (= 3.0.5)	137	rails (= 3.0.5)
132	redmine_client!	138	redmine_client!
1	class ErrsController < ApplicationController	1	class ErrsController < ApplicationController
2	-	2	+
3	before_filter :find_app, :except => [:index, :all]	3	before_filter :find_app, :except => [:index, :all]
4	before_filter :find_err, :except => [:index, :all]	4	before_filter :find_err, :except => [:index, :all]
5	-	5	+
6	def index	6	def index
7	app_scope = current_user.admin? ? App.all : current_user.apps	7	app_scope = current_user.admin? ? App.all : current_user.apps
8	respond_to do \|format\|	8	respond_to do \|format\|
	@@ -14,14 +14,14 @@ class ErrsController < ApplicationController		@@ -14,14 +14,14 @@ class ErrsController < ApplicationController
14	end	14	end
15	end	15	end
16	end	16	end
17	-	17	+
18	def all	18	def all
19	app_scope = current_user.admin? ? App.all : current_user.apps	19	app_scope = current_user.admin? ? App.all : current_user.apps
20	@errs = Err.for_apps(app_scope).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)	20	@errs = Err.for_apps(app_scope).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
21	end	21	end
22	-	22	+
23	def show	23	def show
24	- page = (params[:notice] \|\| @err.notices.count)	24	+ page = (params[:notice] \|\| @err.notices_count)
25	page = 1 if page.to_i.zero?	25	page = 1 if page.to_i.zero?
26	@notices = @err.notices.ordered.paginate(:page => page, :per_page => 1)	26	@notices = @err.notices.ordered.paginate(:page => page, :per_page => 1)
27	@notice = @notices.first	27	@notice = @notices.first
	@@ -46,25 +46,25 @@ class ErrsController < ApplicationController		@@ -46,25 +46,25 @@ class ErrsController < ApplicationController
46	@err.update_attribute :issue_link, nil	46	@err.update_attribute :issue_link, nil
47	redirect_to app_err_path(@app, @err)	47	redirect_to app_err_path(@app, @err)
48	end	48	end
49	-	49	+
50	def resolve	50	def resolve
51	- # Deal with bug in mogoid where find is returning an Enumberable obj	51	+ # Deal with bug in mongoid where find is returning an Enumberable obj
52	@err = @err.first if @err.respond_to?(:first)	52	@err = @err.first if @err.respond_to?(:first)
53	-	53	+
54	@err.resolve!	54	@err.resolve!
55	-	55	+
56	flash[:success] = 'Great news everyone! The err has been resolved.'	56	flash[:success] = 'Great news everyone! The err has been resolved.'
57		57
58	redirect_to :back	58	redirect_to :back
59	rescue ActionController::RedirectBackError	59	rescue ActionController::RedirectBackError
60	redirect_to app_path(@app)	60	redirect_to app_path(@app)
61	end	61	end
62	-	62	+
63	protected	63	protected
64	-	64	+
65	def find_app	65	def find_app
66	@app = App.find(params[:app_id])	66	@app = App.find(params[:app_id])
67	-	67	+
68	# Mongoid Bug: could not chain: current_user.apps.find_by_id!	68	# Mongoid Bug: could not chain: current_user.apps.find_by_id!
69	# apparently finding by 'watchers.email' and 'id' is broken	69	# apparently finding by 'watchers.email' and 'id' is broken
70	raise(Mongoid::Errors::DocumentNotFound.new(App,@app.id)) unless current_user.admin? \|\| current_user.watching?(@app)	70	raise(Mongoid::Errors::DocumentNotFound.new(App,@app.id)) unless current_user.admin? \|\| current_user.watching?(@app)
	@@ -79,5 +79,5 @@ class ErrsController < ApplicationController		@@ -79,5 +79,5 @@ class ErrsController < ApplicationController
79	IssueTracker.default_url_options[:port] = request.port	79	IssueTracker.default_url_options[:port] = request.port
80	IssueTracker.default_url_options[:protocol] = request.scheme	80	IssueTracker.default_url_options[:protocol] = request.scheme
81	end	81	end
82	-	82	+
83	end	83	end
1	class App	1	class App
2	include Mongoid::Document	2	include Mongoid::Document
3	include Mongoid::Timestamps	3	include Mongoid::Timestamps
4	-	4	+
5	field :name, :type => String	5	field :name, :type => String
6	field :api_key	6	field :api_key
7	field :resolve_errs_on_deploy, :type => Boolean, :default => false	7	field :resolve_errs_on_deploy, :type => Boolean, :default => false
	@@ -21,29 +21,29 @@ class App		@@ -21,29 +21,29 @@ class App
21	embeds_many :deploys	21	embeds_many :deploys
22	embeds_one :issue_tracker	22	embeds_one :issue_tracker
23	references_many :errs, :dependent => :destroy	23	references_many :errs, :dependent => :destroy
24	-	24	+
25	before_validation :generate_api_key, :on => :create	25	before_validation :generate_api_key, :on => :create
26	-	26	+
27	validates_presence_of :name, :api_key	27	validates_presence_of :name, :api_key
28	validates_uniqueness_of :name, :allow_blank => true	28	validates_uniqueness_of :name, :allow_blank => true
29	validates_uniqueness_of :api_key, :allow_blank => true	29	validates_uniqueness_of :api_key, :allow_blank => true
30	validates_associated :watchers	30	validates_associated :watchers
31	validate :check_issue_tracker	31	validate :check_issue_tracker
32	-	32	+
33	accepts_nested_attributes_for :watchers, :allow_destroy => true,	33	accepts_nested_attributes_for :watchers, :allow_destroy => true,
34	:reject_if => proc { \|attrs\| attrs[:user_id].blank? && attrs[:email].blank? }	34	:reject_if => proc { \|attrs\| attrs[:user_id].blank? && attrs[:email].blank? }
35	accepts_nested_attributes_for :issue_tracker, :allow_destroy => true,	35	accepts_nested_attributes_for :issue_tracker, :allow_destroy => true,
36	:reject_if => proc { \|attrs\| !%w( lighthouseapp redmine ).include?(attrs[:issue_tracker_type]) }	36	:reject_if => proc { \|attrs\| !%w( lighthouseapp redmine ).include?(attrs[:issue_tracker_type]) }
37	-	37	+
38	# Mongoid Bug: find(id) on association proxies returns an Enumerator	38	# Mongoid Bug: find(id) on association proxies returns an Enumerator
39	def self.find_by_id!(app_id)	39	def self.find_by_id!(app_id)
40	where(:_id => app_id).first \|\| raise(Mongoid::Errors::DocumentNotFound.new(self,app_id))	40	where(:_id => app_id).first \|\| raise(Mongoid::Errors::DocumentNotFound.new(self,app_id))
41	end	41	end
42	-	42	+
43	def self.find_by_api_key!(key)	43	def self.find_by_api_key!(key)
44	where(:api_key => key).first \|\| raise(Mongoid::Errors::DocumentNotFound.new(self,key))	44	where(:api_key => key).first \|\| raise(Mongoid::Errors::DocumentNotFound.new(self,key))
45	end	45	end
46	-	46	+
47	def last_deploy_at	47	def last_deploy_at
48	deploys.last && deploys.last.created_at	48	deploys.last && deploys.last.created_at
49	end	49	end
	@@ -58,9 +58,9 @@ class App		@@ -58,9 +58,9 @@ class App
58	!(self[:notify_on_deploys] == false)	58	!(self[:notify_on_deploys] == false)
59	end	59	end
60	alias :notify_on_deploys? :notify_on_deploys	60	alias :notify_on_deploys? :notify_on_deploys
61	-	61	+
62	protected	62	protected
63	-	63	+
64	def generate_api_key	64	def generate_api_key
65	self.api_key \|\|= ActiveSupport::SecureRandom.hex	65	self.api_key \|\|= ActiveSupport::SecureRandom.hex
66	end	66	end
	@@ -14,7 +14,7 @@		@@ -14,7 +14,7 @@
14	%td.name= link_to app.name, app_path(app)	14	%td.name= link_to app.name, app_path(app)
15	%td.deploy= app.last_deploy_at ? link_to( app.last_deploy_at.to_s(:micro), app_deploys_path(app)) : 'n/a'	15	%td.deploy= app.last_deploy_at ? link_to( app.last_deploy_at.to_s(:micro), app_deploys_path(app)) : 'n/a'
16	%td.count	16	%td.count
17	- - if app.errs.any?	17	+ - if app.errs.count > 0
18	= link_to app.errs.unresolved.count, app_errs_path(app)	18	= link_to app.errs.unresolved.count, app_errs_path(app)
19	- else	19	- else
20	\-	20	\-
	@@ -50,7 +50,7 @@		@@ -50,7 +50,7 @@
50	- else	50	- else
51	%h3 No deploys	51	%h3 No deploys
52		52
53	-- if @app.errs.any?	53	+- if @app.errs.count > 0
54	%h3.clear Errs	54	%h3.clear Errs
55	= render 'errs/table', :errs => @errs	55	= render 'errs/table', :errs => @errs
56	- else	56	- else
	@@ -18,7 +18,7 @@		@@ -18,7 +18,7 @@
18	%em= err.where	18	%em= err.where
19	%td.latest #{time_ago_in_words(last_notice_at err)} ago	19	%td.latest #{time_ago_in_words(last_notice_at err)} ago
20	%td.deploy= err.app.last_deploy_at ? err.app.last_deploy_at.to_s(:micro) : 'n/a'	20	%td.deploy= err.app.last_deploy_at ? err.app.last_deploy_at.to_s(:micro) : 'n/a'
21	- %td.count= link_to err.notices.count, app_err_path(err.app, err)	21	+ %td.count= link_to err.notices_count, app_err_path(err.app, err)
22	%td.resolve= link_to image_tag("thumbs-up.png"), resolve_app_err_path(err.app, err), :title => "Resolve", :method => :put, :confirm => err_confirm, :class => 'resolve' if err.unresolved?	22	%td.resolve= link_to image_tag("thumbs-up.png"), resolve_app_err_path(err.app, err), :title => "Resolve", :method => :put, :confirm => err_confirm, :class => 'resolve' if err.unresolved?
23	- if errs.none?	23	- if errs.none?
24	%tr	24	%tr
	@@ -13,7 +13,7 @@		@@ -13,7 +13,7 @@
13	<%= notice.created_at.to_s(:micro) %>	13	<%= notice.created_at.to_s(:micro) %>
14		14
15	### Similar ###	15	### Similar ###
16	- <%= (notice.err.notices.count - 1).to_s %>	16	+ <%= (notice.err.notices_count - 1).to_s %>
17		17
18	## Params ##	18	## Params ##
19	<code><%= pretty_hash(notice.params) %></code>	19	<code><%= pretty_hash(notice.params) %></code>
	@@ -18,7 +18,7 @@ h3. Occured		@@ -18,7 +18,7 @@ h3. Occured
18		18
19	h3. Similar	19	h3. Similar
20		20
21	-<%= (notice.err.notices.count - 1).to_s %>	21	+<%= (notice.err.notices_count - 1).to_s %>
22		22
23	h2. Params	23	h2. Params
24		24
	@@ -20,7 +20,7 @@		@@ -20,7 +20,7 @@
20	%span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve'	20	%span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve'
21		21
22	%h4= @notice.try(:message)	22	%h4= @notice.try(:message)
23	-	23	+
24	= will_paginate @notices, :param_name => :notice, :page_links => false, :class => 'notice-pagination'	24	= will_paginate @notices, :param_name => :notice, :page_links => false, :class => 'notice-pagination'
25	viewing occurrence #{@notices.current_page} of #{@notices.total_pages}	25	viewing occurrence #{@notices.current_page} of #{@notices.total_pages}
26		26
	@@ -36,19 +36,19 @@ viewing occurrence #{@notices.current_page} of #{@notices.total_pages}		@@ -36,19 +36,19 @@ viewing occurrence #{@notices.current_page} of #{@notices.total_pages}
36	#summary	36	#summary
37	%h3 Summary	37	%h3 Summary
38	= render 'notices/summary', :notice => @notice	38	= render 'notices/summary', :notice => @notice
39	-	39	+
40	#backtrace	40	#backtrace
41	%h3 Backtrace	41	%h3 Backtrace
42	= render 'notices/backtrace', :lines => @notice.backtrace	42	= render 'notices/backtrace', :lines => @notice.backtrace
43	-	43	+
44	#environment	44	#environment
45	%h3 Environment	45	%h3 Environment
46	= render 'notices/environment', :notice => @notice	46	= render 'notices/environment', :notice => @notice
47	-	47	+
48	#params	48	#params
49	%h3 Parameters	49	%h3 Parameters
50	= render 'notices/params', :notice => @notice	50	= render 'notices/params', :notice => @notice
51	-	51	+
52	#session	52	#session
53	%h3 Session	53	%h3 Session
54	= render 'notices/session', :notice => @notice	54	= render 'notices/session', :notice => @notice