fixed conflict

damau
2 parents 0051bd61 98963feb
Showing 62 changed files with 1534 additions and 346 deletions Show diff stats
Gemfile
Gemfile.lock
README.md
app/assets/images/webhook_create.png
app/assets/images/webhook_goto.png
app/assets/images/webhook_inactive.png
app/assets/stylesheets/errbit.css
app/controllers/api/v1/stats_controller.rb
app/helpers/application_helper.rb
app/helpers/backtrace_line_helper.rb
app/mailers/mailer.rb
app/models/app.rb
app/models/backtrace.rb
app/models/backtrace_line.rb
app/models/backtrace_line_normalizer.rb
app/models/comment.rb
app/models/comment_observer.rb
app/models/error_report.rb
app/models/issue_trackers/redmine_tracker.rb
app/models/notice.rb
 source 'http://rubygems.org'
  
-gem 'rails', '3.2.11'
+gem 'rails', '3.2.12'
 gem 'mongoid', '~> 2.4.10'
 gem 'mongoid_rails_migrations'
 gem 'devise', '~> 1.5.4'
@@ -8,7 +8,7 @@ gem &#39;haml&#39;
 gem 'htmlentities', "~> 4.3.0"
 gem 'rack-ssl', :require => 'rack/ssl'   # force SSL
  
-gem 'useragent', '~> 0.3.1'
+gem 'useragent', '~> 0.4.16'
 gem 'inherited_resources'
 gem 'SystemTimer', :platform => :ruby_18
 gem 'actionmailer_inline_css', "~> 1.3.0"
@@ -83,6 +83,11 @@ group :development, :test do
 #  gem 'rpm_contrib'
 #  gem 'newrelic_rpm'
   gem 'capistrano'
+
+  # better errors
+  gem 'better_errors', :platform => :ruby_19
+  gem 'binding_of_caller', :platform => :ruby_19
+  gem 'meta_request', :platform => :ruby_19
 end
  
 gem 'foreman', :group => :development
@@ -9,40 +9,45 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
       mail (~> 2.4.4)
     actionmailer_inline_css (1.3.1)
       actionmailer (>= 3.0.0)
       nokogiri (>= 1.4.4)
       premailer (>= 1.7.1)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
