Merge remote branch 'boblail/merge-rebase' into boblail. Tweaked some changed fi…

…les, fixed whitespace, upgraded RSpec to 2.6.0 Conflicts: app/helpers/errs_helper.rb app/mailers/mailer.rb app/models/notice.rb app/views/errs/_table.html.haml app/views/errs/show.html.haml app/views/notices/_summary.html.haml spec/models/issue_trackers/redmine_tracker_spec.rb spec/views/errs/show.html.haml_spec.rb

Merge remote branch 'boblail/merge-rebase' into boblail. Tweaked some changed fi…
…les, fixed whitespace, upgraded RSpec to 2.6.0 Conflicts: app/helpers/errs_helper.rb app/mailers/mailer.rb app/models/notice.rb app/views/errs/_table.html.haml app/views/errs/show.html.haml app/views/notices/_summary.html.haml spec/models/issue_trackers/redmine_tracker_spec.rb spec/views/errs/show.html.haml_spec.rb
Nathan Broadbent
2 parents f18852d4 8a9001fd
Showing 96 changed files with 1540 additions and 820 deletions Show diff stats
.gitignore
Gemfile
Gemfile.lock
app/controllers/application_controller.rb
app/controllers/apps_controller.rb
app/controllers/deploys_controller.rb
app/controllers/errs_controller.rb
app/controllers/notices_controller.rb
app/controllers/users_controller.rb
app/helpers/errs_helper.rb
app/helpers/form_helper.rb
app/helpers/hash_helper.rb
app/helpers/navigation_helper.rb
app/mailers/mailer.rb
app/models/app.rb
app/models/deploy.rb
app/models/err.rb
app/models/error_report.rb
app/models/issue_tracker.rb
app/models/issue_trackers/fogbugz_tracker.rb
@@ -4,6 +4,7 @@ log/*.log
 tmp/**/*
 config/config.yml
 config/deploy.rb
+config/deploy
 config/mongoid.yml
 .rvmrc
 *~
@@ -24,7 +24,7 @@ platform :ruby do
 end
  
 group :development, :test do
-  gem 'rspec-rails', '~> 2.5'
+  gem 'rspec-rails', '~> 2.6'
   gem 'webmock', :require => false
   gem 'factory_girl_rails'
   unless ENV['TRAVIS']
@@ -34,7 +34,7 @@ group :development, :test do
 end
  
 group :test do
-  gem 'rspec', '~> 2.5'
+  gem 'rspec', '~> 2.6'
   gem 'database_cleaner', '~> 0.6.0'
   gem 'email_spec'
 end
@@ -57,7 +57,7 @@ GEM
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     email_spec (1.1.1)
       rspec (~> 2.0)
     erubis (2.6.6)
@@ -158,19 +158,19 @@ GEM
     responders (0.6.4)
     rest-client (1.5.1)
       mime-types (>= 1.16)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.6.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -232,8 +232,8 @@ DEPENDENCIES
   pivotal-tracker
   rails (= 3.0.10)
   redmine_client!
-  rspec (~> 2.5)
-  rspec-rails (~> 2.5)
+  rspec (~> 2.6)
+  rspec-rails (~> 2.6)
   ruby-debug
   ruby-debug19
   ruby-fogbugz
@@ -10,11 +10,20 @@ class ApplicationController &lt; ActionController::Base
     (location == root_path && App.count == 1) ? app_path(App.first) : location
   end
  
-  protected
+  rescue_from ActionController::RedirectBackError, :with => :redirect_to_root
+
+
+protected
+
+
+  def require_admin!
+    redirect_to_root unless user_signed_in? && current_user.admin?
+  end
+
+  def redirect_to_root
+    redirect_to(root_path)
+  end
  
-    def require_admin!
-      redirect_to root_path unless user_signed_in? && current_user.admin?
-    end
  
 end
  
 class AppsController < InheritedResources::Base
-
   before_filter :require_admin!, :except => [:index, :show]
   before_filter :parse_email_at_notices_or_set_default, :only => [:create, :update]
   respond_to :html
  
+
   def show
     respond_to do |format|
       format.html do
         @all_errs = !!params[:all_errs]
  
-        @errs = resource.errs
-        @errs = @errs.unresolved unless @all_errs
-        @errs = @errs.in_env(params[:environment]).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
+        @problems = resource.problems
+        @problems = @problems.unresolved unless @all_errs
+        @problems = @problems.in_env(params[:environment]).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
  
+        @selected_problems = params[:problems] || []
         @deploys = @app.deploys.order_by(:created_at.desc).limit(5)
       end
       format.atom do
-        @errs = resource.errs.unresolved.ordered
+        @problems = resource.problems.unresolved.ordered
       end
     end
   end
@@ -49,7 +50,7 @@ class AppsController &lt; InheritedResources::Base
       # Caches the unresolved err counts while performing the sort.
       @unresolved_counts = {}
       @apps ||= end_of_association_chain.all.sort{|a,b|
-        [a,b].each{|app| @unresolved_counts[app.id] ||= app.errs.unresolved.count }
+        [a,b].each{|app| @unresolved_counts[app.id] ||= app.problems.unresolved.count }
         @unresolved_counts[b.id] <=> @unresolved_counts[a.id]
       }
     end
@@ -18,9 +18,9 @@ class DeploysController &lt; ApplicationController
  
     @deploys = app.deploys.order_by(:created_at.desc).paginate(:page => params[:page], :per_page => 10)
   end
-  
+
   private
-  
+
     def default_deploy
       if params[:deploy]
         {
@@ -32,7 +32,7 @@ class DeploysController &lt; ApplicationController
         }
       end
     end
-  
+
     # handle Heroku's HTTP post deployhook format
     def heroku_deploy
       {
@@ -42,5 +42,6 @@ class DeploysController &lt; ApplicationController
         :revision     => params[:head],
       }
     end
-    
+
 end
+
 class ErrsController < ApplicationController
+  include ActionView::Helpers::TextHelper
+
+  before_filter :find_app, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
+  before_filter :find_problem, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
+  before_filter :find_selected_problems, :only => [:destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
+
  
-  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
-    @errs = Err.for_apps(app_scope).in_env(params[:environment]).unresolved.ordered
+    @problems = Problem.for_apps(app_scope).in_env(params[:environment]).unresolved.ordered
+    @selected_problems = params[:problems] || []
     respond_to do |format|
       format.html do
-        @errs = @errs.paginate(:page => params[:page], :per_page => current_user.per_page)
+        @problems = @problems.paginate(:page => params[:page], :per_page => current_user.per_page)
       end
       format.atom
     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)
+    @problems = Problem.for_apps(app_scope).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
+    @selected_problems = params[:problems] || []
   end
  
+
   def show
-    page      = (params[:notice] || @err.notices_count)
+    page      = (params[:notice] || @problem.notices_count)
     page      = 1 if page.to_i.zero?
-    @notices  = @err.notices.ordered.paginate(:page => page, :per_page => 1)
+    @notices  = @problem.notices.paginate(:page => page, :per_page => 1)
     @notice   = @notices.first
     @comment = Comment.new
   end
  
+
   def create_issue
     set_tracker_params
  
     if @app.issue_tracker
-      @app.issue_tracker.create_issue @err
+      @app.issue_tracker.create_issue @problem
     else
       flash[:error] = "This app has no issue tracker setup."
     end
-    redirect_to app_err_path(@app, @err)
+    redirect_to app_err_path(@app, @problem)
   rescue ActiveResource::ConnectionError => e
     Rails.logger.error e.to_s
     flash[:error] = "There was an error during issue creation. Check your tracker settings or try again later."
-    redirect_to app_err_path(@app, @err)
+    redirect_to app_err_path(@app, @problem)
   end
  
+
   def unlink_issue
-    @err.update_attribute :issue_link, nil
-    redirect_to app_err_path(@app, @err)
+    @problem.update_attribute :issue_link, nil
+    redirect_to app_err_path(@app, @problem)
   end
  
+
   def resolve
     # Deal with bug in mongoid where find is returning an Enumberable obj
-    @err = @err.first if @err.respond_to?(:first)
-
-    @err.resolve!
+    @problem = @problem.first if @problem.respond_to?(:first)
  
+    @problem.resolve!
     flash[:success] = 'Great news everyone! The err has been resolved.'
-
     redirect_to :back
   rescue ActionController::RedirectBackError
     redirect_to app_path(@app)
@@ -64,15 +73,16 @@ class ErrsController &lt; ApplicationController
   def create_comment
     @comment = Comment.new(params[:comment].merge(:user_id => current_user.id))
     if @comment.valid?
-      @err.comments << @comment
-      @err.save
+      @problem.comments << @comment
+      @problem.save
       flash[:success] = "Comment saved!"
     else
       flash[:error] = "I'm sorry, your comment was blank! Try again?"
     end
-    redirect_to app_err_path(@app, @err)
+    redirect_to app_err_path(@app, @problem)
   end
  
+
   def destroy_comment
     @comment = Comment.find(params[:comment_id])
     if @comment.destroy
@@ -80,29 +90,86 @@ class ErrsController &lt; ApplicationController
     else
       flash[:error] = "Sorry, I couldn't delete your comment for some reason. I hope you don't have any sensitive information in there!"
     end
-    redirect_to app_err_path(@app, @err)
+    redirect_to app_err_path(@app, @problem)
+  end
+
+
+  def resolve_several
+    @selected_problems.each(&:resolve!)
+    flash[:success] = "Great news everyone! #{pluralize(@selected_problems.count, 'err has', 'errs have')} been resolved."
+    redirect_to :back
   end
  
  
-  protected
+  def unresolve_several
+    @selected_problems.each(&:unresolve!)
+    flash[:success] = "#{pluralize(@selected_problems.count, 'err has', 'errs have')} been unresolved."
+    redirect_to :back
+  end
  
-    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)
+  def merge_several
+    if @selected_problems.length < 2
+      flash[:notice] = "You must select at least two errors to merge"
+    else
+      @merged_problem = Problem.merge!(@selected_problems)
+      flash[:notice] = "#{@selected_problems.count} errors have been merged."
     end
+    redirect_to :back
+  end
  
-    def find_err
-      @err = @app.errs.find(params[:id])
-    end
  
-    def set_tracker_params
-      IssueTracker.default_url_options[:host] = request.host
-      IssueTracker.default_url_options[:port] = request.port
-      IssueTracker.default_url_options[:protocol] = request.scheme
+  def unmerge_several
+    all = @selected_problems.map(&:unmerge!).flatten
+    flash[:success] = "#{pluralize(all.length, 'err has', 'errs have')} been unmerged."
+    redirect_to :back
+  end
+
+
+  def destroy_several
+    @selected_problems.each(&:destroy)
+    flash[:notice] = "#{pluralize(@selected_problems.count, 'err has', 'errs have')} been deleted."
+    redirect_to :back
+  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)
+  end
+
+
+  def find_problem
+    @problem = @app.problems.find(params[:id])
+
+    # Deal with bug in mogoid where find is returning an Enumberable obj
+    @problem = @problem.first if @problem.respond_to?(:first)
+  end
+
+
+  def set_tracker_params
+    IssueTracker.default_url_options[:host] = request.host
+    IssueTracker.default_url_options[:port] = request.port
+    IssueTracker.default_url_options[:protocol] = request.scheme
+  end
+
+
+  def find_selected_problems
+    err_ids = (params[:problems] || []).compact
+    if err_ids.empty?
+      flash[:notice] = "You have not selected any errors"
+      redirect_to :back
+    else
+      @selected_problems = Array(Problem.find(err_ids))
     end
+  end
+
  
 end
  
@@ -5,8 +5,9 @@ class NoticesController &lt; ApplicationController
  
   def create
     # params[:data] if the notice came from a GET request, raw_post if it came via POST
-    @notice = Notice.from_xml(params[:data] || request.raw_post)
+    @notice = App.report_error!(params[:data] || request.raw_post)
     respond_with @notice
   end
  
 end
+
@@ -71,3 +71,4 @@ class UsersController &lt; ApplicationController
     end
  
 end
+
 module ErrsHelper
-  def last_notice_at err
-    err.last_notice_at || err.created_at
+  def last_notice_at(problem)
+    problem.last_notice_at || problem.created_at
   end
  
   def err_confirm
@@ -15,4 +15,4 @@ module FormHelper
     (builder.object_name + field).gsub(/[\[\]]/,'_').squeeze('_')
   end
  
-end
 \ No newline at end of file
+end
@@ -17,4 +17,4 @@ module HashHelper
     pretty += "\n#{' '*nesting*tab_size}}"
   end
  
-end
 \ No newline at end of file
+end
@@ -34,4 +34,4 @@ module NavigationHelper
     active
   end
  
-end
 \ No newline at end of file
+end
@@ -7,10 +7,10 @@ class Mailer &lt; ActionMailer::Base
  
   def err_notification(notice)
     @notice   = notice
-    @app  = notice.err.app
+    @app      = notice.app
  
     mail :to      => @app.notification_recipients,
-         :subject => "[#{@app.name}][#{@notice.err.environment}] #{@notice.err.message}"
+         :subject => "[#{@app.name}][#{@notice.environment_name}] #{@notice.message}"
   end
  
   def deploy_notification(deploy)
@@ -13,6 +13,7 @@ class App
  
   # Some legacy apps may have string as key instead of BSON::ObjectID
   identity :type => String
+
   # There seems to be a Mongoid bug making it impossible to use String identity with references_many feature:
   # https://github.com/mongoid/mongoid/issues/703
   # Using 32 character string as a workaround.
@@ -23,7 +24,7 @@ class App
   embeds_many :watchers
   embeds_many :deploys
   embeds_one :issue_tracker
-  has_many :errs, :inverse_of => :app, :dependent => :destroy
+  has_many :problems, :inverse_of => :app, :dependent => :destroy
  
   before_validation :generate_api_key, :on => :create
   before_save :normalize_github_url
@@ -39,6 +40,50 @@ class App
   accepts_nested_attributes_for :issue_tracker, :allow_destroy => true,
     :reject_if => proc { |attrs| !IssueTracker.subclasses.map(&:to_s).include?(attrs[:type].to_s) }
  
+
+  # Processes a new error report.
+  #
+  # Accepts either XML or a hash with the following attributes:
+  #
+  # * <tt>:klass</tt> - the class of error
+  # * <tt>:message</tt> - the error message
+  # * <tt>:backtrace</tt> - an array of stack trace lines
+  #
+  # * <tt>:request</tt> - a hash of values describing the request
+  # * <tt>:server_environment</tt> - a hash of values describing the server environment
+  #
+  # * <tt>:api_key</tt> - the API key with which the error was reported
+  # * <tt>:notifier</tt> - information to identify the source of the error report
+  #
+  def self.report_error!(*args)
+    report = ErrorReport.new(*args)
+    report.generate_notice!
+  end
+
+
+  # Processes a new error report.
+  #
+  # Accepts a hash with the following attributes:
+  #
+  # * <tt>:klass</tt> - the class of error
+  # * <tt>:message</tt> - the error message
+  # * <tt>:backtrace</tt> - an array of stack trace lines
+  #
+  # * <tt>:request</tt> - a hash of values describing the request
+  # * <tt>:server_environment</tt> - a hash of values describing the server environment
+  #
+  # * <tt>:notifier</tt> - information to identify the source of the error report
+  #
+  def report_error!(hash)
+    report = ErrorReport.new(hash.merge(:api_key => api_key))
+    report.generate_notice!
+  end
+
+  def find_or_create_err!(attrs)
+    Err.where(attrs).first || problems.create!.errs.create!(attrs)
+  end
+
+  # Mongoid Bug: find(id) on association proxies returns an Enumerator
   def self.find_by_id!(app_id)
     find app_id
   end
@@ -51,6 +96,7 @@ class App
     deploys.last && deploys.last.created_at
   end
  
+
   # Legacy apps don't have notify_on_errs and notify_on_deploys params
   def notify_on_errs
     !(self[:notify_on_errs] == false)
@@ -62,6 +108,7 @@ class App
   end
   alias :notify_on_deploys? :notify_on_deploys
  
+
   def github_url?
     self.github_url.present?
   end
@@ -22,7 +22,7 @@ class Deploy
   end
  
   def resolve_app_errs
-    app.errs.unresolved.in_env(environment).each {|err| err.resolve!}
+    app.problems.unresolved.in_env(environment).each {|problem| problem.resolve!}
   end
  
   def short_revision
+# Represents a set of Notices which can be automatically
+# determined to refer to the same Error (Errbit groups
+# notices into errs by a notice's fingerprint.)
+
 class Err
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -7,53 +11,18 @@ class Err
   field :action
   field :environment
   field :fingerprint
-  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
-  index :notices
+  belongs_to :problem
+  index :problem_id
  
-  belongs_to :app
-  has_many :notices
-  has_many :comments, :inverse_of => :err, :dependent => :destroy
+  has_many :notices, :inverse_of => :err, :dependent => :destroy
  
   validates_presence_of :klass, :environment
  
-  scope :resolved, where(:resolved => true)
-  scope :unresolved, where(:resolved => false)
-  scope :ordered, order_by(:last_notice_at.desc)
-  scope :for_apps, lambda {|apps| where(:app_id.in => apps.all.map(&:id))}
-
-  def self.in_env(env)
-    env.present? ? where(:environment => env) : scoped
-  end
-
-  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
-    super || klass
-  end
+  delegate :app,
+           :resolved?,
+           :to => :problem
+
  
 end
  
