fix specs related to mongoid5 upgrade

Stephen Crosby
1 parent 8ef1dc2b
Showing 32 changed files with 236 additions and 260 deletions Show diff stats
app/controllers/problems_controller.rb
app/decorators/backtrace_decorator.rb
app/decorators/backtrace_line_decorator.rb
app/decorators/notice_decorator.rb
app/decorators/problem_decorator.rb
app/helpers/backtrace_line_helper.rb
app/mailers/mailer.rb
app/models/backtrace.rb
app/models/backtrace_line.rb
app/models/backtrace_line_normalizer.rb
app/models/error_report.rb
app/models/notice.rb
app/models/problem.rb
app/views/issue_trackers/issue.md.erb
app/views/issue_trackers/issue.txt.erb
app/views/mailer/comment_notification.text.erb
app/views/mailer/err_notification.html.haml
app/views/mailer/err_notification.text.erb
app/views/notices/_backtrace_line.html.haml
spec/acceptance/app_regenerate_api_key_spec.rb
@@ -22,7 +22,7 @@ class ProblemsController &lt; ApplicationController
   }
  
   expose(:problem) {
-    app.problems.find(params[:id])
+    ProblemDecorator.new app.problems.find(params[:id])
   }
  
   expose(:all_errs) {
@@ -50,7 +50,8 @@ class ProblemsController &lt; ApplicationController
   def index; end
  
   def show
-    @notices  = problem.notices.reverse_ordered.page(params[:notice]).per(1)
+    @notices  = problem.object.notices.reverse_ordered
+      .page(params[:notice]).per(1)
     @notice   = @notices.first
     @comment = Comment.new
   end
@@ -0,0 +1,5 @@
+class BacktraceDecorator < Draper::Decorator
+  def lines
+    @lines ||= object.lines.map { |line| BacktraceLineDecorator.new line }
+  end
+end
@@ -0,0 +1,76 @@
+class BacktraceLineDecorator < Draper::Decorator
+  EMPTY_STRING = ''.freeze
+
+  def in_app?
+    object[:file].match Backtrace::IN_APP_PATH
+  end
+
+  def number
+    object[:number]
+  end
+
+  def file
+    object[:file]
+  end
+
+  def method
+    object[:method]
+  end
+
+  def file_relative
+    file.to_s.sub(Backtrace::IN_APP_PATH, EMPTY_STRING)
+  end
+
+  def file_name
+    File.basename file
+  end
+
+  def to_s
+    column = object.try(:[], :column)
+    "#{file_relative}:#{number}#{column.present? ? ":#{column}" : ''}"
+  end
+
+  def link_to_source_file(app, &block)
+    text = h.capture_haml(&block)
+    link_to_in_app_source_file(app, text) || text
+  end
+
+  private
+  def link_to_in_app_source_file(app, text)
+    return unless in_app?
+    if file_name =~ /\.js$/
+      link_to_hosted_javascript(app, text)
+    else
+      link_to_repo_source_file(app, text) ||
+      link_to_issue_tracker_file(app, text)
+    end
+  end
+
+  def link_to_repo_source_file(app, text)
+    link_to_github(app, text) || link_to_bitbucket(app, text)
+  end
+
+  def link_to_hosted_javascript(app, text)
+    if app.asset_host?
+      h.link_to(text, "#{app.asset_host}/#{file_relative}", :target => '_blank')
+    end
+  end
+
+  def link_to_github(app, text = nil)
+    return unless app.github_repo?
+    href = "%s#L%s" % [app.github_url_to_file(decorated_path + file_name), number]
+    h.link_to(text || file_name, href, :target => '_blank')
+  end
+
+  def link_to_bitbucket(app, text = nil)
+    return unless app.bitbucket_repo?
+    href = "%s#cl-%s" % [app.bitbucket_url_to_file(decorated_path + file_name), number]
+    h.link_to(text || file_name, href, :target => '_blank')
+  end
+
+  def link_to_issue_tracker_file(app, text = nil)
+    return unless app.issue_tracker && app.issue_tracker.respond_to?(:url_to_file)
+    href = app.issue_tracker.url_to_file(file_relative, number)
+    h.link_to(text || file_name, href, :target => '_blank')
+  end
+end
@@ -0,0 +1,4 @@
+class NoticeDecorator < Draper::Decorator
+  decorates_association :backtrace
+  delegate_all
+end
@@ -0,0 +1,4 @@
+class ProblemDecorator < Draper::Decorator
+  decorates_association :notices
+  delegate_all
+end
 module BacktraceLineHelper
-  def link_to_source_file(line, &block)
+  def link_to_source_file(line, app, &block)
     text = capture_haml(&block)
-     link_to_in_app_source_file(line, text) || link_to_external_source_file(text)
+    link_to_in_app_source_file(line, app, text) || text
   end
  
   private
-  def link_to_in_app_source_file(line, text)
+  def link_to_in_app_source_file(line, app, text)
     return unless line.in_app?
     if line.file_name =~ /\.js$/
-      link_to_hosted_javascript(line, text)
+      link_to_hosted_javascript(line, app, text)
     else
-      link_to_repo_source_file(line, text) ||
-      link_to_issue_tracker_file(line, text)
+      link_to_repo_source_file(line, app, text) ||
+      link_to_issue_tracker_file(line, app, text)
     end
   end
  
-  def link_to_repo_source_file(line, text)
-    link_to_github(line, text) || link_to_bitbucket(line, text)
+  def link_to_repo_source_file(line, app, text)
+    link_to_github(line, app, text) || link_to_bitbucket(line, app, 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')
+  def link_to_hosted_javascript(line, app, text)
+    if app.asset_host?
+      link_to(text, "#{app.asset_host}/#{line.file_relative}", :target => '_blank')
     end
   end
  
-  def link_to_external_source_file(text)
-    text
-  end
-
-  def link_to_github(line, text = nil)
-    return unless line.app.github_repo?
-    href = "%s#L%s" % [line.app.github_url_to_file(line.decorated_path + line.file_name), line.number]
+  def link_to_github(line, app, text = nil)
+    return unless app.github_repo?
+    href = "%s#L%s" % [app.github_url_to_file(line.decorated_path + line.file_name), line.number]
     link_to(text || line.file_name, href, :target => '_blank')
   end
  
-  def link_to_bitbucket(line, text = nil)
-    return unless line.app.bitbucket_repo?
-    href = "%s#cl-%s" % [line.app.bitbucket_url_to_file(line.decorated_path + line.file_name), line.number]
+  def link_to_bitbucket(line, app, text = nil)
+    return unless app.bitbucket_repo?
+    href = "%s#cl-%s" % [app.bitbucket_url_to_file(line.decorated_path + line.file_name), line.number]
     link_to(text || line.file_name, href, :target => '_blank')
   end
  
-  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_relative, line.number)
+  def link_to_issue_tracker_file(line, app, text = nil)
+    return unless app.issue_tracker && app.issue_tracker.respond_to?(:url_to_file)
+    href = app.issue_tracker.url_to_file(line.file_relative, line.number)
     link_to(text || line.file_name, href, :target => '_blank')
   end
  
@@ -13,11 +13,11 @@ class Mailer &lt; ActionMailer::Base
           'Precedence' => 'bulk',
           'Auto-Submitted' => 'auto-generated'
  
-  def err_notification(notice)
-    @notice   = notice
-    @app      = notice.app
+  def err_notification(error_report)
+    @notice   = NoticeDecorator.new error_report.notice
+    @app      = AppDecorator.new error_report.app
  
-    count = @notice.similar_count
+    count = error_report.problem.notices_count
     count = count > 1 ? "(#{count}) " : ""
  
     errbit_headers 'App' => @app.name,
@@ -30,7 +30,7 @@ class Mailer &lt; ActionMailer::Base
  
   def deploy_notification(deploy)
     @deploy   = deploy
-    @app  = deploy.app
+    @app  = AppDecorator.new deploy.app
  
     errbit_headers 'App' => @app.name,
                    'Environment' => @deploy.environment,
@@ -44,7 +44,7 @@ class Mailer &lt; ActionMailer::Base
   def comment_notification(comment)
     @comment  = comment
     @user     = comment.user
-    @problem  = comment.err
+    @problem  = ProblemDecorator.new comment.err
     @notice   = @problem.notices.first
     @app      = @problem.app
  
@@ -2,31 +2,23 @@ class Backtrace
   include Mongoid::Document
   include Mongoid::Timestamps
  
-  field :fingerprint
-  index :fingerprint => 1
-
-  has_many :notices
-  has_one :notice
+  IN_APP_PATH = %r{^\[PROJECT_ROOT\](?!(\/vendor))/?}
  
-  embeds_many :lines, :class_name => "BacktraceLine"
-
-  after_initialize :generate_fingerprint
+  field :fingerprint
+  field :lines
  
-  delegate :app, :to => :notice
+  index :fingerprint => 1
  
   def self.find_or_create(lines)
     fingerprint = generate_fingerprint(lines)
  
-    where(fingerprint: generate_fingerprint(lines)).
-      find_one_and_update(
-        { '$setOnInsert' => { fingerprint: fingerprint, lines: lines } },
-        { return_document: :after, upsert: true })
+    where(fingerprint: fingerprint).find_one_and_update(
+      { '$setOnInsert' => { fingerprint: fingerprint, lines: lines } },
+      { return_document: :after, upsert: true })
   end
  
-  def raw=(raw)
-    raw.compact.each do |raw_line|
-      lines << BacktraceLine.new(BacktraceLineNormalizer.new(raw_line).call)
-    end
+  def self.generate_fingerprint(lines)
+    Digest::SHA1.hexdigest(lines.map(&:to_s).join)
   end
  
   private
@@ -1,42 +0,0 @@
-class BacktraceLine
-  include Mongoid::Document
-  IN_APP_PATH = %r{^\[PROJECT_ROOT\](?!(\/vendor))/?}
-  GEMS_PATH   = %r{\[GEM_ROOT\]\/gems\/([^\/]+)}
-
-  field :number, :type => Integer
-  field :column, :type => Integer
-  field :file
-  field :method
-
-  embedded_in :backtrace
-
-  scope :in_app, ->{ where(:file => IN_APP_PATH) }
-
-  delegate :app, :to => :backtrace
-
-  def to_s
-    "#{file_relative}:#{number}" << (column.present? ? ":#{column}" : "")
-  end
-
-  def in_app?
-    !!(file =~ IN_APP_PATH)
-  end
-
-  def path
-    File.dirname(file).gsub(/^\.$/, '') + "/"
-  end
-
-  def file_relative
-    file.to_s.sub(IN_APP_PATH, '')
-  end
-
-  def file_name
-    File.basename file
-  end
-
-  def decorated_path
-    path.sub(BacktraceLine::IN_APP_PATH, '').
-      sub(BacktraceLine::GEMS_PATH, "<strong>\\1</strong>")
-  end
-
-end
@@ -1,32 +0,0 @@
-class BacktraceLineNormalizer
-  def initialize(raw_line)
-    @raw_line = raw_line || {}
-  end
-
-  def call
-    @raw_line.merge 'file' => normalized_file, 'method' => normalized_method
-  end
-
-  private
-  def normalized_file
-    if @raw_line['file'].blank?
-      "[unknown source]"
-    else
-      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
-
-  def normalized_method
-    if @raw_line['method'].blank?
-      "[unknown method]"
-    else
-      @raw_line['method'].to_s.gsub(/[0-9_]{10,}+/, "__FRAGMENT__")
-    end
-  end
-
-end
@@ -79,23 +79,20 @@ class ErrorReport
   # Update problem cache with information about this notice
   def cache_attributes_on_problem
     @problem = Problem.cache_notice(@error.problem_id, @notice)
-
-    # cache_notice returns the old problem, so the count is one higher
-    @similar_count = @problem.notices_count + 1
   end
  
   # Send email notification if needed
   def email_notification
     return false unless app.emailable?
-    return false unless app.email_at_notices.include?(@similar_count)
-    Mailer.err_notification(@notice).deliver
+    return false unless app.email_at_notices.include?(@problem.notices_count)
+    Mailer.err_notification(self).deliver
   rescue => e
     HoptoadNotifier.notify(e)
   end
  
   def should_notify?
     app.notification_service.notify_at_notices.include?(0) ||
-      app.notification_service.notify_at_notices.include?(@similar_count)
+      app.notification_service.notify_at_notices.include?(@problem.notices_count)
   end
  
   # Launch all notification define on the app associate to this notice
@@ -103,10 +103,6 @@ class Notice
     request['session'] || {}
   end
  
-  def in_app_backtrace_lines
-    backtrace_lines.in_app
-  end
-
   ##
   # TODO: Move on decorator maybe
   #
@@ -76,7 +76,7 @@ class Problem
     host_digest = Digest::MD5.hexdigest(notice.host)
     user_agent_digest = Digest::MD5.hexdigest(notice.user_agent_string)
  
-    Problem.where('_id' => id).find_one_and_update(
+    Problem.where('_id' => id).find_one_and_update({
       '$set' => {
         'environment' => notice.environment_name,
         'error_class' => notice.error_class,
@@ -95,7 +95,7 @@ class Problem
         "hosts.#{host_digest}.count" => 1,
         "user_agents.#{user_agent_digest}.count" => 1,
       }
-    )
+    }, return_document: :after)
   end
  
   def uncache_notice(notice)
@@ -27,7 +27,7 @@
  
 ## Backtrace ##
 ~~~
-<% notice.backtrace_lines.each do |line| %><%= line.number %>:  <%= line.file_relative %> -> **<%= line.method %>**
+<% notice.backtrace.lines.each do |line| %><%= line.number %>:  <%= line.file_relative %> -> **<%= line.method %>**
 <% end %>
 ~~~
  
@@ -16,6 +16,6 @@ Env:     &lt;%= pretty_hash notice.env_vars %&gt;
  
 Backtrace
 ---------
-<% notice.backtrace_lines.each do |line| %><%= sprintf('%5d: %s **%s', line.number, line.file_relative, line.method) %>
+<% notice.backtrace.lines.each do |line| %><%= sprintf('%5d: %s **%s', line.number, line.file_relative, line.method) %>
 <% end %>
 <% end %>
@@ -21,8 +21,8 @@ WHERE:
  
 <%= @notice.where %>
  
-<% @notice.in_app_backtrace_lines.each do |line| %>
-  <%= line %>
+<% @notice.backtrace.lines.each do |line| %>
+  <% next unless line.in_app? %><%= line %>
 <% end %>
  
  
@@ -27,9 +27,10 @@
               %p.heading WHERE:
               %p.monospace
                 = @notice.where
-              - @notice.in_app_backtrace_lines.each do |line|
+              - @notice.backtrace.lines.each do |line|
+                - next unless line.in_app?
                 %p.backtrace
-                  = link_to_source_file(line) do
+                  = line.link_to_source_file(@app) do
                     = line.to_s
               %br
               - if @notice.app_version.present?
@@ -59,11 +60,11 @@
                       %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?
+              - if @notice.backtrace.lines.any?
                 %br
                 %p.heading FULL BACKTRACE:
-                - @notice.backtrace_lines.each do |line|
+                - @notice.backtrace.lines.each do |line|
                   %p.backtrace
-                    = link_to_source_file(line) do
+                    = link_to_source_file(line, @app) do
                       = line.to_s
                 %br
@@ -14,7 +14,8 @@ WHERE:
  
 <%= @notice.where %>
  
-<% @notice.in_app_backtrace_lines.each do |line| %>
+<% @notice.backtrace.lines.each do |line| %>
+  <% next unless line.in_app? %>
   <%= line %>
 <% end %>
  
@@ -51,7 +52,7 @@ USER:
  
 BACKTRACE:
  
-<% @notice.backtrace_lines.each do |line| %>
+<% @notice.backtrace.lines.each do |line| %>
   <%= line %>
 <% end %>
  
 %tr{:class => defined?(row_class) && row_class}
   %td.line{:class => line.in_app? && 'in-app' }
-    = link_to_source_file(line) do
+    = line.link_to_source_file(app) do
       %span.path>= raw line.decorated_path
       %span.file>= line.file_name
       - if line.number.present?
@@ -52,8 +52,8 @@ feature &quot;Create an application&quot; do
     fill_in 'app_name', :with => 'My new app'
     click_on I18n.t('apps.new.add_app')
     page.has_content?(I18n.t('controllers.apps.flash.create.success'))
-    expect(App.where(:name => 'My new app').count).to eql 1
-    expect(App.where(:name => 'My new app 2').count).to eql 0
+    expect(App.where(:name => 'My new app').count).to eq 1
+    expect(App.where(:name => 'My new app 2').count).to eq 0
  
  
     click_on I18n.t('shared.navigation.apps')
@@ -62,8 +62,8 @@ feature &quot;Create an application&quot; do
     fill_in 'app_name', :with => 'My new app 2'
     click_on I18n.t('apps.edit.update')
     page.has_content?(I18n.t('controllers.apps.flash.update.success'))
-    expect(App.where(:name => 'My new app').count).to eql 0
-    expect(App.where(:name => 'My new app 2').count).to eql 1
+    expect(App.where(:name => 'My new app').count).to eq 0
+    expect(App.where(:name => 'My new app 2').count).to eq 1
  
   end
  
@@ -145,8 +145,6 @@ describe ProblemsController, type: &#39;controller&#39; do
   end
  
   describe "GET /apps/:app_id/problems/:id" do
-    #render_views
-
     context 'when logged in as an admin' do
       before do
         sign_in admin
@@ -250,8 +248,8 @@ describe ProblemsController, type: &#39;controller&#39; do
     before { sign_in admin }
  
     context "when app has a issue tracker" do
-      let(:notice) { Fabricate :notice }
-      let(:problem) { notice.problem }
+      let(:notice) { NoticeDecorator.new(Fabricate :notice) }
+      let(:problem) { ProblemDecorator.new(notice.problem) }
       let(:issue_tracker) do
         Fabricate(:issue_tracker).tap do |t|
           t.instance_variable_set(:@tracker, ErrbitPlugin::MockIssueTracker.new(t.options))
@@ -18,12 +18,11 @@ Fabricator :notice do
 end
  
 Fabricator :backtrace do
-  lines(:count => 99) { Fabricate.build(:backtrace_line) }
-end
-
-Fabricator :backtrace_line do
-  number { rand(999) }
-  file { "/path/to/file/#{SecureRandom.hex(4)}.rb" }
-  method(:method) { ActiveSupport.methods.shuffle.first }
+  lines(:count => 99) do
+    {
+      number: rand(999),
+      file: "/path/to/file/#{SecureRandom.hex(4)}.rb",
+      method: ActiveSupport.methods.shuffle.first
+    }
+  end
 end
-
@@ -23,8 +23,7 @@ end
  
 Fabricator(:problem_resolved, :from => :problem) do
   after_create do |pr|
-    Fabricate(:notice,
-              :err => Fabricate(:err, :problem => pr))
+    Fabricate(:notice, :err => Fabricate(:err, :problem => pr))
     pr.resolve!
   end
 end
 shared_examples "a notification email" do
   it "should have X-Mailer header" do
-    expect(@email).to have_header('X-Mailer', 'Errbit')
+    expect(email).to have_header('X-Mailer', 'Errbit')
   end
  
   it "should have X-Errbit-Host header" do
-    expect(@email).to have_header('X-Errbit-Host', Errbit::Config.host)
+    expect(email).to have_header('X-Errbit-Host', Errbit::Config.host)
   end
  
   it "should have Precedence header" do
-    expect(@email).to have_header('Precedence', 'bulk')
+    expect(email).to have_header('Precedence', 'bulk')
   end
  
   it "should have Auto-Submitted header" do
-    expect(@email).to have_header('Auto-Submitted', 'auto-generated')
+    expect(email).to have_header('Auto-Submitted', 'auto-generated')
   end
  
   it "should have X-Auto-Response-Suppress header" do
     # http://msdn.microsoft.com/en-us/library/ee219609(v=EXCHG.80).aspx
-    expect(@email).to have_header('X-Auto-Response-Suppress', 'OOF, AutoReply')
+    expect(email).to have_header('X-Auto-Response-Suppress', 'OOF, AutoReply')
   end
  
   it "should send the email" do
+    email
     expect(ActionMailer::Base.deliveries.size).to eq 1
   end
 end
@@ -30,44 +31,63 @@ describe Mailer do
     include EmailSpec::Helpers
     include EmailSpec::Matchers
  
-    let(:notice)  { Fabricate(:notice, :message => "class < ActionController::Base") }
-    let!(:user)   { Fabricate(:admin) }
+    let(:notice) do
+      n = Fabricate(:notice, message: "class < ActionController::Base")
+      n.backtrace.lines.last[:file] = '[PROJECT_ROOT]/path/to/file.js'
+      # notice.backtrace.update_attributes(lines: lines)
+      n
+    end
  
-    before do
-      ActionMailer::Base.deliveries = []
-      notice.backtrace.lines.last.update_attributes(:file => "[PROJECT_ROOT]/path/to/file.js")
-      notice.app.update_attributes(
+    let(:app) do
+      a = notice.app
+      a.update_attributes(
         :asset_host => "http://example.com",
         :notify_all_users => true
       )
-      notice.problem.update_attributes :notices_count => 3
-
-      @email = Mailer.err_notification(notice).deliver
+      a
+    end
+    let(:problem) do
+      p = notice.problem
+      p.notices_count = 3
+      p
+    end
+    let!(:user)   { Fabricate(:admin) }
+    let(:error_report) do
+      instance_double(
+        'ErrorReport',
+        notice: notice,
+        app: app,
+        problem: problem
+      )
+    end
+    let(:email) do
+      Mailer.err_notification(error_report).deliver
     end
  
-    it_should_behave_like "a notification email"
+    before { email }
  
+    it_should_behave_like "a notification email"
  
     it "should html-escape the notice's message for the html part" do
-      expect(@email).to have_body_text("class &lt; ActionController::Base")
+      expect(email).to have_body_text("class &lt; ActionController::Base")
     end
  
     it "should have inline css" do
-      expect(@email).to have_body_text('<p class="backtrace" style="')
+      expect(email).to have_body_text('<p class="backtrace" style="')
     end
  
     it "should have links to source files" do
-      expect(@email).to have_body_text('<a href="http://example.com/path/to/file.js" target="_blank">path/to/file.js')
+      expect(email).to 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
-      expect(@email.subject).to match( /^\(3\) / )
+      expect(email.subject).to match( /^\(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
-        expect(@email.subject).to match( / \d{47}\.{3}$/ )
+        expect(email.subject).to match( / \d{47}\.{3}$/ )
       end
     end
   end
@@ -1,10 +0,0 @@
-describe BacktraceLine, type: 'model' do
-  subject { described_class.new(raw_line) }
-
-  describe "root at the start of decorated filename" do
-    let(:raw_line) { { 'number' => rand(999), 'file' => '[PROJECT_ROOT]/app/controllers/pages_controller.rb', 'method' => ActiveSupport.methods.shuffle.first.to_s } }
-    it "should leave leading root symbol in filepath" do
-      expect(subject.decorated_path).to eq 'app/controllers/'
-    end
-  end
-end
 describe Backtrace, type: 'model' do
-  subject { described_class.new }
-
-  its(:fingerprint) { should be_present }
-
-  describe "#similar" do
-    context "no similar backtrace" do
-      its(:similar) { should be_nil }
+  describe '.find_or_create' do
+    let(:lines) do
+      [
+        { 'number' => '123', 'file' => '/some/path/to.rb', 'method' => 'abc' },
+        { 'number' => '345', 'file' => '/path/to.rb', 'method' => 'dowhat' }
+      ]
     end
+    let(:fingerprint) { Backtrace.generate_fingerprint(lines) }
  
-    context "similar backtrace exist" do
-      let!(:similar_backtrace) {
-        b =  Fabricate(:backtrace)
-        b.fingerprint = fingerprint
-        b.save!
-        b
-      }
-      let(:fingerprint) { "fingerprint" }
-
-      before { allow(subject).to receive(:fingerprint).and_return(fingerprint) }
-
-      its(:similar) { should == similar_backtrace }
-    end
-  end
-
-  describe "find_or_create" do
-    subject { described_class.find_or_create(attributes) }
-    let(:attributes) { double :attributes }
-    let(:backtrace) { double :backtrace }
-
-    before { allow(described_class).to receive(:new).and_return(backtrace) }
-
-    context "no similar backtrace" do
-      before { allow(backtrace).to receive(:similar).and_return(nil) }
-      it "create new backtrace" do
-        expect(described_class).to receive(:create).with(attributes)
+    it 'create new backtrace' do
+      backtrace = described_class.find_or_create(lines)
  
-        described_class.find_or_create(attributes)
-      end
+      expect(backtrace.lines).to eq(lines)
+      expect(backtrace.fingerprint).to eq(fingerprint)
     end
  
-    context "similar backtrace exist" do
-      let(:similar_backtrace) { double :similar_backtrace }
-      before { allow(backtrace).to receive(:similar).and_return(similar_backtrace) }
+    it 'creates one backtrace for two identical ones' do
+      described_class.find_or_create(lines)
+      described_class.find_or_create(lines)
  
-      it { should == similar_backtrace }
+      expect(Backtrace.where(fingerprint: fingerprint).count).to eq(1)
     end
   end
 end
@@ -21,9 +21,7 @@ describe ErrorReport do
     Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read
   }
  
-  let(:error_report) {
-    ErrorReport.new(xml)
-  }
+  let(:error_report) { ErrorReport.new(xml) }
  
   let!(:app) {
     Fabricate(
@@ -210,14 +208,13 @@ describe ErrorReport do
   end
  
   it 'find the correct err for the notice' do
-    err = Fabricate(:err, :problem => Fabricate(:problem, :resolved => true))
-
-    allow(error_report).to receive(:fingerprint).and_return(err.fingerprint)
+    error_report.generate_notice!
+    error_report.problem.resolve!
  
     expect {
-      error_report.generate_notice!
+      ErrorReport.new(xml).generate_notice!
     }.to change {
-      error_report.error.resolved?
+      error_report.problem.reload.resolved?
     }.from(true).to(false)
   end
  
@@ -227,6 +224,7 @@ describe ErrorReport do
       app.watchers.build(:email => 'foo@example.com')
       app.save
     end
+
     it 'send email' do
       notice = error_report.generate_notice!
       email = ActionMailer::Base.deliveries.last
 describe Fingerprint::MD5, type: 'model' do
   context 'being created' do
     let(:backtrace) do
-      Backtrace.create(:raw => [
+      Backtrace.find_or_create([
         {
           "number"=>"17",
           "file"=>"[GEM_ROOT]/gems/activesupport/lib/active_support/callbacks.rb",
@@ -14,10 +14,9 @@ describe Fingerprint::MD5, type: &#39;model&#39; do
  
     context "with same backtrace" do
       let(:backtrace_2) do
-        backtrace
-        backtrace.lines.last.method =  '_run__FRAGMENT__process_action__FRAGMENT__callbacks'
-        backtrace.save
-        backtrace
+        new_lines = backtrace.lines.dup
+        new_lines.last[:method] = '_run__FRAGMENT__process_action__FRAGMENT__callbacks'
+        Backtrace.find_or_create(new_lines)
       end
  
       it "normalizes the fingerprint of generated methods" do
@@ -27,10 +26,9 @@ describe Fingerprint::MD5, type: &#39;model&#39; do
  
     context "with same backtrace where FRAGMENT has not been extracted" do
       let(:backtrace_2) do
-        backtrace
-        backtrace.lines.last.method =  '_run__998857585768765__process_action__1231231312321313__callbacks'
-        backtrace.save
-        backtrace
+        new_lines = backtrace.lines.dup
+        new_lines.last[:method] =  '_run__998857585768765__process_action__1231231312321313__callbacks'
+        Backtrace.find_or_create(new_lines)
       end
  
       it "normalizes the fingerprint of generated methods" do
 describe Fingerprint::Sha1, type: 'model' do
   context '#generate' do
     let(:backtrace) {
-      Backtrace.create(:raw => [
+      Backtrace.find_or_create([
         {"number"=>"425", "file"=>"[GEM_ROOT]/gems/activesupport-3.0.0.rc/lib/active_support/callbacks.rb", "method"=>"_run__2115867319__process_action__262109504__callbacks"},
         {"number"=>"404", "file"=>"[GEM_ROOT]/gems/activesupport-3.0.0.rc/lib/active_support/callbacks.rb", "method"=>"send"},
         {"number"=>"404", "file"=>"[GEM_ROOT]/gems/activesupport-3.0.0.rc/lib/active_support/callbacks.rb", "method"=>"_run_process_action_callbacks"}
@@ -19,11 +19,9 @@ describe Fingerprint::Sha1, type: &#39;model&#39; do
  
     context "with different backtrace with only last line change" do
       let(:backtrace_2) {
-        backtrace
-        backtrace.lines.last.number = 401
-        backtrace.send(:generate_fingerprint)
-        backtrace.save
-        backtrace
+        new_lines = backtrace.lines.dup
+        new_lines.last[:number] = 401
+        Backtrace.find_or_create backtrace.lines
       }
       it 'should not same fingerprint' do
         expect(
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 ENV["RAILS_ENV"] = 'test'
-ENV["ERRBIT_LOG_LEVEL"] = 'error'
+ENV["ERRBIT_LOG_LEVEL"] = 'info'
  
 if ENV['COVERAGE']
   require 'coveralls'
@@ -6,7 +6,7 @@ describe &quot;issue_trackers/issue.md.erb&quot;, type: &#39;view&#39; do
   }
  
   before do
-    allow(view).to receive(:problem).and_return(problem)
+    allow(view).to receive(:problem).and_return(ProblemDecorator.new(problem))
   end
  
   it "has the problem url" do
@@ -6,7 +6,8 @@ describe &quot;issue_trackers/issue.txt.erb&quot;, type: &#39;view&#39; do
   }
  
   before do
-    allow(view).to receive(:problem).and_return(problem)
+    allow(view).to receive(:problem).and_return(
+      ProblemDecorator.new(problem))
   end
  
   it "has the problem url" do
...	...	@@ -22,7 +22,7 @@ class ProblemsController < ApplicationController
22	22	}
23	23
24	24	expose(:problem) {
25		- app.problems.find(params[:id])
	25	+ ProblemDecorator.new app.problems.find(params[:id])
26	26	}
27	27
28	28	expose(:all_errs) {
...	...	@@ -50,7 +50,8 @@ class ProblemsController < ApplicationController
50	50	def index; end
51	51
52	52	def show
53		- @notices = problem.notices.reverse_ordered.page(params[:notice]).per(1)
	53	+ @notices = problem.object.notices.reverse_ordered
	54	+ .page(params[:notice]).per(1)
54	55	@notice = @notices.first
55	56	@comment = Comment.new
56	57	end
...	...
...	...	@@ -0,0 +1,5 @@
	1	+class BacktraceDecorator < Draper::Decorator
	2	+ def lines
	3	+ @lines \|\|= object.lines.map { \|line\| BacktraceLineDecorator.new line }
	4	+ end
	5	+end
...	...
...	...	@@ -0,0 +1,76 @@
	1	+class BacktraceLineDecorator < Draper::Decorator
	2	+ EMPTY_STRING = ''.freeze
	3	+
	4	+ def in_app?
	5	+ object[:file].match Backtrace::IN_APP_PATH
	6	+ end
	7	+
	8	+ def number
	9	+ object[:number]
	10	+ end
	11	+
	12	+ def file
	13	+ object[:file]
	14	+ end
	15	+
	16	+ def method
	17	+ object[:method]
	18	+ end
	19	+
	20	+ def file_relative
	21	+ file.to_s.sub(Backtrace::IN_APP_PATH, EMPTY_STRING)
	22	+ end
	23	+
	24	+ def file_name
	25	+ File.basename file
	26	+ end
	27	+
	28	+ def to_s
	29	+ column = object.try(:[], :column)
	30	+ "#{file_relative}:#{number}#{column.present? ? ":#{column}" : ''}"
	31	+ end
	32	+
	33	+ def link_to_source_file(app, &block)
	34	+ text = h.capture_haml(&block)
	35	+ link_to_in_app_source_file(app, text) \|\| text
	36	+ end
	37	+
	38	+ private
	39	+ def link_to_in_app_source_file(app, text)
	40	+ return unless in_app?
	41	+ if file_name =~ /\.js$/
	42	+ link_to_hosted_javascript(app, text)
	43	+ else
	44	+ link_to_repo_source_file(app, text) \|\|
	45	+ link_to_issue_tracker_file(app, text)
	46	+ end
	47	+ end
	48	+
	49	+ def link_to_repo_source_file(app, text)
	50	+ link_to_github(app, text) \|\| link_to_bitbucket(app, text)
	51	+ end
	52	+
	53	+ def link_to_hosted_javascript(app, text)
	54	+ if app.asset_host?
	55	+ h.link_to(text, "#{app.asset_host}/#{file_relative}", :target => '_blank')
	56	+ end
	57	+ end
	58	+
	59	+ def link_to_github(app, text = nil)
	60	+ return unless app.github_repo?
	61	+ href = "%s#L%s" % [app.github_url_to_file(decorated_path + file_name), number]
	62	+ h.link_to(text \|\| file_name, href, :target => '_blank')
	63	+ end
	64	+
	65	+ def link_to_bitbucket(app, text = nil)
	66	+ return unless app.bitbucket_repo?
	67	+ href = "%s#cl-%s" % [app.bitbucket_url_to_file(decorated_path + file_name), number]
	68	+ h.link_to(text \|\| file_name, href, :target => '_blank')
	69	+ end
	70	+
	71	+ def link_to_issue_tracker_file(app, text = nil)
	72	+ return unless app.issue_tracker && app.issue_tracker.respond_to?(:url_to_file)
	73	+ href = app.issue_tracker.url_to_file(file_relative, number)
	74	+ h.link_to(text \|\| file_name, href, :target => '_blank')
	75	+ end
	76	+end
...	...
...	...	@@ -0,0 +1,4 @@
	1	+class NoticeDecorator < Draper::Decorator
	2	+ decorates_association :backtrace
	3	+ delegate_all
	4	+end
...	...
...	...	@@ -0,0 +1,4 @@
	1	+class ProblemDecorator < Draper::Decorator
	2	+ decorates_association :notices
	3	+ delegate_all
	4	+end
...	...
1	1	module BacktraceLineHelper
2		- def link_to_source_file(line, &block)
	2	+ def link_to_source_file(line, app, &block)
3	3	text = capture_haml(&block)
4		- link_to_in_app_source_file(line, text) \|\| link_to_external_source_file(text)
	4	+ link_to_in_app_source_file(line, app, text) \|\| text
5	5	end
6	6
7	7	private
8		- def link_to_in_app_source_file(line, text)
	8	+ def link_to_in_app_source_file(line, app, text)
9	9	return unless line.in_app?
10	10	if line.file_name =~ /\.js$/
11		- link_to_hosted_javascript(line, text)
	11	+ link_to_hosted_javascript(line, app, text)
12	12	else
13		- link_to_repo_source_file(line, text) \|\|
14		- link_to_issue_tracker_file(line, text)
	13	+ link_to_repo_source_file(line, app, text) \|\|
	14	+ link_to_issue_tracker_file(line, app, text)
15	15	end
16	16	end
17	17
18		- def link_to_repo_source_file(line, text)
19		- link_to_github(line, text) \|\| link_to_bitbucket(line, text)
	18	+ def link_to_repo_source_file(line, app, text)
	19	+ link_to_github(line, app, text) \|\| link_to_bitbucket(line, app, text)
20	20	end
21	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')
	22	+ def link_to_hosted_javascript(line, app, text)
	23	+ if app.asset_host?
	24	+ link_to(text, "#{app.asset_host}/#{line.file_relative}", :target => '_blank')
25	25	end
26	26	end
27	27
28		- def link_to_external_source_file(text)
29		- text
30		- end
31		-
32		- def link_to_github(line, text = nil)
33		- return unless line.app.github_repo?
34		- href = "%s#L%s" % [line.app.github_url_to_file(line.decorated_path + line.file_name), line.number]
	28	+ def link_to_github(line, app, text = nil)
	29	+ return unless app.github_repo?
	30	+ href = "%s#L%s" % [app.github_url_to_file(line.decorated_path + line.file_name), line.number]
35	31	link_to(text \|\| line.file_name, href, :target => '_blank')
36	32	end
37	33
38		- def link_to_bitbucket(line, text = nil)
39		- return unless line.app.bitbucket_repo?
40		- href = "%s#cl-%s" % [line.app.bitbucket_url_to_file(line.decorated_path + line.file_name), line.number]
	34	+ def link_to_bitbucket(line, app, text = nil)
	35	+ return unless app.bitbucket_repo?
	36	+ href = "%s#cl-%s" % [app.bitbucket_url_to_file(line.decorated_path + line.file_name), line.number]
41	37	link_to(text \|\| line.file_name, href, :target => '_blank')
42	38	end
43	39
44		- def link_to_issue_tracker_file(line, text = nil)
45		- return unless line.app.issue_tracker && line.app.issue_tracker.respond_to?(:url_to_file)
46		- href = line.app.issue_tracker.url_to_file(line.file_relative, line.number)
	40	+ def link_to_issue_tracker_file(line, app, text = nil)
	41	+ return unless app.issue_tracker && app.issue_tracker.respond_to?(:url_to_file)
	42	+ href = app.issue_tracker.url_to_file(line.file_relative, line.number)
47	43	link_to(text \|\| line.file_name, href, :target => '_blank')
48	44	end
49	45
...	...
...	...	@@ -13,11 +13,11 @@ class Mailer < ActionMailer::Base
13	13	'Precedence' => 'bulk',
14	14	'Auto-Submitted' => 'auto-generated'
15	15
16		- def err_notification(notice)
17		- @notice = notice
18		- @app = notice.app
	16	+ def err_notification(error_report)
	17	+ @notice = NoticeDecorator.new error_report.notice
	18	+ @app = AppDecorator.new error_report.app
19	19
20		- count = @notice.similar_count
	20	+ count = error_report.problem.notices_count
21	21	count = count > 1 ? "(#{count}) " : ""
22	22
23	23	errbit_headers 'App' => @app.name,
...	...	@@ -30,7 +30,7 @@ class Mailer < ActionMailer::Base
30	30
31	31	def deploy_notification(deploy)
32	32	@deploy = deploy
33		- @app = deploy.app
	33	+ @app = AppDecorator.new deploy.app
34	34
35	35	errbit_headers 'App' => @app.name,
36	36	'Environment' => @deploy.environment,
...	...	@@ -44,7 +44,7 @@ class Mailer < ActionMailer::Base
44	44	def comment_notification(comment)
45	45	@comment = comment
46	46	@user = comment.user
47		- @problem = comment.err
	47	+ @problem = ProblemDecorator.new comment.err
48	48	@notice = @problem.notices.first
49	49	@app = @problem.app
50	50
...	...
...	...	@@ -2,31 +2,23 @@ class Backtrace
2	2	include Mongoid::Document
3	3	include Mongoid::Timestamps
4	4
5		- field :fingerprint
6		- index :fingerprint => 1
7		-
8		- has_many :notices
9		- has_one :notice
	5	+ IN_APP_PATH = %r{^\[PROJECT_ROOT\](?!(\/vendor))/?}
10	6
11		- embeds_many :lines, :class_name => "BacktraceLine"
12		-
13		- after_initialize :generate_fingerprint
	7	+ field :fingerprint
	8	+ field :lines
14	9
15		- delegate :app, :to => :notice
	10	+ index :fingerprint => 1
16	11
17	12	def self.find_or_create(lines)
18	13	fingerprint = generate_fingerprint(lines)
19	14
20		- where(fingerprint: generate_fingerprint(lines)).
21		- find_one_and_update(
22		- { '$setOnInsert' => { fingerprint: fingerprint, lines: lines } },
23		- { return_document: :after, upsert: true })
	15	+ where(fingerprint: fingerprint).find_one_and_update(
	16	+ { '$setOnInsert' => { fingerprint: fingerprint, lines: lines } },
	17	+ { return_document: :after, upsert: true })
24	18	end
25	19
26		- def raw=(raw)
27		- raw.compact.each do \|raw_line\|
28		- lines << BacktraceLine.new(BacktraceLineNormalizer.new(raw_line).call)
29		- end
	20	+ def self.generate_fingerprint(lines)
	21	+ Digest::SHA1.hexdigest(lines.map(&:to_s).join)
30	22	end
31	23
32	24	private
...	...
...	...	@@ -1,42 +0,0 @@
1		-class BacktraceLine
2		- include Mongoid::Document
3		- IN_APP_PATH = %r{^\[PROJECT_ROOT\](?!(\/vendor))/?}
4		- GEMS_PATH = %r{\[GEM_ROOT\]\/gems\/([^\/]+)}
5		-
6		- field :number, :type => Integer
7		- field :column, :type => Integer
8		- field :file
9		- field :method
10		-
11		- embedded_in :backtrace
12		-
13		- scope :in_app, ->{ where(:file => IN_APP_PATH) }
14		-
15		- delegate :app, :to => :backtrace
16		-
17		- def to_s
18		- "#{file_relative}:#{number}" << (column.present? ? ":#{column}" : "")
19		- end
20		-
21		- def in_app?
22		- !!(file =~ IN_APP_PATH)
23		- end
24		-
25		- def path
26		- File.dirname(file).gsub(/^\.$/, '') + "/"
27		- end
28		-
29		- def file_relative
30		- file.to_s.sub(IN_APP_PATH, '')
31		- end
32		-
33		- def file_name
34		- File.basename file
35		- end
36		-
37		- def decorated_path
38		- path.sub(BacktraceLine::IN_APP_PATH, '').
39		- sub(BacktraceLine::GEMS_PATH, "<strong>\\1</strong>")
40		- end
41		-
42		-end
...	...	@@ -1,32 +0,0 @@
1		-class BacktraceLineNormalizer
2		- def initialize(raw_line)
3		- @raw_line = raw_line \|\| {}
4		- end
5		-
6		- def call
7		- @raw_line.merge 'file' => normalized_file, 'method' => normalized_method
8		- end
9		-
10		- private
11		- def normalized_file
12		- if @raw_line['file'].blank?
13		- "[unknown source]"
14		- else
15		- file = @raw_line['file'].to_s
16		- # Detect lines from gem
17		- file.gsub!(/\[PROJECT_ROOT\]\/.*\/ruby\/[0-9.]+\/gems/, '[GEM_ROOT]/gems')
18		- # Strip any query strings
19		- file.gsub!(/\?[^\?]*$/, '')
20		- @raw_line['file'] = file
21		- end
22		- end
23		-
24		- def normalized_method
25		- if @raw_line['method'].blank?
26		- "[unknown method]"
27		- else
28		- @raw_line['method'].to_s.gsub(/[0-9_]{10,}+/, "__FRAGMENT__")
29		- end
30		- end
31		-
32		-end