+    better_errors (0.7.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+    binding_of_caller (0.7.1)
+      debug_inspector (>= 0.0.1)
     bitbucket_rest_api (0.1.1)
       faraday (~> 0.8.1)
       faraday_middleware (~> 0.8.1)
@@ -79,13 +84,14 @@ GEM
       rdoc
     daemons (1.1.8)
     database_cleaner (0.6.7)
-    debugger (1.2.1)
+    debug_inspector (0.0.2)
+    debugger (1.3.0)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.4)
+      debugger-ruby_core_source (~> 1.1.7)
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.4)
+    debugger-ruby_core_source (1.1.7)
     devise (1.5.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
@@ -131,7 +137,7 @@ GEM
       has_scope (~> 0.5.0)
       responders (~> 0.6)
     journey (1.0.4)
-    json (1.7.6)
+    json (1.7.7)
     jwt (0.1.5)
       multi_json (>= 1.0)
     kaminari (0.14.1)
@@ -140,7 +146,7 @@ GEM
     kgio (2.7.4)
     launchy (2.1.2)
       addressable (~> 2.3)
-    libv8 (3.3.10.4)
+    libv8 (3.11.8.13)
     libwebsocket (0.1.5)
       addressable
     libxml-ruby (2.3.3)
@@ -153,8 +159,11 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    meta_request (0.2.2)
+      rack-contrib
+      railties
     method_source (0.7.1)
-    mime-types (1.19)
+    mime-types (1.21)
     mongo (1.6.2)
       bson (~> 1.6.2)
     mongoid (2.4.10)
@@ -166,7 +175,7 @@ GEM
       bundler (>= 1.0.0)
       rails (>= 3.0.0)
       railties (>= 3.0.0)
-    multi_json (1.5.0)
+    multi_json (1.5.1)
     multi_xml (0.5.2)
     multipart-post (1.1.5)
     net-scp (1.0.4)
@@ -220,27 +229,29 @@ GEM
       slop (>= 2.4.4, < 3)
     pry-rails (0.2.0)
       pry
-    rack (1.4.3)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-contrib (1.1.0)
+      rack (>= 0.9.1)
+    rack-ssl (1.3.3)
       rack
     rack-ssl-enforcer (0.2.4)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
       bundler (~> 1.0)
-      railties (= 3.2.11)
+      railties (= 3.2.12)
     rails_autolink (1.0.9)
       rails (~> 3.1)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -248,8 +259,9 @@ GEM
     raindrops (0.10.0)
     rake (10.0.3)
     rbx-require-relative (0.0.9)
-    rdoc (3.12)
+    rdoc (3.12.1)
       json (~> 1.4)
+    ref (1.0.2)
     responders (0.9.2)
       railties (~> 3.1)
     rest-client (1.6.7)
@@ -276,7 +288,7 @@ GEM
     ruby-fogbugz (0.1.1)
       crack
     rubyzip (0.9.9)
-    rushover (0.1.1)
+    rushover (0.3.0)
       json
       rest-client
     selenium-webdriver (2.25.0)
@@ -291,13 +303,14 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.10.2)
-      libv8 (~> 3.3.10)
+    therubyracer (0.11.4)
+      libv8 (~> 3.11.8.12)
+      ref
     thin (1.4.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
     timecop (0.3.5)
     treetop (1.4.12)
@@ -315,7 +328,7 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    useragent (0.3.2)
+    useragent (0.4.16)
     warden (1.2.1)
       rack (>= 1.0)
     webmock (1.8.7)
@@ -332,6 +345,8 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer
   actionmailer_inline_css (~> 1.3.0)
+  better_errors
+  binding_of_caller
   bitbucket_rest_api
   bson (= 1.6.2)
   bson_ext (= 1.6.2)
@@ -356,6 +371,7 @@ DEPENDENCIES
   kaminari (>= 0.14.1)
   launchy
   lighthouse-api
+  meta_request
   mongo (= 1.6.2)
   mongoid (~> 2.4.10)
   mongoid_rails_migrations
@@ -366,7 +382,7 @@ DEPENDENCIES
   pry-rails
   rack-ssl
   rack-ssl-enforcer
-  rails (= 3.2.11)
+  rails (= 3.2.12)
   rails_autolink (~> 1.0.9)
   ri_cal
   rspec-rails (~> 2.6)
@@ -380,7 +396,7 @@ DEPENDENCIES
   uglifier (>= 1.0.3)
   underscore-rails
   unicorn
-  useragent (~> 0.3.1)
+  useragent (~> 0.4.16)
   webmock
   xmpp4r
   yajl-ruby
@@ -443,6 +443,13 @@ TODO
 * Add ability for watchers to be configured for types of notifications they should receive
  
  
+People using Errbit
+-------------------
+
+See our wiki page for a [list of people and companies around the world who use Errbit](https://github.com/errbit/errbit/wiki/People-using-Errbit).
+Feel free to [edit this page](https://github.com/errbit/errbit/wiki/People-using-Errbit/_edit), and add your name and country to the list if you are using Errbit.
+
+
 Special Thanks
 --------------
  
@@ -654,7 +654,6 @@ table.errs td.message a {
     overflow: hidden;
     text-overflow: ellipsis;
     -o-text-overflow: ellipsis;
-    white-space: nowrap;
   /* ------ */
 }
 table.errs td.message em {
@@ -0,0 +1,41 @@
+class Api::V1::StatsController < ApplicationController
+  respond_to :json, :xml
+
+  # The stats API only requires an api_key for the given app.
+  skip_before_filter :authenticate_user!
+  before_filter :require_api_key_or_authenticate_user!
+
+  def app
+    if problem = @app.problems.order_by(:last_notice_at.desc).first
+      @last_error_time = problem.last_notice_at
+    end
+
+    stats = {
+      :name => @app.name,
+      :last_error_time => @last_error_time,
+      :unresolved_errors => @app.unresolved_count
+    }
+
+    respond_to do |format|
+      format.html { render :json => Yajl.dump(stats) } # render JSON if no extension specified on path
+      format.json { render :json => Yajl.dump(stats) }
+      format.xml  { render :xml  => stats }
+    end
+  end
+
+
+  protected
+
+  def require_api_key_or_authenticate_user!
+    if params[:api_key].present?
+      if @app = App.where(:api_key => params[:api_key]).first
+        return true
+      end
+    end
+
+    authenticate_user!
+  end
+
+end
+
+
@@ -57,7 +57,7 @@ module ApplicationHelper
     total   = (options[:total] || total_from_tallies(tallies))
     percent = 100.0 / total.to_f
     rows    = tallies.map {|value, count| [(count.to_f * percent), value]} \
-                     .sort {|a, b| a[0] <=> b[0]}
+                     .sort {|a, b| b[0] <=> a[0]}
     render "problems/tally_table", :rows => rows
   end
  
 module BacktraceLineHelper
   def link_to_source_file(line, &block)
     text = capture_haml(&block)
-    line.in_app? ? link_to_in_app_source_file(line, text) : link_to_external_source_file(text)
+     link_to_in_app_source_file(line, text) || link_to_external_source_file(text)
   end
  
   private
   def link_to_in_app_source_file(line, text)
-    link_to_repo_source_file(line, text) || link_to_issue_tracker_file(line, text)
+    return unless line.in_app?
+    if line.file_name =~ /\.js$/
+      link_to_hosted_javascript(line, text)
+    else
+      link_to_repo_source_file(line, text) ||
+      link_to_issue_tracker_file(line, text)
+    end
   end
  
   def link_to_repo_source_file(line, text)
     link_to_github(line, text) || link_to_bitbucket(line, text)
   end
  
+  def link_to_hosted_javascript(line, text)
+    if line.app.asset_host?
+      link_to(text, "#{line.app.asset_host}/#{line.file_relative}", :target => '_blank')
+    end
+  end
+
   def link_to_external_source_file(text)
     text
   end
@@ -31,7 +43,7 @@ module BacktraceLineHelper
  
   def link_to_issue_tracker_file(line, text = nil)
     return unless line.app.issue_tracker && line.app.issue_tracker.respond_to?(:url_to_file)
-    href = line.app.issue_tracker.url_to_file(line.file, line.number)
+    href = line.app.issue_tracker.url_to_file(line.file_relative, line.number)
     link_to(text || line.file_name, href, :target => '_blank')
   end
  
@@ -3,14 +3,20 @@
 require Rails.root.join('config/routes.rb')
  
 class Mailer < ActionMailer::Base
+  helper ApplicationHelper
+  helper BacktraceLineHelper
+
   default :from => Errbit::Config.email_from
  
   def err_notification(notice)
     @notice   = notice
     @app      = notice.app
  
+    count = @notice.similar_count
+    count = count > 1 ? "(#{count}) " : ""
+
     mail :to      => @app.notification_recipients,
-         :subject => "[#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
+         :subject => "#{count}[#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
   end
  
   def deploy_notification(deploy)
@@ -20,5 +26,18 @@ class Mailer &lt; ActionMailer::Base
     mail :to       => @app.notification_recipients,
          :subject  => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"
   end
-end
  
+  def comment_notification(comment)
+    @comment  = comment
+    @user     = comment.user
+    @problem  = comment.err
+    @notice   = @problem.notices.first
+    @app      = @problem.app
+
+    # Don't send comment notification to user who posted the comment
+    recipients = @app.notification_recipients - [comment.user.email]
+
+    mail :to      => recipients,
+         :subject => "#{@user.name} commented on [#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
+  end
+end
 class App
+  include Comparable
   include Mongoid::Document
   include Mongoid::Timestamps
-  include Comparable
  
   field :name, :type => String
   field :api_key
   field :github_repo
   field :bitbucket_repo
+  field :asset_host
   field :repository_branch
   field :resolve_errs_on_deploy, :type => Boolean, :default => false
   field :notify_all_users, :type => Boolean, :default => false
@@ -23,7 +23,7 @@ class Backtrace
   end
  
   def raw=(raw)
-    raw.each do |raw_line|
+    raw.compact.each do |raw_line|
       lines << BacktraceLine.new(BacktraceLineNormalizer.new(raw_line).call)
     end
   end
@@ -4,6 +4,7 @@ class BacktraceLine
   GEMS_PATH   = %r{\[GEM_ROOT\]\/gems\/([^\/]+)}
  
   field :number, :type => Integer
+  field :column, :type => Integer
   field :file
   field :method
  
@@ -14,7 +15,7 @@ class BacktraceLine
   delegate :app, :to => :backtrace
  
   def to_s
-    "#{file}:#{number}"
+    "#{file_relative}:#{number}" << (column.present? ? ":#{column}" : "")
   end
  
   def in_app?
 class BacktraceLineNormalizer
   def initialize(raw_line)
-    @raw_line = raw_line
+    @raw_line = raw_line || {}
   end
  
   def call
@@ -12,7 +12,12 @@ class BacktraceLineNormalizer
     if @raw_line['file'].blank?
       "[unknown source]"
     else
-      @raw_line['file'].to_s.gsub(/\[PROJECT_ROOT\]\/.*\/ruby\/[0-9.]+\/gems/, '[GEM_ROOT]/gems')
+      file = @raw_line['file'].to_s
+      # Detect lines from gem
+      file.gsub!(/\[PROJECT_ROOT\]\/.*\/ruby\/[0-9.]+\/gems/, '[GEM_ROOT]/gems')
+      # Strip any query strings
+      file.gsub!(/\?[^\?]*$/, '')
+      @raw_line['file'] = file
     end
   end
  
@@ -10,6 +10,7 @@ class Comment
  
   belongs_to :err, :class_name => "Problem"
   belongs_to :user
+  delegate   :app, :to => :err
  
   validates_presence_of :body
  
@@ -0,0 +1,8 @@
+class CommentObserver < Mongoid::Observer
+  observe :comment
+
+  def after_create(comment)
+    Mailer.comment_notification(comment).deliver if comment.app.notifiable?
+  end
+
+end
@@ -2,7 +2,7 @@ require &#39;digest/sha1&#39;
 require 'hoptoad_notifier'
  
 class ErrorReport
-  attr_reader :error_class, :message, :request, :server_environment, :api_key, :notifier, :user_attributes, :current_user, :framework
+  attr_reader :error_class, :message, :request, :server_environment, :api_key, :notifier, :user_attributes, :framework
  
   def initialize(xml_or_attributes)
     @attributes = (xml_or_attributes.is_a?(String) ? Hoptoad.parse_xml!(xml_or_attributes) : xml_or_attributes).with_indifferent_access
@@ -42,7 +42,6 @@ class ErrorReport
       :server_environment => server_environment,
       :notifier => notifier,
       :user_attributes => user_attributes,
-      :current_user => current_user,
       :framework => framework
     )
  
@@ -59,8 +58,17 @@ class ErrorReport
  
   private
   def fingerprint_source
+    # Find the first backtrace line with a file and line number.
+    if line = backtrace.lines.detect {|l| l.number.present? && l.file.present? }
+      # If line exists, only use file and number.
+      file_or_message = "#{line.file}:#{line.number}"
+    else
+      # If no backtrace, use error message
+      file_or_message = message
+    end
+
     {
-      :backtrace => backtrace.id,
+      :file_or_message => file_or_message,
       :error_class => error_class,
       :component => component,
       :action => action,
@@ -9,6 +9,12 @@ if defined? RedmineClient
       [:api_token, {
         :placeholder => "API Token for your account"
       }],
+      [:username, {
+        :placeholder => "Your username"
+      }],
+      [:password, {
+        :placeholder => "Your password"
+      }],
       [:project_id, {
         :label       => "Ticket Project",
         :placeholder => "Redmine Project where tickets will be created"
@@ -22,15 +28,19 @@ if defined? RedmineClient
  
     def check_params
       if Fields.detect {|f| self[f[0]].blank? && !f[1][:optional]}
-        errors.add :base, 'You must specify your Redmine URL, API token and Project ID'
+        errors.add :base, 'You must specify your Redmine URL, API token, Username, Password and Project ID'
       end
     end
  
     def create_issue(problem, reported_by = nil)
       token = api_token
       acc = account
+      user = username
+      passwd = password
       RedmineClient::Base.configure do
         self.token = token
+        self.user = user
+        self.password = passwd
         self.site = acc
         self.format = :xml
       end
@@ -47,7 +57,7 @@ if defined? RedmineClient
     def url_to_file(file_path, line_number = nil)
       # alt_project_id let's users specify a different project for tickets / app files.
       project = self.alt_project_id.present? ? self.alt_project_id : self.project_id
-      url = "#{self.account}/projects/#{project}/repository/annotate/#{file_path.sub(/^\//,'')}"
+      url = "#{self.account.gsub(/\/$/, '')}/projects/#{project}/repository/revisions/#{app.repository_branch}/changes/#{file_path.sub(/\[PROJECT_ROOT\]/, '').sub(/^\//,'')}"
       line_number ? url << "#L#{line_number}" : url
     end
  
@@ -10,7 +10,6 @@ class Notice
   field :request, :type => Hash
   field :notifier, :type => Hash
   field :user_attributes, :type => Hash
-  field :current_user, :type => Hash
   field :framework
   field :error_class
   delegate :lines, :to => :backtrace, :prefix => true
@@ -43,7 +42,11 @@ class Notice
   end
  
   def user_agent_string
-    (user_agent.nil? || user_agent.none?) ? "N/A" : "#{user_agent.browser} #{user_agent.version}"
+    if user_agent.nil? || user_agent.none?
+      "N/A"
+    else
+      "#{user_agent.browser} #{user_agent.version} (#{user_agent.os})"
+    end
   end
  
   def environment_name
@@ -12,7 +12,6 @@ class NotificationService
   field :subdomain, :type => String
   field :sender_name, :type => String
   field :notify_at_notices, :type => Array, :default => Errbit::Config.notify_at_notices
-  
   embedded_in :app, :inverse_of => :notification_service
  
   validate :check_params
@@ -52,4 +51,8 @@ class NotificationService
   def configured?
     api_token.present?
   end
+
+  def problem_url(problem)
+    "http://#{Errbit::Config.host}/apps/#{problem.app.id}/problems/#{problem.id}"
+  end
 end
@@ -22,7 +22,7 @@ class NotificationServices::HubotService &lt; NotificationService
   end
  
   def message_for_hubot(problem)
-    notification_description(problem)
+    "[#{problem.app.name}][#{problem.environment}][#{problem.where}]: #{problem.error_class} #{problem_url(problem)}"
   end
  
   def create_notification(problem)
@@ -0,0 +1,19 @@
+class NotificationServices::WebhookService < NotificationService
+  Label = "webhook"
+  Fields = [
+    [:api_token, {
+      :placeholder => 'URL to receive a POST request when an error occurs',
+      :label => 'URL'
+    }]
+  ]
+
+  def check_params
+    if Fields.detect {|f| self[f[0]].blank? }
+      errors.add :base, 'You must specify the URL'
+    end
+  end
+
+  def create_notification(problem)
+    HTTParty.post(api_token, :body => {:problem => problem.to_json})
+  end
+end
@@ -52,6 +52,13 @@ class User
     github_account? && Errbit::Config.github_access_scope.include?('repo')
   end
  
+  def github_login=(login)
+    if login.is_a?(String) && login.strip.empty?
+      login = nil
+    end
+    self[:github_login] = login
+  end
+
   protected
  
     def destroy_watchers
@@ -13,6 +13,10 @@
 %div
   = f.label :bitbucket_repo
   = f.text_field :bitbucket_repo, :placeholder => "errbit/errbit from https://bitbucket.org/errbit/errbit"
+%div
+  = f.label :asset_host
+  %em Used to generate links for JavaScript errors
+  = f.text_field :asset_host, :placeholder => "e.g. https://assets.example.com"
  
 %fieldset
   %legend Notifications
@@ -6,9 +6,9 @@
 -#    remote:        data-remote
 -#    paginator:     the paginator that renders the pagination tags inside
 = paginator.render do
-  .notice-pagination<
+  .notice-pagination
     = next_page_tag
-    |&nbsp;
+    |
     = prev_page_tag
 .notice-pagination-loader= image_tag 'loader.gif'
 viewing occurrence #{page_count_from_end(current_page, total_pages)} of #{total_pages}
@@ -0,0 +1,50 @@
+%tr
+  %td.section
+    %table(cellpadding="0" cellspacing="0" border="0" align="left")
+      %tbody
+        %tr
+          %td.content(valign="top")
+            %div
+              %p
+                = @user.name
+                has just commented on an error that occurred in
+                = link_to(@app.name, app_url(@app), :class => "bold") << ","
+                on the
+                %span.bold= @problem.environment
+                environment.
+                %br
+                This err has occurred #{pluralize @problem.notices_count, 'time'}.
+              %p
+                = link_to("Click here to view the error and add a comment on Errbit", app_problem_url(@app, @problem), :class => "bold") << "."
+
+%tr
+  %td.section
+    %table(cellpadding="0" cellspacing="0" border="0" align="left")
+      %tbody
+        %tr
+          %td.content(valign="top")
+            %div
+              %p.heading COMMENT:
+              %br
+              %p= @comment.body.to_s.gsub("\n", "<br/>").html_safe
+
+%tr
+  %td.section
+    %table(cellpadding="0" cellspacing="0" border="0" align="left")
+      %tbody
+        %tr
+          %td.content(valign="top")
+            %div
+              %p.heading ERROR MESSAGE:
+              %p= @problem.message
+              %p.heading WHERE:
+              %p.monospace
+                = @problem.where
+              %p.heading URL:
+              %p.monospace
+                - if @notice.request['url'].present?
+                  = link_to @notice.request['url'], @notice.request['url']
+              %p.heading BROWSER:
+              %p.monospace
+                = user_agent_graph(@problem)
+              %br
@@ -0,0 +1,36 @@
+<%= @user.name %> has just commented on an error that occurred in <%= @notice.environment_name %>: <%= raw(@notice.message) %>
+
+This err has occurred <%= pluralize @notice.problem.notices_count, 'time' %>. You should really look into it here:
+
+  <%= app_problem_url(@app, @notice.problem) %>
+
+
+COMMENT:
+
+<%= @comment.body %>
+
+
+-----------------------------------------------
+
+ERROR MESSAGE:
+
+<%= raw(@notice.message) %>
+
+
+WHERE:
+
+<%= @notice.where %>
+
+<% @notice.in_app_backtrace_lines.each do |line| %>
+  <%= line %>
+<% end %>
+
+
+URL:
+
+<%= @notice.request['url'] %>
+
+
+BROWSER:
+
+<%= @notice.user_agent_string %>
@@ -28,14 +28,31 @@
               %p.monospace
                 = @notice.where
               - @notice.in_app_backtrace_lines.each do |line|
-                %p.backtrace= line
-                %br
+                %p.backtrace
+                  = link_to_source_file(line) do
+                    = line.to_s
+              %br
               %p.heading URL:
               %p.monospace
                 - if @notice.request['url'].present?
                   = link_to @notice.request['url'], @notice.request['url']
-              %p.heading BACKTRACE:
-              - @notice.backtrace_lines.each do |line|
-                %p.backtrace= line
+              %p.heading BROWSER:
+              %p.monospace
+                = user_agent_graph(@notice.problem)
               %br
-
+              - if @notice.user_attributes.present?
+                %p.heading USER:
+                %table
+                  - @notice.user_attributes.each do |key, value|
+                    %tr
+                      %td(style="text-align: right; padding-right: 10px; color: #6a6a6a;")= key.to_s.titleize + ":"
+                      %td= auto_link(value.to_s)
+                %br
+              - if @notice.backtrace_lines.any?
+                %br
+                %p.heading FULL BACKTRACE:
+                - @notice.backtrace_lines.each do |line|
+                  %p.backtrace
+                    = link_to_source_file(line) do
+                      = line.to_s
+                %br
@@ -24,6 +24,20 @@ URL:
 <%= @notice.request['url'] %>
  
  
+BROWSER:
+
+<%= @notice.user_agent_string %>
+
+
+<%- if @notice.user_attributes.present? %>
+USER:
+
+<%- @notice.user_attributes.each do |key, value| %>
+<%= key.to_s.titleize %>: <%= value.to_s %>
+<%- end %>
+
+<%- end %>
+
 BACKTRACE:
  
 <% @notice.backtrace_lines.each do |line| %>
 %tr{:class => defined?(row_class) && row_class}
   %td.line{:class => line.in_app? && 'in-app' }
     = link_to_source_file(line) do
-      %span.path>=raw line.decorated_path
+      %span.path>= raw line.decorated_path
       %span.file>= line.file_name
       - if line.number.present?
         %span.number>= ":#{line.number}"
+      - if line.column.present?
+        %span.number>= ":#{line.column}"
     &rarr;
     %span.method= line.method
@@ -2,8 +2,8 @@
   %table.user_attributes
     %tr
       %td
-        %strong Information about the user who experienced the error.
-    - user.each do |user_key, user_value|
+        %strong The user who experienced the error:
+    - user.each do |key, value|
       %tr
-        %th= user_key
-        %td= auto_link(user_value.to_s).html_safe
+        %th= key
+        %td= auto_link(auto_link(value.to_s, :urls, :target => "_blank"), :email_addresses).html_safe
@@ -55,7 +55,7 @@
     %li= link_to 'Summary', '#summary', :rel => 'summary', :class => 'button'
     %li= link_to 'Backtrace', '#backtrace', :rel => 'backtrace', :class => 'button'
     - if @notice && @notice.user_attributes.present?
-      %li= link_to 'User Details', '#user_attributes', :rel => 'user_attributes', :class => 'button'
+      %li= link_to 'User', '#user_attributes', :rel => 'user_attributes', :class => 'button'
     %li= link_to 'Environment', '#environment', :rel => 'environment', :class => 'button'
     %li= link_to 'Parameters', '#params', :rel => 'params', :class => 'button'
     %li= link_to 'Session', '#session', :rel => 'session', :class => 'button'
@@ -71,7 +71,7 @@
  
   - if @notice.user_attributes.present?
     #user_attributes
-      %h3 User Details
+      %h3 User
       = render 'notices/user_attributes', :user => @notice.user_attributes
  
   #environment
@@ -48,11 +48,14 @@ module Errbit
       g.fixture_replacement :fabrication
     end
  
+    # Enable the mongoid identity map for performance
+    Mongoid.identity_map_enabled = true
+
     # IssueTracker subclasses use inheritance, so preloading models provides querying consistency in dev mode.
     config.mongoid.preload_models = true
  
     # Set up observers
-    config.mongoid.observers = :deploy_observer, :notice_observer
+    config.mongoid.observers = :deploy_observer, :notice_observer, :comment_observer
  
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
@@ -48,6 +48,12 @@ user_has_username: false
 # but you want to leave a short comment.
 allow_comments_with_issue_tracker: true
  
+# Display internal errors in production
+# Since this is an internal application, you might like to see what caused Errbit to crash.
+# Pull requests are always welcome!
+# However, you might be more comfortable setting this to false if your server can be accessed by anyone.
+display_internal_errors: true
+
 # Enable Gravatar.
 use_gravatar: true
 # Default Gravatar image, can be: mm, identicon, monsterid, wavatar, retro.
-# Load the rails application
-require File.expand_path('../application', __FILE__)
 if RUBY_VERSION.to_f >= 1.9
   require 'yaml'
   YAML::ENGINE.yamler = 'syck'
 end
+
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
 # Initialize the rails application
 Errbit::Application.initialize!
-
@@ -14,7 +14,7 @@ Errbit::Application.configure do
   config.action_controller.perform_caching = false
  
   # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.raise_delivery_errors = false
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
  
   # Print deprecation notices to the Rails logger
@@ -5,8 +5,8 @@ Errbit::Application.configure do
   # Code is not reloaded between requests
   config.cache_classes = true
  
-  # Full error reports are enabled, since this is an internal application.
-  config.consider_all_requests_local       = true
+  # Shows or hides all error details if something goes wrong inside Errbit
+  config.consider_all_requests_local       = false
   # Caching is turned on
   config.action_controller.perform_caching = true
  
@@ -74,3 +74,6 @@ end
   default.merge! :host => Errbit::Config.host if default[:host].blank?
 end
  
+if Rails.env.production?
+  Rails.application.config.consider_all_requests_local = Errbit::Config.display_internal_errors
+end
 \ No newline at end of file
@@ -69,7 +69,7 @@ Devise.setup do |config|
  
   # ==> Configuration for :validatable
   # Range for password length
-  config.password_length = 6..20
+  config.password_length = 6..1024
  
   # Regex to use to validate the email address
   config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
-#
 # Enforce SSL connections, if configured
 if Errbit::Config.enforce_ssl
+  ActionMailer::Base.default_url_options.merge!(:protocol => 'https://')
   Errbit::Application.configure do
     config.middleware.use Rack::SslEnforcer, :except => /^\/deploys/
   end
@@ -9,6 +9,8 @@
  
 defaults: &defaults
   host: localhost
+  identity_map_enabled: true
+
   # slaves:
   #   - host: slave1.local
   #     port: 27018
@@ -6,3 +6,4 @@
  
 production:
   uri: <%= ENV['MONGOHQ_URL'] %>
+  identity_map_enabled: true
@@ -6,3 +6,4 @@
  
 production:
   uri: <%= ENV['MONGOLAB_URI'] %>
+  identity_map_enabled: true
@@ -45,7 +45,12 @@ Errbit::Application.routes.draw do
   namespace :api do
     namespace :v1 do
       resources :problems, :only => [:index], :defaults => { :format => 'json' }
-      resources :notices, :only => [:index], :defaults => { :format => 'json' }
+      resources :notices,  :only => [:index], :defaults => { :format => 'json' }
+      resources :stats, :only => [], :defaults => { :format => 'json' } do
+        collection do
+          get :app
+        end
+      end
     end
   end
  
@@ -3,3 +3,27 @@
 worker_processes 3 # amount of unicorn workers to spin up
 timeout 30         # restarts workers that hang for 30 seconds
 preload_app true
+
+# Taken from github: https://github.com/blog/517-unicorn
+# Though everyone uses pretty miuch the same code
+before_fork do |server, worker|
+  ##
+  # When sent a USR2, Unicorn will suffix its pidfile with .oldbin and
+  # immediately start loading up a new version of itself (loaded with a new
+  # version of our app). When this new Unicorn is completely loaded
+  # it will begin spawning workers. The first worker spawned will check to
+  # see if an .oldbin pidfile exists. If so, this means we've just booted up
+  # a new Unicorn and need to tell the old one that it can now die. To do so
+  # we send it a QUIT.
+  #
+  # Using this method we get 0 downtime deploys.
+ 
+  old_pid = "#{server.config[:pid]}.oldbin"
+  if File.exists?(old_pid) && server.pid != old_pid
+    begin
+      Process.kill("QUIT", File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+      # someone else did our job for us
+    end
+  end
+end
@@ -59,11 +59,10 @@ module Hoptoad
  
         :api_key            => notice['api-key'],
         :notifier           => notice['notifier'],
-        :user_attributes    => notice['user-attributes'] || {},
-        :current_user       => notice['current-user'] || {},
+        # 'current-user' from airbrake, 'user-attributes' from airbrake_user_attributes gem
+        :user_attributes    => notice['current-user'] || notice['user-attributes'] || {},
         :framework          => notice['framework']
       }
     end
   end
 end
-
-var Hoptoad = {
-  VERSION           : '2.0',
-  NOTICE_XML        : '<?xml version="1.0" encoding="UTF-8"?>\
-  <notice version="2.0">\
-    <api-key></api-key>\
-    <notifier>\
-      <name>errbit_notifier_js</name>\
-      <version>2.0</version>\
-      <url>https://github.com/errbit/errbit</url>\
-    </notifier>\
-    <error>\
-      <class>EXCEPTION_CLASS</class>\
-      <message>EXCEPTION_MESSAGE</message>\
-      <backtrace>BACKTRACE_LINES</backtrace>\
-    </error>\
-    <request>\
-      <url>REQUEST_URL</url>\
-      <component>REQUEST_COMPONENT</component>\
-      <action>REQUEST_ACTION</action>\
-    </request>\
-    <server-environment>\
-      <project-root>PROJECT_ROOT</project-root>\
-      <environment-name>production</environment-name>\
-    </server-environment>\
-  </notice>',
-  ROOT              : window.location.protocol + '//' + window.location.host,
-  BACKTRACE_MATCHER : /^(.*)\@(.*)\:(\d+)$/,
-  backtrace_filters : [/notifier\.js/],
-
-  notify: function(error) {
-    var xml     = escape(Hoptoad.generateXML(error));
-    var host    = Hoptoad.host;
-    var url     = '//' + host + '/notifier_api/v2/notices.xml?data=' + xml;
-    var request = document.createElement('iframe');
-
-    request.style.width   = '1px';
-    request.style.height  = '1px';
-    request.style.display = 'none';
-    request.src = url;
-
-    document.getElementsByTagName('head')[0].appendChild(request);
-  },
-
-  setEnvironment: function(value) {
-    var matcher = /<environment-name>.*<\/environment-name>/;
-
-    Hoptoad.NOTICE_XML  = Hoptoad.NOTICE_XML.replace(matcher,
-                                                     '<environment-name>' +
-                                                       value +
-                                                     '</environment-name>')
-  },
-
-  setHost: function(value) {
-    Hoptoad.host = value;
-  },
-
-  setKey: function(value) {
-    var matcher = /<api-key>.*<\/api-key>/;
-
-    Hoptoad.NOTICE_XML = Hoptoad.NOTICE_XML.replace(matcher,
-                                                    '<api-key>' +
-                                                      value +
-                                                    '</api-key>');
-  },
-
-  setErrorDefaults: function(value) {
-    Hoptoad.errorDefaults = value;
-  },
-
-  generateXML: function(errorWithoutDefaults) {
-    var error = Hoptoad.mergeDefault(Hoptoad.errorDefaults, errorWithoutDefaults);
-
-    var xml       = Hoptoad.NOTICE_XML;
-    var url       = Hoptoad.escapeText(error.url       || '');
-    var component = Hoptoad.escapeText(error.component || '');
-    var action    = Hoptoad.escapeText(error.action    || '');
-    var type      = Hoptoad.escapeText(error.type      || 'Error');
-    var message   = Hoptoad.escapeText(error.message   || 'Unknown error.');
-    var backtrace = Hoptoad.generateBacktrace(error);
-
-
-    if (Hoptoad.trim(url) == '' && Hoptoad.trim(component) == '') {
-      xml = xml.replace(/<request>.*<\/request>/, '');
-    } else {
-      var data    = '';
-
-      var cgi_data = error['cgi-data'] || {};
-      cgi_data["HTTP_USER_AGENT"] = navigator.userAgent;
-      data += '<cgi-data>';
-      data += Hoptoad.generateVariables(cgi_data);
-      data += '</cgi-data>';
-
-      var methods = ['params', 'session'];
-
-      for (var i = 0; i < methods.length; i++) {
-        var method = methods[i];
-
-        if (error[method]) {
-          data += '<' + method + '>';
-          data += Hoptoad.generateVariables(error[method]);
-          data += '</' + method + '>';
-        }
-      }
-
-      xml = xml.replace('</request>',        data + '</request>')
-               .replace('REQUEST_URL',       url)
-               .replace('REQUEST_ACTION',    action)
-               .replace('REQUEST_COMPONENT', component);
-    }
+// Airbrake JavaScript Notifier Bundle
+(function(window, document, undefined) {
+// Domain Public by Eric Wendelin http://eriwen.com/ (2008)
+//                  Luke Smith http://lucassmith.name/ (2008)
+//                  Loic Dachary <loic@dachary.org> (2008)
+//                  Johan Euphrosine <proppy@aminche.com> (2008)
+//                  Øyvind Sean Kinsey http://kinsey.no/blog (2010)
+//                  Victor Homyakov (2010)
+//
+// Information and discussions
+// http://jspoker.pokersource.info/skin/test-printstacktrace.html
+// http://eriwen.com/javascript/js-stack-trace/
+// http://eriwen.com/javascript/stacktrace-update/
+// http://pastie.org/253058
+//
+// guessFunctionNameFromLines comes from firebug
+//
+// Software License Agreement (BSD License)
+//
+// Copyright (c) 2007, Parakey Inc.
+// All rights reserved.
+//
+// Redistribution and use of this software in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above
+//   copyright notice, this list of conditions and the
+//   following disclaimer.
+//
+// * Redistributions in binary form must reproduce the above
+//   copyright notice, this list of conditions and the
+//   following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+//
+// * Neither the name of Parakey Inc. nor the names of its
+//   contributors may be used to endorse or promote products
+//   derived from this software without specific prior
+//   written permission of Parakey Inc.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
-    return xml.replace('PROJECT_ROOT',     Hoptoad.ROOT)
-              .replace('EXCEPTION_CLASS',   type)
-              .replace('EXCEPTION_MESSAGE', message)
-              .replace('BACKTRACE_LINES',   backtrace.join(''));
-  },
-
-  generateBacktrace: function(error) {
-    error = error || {};
-
-    if (typeof error.stack != 'string') {
-      try {
-        (0)();
-      } catch(e) {
-        error.stack = e.stack;
-      }
-    }
+/**
+ * Main function giving a function stack trace with a forced or passed in Error 
+ *
+ * @cfg {Error} e The error to create a stacktrace from (optional)
+ * @cfg {Boolean} guess If we should try to resolve the names of anonymous functions
+ * @return {Array} of Strings with functions, lines, files, and arguments where possible 
+ */
+function printStackTrace(options) {
+    var ex = (options && options.e) ? options.e : null;
+    var guess = options ? !!options.guess : true;
+    
+    var p = new printStackTrace.implementation();
+    var result = p.run(ex);
+    return (guess) ? p.guessFunctions(result) : result;
+}
  
-    var backtrace  = [];
-    var stacktrace = Hoptoad.getStackTrace(error);
+printStackTrace.implementation = function() {};
  
-    for (var i = 0, l = stacktrace.length; i < l; i++) {
-      var line    = stacktrace[i];
-      var matches = line.match(Hoptoad.BACKTRACE_MATCHER);
+printStackTrace.implementation.prototype = {
+    run: function(ex) {
+        ex = ex ||
+            (function() {
+                try {
+                    var _err = __undef__ << 1;
+                } catch (e) {
+                    return e;
+                }
+            })();
+        // Use either the stored mode, or resolve it
+        var mode = this._mode || this.mode(ex);
+        if (mode === 'other') {
+            return this.other(arguments.callee);
+        } else {
+            return this[mode](ex);
+        }
+    },
+    
+    /**
+     * @return {String} mode of operation for the environment in question.
+     */
+    mode: function(e) {
+        if (e['arguments']) {
+            return (this._mode = 'chrome');
+        } else if (window.opera && e.stacktrace) {
+            return (this._mode = 'opera10');
+        } else if (e.stack) {
+            return (this._mode = 'firefox');
+        } else if (window.opera && !('stacktrace' in e)) { //Opera 9-
+            return (this._mode = 'opera');
+        }
+        return (this._mode = 'other');
+    },
  
-      if (matches && Hoptoad.validBacktraceLine(line)) {
-        var file = matches[2].replace(Hoptoad.ROOT, '[PROJECT_ROOT]');
+    /**
+     * Given a context, function name, and callback function, overwrite it so that it calls
+     * printStackTrace() first with a callback and then runs the rest of the body.
+     * 
+     * @param {Object} context of execution (e.g. window)
+     * @param {String} functionName to instrument
+     * @param {Function} function to call with a stack trace on invocation
+     */
+    instrumentFunction: function(context, functionName, callback) {
+        context = context || window;
+        context['_old' + functionName] = context[functionName];
+        context[functionName] = function() { 
+            callback.call(this, printStackTrace());
+            return context['_old' + functionName].apply(this, arguments);
+        };
+        context[functionName]._instrumented = true;
+    },
+    
+    /**
+     * Given a context and function name of a function that has been
+     * instrumented, revert the function to it's original (non-instrumented)
+     * state.
+     *
+     * @param {Object} context of execution (e.g. window)
+     * @param {String} functionName to de-instrument
+     */
+    deinstrumentFunction: function(context, functionName) {
+        if (context[functionName].constructor === Function &&
+                context[functionName]._instrumented &&
+                context['_old' + functionName].constructor === Function) {
+            context[functionName] = context['_old' + functionName];
+        }
+    },
+    
+    /**
+     * Given an Error object, return a formatted Array based on Chrome's stack string.
+     * 
+     * @param e - Error object to inspect
+     * @return Array<String> of function calls, files and line numbers
+     */
+    chrome: function(e) {
+        return e.stack.replace(/^[^\(]+?[\n$]/gm, '').replace(/^\s+at\s+/gm, '').replace(/^Object.<anonymous>\s*\(/gm, '{anonymous}()@').split('\n');
+    },
  
-        if (i == 0) {
-          if (matches[2].match(document.location.href)) {
-            backtrace.push('<line method="" file="internal: " number=""/>');
-          }
+    /**
+     * Given an Error object, return a formatted Array based on Firefox's stack string.
+     * 
+     * @param e - Error object to inspect
+     * @return Array<String> of function calls, files and line numbers
+     */
+    firefox: function(e) {
+        return e.stack.replace(/(?:\n@:0)?\s+$/m, '').replace(/^\(/gm, '{anonymous}(').split('\n');
+    },
+
+    /**
+     * Given an Error object, return a formatted Array based on Opera 10's stacktrace string.
+     * 
+     * @param e - Error object to inspect
+     * @return Array<String> of function calls, files and line numbers
+     */
+    opera10: function(e) {
+        var stack = e.stacktrace;
+        var lines = stack.split('\n'), ANON = '{anonymous}',
+            lineRE = /.*line (\d+), column (\d+) in ((<anonymous function\:?\s*(\S+))|([^\(]+)\([^\)]*\))(?: in )?(.*)\s*$/i, i, j, len;
+        for (i = 2, j = 0, len = lines.length; i < len - 2; i++) {
+            if (lineRE.test(lines[i])) {
+                var location = RegExp.$6 + ':' + RegExp.$1 + ':' + RegExp.$2;
+                var fnName = RegExp.$3;
+                fnName = fnName.replace(/<anonymous function\:?\s?(\S+)?>/g, ANON);
+                lines[j++] = fnName + '@' + location;
+            }
+        }
+        
+        lines.splice(j, lines.length - j);
+        return lines;
+    },
+    
+    // Opera 7.x-9.x only!
+    opera: function(e) {
+        var lines = e.message.split('\n'), ANON = '{anonymous}', 
+            lineRE = /Line\s+(\d+).*script\s+(http\S+)(?:.*in\s+function\s+(\S+))?/i, 
+            i, j, len;
+        
+        for (i = 4, j = 0, len = lines.length; i < len; i += 2) {
+            //TODO: RegExp.exec() would probably be cleaner here
+            if (lineRE.test(lines[i])) {
+                lines[j++] = (RegExp.$3 ? RegExp.$3 + '()@' + RegExp.$2 + RegExp.$1 : ANON + '()@' + RegExp.$2 + ':' + RegExp.$1) + ' -- ' + lines[i + 1].replace(/^\s+/, '');
+            }
+        }
+        
+        lines.splice(j, lines.length - j);
+        return lines;
+    },
+    
+    // Safari, IE, and others
+    other: function(curr) {
+        var ANON = '{anonymous}', fnRE = /function\s*([\w\-$]+)?\s*\(/i,
+            stack = [], fn, args, maxStackSize = 10;
+        
+        while (curr && stack.length < maxStackSize) {
+            fn = fnRE.test(curr.toString()) ? RegExp.$1 || ANON : ANON;
+            args = Array.prototype.slice.call(curr['arguments']);
+            stack[stack.length] = fn + '(' + this.stringifyArguments(args) + ')';
+            curr = curr.caller;
         }
+        return stack;
+    },
+    
+    /**
+     * Given arguments array as a String, subsituting type names for non-string types.
+     *
+     * @param {Arguments} object
+     * @return {Array} of Strings with stringified arguments
+     */
+    stringifyArguments: function(args) {
+        for (var i = 0; i < args.length; ++i) {
+            var arg = args[i];
+            if (arg === undefined) {
+                args[i] = 'undefined';
+            } else if (arg === null) {
+                args[i] = 'null';
+            } else if (arg.constructor) {
+                if (arg.constructor === Array) {
+                    if (arg.length < 3) {
+                        args[i] = '[' + this.stringifyArguments(arg) + ']';
+                    } else {
+                        args[i] = '[' + this.stringifyArguments(Array.prototype.slice.call(arg, 0, 1)) + '...' + this.stringifyArguments(Array.prototype.slice.call(arg, -1)) + ']';
+                    }
+                } else if (arg.constructor === Object) {
+                    args[i] = '#object';
+                } else if (arg.constructor === Function) {
+                    args[i] = '#function';
+                } else if (arg.constructor === String) {
+                    args[i] = '"' + arg + '"';
+                }
+            }
+        }
+        return args.join(',');
+    },
+    
+    sourceCache: {},
+    
+    /**
+     * @return the text from a given URL.
+     */
+    ajax: function(url) {
+        var req = this.createXMLHTTPObject();
+        if (!req) {
+            return;
+        }
+        req.open('GET', url, false);
+        // REMOVED FOR JS TEST. 
+		//req.setRequestHeader('User-Agent', 'XMLHTTP/1.0');
+        req.send('');
+        return req.responseText;
+    },
+    
+    /**
+     * Try XHR methods in order and store XHR factory.
+     *
+     * @return <Function> XHR function or equivalent
+     */
+    createXMLHTTPObject: function() {
+        var xmlhttp, XMLHttpFactories = [
+            function() {
+                return new XMLHttpRequest();
+            }, function() {
+                return new ActiveXObject('Msxml2.XMLHTTP');
+            }, function() {
+                return new ActiveXObject('Msxml3.XMLHTTP');
+            }, function() {
+                return new ActiveXObject('Microsoft.XMLHTTP');
+            }
+        ];
+        for (var i = 0; i < XMLHttpFactories.length; i++) {
+            try {
+                xmlhttp = XMLHttpFactories[i]();
+                // Use memoization to cache the factory
+                this.createXMLHTTPObject = XMLHttpFactories[i];
+                return xmlhttp;
+            } catch (e) {}
+        }
+    },
  
-        backtrace.push('<line method="' + Hoptoad.escapeText(matches[1]) +
-                       '" file="' + Hoptoad.escapeText(file) +
-                       '" number="' + matches[3] + '" />');
-      }
+    /**
+     * Given a URL, check if it is in the same domain (so we can get the source
+     * via Ajax).
+     *
+     * @param url <String> source url
+     * @return False if we need a cross-domain request
+     */
+    isSameDomain: function(url) {
+        return url.indexOf(location.hostname) !== -1;
+    },
+    
+    /**
+     * Get source code from given URL if in the same domain.
+     *
+     * @param url <String> JS source URL
+     * @return <Array> Array of source code lines
+     */
+    getSource: function(url) {
+        if (!(url in this.sourceCache)) {
+            this.sourceCache[url] = this.ajax(url).split('\n');
+        }
+        return this.sourceCache[url];
+    },
+    
+    guessFunctions: function(stack) {
+        for (var i = 0; i < stack.length; ++i) {
+            var reStack = /\{anonymous\}\(.*\)@(\w+:\/\/([\-\w\.]+)+(:\d+)?[^:]+):(\d+):?(\d+)?/;
+            var frame = stack[i], m = reStack.exec(frame);
+            if (m) {
+                var file = m[1], lineno = m[4]; //m[7] is character position in Chrome
+                if (file && this.isSameDomain(file) && lineno) {
+                    var functionName = this.guessFunctionName(file, lineno);
+                    stack[i] = frame.replace('{anonymous}', functionName);
+                }
+            }
+        }
+        return stack;
+    },
+    
+    guessFunctionName: function(url, lineNo) {
+        try {
+            return this.guessFunctionNameFromLines(lineNo, this.getSource(url));
+        } catch (e) {
+            return 'getSource failed with url: ' + url + ', exception: ' + e.toString();
+        }
+    },
+    
+    guessFunctionNameFromLines: function(lineNo, source) {
+        var reFunctionArgNames = /function ([^(]*)\(([^)]*)\)/;
+        var reGuessFunction = /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*(function|eval|new Function)/;
+        // Walk backwards from the first line in the function until we find the line which
+        // matches the pattern above, which is the function definition
+        var line = "", maxLines = 10;
+        for (var i = 0; i < maxLines; ++i) {
+            line = source[lineNo - i] + line;
+            if (line !== undefined) {
+                var m = reGuessFunction.exec(line);
+                if (m && m[1]) {
+                    return m[1];
+                } else {
+                    m = reFunctionArgNames.exec(line);
+                    if (m && m[1]) {
+                        return m[1];
+                    }
+                }
+            }
+        }
+        return '(?)';
     }
+};// Airbrake JavaScript Notifier
+(function() {
+    "use strict";
+    
+    var NOTICE_XML = '<?xml version="1.0" encoding="UTF-8"?>' +
+        '<notice version="2.0">' +
+            '<api-key>{key}</api-key>' +
+            '<notifier>' +
+                '<name>airbrake_js</name>' +
+                '<version>0.2.0</version>' +
+                '<url>http://airbrake.io</url>' +
+            '</notifier>' +
+            '<error>' +
+                '<class>{exception_class}</class>' +
+                '<message>{exception_message}</message>' +
+                '<backtrace>{backtrace_lines}</backtrace>' +
+            '</error>' +
+            '<request>' +
+                '<url>{request_url}</url>' +
+                '<component>{request_component}</component>' +
+                '<action>{request_action}</action>' +
+                '{request}' +
+            '</request>' +
+            '<server-environment>' +
+                '<project-root>{project_root}</project-root>' +
+                '<environment-name>{environment}</environment-name>' +
+            '</server-environment>' +
+        '</notice>',
+        REQUEST_VARIABLE_GROUP_XML = '<{group_name}>{inner_content}</{group_name}>',
+        REQUEST_VARIABLE_XML = '<var key="{key}">{value}</var>',
+        BACKTRACE_LINE_XML = '<line method="{function}" file="{file}" number="{line}" />',
+        Config,
+        Global,
+        Util,
+        _publicAPI,
+        
+        NOTICE_JSON = {
+            "notifier": {
+                "name": "airbrake_js",
+                "version": "0.2.0",
+                "url": "http://airbrake.io"
+            },
+            "error": [
+             {
+				"type": "{exception_class}",
+                "message": "{exception_message}",
+                "backtrace": []
+				
+            }
+			],
+            "context": {
+				"language": "JavaScript",
+				"environment": "{environment}",
+				
+                "version": "1.1.1",
+				"url": "{request_url}",
+                "rootDirectory": "{project_root}",
+                "action": "{request_action}",
  
-    return backtrace;
-  },
+				"userId": "{}",
+				"userName": "{}",
+				"userEmail": "{}",
+            },
+            "environment": {},
+			//"session": "",
+			"params": {},
+        };
  
-  getStackTrace: function(error) {
-    var stacktrace = printStackTrace({ e : error, guess : false });
+    Util = {
+        /*
+         * Merge a number of objects into one.
+         * 
+         * Usage example: 
+         *  var obj1 = {
+         *          a: 'a'
+         *      },
+         *      obj2 = {
+         *          b: 'b'     
+         *      },
+         *      obj3 = {
+         *          c: 'c'     
+         *      },
+         *      mergedObj = Util.merge(obj1, obj2, obj3);  
+         *
+         * mergedObj is: {
+         *     a: 'a',
+         *     b: 'b',
+         *     c: 'c'
+         * }
+         * 
+         */
+        merge: (function() {
+            function processProperty (key, dest, src) {
+                if (src.hasOwnProperty(key)) {
+                    dest[key] = src[key];
+                }
+            }
  
-    for (var i = 0, l = stacktrace.length; i < l; i++) {
-      if (stacktrace[i].match(/\:\d+$/)) {
-        continue;
-      }
+            return function() {
+                var objects = Array.prototype.slice.call(arguments),
+                    obj,
+                    key,
+                    result = {};
  
-      if (stacktrace[i].indexOf('@') == -1) {
-        stacktrace[i] += '@unsupported.js';
-      }
+                while (obj = objects.shift()) {
+                    for (key in obj) {
+                        processProperty(key, result, obj);
+                    }
+                }
  
-      stacktrace[i] += ':0';
-    }
+                return result;
+            };
+        })(),
+        
+        /*
+         * Replace &, <, >, ', " characters with correspondent HTML entities.
+         */
+        escape: function (text) {
+            return text.replace(/&/g, '&#38;').replace(/</g, '&#60;').replace(/>/g, '&#62;')
+                    .replace(/'/g, '&#39;').replace(/"/g, '&#34;');
+        },
+        
+        /*
+         * Remove leading and trailing space characters. 
+         */
+        trim: function (text) {
+            return text.toString().replace(/^\s+/, '').replace(/\s+$/, '');
+        },
+        
+        /*
+         * Fill 'text' pattern with 'data' values.
+         * 
+         * e.g. Utils.substitute('<{tag}></{tag}>', {tag: 'div'}, true) will return '<div></div>'
+         * 
+         * emptyForUndefinedData - a flag, if true, all matched {<name>} without data.<name> value specified will be 
+         * replaced with empty string.
+         */
+        substitute: function (text, data, emptyForUndefinedData) {
+            return text.replace(/{([\w_.-]+)}/g, function(match, key) {
+                return (key in data) ? data[key] : (emptyForUndefinedData ? '' : match);
+            });
+        },
+        
+        /*
+         * Perform pattern rendering for an array of data objects. 
+         * Returns a concatenation of rendered strings of all objects in array. 
+         */
+        substituteArr: function (text, dataArr, emptyForUndefinedData) {
+            var _i = 0, _l = 0, 
+                returnStr = '';
+            
+            for (_i = 0, _l = dataArr.length; _i < _l; _i += 1) {
+                returnStr += this.substitute(text, dataArr[_i], emptyForUndefinedData);
+            }
+            
+            return returnStr;
+        },
+        
+        /*
+         * Add hook for jQuery.fn.on function, to manualy call window.Airbrake.captureException() method
+         * for every exception occurred.
+         * 
+         * Let function 'f' be binded as an event handler:
+         * 
+         * $(window).on 'click', f
+         * 
+         * If an exception is occurred inside f's body, it will be catched here 
+         * and forwarded to captureException method.
+         * 
+         * processjQueryEventHandlerWrapping is called every time window.Airbrake.setTrackJQ method is used,
+         * if it switches previously setted value. 
+         */
+        processjQueryEventHandlerWrapping: function () {
+            if (Config.options.trackJQ === true) {
+                Config.jQuery_fn_on_original = Config.jQuery_fn_on_original || jQuery.fn.on;
  
-    return stacktrace;
-  },
+                jQuery.fn.on = function () {
+                    var args = Array.prototype.slice.call(arguments),
+                        fnArgIdx = 4;
  
-  validBacktraceLine: function(line) {
-    for (var i = 0; i < Hoptoad.backtrace_filters.length; i++) {
-      if (line.match(Hoptoad.backtrace_filters[i])) {
-        return false;
-      }
-    }
+                    // Search index of function argument
+                    while((--fnArgIdx > -1) && (typeof args[fnArgIdx] !== 'function'));
+
+                    // If the function is not found, then subscribe original event handler function
+                    if (fnArgIdx === -1) {
+                        return Config.jQuery_fn_on_original.apply(this, arguments);
+                    }
+
+                    // If the function is found, then subscribe wrapped event handler function
+                    args[fnArgIdx] = (function (fnOriginHandler) {
+                        return function() {
+                            try {
+                                fnOriginHandler.apply(this, arguments);
+                            } catch (e) {
+                                Global.captureException(e);
+                            }
+                        };
+                    })(args[fnArgIdx]);
+                    
+                    // Call original jQuery.fn.on, with the same list of arguments, but 
+                    // a function replaced with a proxy.
+                    return Config.jQuery_fn_on_original.apply(this, args);
+                };
+            } else {
+                // Recover original jQuery.fn.on if Config.options.trackJQ is set to false
+                (typeof Config.jQuery_fn_on_original === 'function') && (jQuery.fn.on = Config.jQuery_fn_on_original);
+            }
+        },
  
-    return true;
-  },
+        isjQueryPresent: function () {
+            // Currently only 1.7.x version supported
+            return (typeof jQuery === 'function') && ('fn' in jQuery) && ('jquery' in jQuery.fn)
+                    && (jQuery.fn.jquery.indexOf('1.7') === 0)
+        },
+        
+        /*
+         * Make first letter in a string capital. e.g. 'guessFunctionName' -> 'GuessFunctionName'
+         * Is used to generate getter and setter method names.
+         */
+        capitalizeFirstLetter: function (str) {
+            return str[0].toUpperCase() + str.slice(1);  
+        },
+        
+        /*
+         * Generate public API from an array of specifically formated objects, e.g.
+         * 
+         * - this will generate 'setEnvironment' and 'getEnvironment' API methods for configObj.xmlData.environment variable:
+         * {
+         *     variable: 'environment',
+         *     namespace: 'xmlData'
+         * }
+         * 
+         * - this will define 'method' function as 'captureException' API method 
+         * {
+         *     methodName: 'captureException',
+         *     method: (function (...) {...});
+         * }
+         * 
+         */
+        generatePublicAPI: (function () {
+            function _generateSetter (variable, namespace, configObj) {
+                return function (value) {
+                    configObj[namespace][variable] = value;
+                };
+            }
+            
+            function _generateGetter (variable, namespace, configObj) {
+                return function (value) {
+                    return configObj[namespace][variable];
+                };
+            }
+            
+            /*
+             * publicAPI: array of specifically formated objects
+             * configObj: inner configuration object 
+             */
+            return function (publicAPI, configObj) {
+                var _i = 0, _m = null, _capitalized = '',
+                    returnObj = {};
+                
+                for (_i = 0; _i < publicAPI.length; _i += 1) {
+                    _m = publicAPI[_i];
+                    
+                    switch (true) {
+                        case (typeof _m.variable !== 'undefined') && (typeof _m.methodName === 'undefined'):
+                            _capitalized = Util.capitalizeFirstLetter(_m.variable)
+                            returnObj['set' + _capitalized] = _generateSetter(_m.variable, _m.namespace, configObj);
+                            returnObj['get' + _capitalized] = _generateGetter(_m.variable, _m.namespace, configObj);
+                            
+                            break;
+                        case (typeof _m.methodName !== 'undefined') && (typeof _m.method !== 'undefined'):
+                            returnObj[_m.methodName] = _m.method
+                            
+                            break;
+                        
+                        default:                       
+                    }
+                }
+                
+                return returnObj;
+            };
+        } ())
+    };
+
+    /*
+     * The object to store settings. Allocated from the Global (windows scope) so that users can change settings
+     * only through the methods, rather than through a direct change of the object fileds. So that we can to handle
+     * change settings event (in setter method).
+     */
+    Config = {
+        xmlData: {
+            environment: 'environment'
+        },
+
+        options: {
+            trackJQ: false, // jQuery.fn.jquery
+            host: 'api.airbrake.io',
+            errorDefaults: {},
+            guessFunctionName: false,
+            requestType: 'GET', // Can be 'POST' or 'GET'
+            outputFormat: 'XML' // Can be 'XML' or 'JSON'
+        }
+    };
+    
+    /*
+     * The public API definition object. If no 'methodName' and 'method' values specified,
+     * getter and setter for 'variable' will be defined.
+     */
+    _publicAPI = [
+        {
+            variable: 'environment',
+            namespace: 'xmlData'
+        }, {
+            variable: 'key',
+            namespace: 'xmlData'
+        }, {
+            variable: 'host',
+            namespace: 'options'
+        },{
+		    variable: 'projectId',
+            namespace: 'options'
+		},{
+            variable: 'errorDefaults',
+            namespace: 'options'
+        }, {
+            variable: 'guessFunctionName',
+            namespace: 'options'
+        }, {
+            variable: 'outputFormat',
+            namespace: 'options'
+        }, {
+            methodName: 'setTrackJQ',
+            variable: 'trackJQ',
+            namespace: 'options',
+            method: (function (value) {
+                if (!Util.isjQueryPresent()) {
+                    throw Error('Please do not call \'Airbrake.setTrackJQ\' if jQuery does\'t present');
+                }
+    
+                value = !!value;
+    
+                if (Config.options.trackJQ === value) {
+                    return;
+                }
+    
+                Config.options.trackJQ = value;
+    
+                Util.processjQueryEventHandlerWrapping();
+            })
+        }, {
+            methodName: 'captureException',
+            method: (function (e) {
+                new Notifier().notify({
+                    message: e.message,
+                    stack: e.stack
+                });
+            })
+        }
+    ];
  
-  generateVariables: function(parameters) {
-    var key;
-    var result = '';
+    // Share to global scope as Airbrake ("window.Hoptoad" for backward compatibility)
+    Global = window.Airbrake = window.Hoptoad = Util.generatePublicAPI(_publicAPI, Config);
  
-    for (key in parameters) {
-      result += '<var key="' + Hoptoad.escapeText(key) + '">' +
-                  Hoptoad.escapeText(parameters[key]) +
-                '</var>';
+    function Notifier() {
+        this.options = Util.merge({}, Config.options);
+        this.xmlData = Util.merge(this.DEF_XML_DATA, Config.xmlData);
     }
+    
+    Notifier.prototype = {
+        constructor: Notifier,
+        VERSION: '0.2.0',
+        ROOT: window.location.protocol + '//' + window.location.host,
+        BACKTRACE_MATCHER: /^(.*)\@(.*)\:(\d+)$/,
+        backtrace_filters: [/notifier\.js/],
+        DEF_XML_DATA: {
+            request: {}
+        },
  
-    return result;
-  },
+        notify: (function () {
+            /*
+             * Emit GET request via <iframe> element.
+             * Data is transmited as a part of query string.
+             */
+            function _sendGETRequest (url, data) {
+                var request = document.createElement('iframe');
+                
+                request.style.display = 'none';
+                request.src = url + '?data=' + data;
+                
+                // When request has been sent, delete iframe
+                request.onload = function () {
+                    // To avoid infinite progress indicator
+                    setTimeout(function() {
+                        document.body.removeChild(request);
+                    }, 0);
+                };
+    
+                document.body.appendChild(request);
+            }
+            
+            /*
+             * Cross-domain AJAX POST request. 
+             * 
+             * It requires a server setup as described in Cross-Origin Resource Sharing spec:
+             * http://www.w3.org/TR/cors/
+             */
+            function _sendPOSTRequest (url, data) {
+                var request = new XMLHttpRequest();
+                request.open('POST', url, true);
+                request.setRequestHeader('Content-Type', 'application/json');
+                request.send(data);
+            }
+            
+            return function (error) {
+                var outputData = '',
+					url =  '';
+				    //
+                
+                   /*
+                    * Should be changed to url = '//' + ...
+                    * to use the protocol of current page (http or https). Only sends 'secure' if page is secure.  
+					* XML uses V2 API. http://collect.airbrake.io/notifier_api/v2/notices
+			       */
+               
+			
+                switch (this.options['outputFormat']) {
+                    case 'XML':
+	                   outputData = encodeURIComponent(this.generateXML(this.generateDataJSON(error)));
+					   url = ('https:' == document.location.protocol ? 'https://' : 'http://') + this.options.host + '/notifier_api/v2/notices';
+                        _sendGETRequest(url, outputData);
+					   break;
  
-  escapeText: function(text) {
-    return text.replace(/&/g, '&#38;')
-               .replace(/</g, '&#60;')
-               .replace(/>/g, '&#62;')
-               .replace(/'/g, '&#39;')
-               .replace(/"/g, '&#34;');
-  },
+                    case 'JSON': 
+ 					/*
+					*   JSON uses API V3. Needs project in URL. 
+					*   http://collect.airbrake.io/api/v3/projects/[PROJECT_ID]/notices?key=[API_KEY]
+					* url = window.location.protocol + '://' + this.options.host + '/api/v3/projects' + this.options.projectId + '/notices?key=' + this.options.key;
+					*/
+ 						outputData = JSON.stringify(this.generateJSON(this.generateDataJSON(error)));  
+						url = ('https:' == document.location.protocol ? 'https://' : 'http://') + this.options.host + '/api/v3/projects/' + this.options.projectId + '/notices?key=' + this.xmlData.key;
+                        _sendPOSTRequest(url, outputData);
+						break;
  
-  trim: function(text) {
-    return text.toString().replace(/^\s+/, '').replace(/\s+$/, '');
-  },
+                    default:
+                }
  
-  mergeDefault: function(defaults, hash) {
-    var cloned = {};
-    var key;
+            };
+        } ()),
+        
+        /*
+         * Generate inner JSON representation of exception data that can be rendered as XML or JSON. 
+         */
+        generateDataJSON: (function () {
+            /*
+             * Generate variables array for inputObj object.
+             * 
+             * e.g.
+             * 
+             * _generateVariables({a: 'a'}) -> [{key: 'a', value: 'a'}]
+             * 
+             */
+            function _generateVariables (inputObj) {
+                var key = '', returnArr = [];
+                
+                for (key in inputObj) {
+                    if (inputObj.hasOwnProperty(key)) {
+                        returnArr.push({
+                            key: key,
+                            value: inputObj[key]
+                        });
+                    }
+                }
+                
+                return returnArr;
+            }
+            
+            /*
+             * Generate Request part of notification.  
+             */
+            function _composeRequestObj (methods, errorObj) {
+                var _i = 0,
+                    returnObj = {},
+                    type = '';
+                
+                for (_i = 0; _i < methods.length; _i += 1) {
+                    type = methods[_i];
+                    if (typeof errorObj[type] !== 'undefined') {
+                        returnObj[type] = _generateVariables(errorObj[type]);
+                    }
+                }
+                
+                return returnObj;             
+            }
+            
+            return function (errorWithoutDefaults) {
+                    /*
+                     * A constructor line:
+                     * 
+                     * this.xmlData = Util.merge(this.DEF_XML_DATA, Config.xmlData);
+                     */
+                var outputData = this.xmlData, 
+                    error = Util.merge(this.options.errorDefaults, errorWithoutDefaults),
+                    
+                    component = error.component || '',
+                    request_url = (error.url || '' + location.hash),
+                    
+                    methods = ['cgi-data', 'params', 'session'],
+                    _outputData = null;
+                
+                _outputData = {
+                    request_url: request_url,
+                    request_action: (error.action || ''),
+                    request_component: component,
+                    request: (function () {
+                        if (request_url || component) {
+                            error['cgi-data'] = error['cgi-data'] || {};
+                            error['cgi-data'].HTTP_USER_AGENT = navigator.userAgent;
+                            return Util.merge(outputData.request, _composeRequestObj(methods, error));
+                        } else {
+                            return {}
+                        }
+                    } ()),
+                    
+                    project_root: this.ROOT,
+                    exception_class: (error.type || 'Error'),
+                    exception_message: (error.message || 'Unknown error.'),
+                    backtrace_lines: this.generateBacktrace(error)
+                }
+                
+                outputData = Util.merge(outputData, _outputData);
+                
+                return outputData;
+            };
+        } ()),
+        
+        /*
+         * Generate XML notification from inner JSON representation.
+         * NOTICE_XML is used as pattern.
+         */
+        generateXML: (function () {
+            function _generateRequestVariableGroups (requestObj) {
+                var _group = '',
+                    returnStr = '';
+                
+                for (_group in requestObj) {
+                    if (requestObj.hasOwnProperty(_group)) {
+                        returnStr += Util.substitute(REQUEST_VARIABLE_GROUP_XML, {
+                            group_name: _group,
+                            inner_content: Util.substituteArr(REQUEST_VARIABLE_XML, requestObj[_group], true)
+                        }, true);
+                    }
+                }
+                
+                return returnStr;
+            }
+            
+            return function (JSONdataObj) {
+                JSONdataObj.request = _generateRequestVariableGroups(JSONdataObj.request);
+                JSONdataObj.backtrace_lines = Util.substituteArr(BACKTRACE_LINE_XML, JSONdataObj.backtrace_lines, true);
+                
+                return Util.substitute(NOTICE_XML, JSONdataObj, true);
+            };
+        } ()),
+        
+        /*
+         * Generate JSON notification from inner JSON representation.
+         * NOTICE_JSON is used as pattern.
+         */
+        generateJSON: function (JSONdataObj) {
+            // Pattern string is JSON.stringify(NOTICE_JSON)
+            // The rendered string is parsed back as JSON.
+            var outputJSON = JSON.parse(Util.substitute(JSON.stringify(NOTICE_JSON), JSONdataObj, true));
+            
+            // REMOVED - Request from JSON. 
+			outputJSON.request = Util.merge(outputJSON.request, JSONdataObj.request);
+            outputJSON.error.backtrace = JSONdataObj.backtrace_lines;
+            
+            return outputJSON;
+        },
+        
+        generateBacktrace: function (error) {
+            var backtrace = [],
+                file,
+                i,
+                matches,
+                stacktrace;
  
-    for (key in hash) {
-      cloned[key] = hash[key];
-    }
+            error = error || {};
  
-    for (key in defaults) {
-      if (!cloned.hasOwnProperty(key)) {
-        cloned[key] = defaults[key];
-      }
-    }
+            if (typeof error.stack !== 'string') {
+                try {
+                    (0)();
+                } catch (e) {
+                    error.stack = e.stack;
+                }
+            }
  
-    return cloned;
-  }
-};
+            stacktrace = this.getStackTrace(error);
  
-// From: http://stacktracejs.com/
-//
-// Domain Public by Eric Wendelin http://eriwen.com/ (2008)
-//                  Luke Smith http://lucassmith.name/ (2008)
-//                  Loic Dachary <loic@dachary.org> (2008)
-//                  Johan Euphrosine <proppy@aminche.com> (2008)
-//                  Oyvind Sean Kinsey http://kinsey.no/blog (2010)
-//                  Victor Homyakov <victor-homyakov@users.sourceforge.net> (2010)
-
-function printStackTrace(a){var a=a||{guess:!0},b=a.e||null,a=!!a.guess,d=new printStackTrace.implementation,b=d.run(b);return a?d.guessAnonymousFunctions(b):b}printStackTrace.implementation=function(){};
-printStackTrace.implementation.prototype={run:function(a,b){a=a||this.createException();b=b||this.mode(a);return"other"===b?this.other(arguments.callee):this[b](a)},createException:function(){try{this.undef()}catch(a){return a}},mode:function(a){return a.arguments&&a.stack?"chrome":a.stack&&a.sourceURL?"safari":"string"===typeof a.message&&"undefined"!==typeof window&&window.opera?!a.stacktrace||-1<a.message.indexOf("\n")&&a.message.split("\n").length>a.stacktrace.split("\n").length?"opera9":!a.stack?
-"opera10a":0>a.stacktrace.indexOf("called from line")?"opera10b":"opera11":a.stack?"firefox":"other"},instrumentFunction:function(a,b,d){var a=a||window,c=a[b];a[b]=function(){d.call(this,printStackTrace().slice(4));return a[b]._instrumented.apply(this,arguments)};a[b]._instrumented=c},deinstrumentFunction:function(a,b){a[b].constructor===Function&&(a[b]._instrumented&&a[b]._instrumented.constructor===Function)&&(a[b]=a[b]._instrumented)},chrome:function(a){a=(a.stack+"\n").replace(/^\S[^\(]+?[\n$]/gm,
-"").replace(/^\s+(at eval )?at\s+/gm,"").replace(/^([^\(]+?)([\n$])/gm,"{anonymous}()@$1$2").replace(/^Object.<anonymous>\s*\(([^\)]+)\)/gm,"{anonymous}()@$1").split("\n");a.pop();return a},safari:function(a){return a.stack.replace(/\[native code\]\n/m,"").replace(/^@/gm,"{anonymous}()@").split("\n")},firefox:function(a){return a.stack.replace(/(?:\n@:0)?\s+$/m,"").replace(/^[\(@]/gm,"{anonymous}()@").split("\n")},opera11:function(a){for(var b=/^.*line (\d+), column (\d+)(?: in (.+))? in (\S+):$/,
-a=a.stacktrace.split("\n"),d=[],c=0,f=a.length;c<f;c+=2){var e=b.exec(a[c]);if(e){var g=e[4]+":"+e[1]+":"+e[2],e=e[3]||"global code",e=e.replace(/<anonymous function: (\S+)>/,"$1").replace(/<anonymous function>/,"{anonymous}");d.push(e+"@"+g+" -- "+a[c+1].replace(/^\s+/,""))}}return d},opera10b:function(a){for(var b=/^(.*)@(.+):(\d+)$/,a=a.stacktrace.split("\n"),d=[],c=0,f=a.length;c<f;c++){var e=b.exec(a[c]);e&&d.push((e[1]?e[1]+"()":"global code")+"@"+e[2]+":"+e[3])}return d},opera10a:function(a){for(var b=
-/Line (\d+).*script (?:in )?(\S+)(?:: In function (\S+))?$/i,a=a.stacktrace.split("\n"),d=[],c=0,f=a.length;c<f;c+=2){var e=b.exec(a[c]);e&&d.push((e[3]||"{anonymous}")+"()@"+e[2]+":"+e[1]+" -- "+a[c+1].replace(/^\s+/,""))}return d},opera9:function(a){for(var b=/Line (\d+).*script (?:in )?(\S+)/i,a=a.message.split("\n"),d=[],c=2,f=a.length;c<f;c+=2){var e=b.exec(a[c]);e&&d.push("{anonymous}()@"+e[2]+":"+e[1]+" -- "+a[c+1].replace(/^\s+/,""))}return d},other:function(a){for(var b=/function\s*([\w\-$]+)?\s*\(/i,
-d=[],c,f;a&&a.arguments&&10>d.length;)c=b.test(a.toString())?RegExp.$1||"{anonymous}":"{anonymous}",f=Array.prototype.slice.call(a.arguments||[]),d[d.length]=c+"("+this.stringifyArguments(f)+")",a=a.caller;return d},stringifyArguments:function(a){for(var b=[],d=Array.prototype.slice,c=0;c<a.length;++c){var f=a[c];void 0===f?b[c]="undefined":null===f?b[c]="null":f.constructor&&(f.constructor===Array?b[c]=3>f.length?"["+this.stringifyArguments(f)+"]":"["+this.stringifyArguments(d.call(f,0,1))+"..."+
-this.stringifyArguments(d.call(f,-1))+"]":f.constructor===Object?b[c]="#object":f.constructor===Function?b[c]="#function":f.constructor===String?b[c]='"'+f+'"':f.constructor===Number&&(b[c]=f))}return b.join(",")},sourceCache:{},ajax:function(a){var b=this.createXMLHTTPObject();if(b)try{return b.open("GET",a,!1),b.send(null),b.responseText}catch(d){}return""},createXMLHTTPObject:function(){for(var a,b=[function(){return new XMLHttpRequest},function(){return new ActiveXObject("Msxml2.XMLHTTP")},function(){return new ActiveXObject("Msxml3.XMLHTTP")},
-function(){return new ActiveXObject("Microsoft.XMLHTTP")}],d=0;d<b.length;d++)try{return a=b[d](),this.createXMLHTTPObject=b[d],a}catch(c){}},isSameDomain:function(a){return"undefined"!==typeof location&&-1!==a.indexOf(location.hostname)},getSource:function(a){a in this.sourceCache||(this.sourceCache[a]=this.ajax(a).split("\n"));return this.sourceCache[a]},guessAnonymousFunctions:function(a){for(var b=0;b<a.length;++b){var d=/^(.*?)(?::(\d+))(?::(\d+))?(?: -- .+)?$/,c=a[b],f=/\{anonymous\}\(.*\)@(.*)/.exec(c);
-if(f){var e=d.exec(f[1]);e&&(d=e[1],f=e[2],e=e[3]||0,d&&(this.isSameDomain(d)&&f)&&(d=this.guessAnonymousFunction(d,f,e),a[b]=c.replace("{anonymous}",d)))}}return a},guessAnonymousFunction:function(a,b){var d;try{d=this.findFunctionName(this.getSource(a),b)}catch(c){d="getSource failed with url: "+a+", exception: "+c.toString()}return d},findFunctionName:function(a,b){for(var d=/function\s+([^(]*?)\s*\(([^)]*)\)/,c=/['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*function\b/,f=/['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*(?:eval|new Function)\b/,
-e="",g,j=Math.min(b,20),h,i=0;i<j;++i)if(g=a[b-i-1],h=g.indexOf("//"),0<=h&&(g=g.substr(0,h)),g)if(e=g+e,(g=c.exec(e))&&g[1]||(g=d.exec(e))&&g[1]||(g=f.exec(e))&&g[1])return g[1];return"(?)"}};
-
-window.onerror = function(message, file, line) {
-  setTimeout(function() {
-    Hoptoad.notify({
-      message : message,
-      stack   : '()@' + file + ':' + line,
-      url     : document.location.href
-    });
-  }, 100);
-  return true;
-};
+            for (i = 0; i < stacktrace.length; i++) {
+                matches = stacktrace[i].match(this.BACKTRACE_MATCHER);
+
+                if (matches && this.validBacktraceLine(stacktrace[i])) {
+                    file = matches[2].replace(this.ROOT, '[PROJECT_ROOT]');
+
+                    if (i === 0 && matches[2].match(document.location.href)) {
+                        // backtrace.push('<line method="" file="internal: " number=""/>');
+                       
+                        backtrace.push({
+						// Updated to fit in with V3 new terms for Backtrace data.
+                            'function': '',
+                            file: 'internal: ',
+                            line: ''
+                        });
+                    }
+
+                    // backtrace.push('<line method="' + Util.escape(matches[1]) + '" file="' + Util.escape(file) +
+                    //        '" number="' + matches[3] + '" />');
+                    
+                    backtrace.push({
+                        'function': matches[1],
+                        file: file,
+                        line: matches[3]
+                    });
+                }
+            }
+
+            return backtrace;
+        },
+
+        getStackTrace: function (error) {
+            var i,
+                stacktrace = printStackTrace({
+                    e: error,
+                    guess: this.options.guessFunctionName
+                });
+
+            for (i = 0; i < stacktrace.length; i++) {
+                if (stacktrace[i].match(/\:\d+$/)) {
+                    continue;
+                }
+
+                if (stacktrace[i].indexOf('@') === -1) {
+                    stacktrace[i] += '@unsupported.js';
+                }
+
+                stacktrace[i] += ':0';
+            }
+
+            return stacktrace;
+        },
+
+        validBacktraceLine: function (line) {
+            for (var i = 0; i < this.backtrace_filters.length; i++) {
+                if (line.match(this.backtrace_filters[i])) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    };
+
+    window.onerror = function (message, file, line) {
+        setTimeout(function () {
+            new Notifier().notify({
+                message: message,
+                stack: '()@' + file + ':' + line
+            });
+        }, 0);
  
+        return true;
+    };
+})();
+})(window, document);
@@ -79,6 +79,11 @@ describe UsersController do
           @user.reload.time_zone.should == "Warsaw"
         end
  
+        it "should be able to not set github_login option" do
+          put :update, :id => @user.to_param, :user => {:github_login => " "}
+          @user.reload.github_login.should == nil
+        end
+
         it "should be able to set github_login option" do
           put :update, :id => @user.to_param, :user => {:github_login => "awesome_name"}
           @user.reload.github_login.should == "awesome_name"
 Fabricator(:app) do
   name { sequence(:app_name){|n| "App ##{n}"} }
+  repository_branch 'master'
 end
  
 Fabricator(:app_with_watcher, :from => :app) do
@@ -12,6 +12,6 @@ Fabricator :gtalk_notification_service, :from =&gt; :notification_service, :class_n
   service { sequence :word }
 end
  
-%w(campfire hipchat hoiio pushover hubot).each do |t|
+%w(campfire hipchat hoiio pushover hubot webhook).each do |t|
   Fabricator "#{t}_notification_service".to_sym, :from => :notification_service, :class_name => "NotificationService::#{t.camelcase}Service"
 end
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe BacktraceLineHelper do
+  describe "in app lines" do
+    let(:notice) do
+      Fabricate.build(:notice, :backtrace =>
+        Fabricate.build(:backtrace, :lines => [
+          Fabricate.build(:backtrace_line, :file => "[PROJECT_ROOT]/path/to/asset.js")
+        ])
+      )
+    end
+
+    describe '#link_to_source_file' do
+      it 'still returns text for in app file and line number when no repo is configured' do
+        result = link_to_source_file(notice.backtrace.lines.first) { haml_concat "link text" }
+        result.strip.should == 'link text'
+      end
+    end
+  end
+end
@@ -6,24 +6,39 @@ describe Mailer do
     include EmailSpec::Matchers
  
     let(:notice)  { Fabricate(:notice, :message => "class < ActionController::Base") }
-    let!(:email)  { Mailer.err_notification(notice).deliver }
+
+    before do
+      notice.backtrace.lines.last.update_attributes(:file => "[PROJECT_ROOT]/path/to/file.js")
+      notice.app.update_attributes :asset_host => "http://example.com"
+      notice.problem.update_attributes :notices_count => 3
+
+      @email = Mailer.err_notification(notice).deliver
+    end
  
     it "should send the email" do
       ActionMailer::Base.deliveries.size.should == 1
     end
  
     it "should html-escape the notice's message for the html part" do
-      email.should have_body_text("class &lt; ActionController::Base")
+      @email.should have_body_text("class &lt; ActionController::Base")
     end
  
     it "should have inline css" do
-      email.should have_body_text('<p class="backtrace" style="')
+      @email.should have_body_text('<p class="backtrace" style="')
+    end
+
+    it "should have links to source files" do
+      @email.should have_body_text('<a href="http://example.com/path/to/file.js" target="_blank">path/to/file.js')
+    end
+
+    it "should have the error count in the subject" do
+      @email.subject.should =~ /^\(3\) /
     end
  
     context 'with a very long message' do
       let(:notice)  { Fabricate(:notice, :message => 6.times.collect{|a| "0123456789" }.join('')) }
       it "should truncate the long message" do
-        email.subject.should =~ / \d{47}\.{3}$/
+        @email.subject.should =~ / \d{47}\.{3}$/
       end
     end
   end
@@ -258,10 +258,10 @@ describe App do
  
     it 'captures the current_user' do
       @notice = App.report_error!(@xml)
-      @notice.current_user['id'].should == '123'
-      @notice.current_user['name'].should == 'Mr. Bean'
-      @notice.current_user['email'].should == 'mr.bean@example.com'
-      @notice.current_user['username'].should == 'mrbean'
+      @notice.user_attributes['id'].should == '123'
+      @notice.user_attributes['name'].should == 'Mr. Bean'
+      @notice.user_attributes['email'].should == 'mr.bean@example.com'
+      @notice.user_attributes['username'].should == 'mrbean'
     end
  
     it 'captures the framework' do
@@ -3,16 +3,25 @@ require &#39;spec_helper&#39;
 describe BacktraceLineNormalizer do
   subject { described_class.new(raw_line).call }
  
-  describe "sanitize file and method" do
-    let(:raw_line) { { 'number' => rand(999), 'file' => nil, 'method' => nil } }
+  describe "sanitize" do
+    context "unknown file and method" do
+      let(:raw_line) { { 'number' => rand(999), 'file' => nil, 'method' => nil } }
  
-    it "should replace nil file with [unknown source]" do
-      subject['file'].should == "[unknown source]"
-    end
+      it "should replace nil file with [unknown source]" do
+        subject['file'].should == "[unknown source]"
+      end
  
-    it "should replace nil method with [unknown method]" do
-      subject['method'].should == "[unknown method]"
+      it "should replace nil method with [unknown method]" do
+        subject['method'].should == "[unknown method]"
+      end
     end
  
+    context "in app file" do
+      let(:raw_line) { { 'number' => rand(999), 'file' => "[PROJECT_ROOT]/assets/file.js?body=1", 'method' => nil } }
+
+      it "should strip query strings from files" do
+        subject['file'].should == "[PROJECT_ROOT]/assets/file.js"
+      end
+    end
   end
 end
@@ -8,13 +8,17 @@ describe IssueTrackers::RedmineTracker do
     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").
+
+    # Build base url with account URL, and username/password basic auth
+    base_url = tracker.account.gsub 'http://', "http://#{tracker.username}:#{tracker.password}@"
+
+    stub_request(:post, "#{base_url}/issues.xml").
                  to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
  
     problem.app.issue_tracker.create_issue(problem)
     problem.reload
  
-    requested = have_requested(:post, "#{tracker.account}/issues.xml")
+    requested = have_requested(:post, "#{base_url}/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>\[#{ problem.environment }\]\[#{problem.where}\] #{problem.message.to_s.truncate(100)}<\/subject>/)
@@ -26,9 +30,9 @@ describe IssueTrackers::RedmineTracker do
   it "should generate a url where a file with line number can be viewed" do
     t = Fabricate(:redmine_tracker, :account => 'http://redmine.example.com', :project_id => "errbit")
     t.url_to_file("/example/file").should ==
-      'http://redmine.example.com/projects/errbit/repository/annotate/example/file'
+      'http://redmine.example.com/projects/errbit/repository/revisions/master/changes/example/file'
     t.url_to_file("/example/file", 25).should ==
-      'http://redmine.example.com/projects/errbit/repository/annotate/example/file#L25'
+      'http://redmine.example.com/projects/errbit/repository/revisions/master/changes/example/file#L25'
   end
  
   it "should use the alt_project_id to generate a file/linenumber url, if given" do
@@ -36,7 +40,6 @@ describe IssueTrackers::RedmineTracker do
                                   :project_id => "errbit",
                                   :alt_project_id => "actual_project")
     t.url_to_file("/example/file", 25).should ==
-      'http://redmine.example.com/projects/actual_project/repository/annotate/example/file#L25'
+      'http://redmine.example.com/projects/actual_project/repository/revisions/master/changes/example/file#L25'
   end
 end
-
@@ -51,7 +51,7 @@ describe Notice do
   describe "user agent string" do
     it "should be parsed and human-readable" do
       notice = Fabricate.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'}})
-      notice.user_agent_string.should == 'Chrome 10.0.648.204'
+      notice.user_agent_string.should == 'Chrome 10.0.648.204 (Intel Mac OS X 10_6_7)'
     end
  
     it "should be nil if HTTP_USER_AGENT is blank" do
@@ -8,7 +8,7 @@ describe NotificationService::HubotService do
     problem = notice.problem
  
     # faraday stubbing
-    HTTParty.should_receive(:post).with(notification_service.api_token, :body => {:message => '[production][foo#bar] FooError: Too Much Bar', :room => notification_service.room_id}).and_return(true)
+    HTTParty.should_receive(:post).with(notification_service.api_token, :body => {:message => an_instance_of(String), :room => notification_service.room_id}).and_return(true)
  
     notification_service.create_notification(problem)
   end
@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe NotificationService::WebhookService do
+  it "it should send a notification to a user-specified URL" do
+    notice = Fabricate :notice
+    notification_service = Fabricate :webhook_notification_service, :app => notice.app
+    problem = notice.problem
+    
+    HTTParty.should_receive(:post).with(notification_service.api_token, :body => {:problem => problem.to_json}).and_return(true)
+
+    notification_service.create_notification(problem)
+  end
+end
@@ -339,7 +339,7 @@ describe Problem do
     it "adding a notice adds a string to #user_agents" do
       lambda {
         Fabricate(:notice, :err => @err, :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'}})
-      }.should change(@problem, :user_agents).from({}).to({Digest::MD5.hexdigest('Chrome 10.0.648.204') => {'value' => 'Chrome 10.0.648.204', 'count' => 1}})
+      }.should change(@problem, :user_agents).from({}).to({Digest::MD5.hexdigest('Chrome 10.0.648.204 (Intel Mac OS X 10_6_7)') => {'value' => 'Chrome 10.0.648.204 (Intel Mac OS X 10_6_7)', 'count' => 1}})
     end
  
     it "removing a notice removes string from #user_agents" do
@@ -347,7 +347,7 @@ describe Problem do
       lambda {
         @err.notices.first.destroy
         @problem.reload
-      }.should change(@problem, :user_agents).from({Digest::MD5.hexdigest('Chrome 10.0.648.204') => {'value' => 'Chrome 10.0.648.204', 'count' => 1}}).to({})
+      }.should change(@problem, :user_agents).from({Digest::MD5.hexdigest('Chrome 10.0.648.204 (Intel Mac OS X 10_6_7)') => {'value' => 'Chrome 10.0.648.204 (Intel Mac OS X 10_6_7)', 'count' => 1}}).to({})
     end
   end
  
@@ -29,6 +29,15 @@ describe User do
       user2.should_not be_valid
       user2.errors[:github_login].should include("is already taken")
     end
+
+    it 'allows blank / null github_login' do
+      user1 = Fabricate(:user, :github_login => ' ')
+      user1.should be_valid
+
+      user2 = Fabricate.build(:user, :github_login => ' ')
+      user2.save
+      user2.should be_valid
+    end
   end
  
   context 'Watchers' do
@@ -28,6 +28,12 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
   config.include WebMock::API
+
+  config.include Haml, :type => :helper
+  config.include Haml::Helpers, :type => :helper
+  config.before(:each, :type => :helper) do |config|
+    init_haml_helpers
+  end
 end
  
 OmniAuth.config.test_mode = true
1	1	source 'http://rubygems.org'
2	2
3		-gem 'rails', '3.2.11'
	3	+gem 'rails', '3.2.12'
4	4	gem 'mongoid', '~> 2.4.10'
5	5	gem 'mongoid_rails_migrations'
6	6	gem 'devise', '~> 1.5.4'
...	...	@@ -8,7 +8,7 @@ gem 'haml'
8	8	gem 'htmlentities', "~> 4.3.0"
9	9	gem 'rack-ssl', :require => 'rack/ssl' # force SSL
10	10
11		-gem 'useragent', '~> 0.3.1'
	11	+gem 'useragent', '~> 0.4.16'
12	12	gem 'inherited_resources'
13	13	gem 'SystemTimer', :platform => :ruby_18
14	14	gem 'actionmailer_inline_css', "~> 1.3.0"
...	...	@@ -83,6 +83,11 @@ group :development, :test do
83	83	# gem 'rpm_contrib'
84	84	# gem 'newrelic_rpm'
85	85	gem 'capistrano'
	86	+
	87	+ # better errors
	88	+ gem 'better_errors', :platform => :ruby_19
	89	+ gem 'binding_of_caller', :platform => :ruby_19
	90	+ gem 'meta_request', :platform => :ruby_19
86	91	end
87	92
88	93	gem 'foreman', :group => :development
...	...
...	...	@@ -9,40 +9,45 @@ GEM
9	9	remote: http://rubygems.org/
10	10	specs:
11	11	SystemTimer (1.2.3)
12		- actionmailer (3.2.11)
13		- actionpack (= 3.2.11)
	12	+ actionmailer (3.2.12)
	13	+ actionpack (= 3.2.12)
14	14	mail (~> 2.4.4)
15	15	actionmailer_inline_css (1.3.1)
16	16	actionmailer (>= 3.0.0)
17	17	nokogiri (>= 1.4.4)
18	18	premailer (>= 1.7.1)
19		- actionpack (3.2.11)
20		- activemodel (= 3.2.11)
21		- activesupport (= 3.2.11)
	19	+ actionpack (3.2.12)
	20	+ activemodel (= 3.2.12)
	21	+ activesupport (= 3.2.12)
22	22	builder (~> 3.0.0)
23	23	erubis (~> 2.7.0)
24	24	journey (~> 1.0.4)
25		- rack (~> 1.4.0)
	25	+ rack (~> 1.4.5)
26	26	rack-cache (~> 1.2)
27	27	rack-test (~> 0.6.1)
28	28	sprockets (~> 2.2.1)
29		- activemodel (3.2.11)
30		- activesupport (= 3.2.11)
	29	+ activemodel (3.2.12)
	30	+ activesupport (= 3.2.12)
31	31	builder (~> 3.0.0)
32		- activerecord (3.2.11)
33		- activemodel (= 3.2.11)
34		- activesupport (= 3.2.11)
	32	+ activerecord (3.2.12)
	33	+ activemodel (= 3.2.12)
	34	+ activesupport (= 3.2.12)
35	35	arel (~> 3.0.2)
36	36	tzinfo (~> 0.3.29)
37		- activeresource (3.2.11)
38		- activemodel (= 3.2.11)
39		- activesupport (= 3.2.11)
40		- activesupport (3.2.11)
	37	+ activeresource (3.2.12)
	38	+ activemodel (= 3.2.12)
	39	+ activesupport (= 3.2.12)
	40	+ activesupport (3.2.12)
41	41	i18n (~> 0.6)
42	42	multi_json (~> 1.0)
43	43	addressable (2.3.2)
44	44	arel (3.0.2)
45	45	bcrypt-ruby (3.0.1)
	46	+ better_errors (0.7.0)
	47	+ coderay (>= 1.0.0)
	48	+ erubis (>= 2.6.6)
	49	+ binding_of_caller (0.7.1)
	50	+ debug_inspector (>= 0.0.1)
46	51	bitbucket_rest_api (0.1.1)
47	52	faraday (~> 0.8.1)
48	53	faraday_middleware (~> 0.8.1)
...	...	@@ -79,13 +84,14 @@ GEM
79	84	rdoc
80	85	daemons (1.1.8)
81	86	database_cleaner (0.6.7)
82		- debugger (1.2.1)
	87	+ debug_inspector (0.0.2)
	88	+ debugger (1.3.0)
83	89	columnize (>= 0.3.1)
84	90	debugger-linecache (~> 1.1.1)
85		- debugger-ruby_core_source (~> 1.1.4)
	91	+ debugger-ruby_core_source (~> 1.1.7)
86	92	debugger-linecache (1.1.2)
87	93	debugger-ruby_core_source (>= 1.1.1)
88		- debugger-ruby_core_source (1.1.4)
	94	+ debugger-ruby_core_source (1.1.7)
89	95	devise (1.5.4)
90	96	bcrypt-ruby (~> 3.0)
91	97	orm_adapter (~> 0.0.3)
...	...	@@ -131,7 +137,7 @@ GEM
131	137	has_scope (~> 0.5.0)
132	138	responders (~> 0.6)
133	139	journey (1.0.4)
134		- json (1.7.6)
	140	+ json (1.7.7)
135	141	jwt (0.1.5)
136	142	multi_json (>= 1.0)
137	143	kaminari (0.14.1)
...	...	@@ -140,7 +146,7 @@ GEM
140	146	kgio (2.7.4)
141	147	launchy (2.1.2)
142	148	addressable (~> 2.3)
143		- libv8 (3.3.10.4)
	149	+ libv8 (3.11.8.13)
144	150	libwebsocket (0.1.5)
145	151	addressable
146	152	libxml-ruby (2.3.3)
...	...	@@ -153,8 +159,11 @@ GEM
153	159	i18n (>= 0.4.0)
154	160	mime-types (~> 1.16)
155	161	treetop (~> 1.4.8)
	162	+ meta_request (0.2.2)
	163	+ rack-contrib
	164	+ railties
156	165	method_source (0.7.1)
157		- mime-types (1.19)
	166	+ mime-types (1.21)
158	167	mongo (1.6.2)
159	168	bson (~> 1.6.2)
160	169	mongoid (2.4.10)
...	...	@@ -166,7 +175,7 @@ GEM
166	175	bundler (>= 1.0.0)
167	176	rails (>= 3.0.0)
168	177	railties (>= 3.0.0)
169		- multi_json (1.5.0)
	178	+ multi_json (1.5.1)
170	179	multi_xml (0.5.2)
171	180	multipart-post (1.1.5)
172	181	net-scp (1.0.4)
...	...	@@ -220,27 +229,29 @@ GEM
220	229	slop (>= 2.4.4, < 3)
221	230	pry-rails (0.2.0)
222	231	pry
223		- rack (1.4.3)
	232	+ rack (1.4.5)
224	233	rack-cache (1.2)
225	234	rack (>= 0.4)
226		- rack-ssl (1.3.2)
	235	+ rack-contrib (1.1.0)
	236	+ rack (>= 0.9.1)
	237	+ rack-ssl (1.3.3)
227	238	rack
228	239	rack-ssl-enforcer (0.2.4)
229	240	rack-test (0.6.2)
230	241	rack (>= 1.0)
231		- rails (3.2.11)
232		- actionmailer (= 3.2.11)
233		- actionpack (= 3.2.11)
234		- activerecord (= 3.2.11)
235		- activeresource (= 3.2.11)
236		- activesupport (= 3.2.11)
	242	+ rails (3.2.12)
	243	+ actionmailer (= 3.2.12)
	244	+ actionpack (= 3.2.12)
	245	+ activerecord (= 3.2.12)
	246	+ activeresource (= 3.2.12)
	247	+ activesupport (= 3.2.12)
237	248	bundler (~> 1.0)
238		- railties (= 3.2.11)
	249	+ railties (= 3.2.12)
239	250	rails_autolink (1.0.9)
240	251	rails (~> 3.1)
241		- railties (3.2.11)
242		- actionpack (= 3.2.11)
243		- activesupport (= 3.2.11)
	252	+ railties (3.2.12)
	253	+ actionpack (= 3.2.12)
	254	+ activesupport (= 3.2.12)
244	255	rack-ssl (~> 1.3.2)
245	256	rake (>= 0.8.7)
246	257	rdoc (~> 3.4)
...	...	@@ -248,8 +259,9 @@ GEM
248	259	raindrops (0.10.0)
249	260	rake (10.0.3)
250	261	rbx-require-relative (0.0.9)
251		- rdoc (3.12)
	262	+ rdoc (3.12.1)
252	263	json (~> 1.4)
	264	+ ref (1.0.2)
253	265	responders (0.9.2)
254	266	railties (~> 3.1)
255	267	rest-client (1.6.7)
...	...	@@ -276,7 +288,7 @@ GEM
276	288	ruby-fogbugz (0.1.1)
277	289	crack
278	290	rubyzip (0.9.9)
279		- rushover (0.1.1)
	291	+ rushover (0.3.0)
280	292	json
281	293	rest-client
282	294	selenium-webdriver (2.25.0)
...	...	@@ -291,13 +303,14 @@ GEM
291	303	multi_json (~> 1.0)
292	304	rack (~> 1.0)
293	305	tilt (~> 1.1, != 1.3.0)
294		- therubyracer (0.10.2)
295		- libv8 (~> 3.3.10)
	306	+ therubyracer (0.11.4)
	307	+ libv8 (~> 3.11.8.12)
	308	+ ref
296	309	thin (1.4.1)
297	310	daemons (>= 1.0.9)
298	311	eventmachine (>= 0.12.6)
299	312	rack (>= 1.0.0)
300		- thor (0.16.0)
	313	+ thor (0.17.0)
301	314	tilt (1.3.3)
302	315	timecop (0.3.5)
303	316	treetop (1.4.12)
...	...	@@ -315,7 +328,7 @@ GEM
315	328	kgio (~> 2.6)
316	329	rack
317	330	raindrops (~> 0.7)
318		- useragent (0.3.2)
	331	+ useragent (0.4.16)
319	332	warden (1.2.1)
320	333	rack (>= 1.0)
321	334	webmock (1.8.7)
...	...	@@ -332,6 +345,8 @@ PLATFORMS
332	345	DEPENDENCIES
333	346	SystemTimer
334	347	actionmailer_inline_css (~> 1.3.0)
	348	+ better_errors
	349	+ binding_of_caller
335	350	bitbucket_rest_api
336	351	bson (= 1.6.2)
337	352	bson_ext (= 1.6.2)
...	...	@@ -356,6 +371,7 @@ DEPENDENCIES
356	371	kaminari (>= 0.14.1)
357	372	launchy
358	373	lighthouse-api
	374	+ meta_request
359	375	mongo (= 1.6.2)
360	376	mongoid (~> 2.4.10)
361	377	mongoid_rails_migrations
...	...	@@ -366,7 +382,7 @@ DEPENDENCIES
366	382	pry-rails
367	383	rack-ssl
368	384	rack-ssl-enforcer
369		- rails (= 3.2.11)
	385	+ rails (= 3.2.12)
370	386	rails_autolink (~> 1.0.9)
371	387	ri_cal
372	388	rspec-rails (~> 2.6)
...	...	@@ -380,7 +396,7 @@ DEPENDENCIES
380	396	uglifier (>= 1.0.3)
381	397	underscore-rails
382	398	unicorn
383		- useragent (~> 0.3.1)
	399	+ useragent (~> 0.4.16)
384	400	webmock
385	401	xmpp4r
386	402	yajl-ruby
...	...
...	...	@@ -443,6 +443,13 @@ TODO
443	443	* Add ability for watchers to be configured for types of notifications they should receive
444	444
445	445
	446	+People using Errbit
	447	+-------------------
	448	+
	449	+See our wiki page for a [list of people and companies around the world who use Errbit](https://github.com/errbit/errbit/wiki/People-using-Errbit).
	450	+Feel free to [edit this page](https://github.com/errbit/errbit/wiki/People-using-Errbit/_edit), and add your name and country to the list if you are using Errbit.
	451	+
	452	+
446	453	Special Thanks
447	454	--------------
448	455
...	...
...	...	@@ -654,7 +654,6 @@ table.errs td.message a {
654	654	overflow: hidden;
655	655	text-overflow: ellipsis;
656	656	-o-text-overflow: ellipsis;
657		- white-space: nowrap;
658	657	/* ------ */
659	658	}
660	659	table.errs td.message em {
...	...
...	...	@@ -0,0 +1,41 @@
	1	+class Api::V1::StatsController < ApplicationController
	2	+ respond_to :json, :xml
	3	+
	4	+ # The stats API only requires an api_key for the given app.
	5	+ skip_before_filter :authenticate_user!
	6	+ before_filter :require_api_key_or_authenticate_user!
	7	+
	8	+ def app
	9	+ if problem = @app.problems.order_by(:last_notice_at.desc).first
	10	+ @last_error_time = problem.last_notice_at
	11	+ end
	12	+
	13	+ stats = {
	14	+ :name => @app.name,
	15	+ :last_error_time => @last_error_time,
	16	+ :unresolved_errors => @app.unresolved_count
	17	+ }
	18	+
	19	+ respond_to do \|format\|
	20	+ format.html { render :json => Yajl.dump(stats) } # render JSON if no extension specified on path
	21	+ format.json { render :json => Yajl.dump(stats) }
	22	+ format.xml { render :xml => stats }
	23	+ end
	24	+ end
	25	+
	26	+
	27	+ protected
	28	+
	29	+ def require_api_key_or_authenticate_user!
	30	+ if params[:api_key].present?
	31	+ if @app = App.where(:api_key => params[:api_key]).first
	32	+ return true
	33	+ end
	34	+ end
	35	+
	36	+ authenticate_user!
	37	+ end
	38	+
	39	+end
	40	+
	41	+
...	...
...	...	@@ -57,7 +57,7 @@ module ApplicationHelper
57	57	total = (options[:total] \|\| total_from_tallies(tallies))
58	58	percent = 100.0 / total.to_f
59	59	rows = tallies.map {\|value, count\| [(count.to_f * percent), value]} \
60		- .sort {\|a, b\| a[0] <=> b[0]}
	60	+ .sort {\|a, b\| b[0] <=> a[0]}
61	61	render "problems/tally_table", :rows => rows
62	62	end
63	63
...	...
1	1	module BacktraceLineHelper
2	2	def link_to_source_file(line, &block)
3	3	text = capture_haml(&block)
4		- line.in_app? ? link_to_in_app_source_file(line, text) : link_to_external_source_file(text)
	4	+ link_to_in_app_source_file(line, text) \|\| link_to_external_source_file(text)
5	5	end
6	6
7	7	private
8	8	def link_to_in_app_source_file(line, text)
9		- link_to_repo_source_file(line, text) \|\| link_to_issue_tracker_file(line, text)
	9	+ return unless line.in_app?
	10	+ if line.file_name =~ /\.js$/
	11	+ link_to_hosted_javascript(line, text)
	12	+ else
	13	+ link_to_repo_source_file(line, text) \|\|
	14	+ link_to_issue_tracker_file(line, text)
	15	+ end
10	16	end
11	17
12	18	def link_to_repo_source_file(line, text)
13	19	link_to_github(line, text) \|\| link_to_bitbucket(line, text)
14	20	end
15	21
	22	+ def link_to_hosted_javascript(line, text)
	23	+ if line.app.asset_host?
	24	+ link_to(text, "#{line.app.asset_host}/#{line.file_relative}", :target => '_blank')
	25	+ end
	26	+ end
	27	+
16	28	def link_to_external_source_file(text)
17	29	text
18	30	end
...	...	@@ -31,7 +43,7 @@ module BacktraceLineHelper
31	43
32	44	def link_to_issue_tracker_file(line, text = nil)
33	45	return unless line.app.issue_tracker && line.app.issue_tracker.respond_to?(:url_to_file)
34		- href = line.app.issue_tracker.url_to_file(line.file, line.number)
	46	+ href = line.app.issue_tracker.url_to_file(line.file_relative, line.number)
35	47	link_to(text \|\| line.file_name, href, :target => '_blank')
36	48	end
37	49
...	...
...	...	@@ -3,14 +3,20 @@
3	3	require Rails.root.join('config/routes.rb')
4	4
5	5	class Mailer < ActionMailer::Base
	6	+ helper ApplicationHelper
	7	+ helper BacktraceLineHelper
	8	+
6	9	default :from => Errbit::Config.email_from
7	10
8	11	def err_notification(notice)
9	12	@notice = notice
10	13	@app = notice.app
11	14
	15	+ count = @notice.similar_count
	16	+ count = count > 1 ? "(#{count}) " : ""
	17	+
12	18	mail :to => @app.notification_recipients,
13		- :subject => "[#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
	19	+ :subject => "#{count}[#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
14	20	end
15	21
16	22	def deploy_notification(deploy)
...	...	@@ -20,5 +26,18 @@ class Mailer < ActionMailer::Base
20	26	mail :to => @app.notification_recipients,
21	27	:subject => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"
22	28	end
23		-end
24	29
	30	+ def comment_notification(comment)
	31	+ @comment = comment
	32	+ @user = comment.user
	33	+ @problem = comment.err
	34	+ @notice = @problem.notices.first
	35	+ @app = @problem.app
	36	+
	37	+ # Don't send comment notification to user who posted the comment
	38	+ recipients = @app.notification_recipients - [comment.user.email]
	39	+
	40	+ mail :to => recipients,
	41	+ :subject => "#{@user.name} commented on [#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
	42	+ end
	43	+end
...	...
1	1	class App
	2	+ include Comparable
2	3	include Mongoid::Document
3	4	include Mongoid::Timestamps
4		- include Comparable
5	5
6	6	field :name, :type => String
7	7	field :api_key
8	8	field :github_repo
9	9	field :bitbucket_repo
	10	+ field :asset_host
10	11	field :repository_branch
11	12	field :resolve_errs_on_deploy, :type => Boolean, :default => false
12	13	field :notify_all_users, :type => Boolean, :default => false
...	...
...	...	@@ -23,7 +23,7 @@ class Backtrace
23	23	end
24	24
25	25	def raw=(raw)
26		- raw.each do \|raw_line\|
	26	+ raw.compact.each do \|raw_line\|
27	27	lines << BacktraceLine.new(BacktraceLineNormalizer.new(raw_line).call)
28	28	end
29	29	end
...	...