@@ -0,0 +1,50 @@
+require 'digest/md5'
+
+class ErrorReport
+  attr_reader :klass, :message, :backtrace, :request, :server_environment, :api_key, :notifier
+
+  def initialize(xml_or_attributes)
+    @attributes = (xml_or_attributes.is_a?(String) ? Hoptoad.parse_xml!(xml_or_attributes) : xml_or_attributes).with_indifferent_access
+    @attributes.each{|k, v| instance_variable_set(:"@#{k}", v) }
+  end
+
+  def fingerprint
+    @fingerprint ||= Digest::MD5.hexdigest(backtrace[0].to_s)
+  end
+
+  def rails_env
+    server_environment['environment-name'] || 'development'
+  end
+
+  def component
+    request['component'] || 'unknown'
+  end
+
+  def action
+    request['action']
+  end
+
+  def app
+    @app ||= App.find_by_api_key!(api_key)
+  end
+
+  def generate_notice!
+    notice = Notice.new(
+      :message => message,
+      :backtrace => backtrace,
+      :request => request,
+      :server_environment => server_environment,
+      :notifier => notifier)
+
+    err = app.find_or_create_err!(
+      :klass => klass,
+      :component => component,
+      :action => action,
+      :environment => rails_env,
+      :fingerprint => fingerprint)
+
+    err.notices << notice
+    notice
+  end
+end
+
@@ -20,8 +20,8 @@ class IssueTracker
   # Subclasses are responsible for overwriting this method.
   def check_params; true; end
  
-  def issue_title err
-    "[#{ err.environment }][#{ err.where }] #{err.message.to_s.truncate(100)}"
+  def issue_title(problem)
+    "[#{ problem.environment }][#{ problem.where }] #{problem.message.to_s.truncate(100)}"
   end
  
   # Allows us to set the issue tracker class from a single form.
@@ -22,19 +22,19 @@ class IssueTrackers::FogbugzTracker &lt; IssueTracker
     end
   end
  
-  def create_issue(err)
+  def create_issue(problem)
     fogbugz = Fogbugz::Interface.new(:email => username, :password => password, :uri => "https://#{account}.fogbugz.com")
     fogbugz.authenticate
  
     issue = {}
-    issue['sTitle'] = issue_title err
+    issue['sTitle'] = issue_title problem
     issue['sArea'] = project_id
     issue['sEvent'] = body_template.result(binding)
     issue['sTags'] = ['errbit'].join(',')
     issue['cols'] = ['ixBug'].join(',')
  
     fb_resp = fogbugz.command(:new, issue)
-    err.update_attribute :issue_link, "https://#{account}.fogbugz.com/default.asp?#{fb_resp['case']['ixBug']}"
+    problem.update_attribute :issue_link, "https://#{account}.fogbugz.com/default.asp?#{fb_resp['case']['ixBug']}"
   end
  
   def body_template
@@ -18,20 +18,20 @@ class IssueTrackers::LighthouseTracker &lt; IssueTracker
     end
   end
  
-  def create_issue(err)
+  def create_issue(problem)
     Lighthouse.account = account
     Lighthouse.token = api_token
     # updating lighthouse account
     Lighthouse::Ticket.site
  
     ticket = Lighthouse::Ticket.new(:project_id => project_id)
-    ticket.title = issue_title err
+    ticket.title = issue_title problem
  
     ticket.body = body_template.result(binding)
  
     ticket.tags << "errbit"
     ticket.save!
-    err.update_attribute :issue_link, "#{Lighthouse::Ticket.site.to_s.sub(/#{Lighthouse::Ticket.site.path}$/, '')}#{Lighthouse::Ticket.element_path(ticket.id, :project_id => project_id)}".sub(/\.xml$/, '')
+    problem.update_attribute :issue_link, "#{Lighthouse::Ticket.site.to_s.sub(/#{Lighthouse::Ticket.site.path}$/, '')}#{Lighthouse::Ticket.element_path(ticket.id, :project_id => project_id)}".sub(/\.xml$/, '')
   end
  
   def body_template
@@ -27,21 +27,21 @@ class IssueTrackers::MingleTracker &lt; IssueTracker
     end
   end
  
-  def create_issue(err)
+  def create_issue(problem)
     properties = ticket_properties_hash
     basic_auth = account.gsub(/https?:\/\//, "https://#{username}:#{password}@")
     Mingle.set_site "#{basic_auth}/api/v1/projects/#{project_id}/"
  
     card = Mingle::Card.new
     card.card_type_name = properties.delete("card_type")
-    card.name = issue_title(err)
+    card.name = issue_title(problem)
     card.description = body_template.result(binding)
     properties.each do |property, value|
       card.send("cp_#{property}=", value)
     end
  
     card.save!
-    err.update_attribute :issue_link, URI.parse("#{account}/projects/#{project_id}/cards/#{card.id}").to_s
+    problem.update_attribute :issue_link, URI.parse("#{account}/projects/#{project_id}/cards/#{card.id}").to_s
   end
  
   def body_template
@@ -13,12 +13,12 @@ class IssueTrackers::PivotalLabsTracker &lt; IssueTracker
     end
   end
  
-  def create_issue(err)
+  def create_issue(problem)
     PivotalTracker::Client.token = api_token
     PivotalTracker::Client.use_ssl = true
     project = PivotalTracker::Project.find project_id.to_i
-    story = project.stories.create :name => issue_title(err), :story_type => 'bug', :description => body_template.result(binding)
-    err.update_attribute :issue_link, "https://www.pivotaltracker.com/story/show/#{story.id}"
+    story = project.stories.create :name => issue_title(problem), :story_type => 'bug', :description => body_template.result(binding)
+    problem.update_attribute :issue_link, "https://www.pivotaltracker.com/story/show/#{story.id}"
   end
  
   def body_template
@@ -25,7 +25,7 @@ class IssueTrackers::RedmineTracker &lt; IssueTracker
     end
   end
  
-  def create_issue(err)
+  def create_issue(problem)
     token = api_token
     acc = account
     RedmineClient::Base.configure do
@@ -33,10 +33,10 @@ class IssueTrackers::RedmineTracker &lt; IssueTracker
       self.site = acc
     end
     issue = RedmineClient::Issue.new(:project_id => project_id)
-    issue.subject = issue_title err
+    issue.subject = issue_title problem
     issue.description = body_template.result(binding)
     issue.save!
-    err.update_attribute :issue_link, "#{RedmineClient::Issue.site.to_s.sub(/#{RedmineClient::Issue.site.path}$/, '')}#{RedmineClient::Issue.element_path(issue.id, :project_id => project_id)}".sub(/\.xml\?project_id=#{project_id}$/, "\?project_id=#{project_id}")
+    problem.update_attribute :issue_link, "#{RedmineClient::Issue.site.to_s.sub(/#{RedmineClient::Issue.site.path}$/, '')}#{RedmineClient::Issue.element_path(issue.id, :project_id => project_id)}".sub(/\.xml\?project_id=#{project_id}$/, "\?project_id=#{project_id}")
   end
  
   def url_to_file(file_path, line_number = nil)
@@ -10,53 +10,47 @@ class Notice
   field :server_environment, :type => Hash
   field :request, :type => Hash
   field :notifier, :type => Hash
+  field :klass
  
   belongs_to :err
   index :err_id
+  index :created_at
  
-  after_create :cache_last_notice_at
+  after_create :increase_counter_cache, :cache_attributes_on_problem, :unresolve_problem
   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)
-  index :created_at
+  scope :for_errs, lambda {|errs| where(:err_id.in => errs.all.map(&:id))}
  
-  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'],
-      :component    => hoptoad_notice['request']['component'],
-      :action       => hoptoad_notice['request']['action'],
-      :environment  => hoptoad_notice['server-environment']['environment-name'],
-      :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']].flatten,
-      :server_environment => hoptoad_notice['server-environment'],
-      :request            => hoptoad_notice['request'],
-      :notifier           => hoptoad_notice['notifier']
-    })
-  end
+  delegate :app, :problem, :to => :err
  
   def user_agent
     agent_string = env_vars['HTTP_USER_AGENT']
     agent_string.blank? ? nil : UserAgent.parse(agent_string)
   end
  
+  def environment_name
+    server_environment['server-environment'] || server_environment['environment-name']
+  end
+
+  def component
+    request['component']
+  end
+
+  def action
+    request['action']
+  end
+
+  def where
+    where = component.to_s.dup
+    where << "##{action}" if action.present?
+    where
+  end
+
   def self.in_app_backtrace_line?(line)
     !!(line['file'] =~ %r{^\[PROJECT_ROOT\]/(?!(vendor))})
   end
@@ -81,10 +75,6 @@ class Notice
     Mailer.err_notification(self).deliver
   end
  
-  def cache_last_notice_at
-    err.update_attributes(:last_notice_at => created_at)
-  end
-
   # Backtrace containing only files from the app itself (ignore gems)
   def app_backtrace
     backtrace.select { |l| l && l['file'] && l['file'].include?("[PROJECT_ROOT]") }
@@ -93,20 +83,24 @@ class Notice
   protected
  
   def should_notify?
-    err.app.notify_on_errs? && (Errbit::Config.per_app_email_at_notices && err.app.email_at_notices || Errbit::Config.email_at_notices).include?(err.notices.count) && err.app.watchers.any?
+    app.notify_on_errs? && (Errbit::Config.per_app_email_at_notices && app.email_at_notices || Errbit::Config.email_at_notices).include?(problem.notices_count) && app.watchers.any?
   end
  
-
   def increase_counter_cache
-    err.inc(:notices_count,1)
+    problem.inc(:notices_count, 1)
   end
  
   def decrease_counter_cache
-    err.inc(:notices_count,-1)
+    problem.inc(:notices_count, -1)
   end
  
-  def cache_message
-    err.update_attribute(:message, message) if err.notices_count == 1
+  def unresolve_problem
+    problem.update_attribute(:resolved, false) if problem.resolved?
+  end
+
+
+  def cache_attributes_on_problem
+    problem.cache_notice_attributes(self) if problem.notices_count == 1
   end
  
   def sanitize
@@ -129,5 +123,6 @@ class Notice
       end
     end
   end
+
 end
  
@@ -0,0 +1,103 @@
+# Represents a single Problem. The problem may have been
+# reported as various Errs, but the user has grouped the
+# Errs together as belonging to the same problem.
+
+class Problem
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :last_notice_at, :type => DateTime
+  field :resolved, :type => Boolean, :default => false
+  field :issue_link, :type => String
+
+  # Cached fields
+  field :notices_count, :type => Integer, :default => 0
+  field :message
+  field :environment
+  field :klass
+  field :where
+
+  index :last_notice_at
+  index :app_id
+
+  belongs_to :app
+  has_many :errs, :inverse_of => :problem, :dependent => :destroy
+  has_many :comments, :inverse_of => :err, :dependent => :destroy
+
+  scope :resolved, where(:resolved => true)
+  scope :unresolved, where(:resolved => false)
+  scope :ordered, order_by(:last_notice_at.desc)
+  scope :for_apps, lambda {|apps| where(:app_id.in => apps.all.map(&:id))}
+
+  def self.in_env(env)
+    env.present? ? where(:environment => env) : scoped
+  end
+
+
+
+  def notices
+    Notice.for_errs(errs).ordered
+  end
+
+
+
+  def resolve!
+    self.update_attributes!(:resolved => true)
+  end
+
+  def unresolve!
+    self.update_attributes!(:resolved => false)
+  end
+
+  def unresolved?
+    !resolved?
+  end
+
+
+
+  def self.merge!(*problems)
+    problems = problems.flatten.uniq
+    merged_problem = problems.shift
+    problems.each do |problem|
+      merged_problem.errs.concat Err.where(:problem_id => problem.id)
+      problem.errs(true) # reload problem.errs (should be empty) before problem.destroy
+      problem.destroy
+    end
+    merged_problem.reset_cached_attributes
+    merged_problem
+  end
+
+  def merged?
+    errs.length > 1
+  end
+
+  def unmerge!
+    [self] + errs[1..-1].map(&:id).map do |err_id|
+      err = Err.find(err_id)
+      app.problems.create.tap do |new_problem|
+        err.update_attribute(:problem_id, new_problem.id)
+        new_problem.reset_cached_attributes
+      end
+    end
+  end
+
+
+
+  def reset_cached_attributes
+    update_attribute(:notices_count, notices.count)
+    cache_notice_attributes
+  end
+
+  def cache_notice_attributes(notice=nil)
+    notice ||= notices.first
+    attrs = {:last_notice_at => notices.max(:created_at)}
+    attrs.merge!(
+      :message => notice.message,
+      :environment => notice.environment_name,
+      :klass => notice.klass,
+      :where => notice.where) if notice
+    update_attributes!(attrs)
+  end
+
+
+end
@@ -41,3 +41,4 @@ class Watcher
     end
  
 end
+
@@ -19,7 +19,7 @@
           - else
             n/a
         %td.count
-          - if app.errs.count > 0
+          - if app.problems.count > 0
             - unresolved = @unresolved_counts[app.id]
             = link_to unresolved, app_path(app), :class => (unresolved == 0 ? "resolved" : nil)
           - else
@@ -4,7 +4,7 @@
   = javascript_include_tag 'apps.show'
 - content_for :meta do
   %strong Errs Caught:
-  = @app.errs.count
+  = @app.problems.count
   %strong Deploy Count:
   = @app.deploys.count
   %strong API Key:
@@ -82,9 +82,9 @@
   - else
     %h3 No deploys
  
-- if @app.errs.count > 0
+- if @app.problems.any?
   %h3.clear Errs
-  = render 'errs/table', :errs => @errs
+  = render 'errs/table', :errs => @problems
 - else
   %h3.clear No errs have been caught yet, make sure you setup your app
   = render 'configuration_instructions', :app => @app
-feed.updated(@errs.first.created_at)
+feed.updated(@problems.first.created_at)
  
-for err in @errs
-  notice = err.notices.first
+for problem in @problems
+  notice = problem.notices.first
  
-  feed.entry(err, :url => app_err_url(err.app, err)) do |entry|
-    entry.title "[#{ err.where }] #{err.message.to_s.truncate(27)}"
+  feed.entry(problem, :url => app_err_url(problem.app, problem)) do |entry|
+    entry.title "[#{ problem.where }] #{problem.message.to_s.truncate(27)}"
     entry.author do |author|
-      author.name "#{ err.app.name } [#{ err.environment }]"
+      author.name "#{ problem.app.name } [#{ problem.environment }]"
     end
     if notice
       entry.summary(notice_atom_summary(notice), :type => "html")
-- any_issue_links = errs.any?{|e| e.issue_link.present? }
-%table.errs
-  %thead
-    %tr
-      %th App
-      %th What &amp; Where
-      %th Latest
-      %th Deploy
-      %th Count
-      - if any_issue_links
-        %th Issue
-      %th Resolve
-  %tbody
-    - errs.each do |err|
-      %tr{:class => err.resolved? ? 'resolved' : 'unresolved'}
-        %td.app
-          = link_to err.app.name, app_path(err.app)
-          - if current_page?(:controller => 'errs')
-            %span.environment= link_to err.environment, errs_path(:environment => err.environment)
-          - else
-            %span.environment= link_to err.environment, app_path(err.app, :environment => err.environment)
-        %td.message
-          = link_to truncate(err.message, :length => 230), app_err_path(err.app, err)
-          %em= err.where
-          - if err.comments.any?
-            - comment = err.comments.last
-            %br
-            .inline_comment
-              %em.commenter= (Errbit::Config.user_has_username ? comment.user.username : comment.user.email).to_s << ":"
-              %em= truncate(comment.body, :length => 100, :separator => ' ')
-        %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)
-        - if any_issue_links
-          %td.issue_link
-            - if err.issue_link.present?
-              = link_to image_tag("#{err.app.issue_tracker.class::Label}_goto.png"), err.issue_link, :target => "_blank"
-        %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?
+=form_tag do
+  %table.errs.selectable
+    %thead
       %tr
-        %td{:colspan => 6}
-          %em No errs here
-= will_paginate @errs, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;'
-
+        %th
+        %th App
+        %th What &amp; Where
+        %th Latest
+        %th Deploy
+        %th Count
+        %th Resolve
+    %tbody
+      - errs.each do |problem|
+        %tr{:class => problem.resolved? ? 'resolved' : 'unresolved'}
+          %td.select
+            = check_box_tag "problems[]", problem.id, @selected_problems.member?(problem.id.to_s)
+          %td.app
+            = link_to problem.app.name, app_path(problem.app)
+            - if current_page?(:controller => 'errs')
+              %span.environment= link_to problem.environment, errs_path(environment: problem.environment)
+            - else
+              %span.environment= link_to problem.environment, app_path(problem.app, environment: problem.environment)
+          %td.message
+            = link_to problem.message, app_err_path(problem.app, problem)
+            %em= problem.where
+          %td.latest #{time_ago_in_words(last_notice_at problem)} ago
+          %td.deploy= problem.app.last_deploy_at ? problem.app.last_deploy_at.to_s(:micro) : 'n/a'
+          %td.count= link_to problem.notices.count, app_err_path(problem.app, problem)
+          %td.resolve= link_to image_tag("thumbs-up.png"), resolve_app_err_path(problem.app, problem), :title => "Resolve", :method => :put, :confirm => err_confirm, :class => 'resolve' if problem.unresolved?
+      - if errs.none?
+        %tr
+          %td{:colspan => (@app ? 5 : 6)}
+            %em No errs here
+  = will_paginate @problems, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;'
+  .tab-bar
+    %ul
+      %li= submit_tag 'Merge', :id => 'merge_errs', :class => 'button', 'data-action' => merge_several_errs_path
+      %li= submit_tag 'Unmerge', :id => 'unmerge_errs', :class => 'button', 'data-action' => unmerge_several_errs_path
+      %li= submit_tag 'Resolve', :id => 'resolve_errs', :class => 'button', 'data-action' => resolve_several_errs_path
+      %li= submit_tag 'Unresolve', :id => 'unresolve_errs', :class => 'button', 'data-action' => unresolve_several_errs_path
+      %li= submit_tag 'Delete', :id => 'delete_errs', :class => 'button', 'data-action' => destroy_several_errs_path
 - content_for :title, 'All Errs'
 - content_for :action_bar do
   = link_to 'hide resolved', errs_path, :class => 'button'
-= render 'table', :errs => @errs
 \ No newline at end of file
+= render 'table', :errs => @problems
 \ No newline at end of file
@@ -3,4 +3,4 @@
   = auto_discovery_link_tag :atom, errs_url(User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices at #{root_url}"
 - content_for :action_bar do
   = link_to 'show resolved', all_errs_path, :class => 'button'
-= render 'table', :errs => @errs
 \ No newline at end of file
+= render 'table', :errs => @problems
 \ No newline at end of file
-- content_for :page_title, @err.message
-- content_for :title, @err.klass
+- content_for :page_title, @problem.message
+- content_for :title, @problem.klass
 - content_for :meta do
   %strong App:
   = link_to @app.name, app_path(@app)
   %strong Where:
-  = @err.where
+  = @problem.where
   %br
   %strong Environment:
-  = @err.environment
+  = @problem.environment
   %strong Last Notice:
-  = last_notice_at(@err).to_s(:micro)
+  = last_notice_at(@problem).to_s(:micro)
 - content_for :action_bar do
-  - if @err.app.issue_tracker_configured?
-    - if @err.issue_link.blank?
-      %span= link_to 'create issue', create_issue_app_err_path(@app, @err), :method => :post, :class => "#{@app.issue_tracker.class::Label}_create create-issue"
+  - if @problem.app.issue_tracker_configured?
+    - if @problem.issue_link.blank?
+      %span= link_to 'create issue', create_issue_app_err_path(@app, @problem), :method => :post, :class => "#{@app.issue_tracker.class::Label}_create create-issue"
     - else
-      %span= link_to 'go to issue', @err.issue_link, :target => "_blank", :class => "#{@app.issue_tracker.class::Label}_goto goto-issue"
-      = link_to 'unlink issue', unlink_issue_app_err_path(@app, @err), :method => :delete, :confirm => "Unlink err issues?", :class => "unlink-issue"
-  - if @err.unresolved?
-    %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve'
+      %span= link_to 'go to issue', @problem.issue_link, :class => "#{@app.issue_tracker.class::Label}_goto goto-issue"
+      = link_to 'unlink issue', unlink_issue_app_err_path(@app, @problem), :method => :delete, :confirm => "Unlink err issues?", :class => "unlink-issue"
+  - if @problem.unresolved?
+    %span= link_to 'resolve', resolve_app_err_path(@app, @problem), :method => :put, :confirm => err_confirm, :class => 'resolve'
  
-- if Errbit::Config.allow_comments_with_issue_tracker || !@app.issue_tracker_configured? || @err.comments.any?
+- if Errbit::Config.allow_comments_with_issue_tracker || !@app.issue_tracker_configured? || @problem.comments.any?
   - content_for :comments do
     %h3 Comments on this Err
-    - @err.comments.each do |comment|
+    - @problem.comments.each do |comment|
       .window
         %table.comment
           %tr
             %th
-              %span= link_to '&#10008;'.html_safe, destroy_comment_app_err_path(@app, @err) << "?comment_id=#{comment.id}", :method => :delete, :confirm => "Are sure you don't need this comment?", :class => "destroy-comment"
+              %span= link_to '&#10008;'.html_safe, destroy_comment_app_err_path(@app, @problem) << "?comment_id=#{comment.id}", :method => :delete, :confirm => "Are sure you don't need this comment?", :class => "destroy-comment"
               = time_ago_in_words(comment.created_at, true) << " ago by "
               = link_to comment.user.email, user_path(comment.user)
           %tr
             %td= comment.body.gsub("\n", "<br>").html_safe
     - if Errbit::Config.allow_comments_with_issue_tracker || !@app.issue_tracker_configured?
-      = form_for @comment, :url => create_comment_app_err_path(@app, @err) do |comment_form|
+      = form_for @comment, :url => create_comment_app_err_path(@app, @problem) do |comment_form|
         %p Add a comment
         = comment_form.text_area :body, :style => "width: 420px; height: 80px;"
         = comment_form.submit "Save Comment"
-"See this exception on Errbit": <%= app_err_url(err.app, err) %>
-<% if notice = err.notices.first %>
+"See this exception on Errbit": <%= app_err_url(problem.app, problem) %>
+<% if notice = problem.notices.first %>
   <%= notice.message %>
  
   Summary
    - Where
-    <%= notice.err.where %>
+    <%= notice.where %>
  
    - Occured
     <%= notice.created_at.to_s(:micro) %>
  
    - Similar
-    <%= (notice.err.notices_count - 1).to_s %>
+    <%= (notice.problem.notices_count - 1).to_s %>
  
   Params
   <%= pretty_hash(notice.params) %>
@@ -7,13 +7,13 @@
   [<%= notice.request['url'] %>](<%= notice.request['url'] %>)"
 <% end %>
 ### Where ###
-<%= notice.err.where %>
+<%= notice.where %>
  
 ### Occured ###
 <%= notice.created_at.to_s(:micro) %>
  
 ### Similar ###
-<%= (notice.err.notices_count - 1).to_s %>
+<%= (notice.problem.notices_count - 1).to_s %>
  
 ## Params ##
 ```
-[See this exception on Errbit](<%= app_err_url err.app, err %> "See this exception on Errbit")
-<% if notice = err.notices.first %>
+[See this exception on Errbit](<%= app_err_url problem.app, problem %> "See this exception on Errbit")
+<% if notice = problem.notices.first %>
   # <%= notice.message %> #
   ## Summary ##
   <% if notice.request['url'].present? %>
@@ -7,13 +7,13 @@
     [<%= notice.request['url'] %>](<%= notice.request['url'] %>)"
   <% end %>
   ### Where ###
-  <%= notice.err.where %>
+  <%= notice.where %>
  
   ### Occured ###
   <%= notice.created_at.to_s(:micro) %>
  
   ### Similar ###
-  <%= (notice.err.notices_count - 1).to_s %>
+  <%= (notice.problem.notices_count - 1).to_s %>
  
   ## Params ##
   <code><%= pretty_hash(notice.params) %></code>
-See this exception on Errbit: <%= app_err_url err.app, err %>
-<% if notice = err.notices.first %>
+See this exception on Errbit: <%= app_err_url problem.app, problem %>
+<% if notice = problem.notices.first %>
     <% if notice.request['url'].present? %>URL: <%= notice.request['url'] %><% end %>
-    Where: <%= notice.err.where %>
+    Where: <%= notice.where %>
     Occurred: <%= notice.created_at.to_s :micro %>
-    Similar: <%= (notice.err.notices.count - 1).to_s %>
+    Similar: <%= (notice.problem.notices.count - 1).to_s %>
  
     Params:
     <%= pretty_hash notice.params %>
-<% if notice = err.notices.first %>
+<% if notice = problem.notices.first %>
 h1. <%= notice.message %>
  
-h3. "See this exception on Errbit":<%= app_err_url err.app, err %>
+h3. "See this exception on Errbit":<%= app_err_url problem.app, problem %>
  
 h2. Summary
 <% if notice.request['url'].present? %>
@@ -11,7 +11,7 @@ h3. URL
 <% end %>
 h3. Where
  
-<%= notice.err.where %>
+<%= notice.where %>
  
 h3. Occurred
  
@@ -19,7 +19,7 @@ h3. Occurred
  
 h3. Similar
  
-<%= (notice.err.notices_count - 1).to_s %>
+<%= (notice.problem.notices_count - 1).to_s %>
  
 h2. Params
  
@@ -9,12 +9,12 @@
                 An err has just occurred in
                 = link_to(@app.name, app_url(@app), :class => "bold") << ","
                 on the
-                %span.bold= @notice.err.environment
+                %span.bold= @notice.environment_name
                 environment.
                 %br
-                This err has occurred #{pluralize @notice.err.notices_count, 'time'}.
+                This err has occurred #{pluralize @notice.problem.notices_count, 'time'}.
               %p
-                = link_to("Click here to view the error on Errbit", app_err_url(@app, @notice.err), :class => "bold") << "."
+                = link_to("Click here to view the error on Errbit", app_err_url(@app, @notice.problem), :class => "bold") << "."
 %tr
   %td.section
     %table(cellpadding="0" cellspacing="0" border="0" align="left")
@@ -23,10 +23,10 @@
           %td.content(valign="top")
             %div
               %p.heading ERROR MESSAGE:
-              %p= @notice.err.message
+              %p= @notice.message
               %p.heading WHERE:
               %p.monospace
-                = @notice.err.where
+                = @notice.where
               - if (app_backtrace = @notice.app_backtrace).any?
                 - app_backtrace.map {|l| "#{l['file']}:#{l['number']}" }.each do |line|
                   %p.backtrace= line
-An err has just occurred in <%= @app.name %>, on the <%= @notice.err.environment %> environment.
+An err has just occurred in <%= @notice.environment_name %>: <%= raw(@notice.message) %>
  
-This err has occurred <%= pluralize @notice.err.notices_count, 'time' %>.
+This err has occurred <%= pluralize @notice.problem.notices_count, 'time' %>. You should really look into it here:
  
-You can view it on Errbit here: <%= app_err_url(@app, @notice.err) %>
+  <%= app_err_url(@app, @notice.problem) %>
  
  
 ERROR MESSAGE:
  
-<%= raw(@notice.err.message) %>
+<%= raw(@notice.message) %>
  
  
 WHERE:
  
-<%= @notice.err.where %>
+<%= @notice.where %>
  
 <% @notice.app_backtrace.map {|l| "#{l['file']}:#{l['number']}" }.each do |line| %>
   <%= line %>
@@ -6,13 +6,13 @@
     = link_to(notice.request['url'], notice.request['url'])
 %p
   %strong Where:
-  = notice.err.where
+  = notice.where
 %p
   %strong Occured:
   = notice.created_at.to_s(:micro)
 %p
   %strong Similar:
-  = notice.err.notices_count - 1
+  = notice.problem.notices_count - 1
  
 %h3 Params
 %p= pretty_hash(notice.params)
@@ -9,19 +9,20 @@
         %td.nowrap= link_to notice.request['url'], notice.request['url']
     %tr
       %th Where
-      %td= notice.err.where
+      %td= notice.where
     %tr
       %th Occurred
       %td= notice.created_at.to_s(:micro)
     %tr
       %th Similar
-      %td= notice.err.notices.count - 1
+      %td= notice.problem.notices.count - 1
     %tr
       %th Browser
-      %td= user_agent_graph(notice.err)
+      %td= user_agent_graph(notice.problem)
     %tr
       %th App Server
       %td= notice.server_environment && notice.server_environment["hostname"]
     %tr
       %th Rel. Directory
       %td= notice.server_environment && notice.server_environment["project-root"]
+
 Autotest.add_discovery { "rails" }
 Autotest.add_discovery { "rspec2" }
+
@@ -39,7 +39,7 @@ module Errbit
     # config.i18n.default_locale = :de
  
     # JavaScript files you want as :defaults (application.js is always included).
-    config.action_view.javascript_expansions[:defaults] = %w(jquery rails form)
+    config.action_view.javascript_expansions[:defaults] = %w(jquery underscore-1.1.6 rails form)
  
     # > rails generate - config
     config.generators do |g|
@@ -11,3 +11,4 @@ rescue Bundler::GemNotFound =&gt; e
   STDERR.puts "Try running `bundle install`."
   exit!
 end if File.exist?(gemfile)
+
@@ -3,3 +3,4 @@ require File.expand_path(&#39;../application&#39;, __FILE__)
  
 # Initialize the rails application
 Errbit::Application.initialize!
+
@@ -50,3 +50,4 @@ Errbit::Application.configure do
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 end
+
@@ -34,3 +34,4 @@ Errbit::Application.configure do
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end
+
@@ -5,3 +5,4 @@
  
 # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
 # Rails.backtrace_cleaner.remove_silencers!
+
@@ -8,3 +8,4 @@
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
+
 InheritedResources.flash_keys = [:success, :error]
+
@@ -3,3 +3,4 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
+
@@ -8,3 +8,4 @@ if mongo = ENV[&#39;MONGOHQ_URL&#39;] || ENV[&#39;MONGOLAB_URI&#39;]
     config.allow_dynamic_fields = false
   end
 end
+
@@ -0,0 +1,2 @@
+require 'core_ext/hash'
+
@@ -6,3 +6,4 @@ Errbit::Application.config.session_store :cookie_store, :key =&gt; &#39;_errbit_session
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rake db:sessions:create")
 # Errbit::Application.config.session_store :active_record_store
+
-Time::DATE_FORMATS[:micro] = '%b %d %l:%M%P'
 \ No newline at end of file
+Time::DATE_FORMATS[:micro] = '%b %d %l:%M%P'
-ActiveSupport::XmlMini.backend = 'Nokogiri'
 \ No newline at end of file
+ActiveSupport::XmlMini.backend = 'Nokogiri'
@@ -6,11 +6,16 @@ Errbit::Application.routes.draw do
   match '/notifier_api/v2/notices' => 'notices#create'
   match '/deploys.txt' => 'deploys#create'
  
-  resources :notices, :only => [:show]
-  resources :deploys, :only => [:show]
+  resources :notices,   :only => [:show]
+  resources :deploys,   :only => [:show]
   resources :users
-  resources :errs,    :only => [:index] do
+  resources :errs,      :only => [:index] do
     collection do
+      post :destroy_several
+      post :resolve_several
+      post :unresolve_several
+      post :merge_several
+      post :unmerge_several
       get :all
     end
   end
@@ -20,6 +25,7 @@ Errbit::Application.routes.draw do
       resources :notices
       member do
         put :resolve
+        put :unresolve
         post :create_issue
         delete :unlink_issue
         post :create_comment
@@ -17,10 +17,10 @@ class MoveNoticesToSeparateCollection &lt; Mongoid::Migration
       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
+    Rake::Task["errbit:db:update_problem_attrs"].invoke
   end
  
   def self.down
   end
-
 end
+
@@ -0,0 +1,27 @@
+class LinkErrsToProblems < Mongoid::Migration
+  def self.up
+
+    # Copy err.klass to notice.klass
+    Notice.all.each do |notice|
+      if notice.err && (klass = notice.err['klass'])
+        notice.update_attribute(:klass, klass)
+      end
+    end
+
+    # Create a Problem for each Err
+    Err.all.each do |err|
+      app_id = err['app_id']
+      app = app_id && App.where(:_id => app_id).first
+      if app
+        err.problem = app.problems.create
+        err.save
+      end
+    end
+
+    Rake::Task["errbit:db:update_notices_count"].invoke
+    Rake::Task["errbit:db:update_problem_attrs"].invoke
+  end
+
+  def self.down
+  end
+end
@@ -0,0 +1,61 @@
+module CoreExt
+  module Hash
+
+
+
+    def pick(*picks)
+      picks = picks.flatten
+      picks.inject({}) {|result, key| self.key?(key) ? result.merge(key => self[key]) : result}
+    end
+
+
+
+    def pick!(*picks)
+      picks = picks.flatten
+      keys.each {|key| self.delete(key) unless picks.member?(key) }
+    end
+
+
+
+    def except(*picks)
+      result = self.dup
+      result.except!(*picks)
+      result
+    end
+
+
+
+    def except!(*picks)
+      picks = picks.flatten
+      keys.each {|key| self.delete(key) if picks.member?(key) }
+    end
+
+
+
+    def inspect!(depth=0)
+      s = ""
+      self.each do |k,v|
+        s << (" " * depth)
+        s << k
+        s << ": "
+        if v.is_a?(Hash)
+          s << "{\n"
+          s << v.inspect!(depth + 2)
+          s << (" " * depth)
+          s << "}"
+        elsif v.is_a?(Array)
+          s << v.inspect
+        else
+          s << v.to_s
+        end
+        s << "\n"
+      end
+      s
+    end
+
+
+
+  end
+end
+
+Hash.send :include, CoreExt::Hash
-module Hoptoad
-  module V2
-    require 'digest/md5'
+require 'hoptoad/v2'
  
-    class ApiVersionError < StandardError
-      def initialize(version)
-        super "Wrong API Version: Expecting v2.0, got version: #{version}"
-      end
-    end
-
-    def self.parse_xml(xml)
-      xml = xml.unpack('C*').pack('U*')  # Repack string into Unicode to fix invalid UTF-8 chars
-      parsed  = ActiveSupport::XmlMini.backend.parse(xml)['notice']
-      raise ApiVersionError.new(parsed['version']) unless parsed && parsed['version'].to_s == '2.0'
-      rekeyed = rekey(parsed)
-      rekeyed['fingerprint'] = Digest::MD5.hexdigest(rekeyed['error']['backtrace'].to_s)
-      rekeyed
+module Hoptoad
+  class ApiVersionError < StandardError
+    def initialize
+      super "Wrong API Version: Expecting v2.0"
     end
+  end
  
-    private
+  def self.parse_xml!(xml)
+    xml = xml.unpack('C*').pack('U*')  # Repack string into Unicode to fix invalid UTF-8 chars
+    parsed = ActiveSupport::XmlMini.backend.parse(xml)['notice'] || raise(ApiVersionError)
+    processor = get_version_processor(parsed['version'])
+    processor.process_notice(parsed)
+  end
  
-      def self.rekey(node)
-        if node.is_a?(Hash) && node.has_key?('var') && node.has_key?('key')
-          {node['key'] => rekey(node['var'])}
-        elsif node.is_a?(Hash) && node.has_key?('var')
-          rekey(node['var'])
-        elsif node.is_a?(Hash) && node.has_key?('__content__') && node.has_key?('key')
-          {node['key'] => node['__content__']}
-        elsif node.is_a?(Hash) && node.has_key?('__content__')
-          node['__content__']
-        elsif node.is_a?(Hash)
-          node.inject({}) {|rekeyed, (key,val)|
-            rekeyed.merge(key => rekey(val))
-          }
-        elsif node.is_a?(Array) && node.first.has_key?('key')
-          node.inject({}) {|rekeyed,keypair|
-            rekeyed.merge(rekey(keypair))
-          }
-        elsif node.is_a?(Array)
-          node.map {|n| rekey(n)}
-        else
-          node
-        end
+  private
+    def self.get_version_processor(version)
+      case version
+      when '2.0'; Hoptoad::V2
+      else;       raise ApiVersionError
       end
-  end
+    end
 end
  
@@ -0,0 +1,66 @@
+module Hoptoad
+  module V2
+    def self.process_notice(parsed)
+      for_errbit_api(
+        normalize(
+          rekey(parsed)))
+    end
+
+  private
+    def self.rekey(node)
+      case node
+      when Hash
+        if node.has_key?('var') && node.has_key?('key')
+          {normalize_key(node['key']) => rekey(node['var'])}
+        elsif node.has_key?('var')
+          rekey(node['var'])
+        elsif node.has_key?('__content__') && node.has_key?('key')
+          {normalize_key(node['key']) => rekey(node['__content__'])}
+        elsif node.has_key?('__content__')
+          rekey(node['__content__'])
+        else
+          node.inject({}) {|rekeyed, (key, val)| rekeyed.merge(normalize_key(key) => rekey(val))}
+        end
+      when Array
+        if node.first.has_key?('key')
+          node.inject({}) {|rekeyed, keypair| rekeyed.merge(rekey(keypair))}
+        else
+          node.map {|n| rekey(n)}
+        end
+      else
+        node
+      end
+    end
+
+    def self.normalize_key(key)
+      key.gsub('.', '_')
+    end
+
+    def self.normalize(notice)
+      error = notice['error']
+      backtrace = error['backtrace']
+      backtrace['line'] = [backtrace['line']] unless backtrace['line'].is_a?(Array)
+
+      notice['request'] ||= {}
+      notice['request']['component']  = 'unknown' if notice['request']['component'].blank?
+      notice['request']['action']     = nil       if notice['request']['action'].blank?
+
+      notice
+    end
+
+    def self.for_errbit_api(notice)
+      {
+        :klass              => notice['error']['class'],
+        :message            => notice['error']['message'],
+        :backtrace          => notice['error']['backtrace']['line'],
+
+        :request            => notice['request'],
+        :server_environment => notice['server-environment'],
+
+        :api_key            => notice['api-key'],
+        :notifier           => notice['notifier']
+      }
+    end
+  end
+end
+
@@ -13,3 +13,4 @@ module Mongoid
     end
   end
 end
+
@@ -22,3 +22,4 @@ class Hash
   end
  
 end
+
 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
+    
+    desc "Updates cached attributes on Problem"
+    task :update_problem_attrs => :environment do
+      puts "Updating problems"
+      Problem.all.each(&:cache_notice_attributes)
     end
-
-    desc "Updates Err#notices_count"
+    
+    desc "Updates Problem#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)
+      puts "Updating problem.notices_count"
+      Problem.all.each do |p|
+        p.update_attributes(:notices_count => p.notices.count)
       end
     end
-
+    
     desc "Delete resolved errors from the database. (Useful for limited heroku databases)"
     task :clear_resolved => :environment do
-      count = Err.resolved.count
-      Err.resolved.each {|err| err.destroy }
+      count = Problem.resolved.count
+      Problem.resolved.each {|problem| problem.destroy }
       puts "=== Cleared #{count} resolved errors from the database." if count > 0
     end
   end
 end
-
 namespace :errbit do
-  desc "Add a demo app & error to your database (for testing)"
+  
+  desc "Add a demo app & errors to your database (for testing)"
   task :demo => :environment do
     require 'factory_girl_rails'
-    Dir.glob(File.join(Rails.root,'spec/factories/*.rb')).each {|f| require f }
+    
+    Dir.glob(File.join(Rails.root,  'spec/factories/*.rb')).each {|f| require f }
     app = Factory(:app, :name => "Demo App #{Time.now.strftime("%N")}")
-    Factory(:notice, :err => Factory(:err, :app => app))
-    puts "=== Created demo app: '#{app.name}', with an example error."
+    
+    # Report a number of errors for the application
+    app.problems.delete_all
+    
+    errors = [{
+      :klass => "ArgumentError",
+      :message => "wrong number of arguments (3 for 0)"
+    }, {
+      :klass => "RuntimeError",
+      :message => "Could not find Red October"
+    }, {
+      :klass => "TypeError",
+      :message => "can't convert Symbol into Integer"
+    }, {
+      :klass => "ActiveRecord::RecordNotFound",
+      :message => "could not find a record with the id 5"
+    }, {
+      :klass => "NameError",
+      :message => "uninitialized constant Tag"
+    }, {
+      :klass => "SyntaxError",
+      :message => "unexpected tSTRING_BEG, expecting keyword_do or '{' or '('"
+    }]
+    
+    RANDOM_METHODS = ActiveSupport.methods.shuffle[1..8]
+    
+    def random_backtrace
+      backtrace = []
+      99.times {|t| backtrace << {
+        'number'  => t.hash % 1000,
+        'file'    => "/path/to/file.rb",
+        'method'  => RANDOM_METHODS.shuffle.first
+      }}
+      backtrace
+    end
+    
+    errors.each do |error_template|
+      rand(34).times do
+        
+        error_report = error_template.reverse_merge({
+          :klass => "StandardError",
+          :message => "Oops. Something went wrong!",
+          :backtrace => random_backtrace,
+          :request => {
+                        'component' => 'main',
+                        'action' => 'error'
+                      },
+          :server_environment => {'environment-name' => Rails.env.to_s},
+          :notifier => {:name => "seeds.rb"}
+        })
+        
+        app.report_error!(error_report)
+      end
+    end
+    
+    
+    Factory(:notice, :err => Factory(:err, :problem => Factory(:problem, :app => app)))
+    puts "=== Created demo app: '#{app.name}', with example errors."
   end
+  
 end
-
 // App JS
  
-$(function(){
-  activateTabbedPanels();
-
-  $('#watcher_name').live("click", function() {
-    $(this).closest('form').find('.show').removeClass('show');
-    $('#app_watchers_attributes_0_user_id').addClass('show');
-  });
-
-  $('#watcher_email').live("click", function() {
-    $(this).closest('form').find('.show').removeClass('show');
-    $('#app_watchers_attributes_0_email').addClass('show');
-  });
-
-  $('a.copy_config').live("click", function() {
-    $('select.choose_other_app').show().focus();
-  });
-  $('select.choose_other_app').live("change", function() {
-    var loc = window.location;
-    window.location.href = loc.protocol + "//" + loc.host + loc.pathname +
-                           "?copy_attributes_from=" + $(this).val();
-  });
-});
-
-function activateTabbedPanels() {
-  $('.tab-bar a').each(function(){
-    var tab = $(this);
+$(function() {
+  
+  function init() {
+    
+    activateTabbedPanels();
+    
+    activateSelectableRows();
+    
+    $('#watcher_name').live("click", function() {
+      $(this).closest('form').find('.show').removeClass('show');
+      $('#app_watchers_attributes_0_user_id').addClass('show');
+    });
+    
+    $('#watcher_email').live("click", function() {
+      $(this).closest('form').find('.show').removeClass('show');
+      $('#app_watchers_attributes_0_email').addClass('show');
+    });
+    
+    $('a.copy_config').live("click", function() {
+      $('select.choose_other_app').show().focus();
+    });
+    
+    $('select.choose_other_app').live("change", function() {
+      var loc = window.location;
+      window.location.href = loc.protocol + "//" + loc.host + loc.pathname +
+                             "?copy_attributes_from=" + $(this).val();
+    });
+    
+    $('input[type=submit][data-action]').click(function() {
+      $(this).closest('form').attr('action', $(this).attr('data-action'));
+    });
+  }
+  
+  function activateTabbedPanels() {
+    $('.tab-bar a').each(function(){
+      var tab = $(this);
+      var panel = $('#'+tab.attr('rel'));
+      panel.addClass('panel');
+      panel.find('h3').hide();
+    })
+    
+    $('.tab-bar a').click(function(){
+      activateTab($(this));
+      return(false);
+    });
+    activateTab($('.tab-bar a').first());
+  }
+  
+  function activateTab(tab) {
+    tab = $(tab);
     var panel = $('#'+tab.attr('rel'));
-    panel.addClass('panel');
-    panel.find('h3').hide();
-  })
-
-  $('.tab-bar a').click(function(){
-    activateTab($(this));
-    return(false);
-  });
-  activateTab($('.tab-bar a').first());
-}
-
-function activateTab(tab) {
-  tab = $(tab);
-  var panel = $('#'+tab.attr('rel'));
-
-  tab.closest('.tab-bar').find('a.active').removeClass('active');
-  tab.addClass('active');
-
-  $('.panel').hide();
-  panel.show();
-}
-
+    
+    tab.closest('.tab-bar').find('a.active').removeClass('active');
+    tab.addClass('active');
+    
+    $('.panel').hide();
+    panel.show();
+  }
+  
+  function activateSelectableRows() {
+    $('.selectable tr').click(function(event) {
+      if(!_.include(['A', 'INPUT', 'BUTTON', 'TEXTAREA'], event.target.nodeName)) {
+        var checkbox = $(this).find('input[name="problems[]"]');
+        checkbox.attr('checked', !checkbox.is(':checked'));
+      }
+    })
+  }
+  
+  init();
+});
@@ -0,0 +1,26 @@
+// Underscore.js 1.1.6
+// (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the MIT license.
+// Portions of Underscore are inspired or borrowed from Prototype,
+// Oliver Steele's Functional, and John Resig's Micro-Templating.
+// For all details and documentation:
+// http://documentcloud.github.com/underscore
+(function(){var p=this,C=p._,m={},i=Array.prototype,n=Object.prototype,f=i.slice,D=i.unshift,E=n.toString,l=n.hasOwnProperty,s=i.forEach,t=i.map,u=i.reduce,v=i.reduceRight,w=i.filter,x=i.every,y=i.some,o=i.indexOf,z=i.lastIndexOf;n=Array.isArray;var F=Object.keys,q=Function.prototype.bind,b=function(a){return new j(a)};typeof module!=="undefined"&&module.exports?(module.exports=b,b._=b):p._=b;b.VERSION="1.1.6";var h=b.each=b.forEach=function(a,c,d){if(a!=null)if(s&&a.forEach===s)a.forEach(c,d);else if(b.isNumber(a.length))for(var e=
+0,k=a.length;e<k;e++){if(c.call(d,a[e],e,a)===m)break}else for(e in a)if(l.call(a,e)&&c.call(d,a[e],e,a)===m)break};b.map=function(a,c,b){var e=[];if(a==null)return e;if(t&&a.map===t)return a.map(c,b);h(a,function(a,g,G){e[e.length]=c.call(b,a,g,G)});return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var k=d!==void 0;a==null&&(a=[]);if(u&&a.reduce===u)return e&&(c=b.bind(c,e)),k?a.reduce(c,d):a.reduce(c);h(a,function(a,b,f){!k&&b===0?(d=a,k=!0):d=c.call(e,d,a,b,f)});if(!k)throw new TypeError("Reduce of empty array with no initial value");
+return d};b.reduceRight=b.foldr=function(a,c,d,e){a==null&&(a=[]);if(v&&a.reduceRight===v)return e&&(c=b.bind(c,e)),d!==void 0?a.reduceRight(c,d):a.reduceRight(c);a=(b.isArray(a)?a.slice():b.toArray(a)).reverse();return b.reduce(a,c,d,e)};b.find=b.detect=function(a,c,b){var e;A(a,function(a,g,f){if(c.call(b,a,g,f))return e=a,!0});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(w&&a.filter===w)return a.filter(c,b);h(a,function(a,g,f){c.call(b,a,g,f)&&(e[e.length]=a)});return e};
+b.reject=function(a,c,b){var e=[];if(a==null)return e;h(a,function(a,g,f){c.call(b,a,g,f)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=!0;if(a==null)return e;if(x&&a.every===x)return a.every(c,b);h(a,function(a,g,f){if(!(e=e&&c.call(b,a,g,f)))return m});return e};var A=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=!1;if(a==null)return e;if(y&&a.some===y)return a.some(c,d);h(a,function(a,b,f){if(e=c.call(d,a,b,f))return m});return e};b.include=b.contains=function(a,c){var b=
+!1;if(a==null)return b;if(o&&a.indexOf===o)return a.indexOf(c)!=-1;A(a,function(a){if(b=a===c)return!0});return b};b.invoke=function(a,c){var d=f.call(arguments,2);return b.map(a,function(a){return(c.call?c||a:a[c]).apply(a,d)})};b.pluck=function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);var e={computed:-Infinity};h(a,function(a,b,f){b=c?c.call(d,a,b,f):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,
+c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};h(a,function(a,b,f){b=c?c.call(d,a,b,f):a;b<e.computed&&(e={value:a,computed:b})});return e.value};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(a,b,f){return{value:a,criteria:c.call(d,a,b,f)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c<d?-1:c>d?1:0}),"value")};b.sortedIndex=function(a,c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=
+function(a){if(!a)return[];if(a.toArray)return a.toArray();if(b.isArray(a))return a;if(b.isArguments(a))return f.call(a);return b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=b.head=function(a,b,d){return b!=null&&!d?f.call(a,0,b):a[0]};b.rest=b.tail=function(a,b,d){return f.call(a,b==null||d?1:b)};b.last=function(a){return a[a.length-1]};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a){return b.reduce(a,function(a,d){if(b.isArray(d))return a.concat(b.flatten(d));
+a[a.length]=d;return a},[])};b.without=function(a){var c=f.call(arguments,1);return b.filter(a,function(a){return!b.include(c,a)})};b.uniq=b.unique=function(a,c){return b.reduce(a,function(a,e,f){if(0==f||(c===!0?b.last(a)!=e:!b.include(a,e)))a[a.length]=e;return a},[])};b.intersect=function(a){var c=f.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.zip=function(){for(var a=f.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),
+e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,d){if(a==null)return-1;var e;if(d)return d=b.sortedIndex(a,c),a[d]===c?d:-1;if(o&&a.indexOf===o)return a.indexOf(c);d=0;for(e=a.length;d<e;d++)if(a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(z&&a.lastIndexOf===z)return a.lastIndexOf(b);for(var d=a.length;d--;)if(a[d]===b)return d;return-1};b.range=function(a,b,d){arguments.length<=1&&(b=a||0,a=0);d=arguments[2]||1;for(var e=Math.max(Math.ceil((b-a)/
+d),0),f=0,g=Array(e);f<e;)g[f++]=a,a+=d;return g};b.bind=function(a,b){if(a.bind===q&&q)return q.apply(a,f.call(arguments,1));var d=f.call(arguments,2);return function(){return a.apply(b,d.concat(f.call(arguments)))}};b.bindAll=function(a){var c=f.call(arguments,1);c.length==0&&(c=b.functions(a));h(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,c){var d={};c||(c=b.identity);return function(){var b=c.apply(this,arguments);return l.call(d,b)?d[b]:d[b]=a.apply(this,arguments)}};b.delay=
+function(a,b){var d=f.call(arguments,2);return setTimeout(function(){return a.apply(a,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(f.call(arguments,1)))};var B=function(a,b,d){var e;return function(){var f=this,g=arguments,h=function(){e=null;a.apply(f,g)};d&&clearTimeout(e);if(d||!e)e=setTimeout(h,b)}};b.throttle=function(a,b){return B(a,b,!1)};b.debounce=function(a,b){return B(a,b,!0)};b.once=function(a){var b=!1,d;return function(){if(b)return d;b=!0;return d=a.apply(this,arguments)}};
+b.wrap=function(a,b){return function(){var d=[a].concat(f.call(arguments));return b.apply(this,d)}};b.compose=function(){var a=f.call(arguments);return function(){for(var b=f.call(arguments),d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return function(){if(--a<1)return b.apply(this,arguments)}};b.keys=F||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var b=[],d;for(d in a)l.call(a,d)&&(b[b.length]=d);return b};b.values=function(a){return b.map(a,
+b.identity)};b.functions=b.methods=function(a){return b.filter(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a){h(f.call(arguments,1),function(b){for(var d in b)b[d]!==void 0&&(a[d]=b[d])});return a};b.defaults=function(a){h(f.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,c){if(a===c)return!0;var d=typeof a;if(d!=
+typeof c)return!1;if(a==c)return!0;if(!a&&c||a&&!c)return!1;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return!1;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return!1;if(a.length&&a.length!==c.length)return!1;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return!1;
+for(var f in a)if(!(f in c)||!b.isEqual(a[f],c[f]))return!1;return!0};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(l.call(a,c))return!1;return!0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=n||function(a){return E.call(a)==="[object Array]"};b.isArguments=function(a){return!(!a||!l.call(a,"callee"))};b.isFunction=function(a){return!(!a||!a.constructor||!a.call||!a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};
+b.isNumber=function(a){return!!(a===0||a&&a.toExponential&&a.toFixed)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===!0||a===!1};b.isDate=function(a){return!(!a||!a.getTimezoneOffset||!a.setUTCFullYear)};b.isRegExp=function(a){return!(!a||!a.test||!a.exec||!(a.ignoreCase||a.ignoreCase===!1))};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.noConflict=function(){p._=C;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=
+0;e<a;e++)b.call(d,e)};b.mixin=function(a){h(b.functions(a),function(c){H(c,b[c]=a[c])})};var I=0;b.uniqueId=function(a){var b=I++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g};b.template=function(a,c){var d=b.templateSettings;d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.interpolate,function(a,b){return"',"+b.replace(/\\'/g,"'")+",'"}).replace(d.evaluate||
+null,function(a,b){return"');"+b.replace(/\\'/g,"'").replace(/[\r\n\t]/g," ")+"__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');";d=new Function("obj",d);return c?d(c):d};var j=function(a){this._wrapped=a};b.prototype=j.prototype;var r=function(a,c){return c?b(a).chain():a},H=function(a,c){j.prototype[a]=function(){var a=f.call(arguments);D.call(a,this._wrapped);return r(c.apply(b,a),this._chain)}};b.mixin(b);h(["pop","push","reverse","shift","sort",
+"splice","unshift"],function(a){var b=i[a];j.prototype[a]=function(){b.apply(this._wrapped,arguments);return r(this._wrapped,this._chain)}});h(["concat","join","slice"],function(a){var b=i[a];j.prototype[a]=function(){return r(b.apply(this._wrapped,arguments),this._chain)}});j.prototype.chain=function(){this._chain=!0;return this};j.prototype.value=function(){return this._wrapped}})();
 \ No newline at end of file
@@ -244,7 +244,10 @@ a.action  { float: right; font-size: 0.9em;}
 }
  
 /* Forms */
-form {
+form#new_user,
+form.edit_user,
+form#new_app,
+form.edit_app {
   width: 620px;
 }
 form > div, form fieldset > div { margin: 1em 0;}
@@ -289,7 +292,11 @@ form input[type=submit] {
   font-size: 1.2em; line-height: 1em; text-transform: uppercase;
   border: none; color: #FFF; background-color: #387fc1;
 }
-form div.buttons {
+form input[type=submit].button {
+  font-size: 1em;
+  text-transform: none;
+}
+form div.buttons { 
   color: #666;
   background: #FFF url(images/button-bg.png) 0 bottom repeat-x;
   border-radius: 50px;
@@ -477,6 +484,7 @@ pre {
 }
  
 /* Buttons */
+input[type="submit"].button,
 a.button {
   display: inline-block;
   padding: 0 0.8em;
@@ -492,6 +500,7 @@ a.button {
   -webkit-box-shadow: inset 0px 0px 4px #FFF;
   line-height: 30px;
 }
+input[type="submit"]:hover.button,
 a:hover.button {
   box-shadow: 0px 0px 4px #ccc;
   -moz-box-shadow: 0px 0px 4px #ccc;
@@ -508,6 +517,7 @@ a.button.active {
   -webkit-box-shadow: inset 0 0 5px #999;
 }
  
+
 /* Tab Bar */
 .tab-bar {
   margin-bottom: 24px;
@@ -6,6 +6,7 @@ describe AppsController do
   it_requires_authentication
   it_requires_admin_privileges :for => {:new => :get, :edit => :get, :create => :post, :update => :put, :destroy => :delete}
  
+
   describe "GET /apps" do
     context 'when logged in as an admin' do
       it 'finds all apps' do
@@ -38,8 +39,7 @@ describe AppsController do
         @user = Factory(:admin)
         sign_in @user
         @app = Factory(:app)
-        @err = Factory :err, :app => @app
-        @notice = Factory :notice, :err => @err
+        @problem = Factory(:notice, :err => Factory(:err, :problem => Factory(:problem, :app => @app))).problem
       end
  
       it 'finds the app' do
@@ -48,50 +48,51 @@ describe AppsController do
       end
  
       it "should not raise errors for app with err without notices" do
-        Factory :err, :app => @app
+        Factory(:err, :problem => Factory(:problem, :app => @app))
         lambda { get :show, :id => @app.id }.should_not raise_error
       end
  
       it "should list atom feed successfully" do
         get :show, :id => @app.id, :format => "atom"
         response.should be_success
-        response.body.should match(@err.message)
+        response.body.should match(@problem.message)
       end
  
       context "pagination" do
         before(:each) do
-          35.times { Factory :err, :app => @app }
+          35.times { Factory(:err, :problem => Factory(:problem, :app => @app)) }
         end
  
         it "should have default per_page value for user" do
           get :show, :id => @app.id
-          assigns(:errs).size.should == User::PER_PAGE
+          assigns(:problems).size.should == User::PER_PAGE
         end
  
         it "should be able to override default per_page value" do
           @user.update_attribute :per_page, 10
           get :show, :id => @app.id
-          assigns(:errs).size.should == 10
+          assigns(:problems).size.should == 10
         end
       end
  
       context 'with resolved errors' do
         before(:each) do
-          resolved_err = Factory.create(:err, :app => @app, :resolved => true)
-          Factory.create(:notice, :err => resolved_err)
+          resolved_problem = Factory(:problem, :app => @app)
+          Factory(:notice, :err => Factory(:err, :problem => resolved_problem))
+          resolved_problem.resolve!
         end
  
         context 'and no params' do
-          it 'shows only unresolved errs' do
+          it 'shows only unresolved problems' do
             get :show, :id => @app.id
-            assigns(:errs).size.should == 1
+            assigns(:problems).size.should == 1
           end
         end
  
-        context 'and all_errs=true params' do
+        context 'and all_problems=true params' do
           it 'shows all errors' do
             get :show, :id => @app.id, :all_errs => true
-            assigns(:errs).size.should == 2
+            assigns(:problems).size.should == 2
           end
         end
       end
@@ -100,42 +101,42 @@ describe AppsController do
         before(:each) do
           environments = ['production', 'test', 'development', 'staging']
           20.times do |i|
-            Factory.create(:err, :app => @app, :environment => environments[i % environments.length])
+            Factory.create(:problem, :app => @app, :environment => environments[i % environments.length])
           end
         end
  
         context 'no params' do
           it 'shows errs for all environments' do
             get :show, :id => @app.id
-            assigns(:errs).size.should == 21
+            assigns(:problems).size.should == 21
           end
         end
  
         context 'environment production' do
           it 'shows errs for just production' do
-            get :show, :id => @app.id, :environment => :production
-            assigns(:errs).size.should == 6
+            get :show, :id => @app.id, :environment => 'production'
+            assigns(:problems).size.should == 6
           end
         end
  
         context 'environment staging' do
           it 'shows errs for just staging' do
-            get :show, :id => @app.id, :environment => :staging
-            assigns(:errs).size.should == 5
+            get :show, :id => @app.id, :environment => 'staging'
+            assigns(:problems).size.should == 5
           end
         end
  
         context 'environment development' do
           it 'shows errs for just development' do
-            get :show, :id => @app.id, :environment => :development
-            assigns(:errs).size.should == 5
+            get :show, :id => @app.id, :environment => 'development'
+            assigns(:problems).size.should == 5
           end
         end
  
         context 'environment test' do
           it 'shows errs for just test' do
-            get :show, :id => @app.id, :environment => :test
-            assigns(:errs).size.should == 5
+            get :show, :id => @app.id, :environment => 'test'
+            assigns(:problems).size.should == 5
           end
         end
       end
@@ -345,5 +346,6 @@ describe AppsController do
     end
   end
  
+
 end
  
@@ -8,7 +8,8 @@ describe ErrsController do
   :params => {:app_id => 'dummyid', :id => 'dummyid'}
  
   let(:app) { Factory(:app) }
-  let(:err) { Factory(:err, :app => app) }
+  let(:err) { Factory(:err, :problem => Factory(:problem, :app => app, :environment => "production")) }
+
  
   describe "GET /errs" do
     render_views
@@ -16,20 +17,19 @@ describe ErrsController do
       before(:each) do
         @user = Factory(:admin)
         sign_in @user
-        @notice = Factory :notice
-        @err = @notice.err
+        @problem = Factory(:notice, :err => Factory(:err, :problem => Factory(:problem, :app => app, :environment => "production"))).problem
       end
  
       it "should successfully list errs" do
         get :index
         response.should be_success
-        response.body.should match(@err.message)
+        response.body.should match(@problem.message)
       end
  
       it "should list atom feed successfully" do
         get :index, :format => "atom"
         response.should be_success
-        response.body.should match(@err.message)
+        response.body.should match(@problem.message)
       end
  
       context "pagination" do
@@ -39,13 +39,13 @@ describe ErrsController do
  
         it "should have default per_page value for user" do
           get :index
-          assigns(:errs).size.should == User::PER_PAGE
+          assigns(:problems).size.should == User::PER_PAGE
         end
  
         it "should be able to override default per_page value" do
           @user.update_attribute :per_page, 10
           get :index
-          assigns(:errs).size.should == 10
+          assigns(:problems).size.should == 10
         end
       end
  
@@ -53,42 +53,42 @@ describe ErrsController do
         before(:each) do
           environments = ['production', 'test', 'development', 'staging']
           20.times do |i|
-            Factory.create(:err, :environment => environments[i % environments.length])
+            Factory(:problem, :environment => environments[i % environments.length])
           end
         end
  
         context 'no params' do
           it 'shows errs for all environments' do
             get :index
-            assigns(:errs).size.should == 21
+            assigns(:problems).size.should == 21
           end
         end
  
         context 'environment production' do
           it 'shows errs for just production' do
-            get :index, :environment => :production
-            assigns(:errs).size.should == 6
+            get :index, :environment => 'production'
+            assigns(:problems).size.should == 6
           end
         end
  
         context 'environment staging' do
           it 'shows errs for just staging' do
-            get :index, :environment => :staging
-            assigns(:errs).size.should == 5
+            get :index, :environment => 'staging'
+            assigns(:problems).size.should == 5
           end
         end
  
         context 'environment development' do
           it 'shows errs for just development' do
-            get :index, :environment => :development
-            assigns(:errs).size.should == 5
+            get :index, :environment => 'development'
+            assigns(:problems).size.should == 5
           end
         end
  
         context 'environment test' do
           it 'shows errs for just test' do
-            get :index, :environment => :test
-            assigns(:errs).size.should == 5
+            get :index, :environment => 'test'
+            assigns(:problems).size.should == 5
           end
         end
       end
@@ -98,11 +98,11 @@ describe ErrsController do
       it 'gets a paginated list of unresolved errs for the users apps' do
         sign_in(user = Factory(:user))
         unwatched_err = Factory(:err)
-        watched_unresolved_err = Factory(:err, :app => Factory(:user_watcher, :user => user).app, :resolved => false)
-        watched_resolved_err = Factory(:err, :app => Factory(:user_watcher, :user => user).app, :resolved => true)
+        watched_unresolved_err = Factory(:err, :problem => Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => false))
+        watched_resolved_err = Factory(:err, :problem => Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => true))
         get :index
-        assigns(:errs).should include(watched_unresolved_err)
-        assigns(:errs).should_not include(unwatched_err, watched_resolved_err)
+        assigns(:problems).should include(watched_unresolved_err.problem)
+        assigns(:problems).should_not include(unwatched_err.problem, watched_resolved_err.problem)
       end
     end
   end
@@ -112,25 +112,25 @@ describe ErrsController do
       it "gets a paginated list of all errs" do
         sign_in Factory(:admin)
         errs = WillPaginate::Collection.new(1,30)
-        3.times { errs << Factory(:err) }
-        3.times { errs << Factory(:err, :resolved => true)}
-        Err.should_receive(:ordered).and_return(
+        3.times { errs << Factory(:err).problem }
+        3.times { errs << Factory(:err, :problem => Factory(:problem, :resolved => true)).problem }
+        Problem.should_receive(:ordered).and_return(
           mock('proxy', :paginate => errs)
         )
         get :all
-        assigns(:errs).should == errs
+        assigns(:problems).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))
-        unwatched_err = Factory(:err)
-        watched_unresolved_err = Factory(:err, :app => Factory(:user_watcher, :user => user).app, :resolved => false)
-        watched_resolved_err = Factory(:err, :app => Factory(:user_watcher, :user => user).app, :resolved => true)
+        unwatched_err = Factory(:problem)
+        watched_unresolved_err = Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => false)
+        watched_resolved_err = Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => true)
         get :all
-        assigns(:errs).should include(watched_resolved_err, watched_unresolved_err)
-        assigns(:errs).should_not include(unwatched_err)
+        assigns(:problems).should include(watched_resolved_err, watched_unresolved_err)
+        assigns(:problems).should_not include(unwatched_err)
       end
     end
   end
@@ -148,17 +148,17 @@ describe ErrsController do
       end
  
       it "finds the app" do
-        get :show, :app_id => app.id, :id => err.id
+        get :show, :app_id => app.id, :id => err.problem.id
         assigns(:app).should == app
       end
  
       it "finds the err" do
-        get :show, :app_id => app.id, :id => err.id
-        assigns(:err).should == err
+        get :show, :app_id => app.id, :id => err.problem.id
+        assigns(:problem).should == err.problem
       end
  
       it "successfully render page" do
-        get :show, :app_id => app.id, :id => err.id
+        get :show, :app_id => app.id, :id => err.problem.id
         response.should be_success
       end
  
@@ -167,23 +167,23 @@ describe ErrsController do
  
         it "should not exist for err's app without issue tracker" do
           err = Factory :err
-          get :show, :app_id => err.app.id, :id => err.id
+          get :show, :app_id => err.app.id, :id => err.problem.id
  
           response.body.should_not button_matcher
         end
  
         it "should exist for err's app with issue tracker" do
           tracker = Factory(:lighthouse_tracker)
-          err = Factory(:err, :app => tracker.app)
-          get :show, :app_id => err.app.id, :id => err.id
+          err = Factory(:err, :problem => Factory(:problem, :app => tracker.app))
+          get :show, :app_id => err.app.id, :id => err.problem.id
  
           response.body.should button_matcher
         end
  
         it "should not exist for err with issue_link" do
           tracker = Factory(:lighthouse_tracker)
-          err = Factory(:err, :app => tracker.app, :issue_link => "http://some.host")
-          get :show, :app_id => err.app.id, :id => err.id
+          err = Factory(:err, :problem => Factory(:problem, :app => tracker.app, :issue_link => "http://some.host"))
+          get :show, :app_id => err.app.id, :id => err.problem.id
  
           response.body.should_not button_matcher
         end
@@ -196,17 +196,17 @@ describe ErrsController do
         @unwatched_err = Factory(:err)
         @watched_app = Factory(:app)
         @watcher = Factory(:user_watcher, :user => @user, :app => @watched_app)
-        @watched_err = Factory(:err, :app => @watched_app)
+        @watched_err = Factory(:err, :problem => Factory(:problem, :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
+        get :show, :app_id => @watched_app.to_param, :id => @watched_err.problem.id
+        assigns(:problem).should == @watched_err.problem
       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
+          get :show, :app_id => @unwatched_err.problem.app_id, :id => @unwatched_err.problem.id
         }.should raise_error(Mongoid::Errors::DocumentNotFound)
       end
     end
@@ -216,38 +216,38 @@ describe ErrsController 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!)
+      @problem = Factory(:err)
+      App.stub(:find).with(@problem.app.id).and_return(@problem.app)
+      @problem.app.problems.stub(:find).and_return(@problem.problem)
+      @problem.problem.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)
-      put :resolve, :app_id => @err.app.id, :id => @err.id
-      assigns(:app).should == @err.app
-      assigns(:err).should == @err
+      App.should_receive(:find).with(@problem.app.id).and_return(@problem.app)
+      @problem.app.problems.should_receive(:find).and_return(@problem.problem)
+      put :resolve, :app_id => @problem.app.id, :id => @problem.problem.id
+      assigns(:app).should == @problem.app
+      assigns(:problem).should == @problem.problem
     end
  
     it "should resolve the issue" do
-      @err.should_receive(:resolve!).and_return(true)
-      put :resolve, :app_id => @err.app.id, :id => @err.id
+      @problem.problem.should_receive(:resolve!).and_return(true)
+      put :resolve, :app_id => @problem.app.id, :id => @problem.problem.id
     end
  
     it "should display a message" do
-      put :resolve, :app_id => @err.app.id, :id => @err.id
+      put :resolve, :app_id => @problem.app.id, :id => @problem.problem.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))
+      put :resolve, :app_id => @problem.app.id, :id => @problem.problem.id
+      response.should redirect_to(app_path(@problem.app))
     end
  
     it "should redirect back to errs page" do
       request.env["Referer"] = errs_path
-      put :resolve, :app_id => @err.app.id, :id => @err.id
+      put :resolve, :app_id => @problem.app.id, :id => @problem.problem.id
       response.should redirect_to(errs_path)
     end
   end
@@ -262,8 +262,8 @@ describe ErrsController do
     context "successful issue creation" do
       context "lighthouseapp tracker" do
         let(:notice) { Factory :notice }
-        let(:tracker) { Factory :lighthouse_tracker, :app => notice.err.app }
-        let(:err) { notice.err }
+        let(:tracker) { Factory :lighthouse_tracker, :app => notice.app }
+        let(:problem) { notice.problem }
  
         before(:each) do
           number = 5
@@ -272,25 +272,25 @@ describe ErrsController do
           stub_request(:post, "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets.xml").
                        to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
  
-          post :create_issue, :app_id => err.app.id, :id => err.id
-          err.reload
+          post :create_issue, :app_id => problem.app.id, :id => problem.id
+          problem.reload
         end
  
-        it "should redirect to err page" do
-          response.should redirect_to( app_err_path(err.app, err) )
+        it "should redirect to problem page" do
+          response.should redirect_to( app_err_path(problem.app, problem) )
         end
       end
     end
  
     context "absent issue tracker" do
-      let(:err) { Factory :err }
+      let(:problem) { Factory :problem }
  
       before(:each) do
-        post :create_issue, :app_id => err.app.id, :id => err.id
+        post :create_issue, :app_id => problem.app.id, :id => problem.id
       end
  
-      it "should redirect to err page" do
-        response.should redirect_to( app_err_path(err.app, err) )
+      it "should redirect to problem page" do
+        response.should redirect_to( app_err_path(problem.app, problem) )
       end
  
       it "should set flash error message telling issue tracker of the app doesn't exist" do
@@ -301,16 +301,16 @@ describe ErrsController do
     context "error during request to a tracker" do
       context "lighthouseapp tracker" do
         let(:tracker) { Factory :lighthouse_tracker }
-        let(:err) { Factory :err, :app => tracker.app }
+        let(:err) { Factory(:err, :problem => Factory(:problem, :app => tracker.app)) }
  
         before(:each) do
           stub_request(:post, "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets.xml").to_return(:status => 500)
  
-          post :create_issue, :app_id => err.app.id, :id => err.id
+          post :create_issue, :app_id => err.app.id, :id => err.problem.id
         end
  
         it "should redirect to err page" do
-          response.should redirect_to( app_err_path(err.app, err) )
+          response.should redirect_to( app_err_path(err.app, err.problem) )
         end
  
         it "should notify of connection error" do
@@ -326,19 +326,19 @@ describe ErrsController do
     end
  
     context "err with issue" do
-      let(:err) { Factory :err, :issue_link => "http://some.host" }
+      let(:err) { Factory(:err, :problem => Factory(:problem, :issue_link => "http://some.host")) }
  
       before(:each) do
-        delete :unlink_issue, :app_id => err.app.id, :id => err.id
-        err.reload
+        delete :unlink_issue, :app_id => err.app.id, :id => err.problem.id
+        err.problem.reload
       end
  
       it "should redirect to err page" do
-        response.should redirect_to( app_err_path(err.app, err) )
+        response.should redirect_to( app_err_path(err.app, err.problem) )
       end
  
       it "should clear issue link" do
-        err.issue_link.should be_nil
+        err.problem.issue_link.should be_nil
       end
     end
  
@@ -346,12 +346,12 @@ describe ErrsController do
       let(:err) { Factory :err }
  
       before(:each) do
-        delete :unlink_issue, :app_id => err.app.id, :id => err.id
-        err.reload
+        delete :unlink_issue, :app_id => err.app.id, :id => err.problem.id
+        err.problem.reload
       end
  
       it "should redirect to err page" do
-        response.should redirect_to( app_err_path(err.app, err) )
+        response.should redirect_to( app_err_path(err.app, err.problem) )
       end
     end
   end
@@ -365,21 +365,21 @@ describe ErrsController do
     end
  
     context "successful comment creation" do
-      let(:err) { Factory(:err) }
+      let(:problem) { Factory(:problem) }
       let(:user) { Factory(:user) }
  
       before(:each) do
-        post :create_comment, :app_id => err.app.id, :id => err.id,
+        post :create_comment, :app_id => problem.app.id, :id => problem.id,
              :comment => { :body => "One test comment", :user_id => user.id }
-        err.reload
+        problem.reload
       end
  
       it "should create the comment" do
-        err.comments.size.should == 1
+        problem.comments.size.should == 1
       end
  
-      it "should redirect to err page" do
-        response.should redirect_to( app_err_path(err.app, err) )
+      it "should redirect to problem page" do
+        response.should redirect_to( app_err_path(problem.app, problem) )
       end
     end
   end
@@ -392,20 +392,85 @@ describe ErrsController do
     end
  
     context "successful comment deletion" do
-      let(:err) { Factory :err_with_comments }
-      let(:comment) { err.comments.first }
+      let(:problem) { Factory(:problem_with_comments) }
+      let(:comment) { problem.comments.first }
  
       before(:each) do
-        delete :destroy_comment, :app_id => err.app.id, :id => err.id, :comment_id => comment.id
-        err.reload
+        delete :destroy_comment, :app_id => problem.app.id, :id => problem.id, :comment_id => comment.id
+        problem.reload
       end
  
       it "should delete the comment" do
-        err.comments.detect{|c| c.id.to_s == comment.id }.should == nil
+        problem.comments.detect{|c| c.id.to_s == comment.id }.should == nil
       end
  
-      it "should redirect to err page" do
-        response.should redirect_to( app_err_path(err.app, err) )
+      it "should redirect to problem page" do
+        response.should redirect_to( app_err_path(problem.app, problem) )
+      end
+    end
+  end
+
+  describe "Bulk Actions" do
+    before(:each) do
+      sign_in Factory(:admin)
+      @problem1 = Factory(:err, :problem => Factory(:problem, :resolved => true)).problem
+      @problem2 = Factory(:err, :problem => Factory(:problem, :resolved => false)).problem
+    end
+
+    it "should apply to multiple problems" do
+      post :resolve_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
+      assigns(:selected_problems).should == [@problem1, @problem2]
+    end
+
+    it "should require at least one problem" do
+      post :resolve_several, :problems => []
+      request.flash[:notice].should match(/You have not selected any/)
+    end
+
+    context "POST /errs/merge_several" do
+      it "should require at least two problems" do
+        post :merge_several, :problems => [@problem1.id.to_s]
+        request.flash[:notice].should match(/You must select at least two/)
+      end
+
+      it "should merge the problems" do
+        lambda {
+          post :merge_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
+          assigns(:merged_problem).reload.errs.length.should == 2
+        }.should change(Problem, :count).by(-1)
+      end
+    end
+
+    context "POST /errs/unmerge_several" do
+      it "should unmerge a merged problem" do
+        merged_problem = Problem.merge!(@problem1, @problem2)
+        merged_problem.errs.length.should == 2
+        lambda {
+          post :unmerge_several, :problems => [merged_problem.id.to_s]
+          merged_problem.reload.errs.length.should == 1
+        }.should change(Problem, :count).by(1)
+      end
+    end
+
+    context "POST /errs/resolve_several" do
+      it "should resolve the issue" do
+        post :resolve_several, :problems => [@problem2.id.to_s]
+        @problem2.reload.resolved?.should == true
+      end
+    end
+
+    context "POST /errs/unresolve_several" do
+      it "should unresolve the issue" do
+        post :unresolve_several, :problems => [@problem1.id.to_s]
+        @problem1.reload.resolved?.should == false
+      end
+    end
+
+    context "POST /errs/destroy_several" do
+      it "should delete the errs" do
+        lambda {
+          post :destroy_several, :problems => [@problem1.id.to_s]
+        }.should change(Problem, :count).by(-1)
       end
     end
   end
@@ -7,20 +7,20 @@ describe NoticesController do
       @xml = Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read
       @app = Factory(:app_with_watcher)
       App.stub(:find_by_api_key!).and_return(@app)
-      @notice = Notice.from_xml(@xml)
+      @notice = App.report_error!(@xml)
  
       request.env['Content-type'] = 'text/xml'
       request.env['Accept'] = 'text/xml, application/xml'
     end
  
     it "generates a notice from xml [POST]" do
-      Notice.should_receive(:from_xml).with(@xml).and_return(@notice)
+      App.should_receive(:report_error!).with(@xml).and_return(@notice)
       request.should_receive(:raw_post).and_return(@xml)
       post :create
     end
  
     it "generates a notice from xml [GET]" do
-      Notice.should_receive(:from_xml).with(@xml).and_return(@notice)
+      App.should_receive(:report_error!).with(@xml).and_return(@notice)
       get :create, {:data => @xml}
     end
  
@@ -29,10 +29,11 @@ describe NoticesController do
       post :create
       email = ActionMailer::Base.deliveries.last
       email.to.should include(@app.watchers.first.email)
-      email.subject.should include(@notice.err.message)
+      email.subject.should include(@notice.message)
       email.subject.should include("[#{@app.name}]")
-      email.subject.should include("[#{@notice.err.environment}]")
+      email.subject.should include("[#{@notice.environment_name}]")
     end
   end
  
 end
+
@@ -215,3 +215,4 @@ describe UsersController do
  
   end
 end
+
@@ -3,3 +3,4 @@ Factory.sequence(:word) {|n| &quot;word#{n}&quot;}
 Factory.sequence(:app_name) {|n| "App ##{n}"}
 Factory.sequence(:email) {|n| "email#{n}@example.com"}
 Factory.sequence(:user_email) {|n| "user.#{n}@example.com"}
+
@@ -20,7 +20,7 @@ Factory.define(:user_watcher, :parent =&gt; :watcher) do |w|
 end
  
 Factory.define(:deploy) do |d|
-  d.app       {|p| p.association :app}
+  d.app           {|p| p.association :app}
   d.username      'clyde.frog'
   d.repository    'git@github.com/errbit/errbit.git'
   d.environment   'production'
+Factory.define :problem do |p|
+  p.app            {|a| a.association :app}
+  p.comments      []
+end
+
+Factory.define(:problem_with_comments, :parent => :problem) do |ec|
+  ec.comments     { (1..3).map { Factory(:comment) } }
+end
+
+
+
 Factory.define :err do |e|
-  e.app           {|p| p.association :app }
+  e.problem        {|p| p.association :problem}
   e.klass         'FooError'
   e.component     'foo'
   e.action        'bar'
   e.environment   'production'
-  e.comments      []
 end
  
-Factory.define(:err_with_comments, :parent => :err) do |ec|
-  ec.comments     { (1..3).map{Factory(:comment)} }
-end
+
  
 Factory.define :notice do |n|
   n.err                 {|e| e.association :err}
   n.message             'FooError: Too Much Bar'
   n.backtrace           { random_backtrace }
-  n.server_environment  'server-environment' => 'production'
+  n.server_environment  'environment-name' => 'production'
+  n.request             {{ 'component' => 'foo', 'action' => 'bar' }}
   n.notifier            'name' => 'Notifier', 'version' => '1', 'url' => 'http://toad.com'
 end
  
@@ -7,4 +7,4 @@ end
  
 Factory.define :admin, :parent => :user do |a|
   a.admin true
-end
 \ No newline at end of file
+end
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notice version="2.0">
+  <api-key>APIKEY</api-key>
+  <notifier>
+    <name>Hoptoad Notifier</name>
+    <version>2.3.2</version>
+    <url>http://hoptoadapp.com</url>
+  </notifier>
+  <error>
+    <class>HoptoadTestingException</class>
+    <message>HoptoadTestingException: Testing hoptoad via "rake hoptoad:test". If you can see this, it works.</message>
+    <backtrace>
+      <line number="425" file="[GEM_ROOT]/gems/activesupport-3.0.0.rc/lib/active_support/callbacks.rb" method="_run__2115867319__process_action__262109504__callbacks"/>
+    </backtrace>
+  </error>
+  <request>
+    <url>http://example.org/verify</url>
+    <component>application</component>
+    <action>verify</action>
+    <params>
+      <var key="action">verify</var>
+      <var key="controller">application</var>
+    </params>
+    <cgi-data>
+      <var key="rack.session"/>
+      <var key="action_dispatch.request.formats">text/html</var>
+      <var key="action_dispatch.request.parameters">
+        <var key="action">verify</var>
+        <var key="controller">application</var>
+      </var>
+      <var key="SERVER_NAME">example.org</var>
+      <var key="rack.url_scheme">http</var>
+      <var key="action_dispatch.remote_ip"/>
+      <var key="CONTENT_LENGTH">0</var>
+      <var key="rack.errors">#&lt;StringIO:0x103d9dec0&gt;</var>
+      <var key="action_dispatch.request.unsigned_session_cookie"/>
+      <var key="action_dispatch.request.query_parameters"/>
+      <var key="HTTPS">off</var>
+      <var key="rack.run_once">false</var>
+      <var key="PATH_INFO">/verify</var>
+      <var key="action_dispatch.secret_token">994f235e3372684bc736dd11842b754d2ddcffc8c2958d33a29527c3217becd6655fa4653a318bc7c34131f9baf2acc0c424ed07e48e0e5e87c6cd34d711e985</var>
+      <var key="rack.version">11</var>
+      <var key="SCRIPT_NAME"/>
+      <var key="action_dispatch.request.path_parameters">
+        <var key="action">verify</var>
+        <var key="controller">application</var>
+      </var>
+      <var key="rack.multithread">false</var>
+      <var key="action_dispatch.parameter_filter">password</var>
+      <var key="action_dispatch.cookies"/>
+      <var key="action_dispatch.request.request_parameters"/>
+      <var key="rack.multiprocess">true</var>
+      <var key="rack.request.query_hash"/>
+      <var key="SERVER_PORT">80</var>
+      <var key="REQUEST_METHOD">GET</var>
+      <var key="action_controller.instance">#&lt;ApplicationController:0x103d2f560&gt;</var>
+      <var key="rack.session.options">
+        <var key="secure">false</var>
+        <var key="httponly">true</var>
+        <var key="path">/</var>
+        <var key="expire_after"/>
+        <var key="domain"/>
+        <var key="id"/>
+      </var>
+      <var key="rack.input">#&lt;StringIO:0x103d9dc90&gt;</var>
+      <var key="action_dispatch.request.content_type"/>
+      <var key="rack.request.query_string"/>
+      <var key="QUERY_STRING"/>
+    </cgi-data>
+  </request>
+  <server-environment>
+    <project-root>/path/to/sample/project</project-root>
+    <environment-name>development</environment-name>
+  </server-environment>
+</notice>
 \ No newline at end of file
 require 'spec_helper'
  
 describe App do
-
   context 'validations' do
     it 'requires a name' do
       app = Factory.build(:app, :name => nil)
@@ -24,6 +23,7 @@ describe App do
     end
   end
  
+
   context 'being created' do
     it 'generates a new api-key' do
       app = Factory.build(:app)
@@ -99,6 +99,7 @@ describe App do
     end
   end
  
+
   context "copying attributes from existing app" do
     it "should only copy the necessary fields" do
       @app, @copy_app = Factory(:app, :name => "app", :github_url => "url"),
@@ -110,5 +111,127 @@ describe App do
       @app.watchers.first.email.should == "copywatcher@example.com"
     end
   end
+
+
+  context '#find_or_create_err!' do
+    before do
+      @app = Factory(:app)
+      @conditions = {
+        :klass        => 'Whoops',
+        :component    => 'Foo',
+        :action       => 'bar',
+        :environment  => 'production'
+      }
+    end
+
+    it 'returns the correct err if one already exists' do
+      existing = Factory(:err, @conditions.merge(:problem => Factory(:problem, :app => @app)))
+      Err.where(@conditions).first.should == existing
+      @app.find_or_create_err!(@conditions).should == existing
+    end
+
+    it 'assigns the returned err to the given app' do
+      @app.find_or_create_err!(@conditions).app.should == @app
+    end
+
+    it 'creates a new problem if a matching one does not already exist' do
+      Err.where(@conditions).first.should be_nil
+      lambda {
+        @app.find_or_create_err!(@conditions)
+      }.should change(Problem,:count).by(1)
+    end
+  end
+
+
+  context '#report_error!' do
+    before do
+      @xml = Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read
+      @app = Factory(:app, :api_key => 'APIKEY')
+      ErrorReport.any_instance.stub(:fingerprint).and_return('fingerprintdigest')
+    end
+
+    it 'finds the correct app' do
+      @notice = App.report_error!(@xml)
+      @notice.err.app.should == @app
+    end
+
+    it 'finds the correct err for the notice' do
+      App.should_receive(:find_by_api_key!).and_return(@app)
+      @app.should_receive(:find_or_create_err!).with({
+        :klass        => 'HoptoadTestingException',
+        :component    => 'application',
+        :action       => 'verify',
+        :environment  => 'development',
+        :fingerprint  => 'fingerprintdigest'
+      }).and_return(err = Factory(:err))
+      err.notices.stub(:create!)
+      @notice = App.report_error!(@xml)
+    end
+
+    it 'marks the err as unresolved if it was previously resolved' do
+      App.should_receive(:find_by_api_key!).and_return(@app)
+      @app.should_receive(:find_or_create_err!).with({
+        :klass        => 'HoptoadTestingException',
+        :component    => 'application',
+        :action       => 'verify',
+        :environment  => 'development',
+        :fingerprint  => 'fingerprintdigest'
+      }).and_return(err = Factory(:err, :problem => Factory(:problem, :resolved => true)))
+      err.should be_resolved
+      @notice = App.report_error!(@xml)
+      @notice.err.should == err
+      @notice.err.should_not be_resolved
+    end
+
+    it 'should create a new notice' do
+      @notice = App.report_error!(@xml)
+      @notice.should be_persisted
+    end
+
+    it 'assigns an err to the notice' do
+      @notice = App.report_error!(@xml)
+      @notice.err.should be_a(Err)
+    end
+
+    it 'captures the err message' do
+      @notice = App.report_error!(@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 = App.report_error!(@xml)
+      @notice.backtrace.size.should == 73
+      @notice.backtrace.last['file'].should == '[GEM_ROOT]/bin/rake'
+    end
+
+    it 'captures the server_environment' do
+      @notice = App.report_error!(@xml)
+      @notice.server_environment['environment-name'].should == 'development'
+    end
+
+    it 'captures the request' do
+      @notice = App.report_error!(@xml)
+      @notice.request['url'].should == 'http://example.org/verify'
+      @notice.request['params']['controller'].should == 'application'
+    end
+
+    it 'captures the notifier' do
+      @notice = App.report_error!(@xml)
+      @notice.notifier['name'].should == 'Hoptoad Notifier'
+    end
+
+    it "should handle params without 'request' section" do
+      xml = Rails.root.join('spec','fixtures','hoptoad_test_notice_without_request_section.xml').read
+      lambda { App.report_error!(xml) }.should_not raise_error
+    end
+
+    it "should handle params with only a single line of backtrace" do
+      xml = Rails.root.join('spec','fixtures','hoptoad_test_notice_with_one_line_of_backtrace.xml').read
+      lambda { @notice = App.report_error!(xml) }.should_not raise_error
+      @notice.backtrace.length.should == 1
+    end
+  end
+
+
 end
  
@@ -26,20 +26,20 @@ describe Deploy do
     context 'when the app has resolve_errs_on_deploy set to false' do
       it 'should not resolve the apps errs' do
         app = Factory(:app, :resolve_errs_on_deploy => false)
-        @errs = 3.times.inject([]) {|errs,_| errs << Factory(:err, :resolved => false, :app => app)}
+        @problems = 3.times.map{Factory(:err, :problem => Factory(:problem, :resolved => false, :app => app))}
         Factory(:deploy, :app => app)
-        app.reload.errs.none?{|err| err.resolved?}.should == true
+        app.reload.problems.none?{|problem| problem.resolved?}.should == true
       end
     end
  
     context 'when the app has resolve_errs_on_deploy set to true' do
       it 'should resolve the apps errs that were in the same environment' do
         app = Factory(:app, :resolve_errs_on_deploy => true)
-        @prod_errs = 3.times.inject([]) {|errs,_| errs << Factory(:err, :resolved => false, :app => app, :environment => 'production')}
-        @staging_errs = 3.times.inject([]) {|errs,_| errs << Factory(:err, :resolved => false, :app => app, :environment => 'staging')}
+        @prod_errs = 3.times.map{Factory(:problem, :resolved => false, :app => app, :environment => 'production')}
+        @staging_errs = 3.times.map{Factory(:problem, :resolved => false, :app => app, :environment => 'staging')}
         Factory(:deploy, :app => app, :environment => 'production')
-        @prod_errs.all?{|err| err.reload.resolved?}.should == true
-        @staging_errs.all?{|err| err.reload.resolved?}.should == false
+        @prod_errs.all?{|problem| problem.reload.resolved?}.should == true
+        @staging_errs.all?{|problem| problem.reload.resolved?}.should == false
       end
     end
  
@@ -16,157 +16,5 @@ describe Err do
     end
   end
  
-  context '#for' do
-    before do
-      @app = Factory(:app)
-      @conditions = {
-        :app      => @app,
-        :klass        => 'Whoops',
-        :component    => 'Foo',
-        :action       => 'bar',
-        :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 {
-        Err.for(@conditions)
-      }.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
-      err.resolve!
-      err.reload.should be_resolved
-    end
-  end
-
-  context "resolve!" do
-    it "marks the err as resolved" do
-      err = Factory(:err)
-      err.should_not be_resolved
-      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
-      err.klass = nil
-      err.should_not be_valid
-      lambda {
-        err.resolve!
-      }.should raise_error(Mongoid::Errors::Validations)
-    end
-  end
-
-  context "Scopes" do
-    context "resolved" do
-      it 'only finds resolved Errs' do
-        resolved = Factory(:err, :resolved => true)
-        unresolved = Factory(:err, :resolved => false)
-        Err.resolved.all.should include(resolved)
-        Err.resolved.all.should_not include(unresolved)
-      end
-    end
-
-    context "unresolved" do
-      it 'only finds unresolved Errs' do
-        resolved = Factory(:err, :resolved => true)
-        unresolved = Factory(:err, :resolved => false)
-        Err.unresolved.all.should_not include(resolved)
-        Err.unresolved.all.should include(unresolved)
-      end
-    end
-  end
-
-  context 'being created' do
-    context 'when the app has err notifications set to false' do
-      it 'should not send an email notification' do
-        app = Factory(:app_with_watcher, :notify_on_errs => false)
-        Mailer.should_not_receive(:err_notification)
-        Factory(:err, :app => app)
-      end
-    end
-  end
-
-  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
-        @err.reload
-      }.should change(@err, :notices_count).from(1).to(0)
-    end
-  end
-
-
 end
  
 require 'spec_helper'
  
 describe FogbugzTracker do
-  it "should create an issue on Fogbugz with err params, and set issue link for err" do
+  it "should create an issue on Fogbugz with problem params, and set issue link for problem" do
     notice = Factory :notice
-    tracker = Factory :fogbugz_tracker, :app => notice.err.app
-    err = notice.err
+    tracker = Factory :fogbugz_tracker, :app => notice.app
+    problem = notice.problem
  
     number = 123
     @issue_link = "https://#{tracker.account}.fogbugz.com/default.asp?#{number}"
@@ -14,10 +14,10 @@ describe FogbugzTracker do
     http_mock.should_receive(:request).twice.and_return(response)
     Fogbugz.adapter[:http] = http_mock
  
-    err.app.issue_tracker.create_issue(err)
-    err.reload
+    problem.app.issue_tracker.create_issue(problem)
+    problem.reload
  
-    err.issue_link.should == @issue_link
+    problem.issue_link.should == @issue_link
   end
 end
  
 require 'spec_helper'
  
 describe GithubIssuesTracker do
-  it "should create an issue on Github Issues with err params, and set issue link for err" do
+  it "should create an issue on Github Issues with problem params, and set issue link for problem" do
     notice = Factory :notice
-    tracker = Factory :github_issues_tracker, :app => notice.err.app
-    err = notice.err
+    tracker = Factory :github_issues_tracker, :app => notice.app
+    problem = notice.problem
  
     number = 5
     @issue_link = "https://github.com/#{tracker.project_id}/issues/#{number}"
@@ -27,15 +27,15 @@ EOF
     stub_request(:post, "https://#{tracker.username}%2Ftoken:#{tracker.api_token}@github.com/api/v2/json/issues/open/#{tracker.project_id}").
       to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
  
-    err.app.issue_tracker.create_issue(err)
-    err.reload
+    problem.app.issue_tracker.create_issue(problem)
+    problem.reload
  
     requested = have_requested(:post, "https://#{tracker.username}%2Ftoken:#{tracker.api_token}@github.com/api/v2/json/issues/open/#{tracker.project_id}")
     WebMock.should requested.with(:headers => {'Content-Type' => 'application/x-www-form-urlencoded'})
     WebMock.should requested.with(:body => /title=%5Bproduction%5D%5Bfoo%23bar%5D%20FooError%3A%20Too%20Much%20Bar/)
     WebMock.should requested.with(:body => /See%20this%20exception%20on%20Errbit/)
  
-    err.issue_link.should == @issue_link
+    problem.issue_link.should == @issue_link
   end
 end
  
 require 'spec_helper'
  
 describe LighthouseTracker do
-  it "should create an issue on Lighthouse with err params, and set issue link for err" do
+  it "should create an issue on Lighthouse with problem params, and set issue link for problem" do
     notice = Factory :notice
-    tracker = Factory :lighthouse_tracker, :app => notice.err.app
-    err = notice.err
+    tracker = Factory :lighthouse_tracker, :app => notice.app
+    problem = notice.problem
  
     number = 5
     @issue_link = "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets/#{number}.xml"
@@ -12,16 +12,16 @@ describe LighthouseTracker do
     stub_request(:post, "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets.xml").
                  to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
  
-    err.app.issue_tracker.create_issue(err)
-    err.reload
+    problem.app.issue_tracker.create_issue(problem)
+    problem.reload
  
     requested = have_requested(:post, "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets.xml")
     WebMock.should requested.with(:headers => {'X-Lighthousetoken' => tracker.api_token})
     WebMock.should requested.with(:body => /<tag>errbit<\/tag>/)
-    WebMock.should requested.with(:body => /<title>\[#{ err.environment }\]\[#{err.where}\] #{err.message.to_s.truncate(100)}<\/title>/)
+    WebMock.should requested.with(:body => /<title>\[#{ problem.environment }\]\[#{problem.where}\] #{problem.message.to_s.truncate(100)}<\/title>/)
     WebMock.should requested.with(:body => /<body>.+<\/body>/m)
  
-    err.issue_link.should == @issue_link.sub(/\.xml$/, '')
+    problem.issue_link.should == @issue_link.sub(/\.xml$/, '')
   end
 end
  
 require 'spec_helper'
  
 describe MingleTracker do
-  it "should create an issue on Mingle with err params, and set issue link for err" do
+  it "should create an issue on Mingle with problem params, and set issue link for problem" do
     notice = Factory :notice
-    tracker = Factory :mingle_tracker, :app => notice.err.app
-    err = notice.err
+    tracker = Factory :mingle_tracker, :app => notice.app
+    problem = notice.problem
  
     number = 5
     @issue_link = "#{tracker.account}/projects/#{tracker.project_id}/cards/#{number}.xml"
@@ -13,8 +13,8 @@ describe MingleTracker do
     stub_request(:post, "#{@basic_auth}/api/v1/projects/#{tracker.project_id}/cards.xml").
                  to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
  
-    err.app.issue_tracker.create_issue(err)
-    err.reload
+    problem.app.issue_tracker.create_issue(problem)
+    problem.reload
  
     requested = have_requested(:post, "#{@basic_auth}/api/v1/projects/#{tracker.project_id}/cards.xml")
     WebMock.should requested.with(:headers => {'Content-Type' => 'application/xml'})
@@ -22,7 +22,7 @@ describe MingleTracker do
     WebMock.should requested.with(:body => /See this exception on Errbit/)
     WebMock.should requested.with(:body => /<card-type-name>Defect<\/card-type-name>/)
  
-    err.issue_link.should == @issue_link.sub(/\.xml$/, '')
+    problem.issue_link.should == @issue_link.sub(/\.xml$/, '')
   end
 end
  
 require 'spec_helper'
  
 describe PivotalLabsTracker do
-  it "should create an issue on Pivotal Tracker with err params, and set issue link for err" do
+  it "should create an issue on Pivotal Tracker with problem params, and set issue link for problem" do
     notice = Factory :notice
-    tracker = Factory :pivotal_labs_tracker, :app => notice.err.app, :project_id => 10
-    err = notice.err
+    tracker = Factory :pivotal_labs_tracker, :app => notice.app, :project_id => 10
+    problem = notice.problem
  
     story_id = 5
     @issue_link = "https://www.pivotaltracker.com/story/show/#{story_id}"
@@ -15,16 +15,16 @@ describe PivotalLabsTracker do
     stub_request(:post, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}/stories").
                  to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => story_body )
  
-    err.app.issue_tracker.create_issue(err)
-    err.reload
+    problem.app.issue_tracker.create_issue(problem)
+    problem.reload
  
     requested = have_requested(:post, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}/stories")
     WebMock.should requested.with(:headers => {'X-Trackertoken' => tracker.api_token})
     WebMock.should requested.with(:body => /See this exception on Errbit/)
-    WebMock.should requested.with(:body => /<name>\[#{ err.environment }\]\[#{err.where}\] #{err.message.to_s.truncate(100)}<\/name>/)
+    WebMock.should requested.with(:body => /<name>\[#{ problem.environment }\]\[#{problem.where}\] #{problem.message.to_s.truncate(100)}<\/name>/)
     WebMock.should requested.with(:body => /<description>.+<\/description>/m)
  
-    err.issue_link.should == @issue_link
+    problem.issue_link.should == @issue_link
   end
 end
  
 require 'spec_helper'
  
 describe RedmineTracker do
-  it "should create an issue on Redmine with err params, and set issue link for err" do
+  it "should create an issue on Redmine with problem params, and set issue link for problem" do
     notice = Factory(:notice)
-    tracker = Factory(:redmine_tracker, :app => notice.err.app, :project_id => 10)
-    err = notice.err
+    tracker = Factory(:redmine_tracker, :app => notice.app, :project_id => 10)
+    problem = notice.problem
     number = 5
     @issue_link = "#{tracker.account}/issues/#{number}.xml?project_id=#{tracker.project_id}"
     body = "<issue><subject>my subject</subject><id>#{number}</id></issue>"
     stub_request(:post, "#{tracker.account}/issues.xml").
                  to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
  
-    err.app.issue_tracker.create_issue(err)
-    err.reload
+    problem.app.issue_tracker.create_issue(problem)
+    problem.reload
  
     requested = have_requested(:post, "#{tracker.account}/issues.xml")
     WebMock.should requested.with(:headers => {'X-Redmine-API-Key' => tracker.api_token})
     WebMock.should requested.with(:body => /<project-id>#{tracker.project_id}<\/project-id>/)
-    WebMock.should requested.with(:body => /<subject>\[#{ err.environment }\]\[#{err.where}\] #{err.message.to_s.truncate(100)}<\/subject>/)
+    WebMock.should requested.with(:body => /<subject>\[#{ problem.environment }\]\[#{problem.where}\] #{problem.message.to_s.truncate(100)}<\/subject>/)
     WebMock.should requested.with(:body => /<description>.+<\/description>/m)
  
-    err.issue_link.should == @issue_link.sub(/\.xml/, '')
+    problem.issue_link.should == @issue_link.sub(/\.xml/, '')
   end
  
   it "should generate a url where a file with line number can be viewed" do
@@ -2,6 +2,7 @@ require &#39;spec_helper&#39;
  
 describe Notice do
  
+
   context 'validations' do
     it 'requires a backtrace' do
       notice = Factory.build(:notice, :backtrace => nil)
@@ -22,6 +23,7 @@ describe Notice do
     end
   end
  
+
   context '.in_app_backtrace_line?' do
     let(:backtrace) do [{
         'number'  => rand(999),
@@ -51,93 +53,6 @@ describe Notice do
     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,
-        :klass        => 'HoptoadTestingException',
-        :component    => 'application',
-        :action       => 'verify',
-        :environment  => 'development',
-        :fingerprint  => 'fingerprintdigest'
-      }).and_return(err = Factory(:err))
-      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,
-        :klass        => 'HoptoadTestingException',
-        :component    => 'application',
-        :action       => 'verify',
-        :environment  => 'development',
-        :fingerprint  => 'fingerprintdigest'
-      }).and_return(err = Factory(:err, :resolved => true))
-      err.should be_resolved
-      @notice = Notice.from_xml(@xml)
-      @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 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
-
-    it "should raise ApiVersionError" do
-      @xml = Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice_with_wrong_version.xml').read
-      expect { Notice.from_xml(@xml)  }.to raise_error(Hoptoad::V2::ApiVersionError)
-    end
-  end
  
   describe "key sanitization" do
     before do
@@ -153,6 +68,7 @@ describe Notice do
     end
   end
  
+
   describe "user agent" do
     it "should be parsed and human-readable" do
       notice = Factory.build(:notice, :request => {'cgi-data' => {'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16'}})
@@ -166,13 +82,14 @@ describe Notice do
     end
   end
  
+
   describe "email notifications (configured individually for each app)" do
     custom_thresholds = [2, 4, 8, 16, 32, 64]
  
     before do
       Errbit::Config.per_app_email_at_notices = true
       @app = Factory(:app_with_watcher, :email_at_notices => custom_thresholds)
-      @err = Factory(:err, :app => @app)
+      @err = Factory(:err, :problem => Factory(:problem, :app => @app))
     end
  
     after do
@@ -181,7 +98,7 @@ describe Notice do
  
     custom_thresholds.each do |threshold|
       it "sends an email notification after #{threshold} notice(s)" do
-        @err.notices.stub(:count).and_return(threshold)
+        @err.problem.stub(:notices_count).and_return(threshold)
         Mailer.should_receive(:err_notification).
           and_return(mock('email', :deliver => true))
         Factory(:notice, :err => @err)
@@ -189,5 +106,6 @@ describe Notice do
     end
   end
  
+
 end
  
@@ -0,0 +1,162 @@
+require 'spec_helper'
+
+describe Problem do
+
+
+  context '#last_notice_at' do
+    it "returns the created_at timestamp of the latest notice" do
+      err = Factory(:err)
+      problem = err.problem
+      problem.should_not be_nil
+
+      problem.last_notice_at.should be_nil
+
+      notice1 = Factory(:notice, :err => err)
+      problem.last_notice_at.should == notice1.created_at
+
+      notice2 = Factory(:notice, :err => err)
+      problem.last_notice_at.should == notice2.created_at
+    end
+  end
+
+
+  context '#message' do
+    it "adding a notice caches its message" do
+      err = Factory(:err)
+      problem = err.problem
+      lambda {
+        Factory(:notice, :err => err, :message => 'ERR 1')
+      }.should change(problem, :message).from(nil).to('ERR 1')
+    end
+  end
+
+
+  context 'being created' do
+    context 'when the app has err notifications set to false' do
+      it 'should not send an email notification' do
+        app = Factory(:app_with_watcher, :notify_on_errs => false)
+        Mailer.should_not_receive(:err_notification)
+        Factory(:problem, :app => app)
+      end
+    end
+  end
+
+
+  context "#resolved?" do
+    it "should start out as unresolved" do
+      problem = Problem.new
+      problem.should_not be_resolved
+      problem.should be_unresolved
+    end
+
+    it "should be able to be resolved" do
+      problem = Factory(:problem)
+      problem.should_not be_resolved
+      problem.resolve!
+      problem.reload.should be_resolved
+    end
+  end
+
+
+  context "resolve!" do
+    it "marks the problem as resolved" do
+      problem = Factory(:problem)
+      problem.should_not be_resolved
+      problem.resolve!
+      problem.should be_resolved
+    end
+
+    it "should throw an err if it's not successful" do
+      problem = Factory(:problem)
+      problem.should_not be_resolved
+      problem.stub!(:valid?).and_return(false)
+      problem.should_not be_valid
+      lambda {
+        problem.resolve!
+      }.should raise_error(Mongoid::Errors::Validations)
+    end
+  end
+
+
+  context ".merge!" do
+    it "collects the Errs from several problems into one and deletes the other problems" do
+      problem1 = Factory(:err).problem
+      problem2 = Factory(:err).problem
+      problem1.errs.length.should == 1
+      problem2.errs.length.should == 1
+
+      lambda {
+        merged_problem = Problem.merge!(problem1, problem2)
+        merged_problem.reload.errs.length.should == 2
+      }.should change(Problem, :count).by(-1)
+    end
+  end
+
+
+  context "#unmerge!" do
+    it "creates a separate problem for each err" do
+      problem1 = Factory(:notice).problem
+      problem2 = Factory(:notice).problem
+      merged_problem = Problem.merge!(problem1, problem2)
+      merged_problem.errs.length.should == 2
+
+      lambda {
+        problems = merged_problem.unmerge!
+        problems.length.should == 2
+        merged_problem.errs(true).length.should == 1
+      }.should change(Problem, :count).by(1)
+    end
+  end
+
+
+  context "Scopes" do
+    context "resolved" do
+      it 'only finds resolved Problems' do
+        resolved = Factory(:problem, :resolved => true)
+        unresolved = Factory(:problem, :resolved => false)
+        Problem.resolved.all.should include(resolved)
+        Problem.resolved.all.should_not include(unresolved)
+      end
+    end
+
+    context "unresolved" do
+      it 'only finds unresolved Problems' do
+        resolved = Factory(:problem, :resolved => true)
+        unresolved = Factory(:problem, :resolved => false)
+        Problem.unresolved.all.should_not include(resolved)
+        Problem.unresolved.all.should include(unresolved)
+      end
+    end
+  end
+
+
+  context "notice counter cache" do
+
+    before do
+      @app = Factory(:app)
+      @problem = Factory(:problem, :app => @app)
+      @err = Factory(:err, :problem => @problem)
+    end
+
+    it "#notices_count returns 0 by default" do
+      @problem.notices_count.should == 0
+    end
+
+    it "adding a notice increases #notices_count by 1" do
+      lambda {
+        Factory(:notice, :err => @err, :message => 'ERR 1')
+      }.should change(@problem, :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
+        @problem.reload
+      }.should change(@problem, :notices_count).from(1).to(0)
+    end
+  end
+
+
+end
+
@@ -49,3 +49,4 @@ describe User do
   end
  
 end
+
@@ -34,3 +34,4 @@ describe Watcher do
   end
  
 end
+
@@ -23,4 +23,4 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
   config.include WebMock::API
-end
 \ No newline at end of file
+end
@@ -55,4 +55,4 @@ def  it_requires_admin_privileges(options = {})
       end
     end
   end
-end
 \ No newline at end of file
+end
@@ -3,11 +3,12 @@ require &#39;spec_helper&#39;
 describe "errs/show.html.haml" do
   before do
     err = Factory(:err)
+    problem = err.problem
     comment = Factory(:comment)
-    assign :err, err
+    assign :problem, problem
     assign :comment, comment
-    assign :app, err.app
-    assign :notices, err.notices.ordered.paginate(:page => 1, :per_page => 1)
+    assign :app, problem.app
+    assign :notices, err.notices.paginate(:page => 1, :per_page => 1)
     assign :notice, err.notices.first
   end
  
@@ -44,9 +45,9 @@ describe &quot;errs/show.html.haml&quot; do
     end
  
     it 'should display comments and new comment form when no issue tracker' do
-      err = Factory(:err_with_comments)
-      assign :err, err
-      assign :app, err.app
+      problem = Factory(:problem_with_comments)
+      assign :problem, problem
+      assign :app, problem.app
       render
       comments_section = String.new(view.instance_variable_get(:@_content_for)[:comments])
       comments_section.should =~ /Test comment/
@@ -54,20 +55,22 @@ describe &quot;errs/show.html.haml&quot; do
     end
  
     context "with issue tracker" do
-      def with_issue_tracker(err)
-        err.app.issue_tracker = PivotalLabsTracker.new :api_token => "token token token", :project_id => "1234"
-        assign :err, err
-        assign :app, err.app
+      def with_issue_tracker(problem)
+        problem.app.issue_tracker = PivotalLabsTracker.new :api_token => "token token token", :project_id => "1234"
+        assign :problem, problem
+        assign :app, problem.app
       end
  
       it 'should not display the comments section' do
-        with_issue_tracker(Factory(:err))
+        problem = Factory(:problem)
+        with_issue_tracker(problem)
         render
         view.instance_variable_get(:@_content_for)[:comments].should be_blank
       end
  
       it 'should display existing comments' do
-        with_issue_tracker(Factory(:err_with_comments))
+        problem = Factory(:problem_with_comments)
+        with_issue_tracker(problem)
         render
         comments_section = String.new(view.instance_variable_get(:@_content_for)[:comments])
         comments_section.should =~ /Test comment/
...	...	@@ -4,6 +4,7 @@ log/*.log
4	4	tmp/*/
5	5	config/config.yml
6	6	config/deploy.rb
	7	+config/deploy
7	8	config/mongoid.yml
8	9	.rvmrc
9	10	*~
...	...
...	...	@@ -24,7 +24,7 @@ platform :ruby do
24	24	end
25	25
26	26	group :development, :test do
27		- gem 'rspec-rails', '~> 2.5'
	27	+ gem 'rspec-rails', '~> 2.6'
28	28	gem 'webmock', :require => false
29	29	gem 'factory_girl_rails'
30	30	unless ENV['TRAVIS']
...	...	@@ -34,7 +34,7 @@ group :development, :test do
34	34	end
35	35
36	36	group :test do
37		- gem 'rspec', '~> 2.5'
	37	+ gem 'rspec', '~> 2.6'
38	38	gem 'database_cleaner', '~> 0.6.0'
39	39	gem 'email_spec'
40	40	end
...	...
...	...	@@ -57,7 +57,7 @@ GEM
57	57	bcrypt-ruby (~> 2.1.2)
58	58	orm_adapter (~> 0.0.3)
59	59	warden (~> 1.0.3)
60		- diff-lcs (1.1.2)
	60	+ diff-lcs (1.1.3)
61	61	email_spec (1.1.1)
62	62	rspec (~> 2.0)
63	63	erubis (2.6.6)
...	...	@@ -158,19 +158,19 @@ GEM
158	158	responders (0.6.4)
159	159	rest-client (1.5.1)
160	160	mime-types (>= 1.16)
161		- rspec (2.5.0)
162		- rspec-core (~> 2.5.0)
163		- rspec-expectations (~> 2.5.0)
164		- rspec-mocks (~> 2.5.0)
165		- rspec-core (2.5.1)
166		- rspec-expectations (2.5.0)
	161	+ rspec (2.6.0)
	162	+ rspec-core (~> 2.6.0)
	163	+ rspec-expectations (~> 2.6.0)
	164	+ rspec-mocks (~> 2.6.0)
	165	+ rspec-core (2.6.4)
	166	+ rspec-expectations (2.6.0)
167	167	diff-lcs (~> 1.1.2)
168		- rspec-mocks (2.5.0)
169		- rspec-rails (2.5.0)
	168	+ rspec-mocks (2.6.0)
	169	+ rspec-rails (2.6.1)
170	170	actionpack (~> 3.0)
171	171	activesupport (~> 3.0)
172	172	railties (~> 3.0)
173		- rspec (~> 2.5.0)
	173	+ rspec (~> 2.6.0)
174	174	ruby-debug (0.10.4)
175	175	columnize (>= 0.1)
176	176	ruby-debug-base (~> 0.10.4.0)
...	...	@@ -232,8 +232,8 @@ DEPENDENCIES
232	232	pivotal-tracker
233	233	rails (= 3.0.10)
234	234	redmine_client!
235		- rspec (~> 2.5)
236		- rspec-rails (~> 2.5)
	235	+ rspec (~> 2.6)
	236	+ rspec-rails (~> 2.6)
237	237	ruby-debug
238	238	ruby-debug19
239	239	ruby-fogbugz
...	...
...	...	@@ -10,11 +10,20 @@ class ApplicationController < ActionController::Base
10	10	(location == root_path && App.count == 1) ? app_path(App.first) : location
11	11	end
12	12
13		- protected
	13	+ rescue_from ActionController::RedirectBackError, :with => :redirect_to_root
	14	+
	15	+
	16	+protected
	17	+
	18	+
	19	+ def require_admin!
	20	+ redirect_to_root unless user_signed_in? && current_user.admin?
	21	+ end
	22	+
	23	+ def redirect_to_root
	24	+ redirect_to(root_path)
	25	+ end
14	26
15		- def require_admin!
16		- redirect_to root_path unless user_signed_in? && current_user.admin?
17		- end
18	27
19	28	end
20	29
...	...
1	1	class AppsController < InheritedResources::Base
2		-
3	2	before_filter :require_admin!, :except => [:index, :show]
4	3	before_filter :parse_email_at_notices_or_set_default, :only => [:create, :update]
5	4	respond_to :html
6	5
	6	+
7	7	def show
8	8	respond_to do \|format\|
9	9	format.html do
10	10	@all_errs = !!params[:all_errs]
11	11
12		- @errs = resource.errs
13		- @errs = @errs.unresolved unless @all_errs
14		- @errs = @errs.in_env(params[:environment]).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
	12	+ @problems = resource.problems
	13	+ @problems = @problems.unresolved unless @all_errs
	14	+ @problems = @problems.in_env(params[:environment]).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
15	15
	16	+ @selected_problems = params[:problems] \|\| []
16	17	@deploys = @app.deploys.order_by(:created_at.desc).limit(5)
17	18	end
18	19	format.atom do
19		- @errs = resource.errs.unresolved.ordered
	20	+ @problems = resource.problems.unresolved.ordered
20	21	end
21	22	end
22	23	end
...	...	@@ -49,7 +50,7 @@ class AppsController < InheritedResources::Base
49	50	# Caches the unresolved err counts while performing the sort.
50	51	@unresolved_counts = {}
51	52	@apps \|\|= end_of_association_chain.all.sort{\|a,b\|
52		- [a,b].each{\|app\| @unresolved_counts[app.id] \|\|= app.errs.unresolved.count }
	53	+ [a,b].each{\|app\| @unresolved_counts[app.id] \|\|= app.problems.unresolved.count }
53	54	@unresolved_counts[b.id] <=> @unresolved_counts[a.id]
54	55	}
55	56	end
...	...
...	...	@@ -18,9 +18,9 @@ class DeploysController < ApplicationController
18	18
19	19	@deploys = app.deploys.order_by(:created_at.desc).paginate(:page => params[:page], :per_page => 10)
20	20	end
21		-
	21	+
22	22	private
23		-
	23	+
24	24	def default_deploy
25	25	if params[:deploy]
26	26	{
...	...	@@ -32,7 +32,7 @@ class DeploysController < ApplicationController
32	32	}
33	33	end
34	34	end
35		-
	35	+
36	36	# handle Heroku's HTTP post deployhook format
37	37	def heroku_deploy
38	38	{
...	...	@@ -42,5 +42,6 @@ class DeploysController < ApplicationController
42	42	:revision => params[:head],
43	43	}
44	44	end
45		-
	45	+
46	46	end
	47	+
...	...
1	1	class ErrsController < ApplicationController
	2	+ include ActionView::Helpers::TextHelper
	3	+
	4	+ before_filter :find_app, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
	5	+ before_filter :find_problem, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
	6	+ before_filter :find_selected_problems, :only => [:destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
	7	+
2	8
3		- before_filter :find_app, :except => [:index, :all]
4		- before_filter :find_err, :except => [:index, :all]
5	9
6	10	def index
7	11	app_scope = current_user.admin? ? App.all : current_user.apps
8		- @errs = Err.for_apps(app_scope).in_env(params[:environment]).unresolved.ordered
	12	+ @problems = Problem.for_apps(app_scope).in_env(params[:environment]).unresolved.ordered
	13	+ @selected_problems = params[:problems] \|\| []
9	14	respond_to do \|format\|
10	15	format.html do
11		- @errs = @errs.paginate(:page => params[:page], :per_page => current_user.per_page)
	16	+ @problems = @problems.paginate(:page => params[:page], :per_page => current_user.per_page)
12	17	end
13	18	format.atom
14	19	end
15	20	end
16	21
	22	+
17	23	def all
18	24	app_scope = current_user.admin? ? App.all : current_user.apps
19		- @errs = Err.for_apps(app_scope).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
	25	+ @problems = Problem.for_apps(app_scope).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
	26	+ @selected_problems = params[:problems] \|\| []
20	27	end
21	28
	29	+
22	30	def show
23		- page = (params[:notice] \|\| @err.notices_count)
	31	+ page = (params[:notice] \|\| @problem.notices_count)
24	32	page = 1 if page.to_i.zero?
25		- @notices = @err.notices.ordered.paginate(:page => page, :per_page => 1)
	33	+ @notices = @problem.notices.paginate(:page => page, :per_page => 1)
26	34	@notice = @notices.first
27	35	@comment = Comment.new
28	36	end
29	37
	38	+
30	39	def create_issue
31	40	set_tracker_params
32	41
33	42	if @app.issue_tracker
34		- @app.issue_tracker.create_issue @err
	43	+ @app.issue_tracker.create_issue @problem
35	44	else
36	45	flash[:error] = "This app has no issue tracker setup."
37	46	end
38		- redirect_to app_err_path(@app, @err)
	47	+ redirect_to app_err_path(@app, @problem)
39	48	rescue ActiveResource::ConnectionError => e
40	49	Rails.logger.error e.to_s
41	50	flash[:error] = "There was an error during issue creation. Check your tracker settings or try again later."
42		- redirect_to app_err_path(@app, @err)
	51	+ redirect_to app_err_path(@app, @problem)
43	52	end
44	53
	54	+
45	55	def unlink_issue
46		- @err.update_attribute :issue_link, nil
47		- redirect_to app_err_path(@app, @err)
	56	+ @problem.update_attribute :issue_link, nil
	57	+ redirect_to app_err_path(@app, @problem)
48	58	end
49	59
	60	+
50	61	def resolve
51	62	# Deal with bug in mongoid where find is returning an Enumberable obj
52		- @err = @err.first if @err.respond_to?(:first)
53		-
54		- @err.resolve!
	63	+ @problem = @problem.first if @problem.respond_to?(:first)
55	64
	65	+ @problem.resolve!
56	66	flash[:success] = 'Great news everyone! The err has been resolved.'
57		-
58	67	redirect_to :back
59	68	rescue ActionController::RedirectBackError
60	69	redirect_to app_path(@app)
...	...	@@ -64,15 +73,16 @@ class ErrsController < ApplicationController
64	73	def create_comment
65	74	@comment = Comment.new(params[:comment].merge(:user_id => current_user.id))
66	75	if @comment.valid?
67		- @err.comments << @comment
68		- @err.save
	76	+ @problem.comments << @comment
	77	+ @problem.save
69	78	flash[:success] = "Comment saved!"
70	79	else
71	80	flash[:error] = "I'm sorry, your comment was blank! Try again?"
72	81	end
73		- redirect_to app_err_path(@app, @err)
	82	+ redirect_to app_err_path(@app, @problem)
74	83	end
75	84
	85	+
76	86	def destroy_comment
77	87	@comment = Comment.find(params[:comment_id])
78	88	if @comment.destroy
...	...	@@ -80,29 +90,86 @@ class ErrsController < ApplicationController
80	90	else
81	91	flash[:error] = "Sorry, I couldn't delete your comment for some reason. I hope you don't have any sensitive information in there!"
82	92	end
83		- redirect_to app_err_path(@app, @err)
	93	+ redirect_to app_err_path(@app, @problem)
	94	+ end
	95	+
	96	+
	97	+ def resolve_several
	98	+ @selected_problems.each(&:resolve!)
	99	+ flash[:success] = "Great news everyone! #{pluralize(@selected_problems.count, 'err has', 'errs have')} been resolved."
	100	+ redirect_to :back
84	101	end
85	102
86	103
87		- protected
	104	+ def unresolve_several
	105	+ @selected_problems.each(&:unresolve!)
	106	+ flash[:success] = "#{pluralize(@selected_problems.count, 'err has', 'errs have')} been unresolved."
	107	+ redirect_to :back
	108	+ end
88	109
89		- def find_app
90		- @app = App.find(params[:app_id])
91	110
92		- # Mongoid Bug: could not chain: current_user.apps.find_by_id!
93		- # apparently finding by 'watchers.email' and 'id' is broken
94		- raise(Mongoid::Errors::DocumentNotFound.new(App,@app.id)) unless current_user.admin? \|\| current_user.watching?(@app)
	111	+ def merge_several
	112	+ if @selected_problems.length < 2
	113	+ flash[:notice] = "You must select at least two errors to merge"
	114	+ else
	115	+ @merged_problem = Problem.merge!(@selected_problems)
	116	+ flash[:notice] = "#{@selected_problems.count} errors have been merged."
95	117	end
	118	+ redirect_to :back
	119	+ end
96	120
97		- def find_err
98		- @err = @app.errs.find(params[:id])
99		- end
100	121
101		- def set_tracker_params
102		- IssueTracker.default_url_options[:host] = request.host
103		- IssueTracker.default_url_options[:port] = request.port
104		- IssueTracker.default_url_options[:protocol] = request.scheme
	122	+ def unmerge_several
	123	+ all = @selected_problems.map(&:unmerge!).flatten
	124	+ flash[:success] = "#{pluralize(all.length, 'err has', 'errs have')} been unmerged."
	125	+ redirect_to :back
	126	+ end
	127	+
	128	+
	129	+ def destroy_several
	130	+ @selected_problems.each(&:destroy)
	131	+ flash[:notice] = "#{pluralize(@selected_problems.count, 'err has', 'errs have')} been deleted."
	132	+ redirect_to :back
	133	+ end
	134	+
	135	+
	136	+protected
	137	+
	138	+
	139	+ def find_app
	140	+ @app = App.find(params[:app_id])
	141	+
	142	+ # Mongoid Bug: could not chain: current_user.apps.find_by_id!
	143	+ # apparently finding by 'watchers.email' and 'id' is broken
	144	+ raise(Mongoid::Errors::DocumentNotFound.new(App,@app.id)) unless current_user.admin? \|\| current_user.watching?(@app)
	145	+ end
	146	+
	147	+
	148	+ def find_problem
	149	+ @problem = @app.problems.find(params[:id])
	150	+
	151	+ # Deal with bug in mogoid where find is returning an Enumberable obj
	152	+ @problem = @problem.first if @problem.respond_to?(:first)
	153	+ end
	154	+
	155	+
	156	+ def set_tracker_params
	157	+ IssueTracker.default_url_options[:host] = request.host
	158	+ IssueTracker.default_url_options[:port] = request.port
	159	+ IssueTracker.default_url_options[:protocol] = request.scheme
	160	+ end
	161	+
	162	+
	163	+ def find_selected_problems
	164	+ err_ids = (params[:problems] \|\| []).compact
	165	+ if err_ids.empty?
	166	+ flash[:notice] = "You have not selected any errors"
	167	+ redirect_to :back
	168	+ else
	169	+ @selected_problems = Array(Problem.find(err_ids))
105	170	end
	171	+ end
	172	+
106	173
107	174	end
108	175
...	...
...	...	@@ -5,8 +5,9 @@ class NoticesController < ApplicationController
5	5
6	6	def create
7	7	# params[:data] if the notice came from a GET request, raw_post if it came via POST
8		- @notice = Notice.from_xml(params[:data] \|\| request.raw_post)
	8	+ @notice = App.report_error!(params[:data] \|\| request.raw_post)
9	9	respond_with @notice
10	10	end
11	11
12	12	end
	13	+
...	...
...	...	@@ -71,3 +71,4 @@ class UsersController < ApplicationController
71	71	end
72	72
73	73	end
	74	+
...	...
1	1	module ErrsHelper
2		- def last_notice_at err
3		- err.last_notice_at \|\| err.created_at
	2	+ def last_notice_at(problem)
	3	+ problem.last_notice_at \|\| problem.created_at
4	4	end
5	5
6	6	def err_confirm
...	...