Let's call errors errs

Jared Pace
1 parent e77f238e
Showing 18 changed files with 68 additions and 67 deletions Show diff stats
app/controllers/apps_controller.rb
app/controllers/errs_controller.rb
app/mailers/mailer.rb
app/models/app.rb
app/models/notice.rb
app/views/apps/_fields.html.haml
app/views/apps/index.html.haml
app/views/apps/show.html.haml
app/views/errs/_table.html.haml
app/views/errs/all.html.haml
app/views/errs/index.html.haml
app/views/mailer/err_notification.text.erb
app/views/mailer/error_notification.text.erb
app/views/shared/_navigation.html.haml
public/stylesheets/application.css
spec/controllers/errs_controller_spec.rb
spec/models/err_spec.rb
spec/models/notice_spec.rb
@@ -33,7 +33,7 @@ class AppsController &lt; ApplicationController
   def update
     @app = App.find(params[:id])
-    if @app.update_attributes!(params[:app])
+    if @app.update_attributes(params[:app])
       flash[:success] = "Good news everyone! '#{@app.name}' was successfully updated."
       redirect_to app_path(@app)
     else
@@ -24,7 +24,7 @@ class ErrsController &lt; ApplicationController
     @err.resolve!
-    flash[:success] = 'Great news everyone! The error has been resolved.'
+    flash[:success] = 'Great news everyone! The err has been resolved.'
     redirect_to errs_path
   end
@@ -2,7 +2,7 @@ class Mailer &lt; ActionMailer::Base
   default :from => Errbit::Config.email_from
   default_url_options[:host] = Errbit::Config.host
-  def error_notification(notice)
+  def err_notification(notice)
     @notice   = notice
     @app  = notice.err.app
@@ -14,7 +14,8 @@ class App
   before_validation :generate_api_key, :on => :create
   validates_presence_of :name, :api_key
-  validates_uniqueness_of :name, :api_key, :allow_blank => true, :on => :create
+  validates_uniqueness_of :name, :allow_blank => true
+  validates_uniqueness_of :api_key, :allow_blank => true
   accepts_nested_attributes_for :watchers, :allow_destroy => true,
     :reject_if => proc { |attrs| attrs.all? { |k, v| v.blank? } }
@@ -26,7 +26,7 @@ class Notice
     hoptoad_notice['request']['component']  = 'unknown' if hoptoad_notice['request']['component'].blank?
     hoptoad_notice['request']['action']     = nil if hoptoad_notice['request']['action'].blank?
-    error = Err.for({
+    err = Err.for({
       :app      => app,
       :klass        => hoptoad_notice['error']['class'],
       :component    => hoptoad_notice['request']['component'],
@@ -35,7 +35,7 @@ class Notice
       :fingerprint  => hoptoad_notice['fingerprint']
     })
-    error.notices.create!({
+    err.notices.create!({
       :message            => hoptoad_notice['error']['message'],
       :backtrace          => hoptoad_notice['error']['backtrace']['line'],
       :server_environment => hoptoad_notice['server-environment'],
@@ -61,7 +61,7 @@ class Notice
   end
   def deliver_notification
-    Mailer.error_notification(self).deliver
+    Mailer.err_notification(self).deliver
   end
   def cache_last_notice_at
@@ -4,7 +4,7 @@
 %div.checkbox
   = f.check_box :resolve_errs_on_deploy
-  = f.label :resolve_errs_on_deploy, 'Resolve errors on deploy'
+  = f.label :resolve_errs_on_deploy, 'Resolve errs on deploy'
 %fieldset.nested-wrapper
   %legend Watchers
@@ -7,7 +7,7 @@
     %tr
       %th Name
       %th Last Deploy
-      %th Errors
+      %th Errs
   %tbody
     - @apps.each do |app|
       %tr
 - content_for :title, @app.name
 - content_for :meta do
-  %strong Errors Caught:
+  %strong Errs Caught:
   = @app.errs.count
   %strong API Key:
   = @app.api_key
@@ -27,5 +27,5 @@
         %td
           %em Sadly, no one is watching this app
-%h3 Errors
+%h3 Errs
 = render 'errs/table', :errs => @errs
 \ No newline at end of file
@@ -24,4 +24,4 @@
     - if errs.none?
       %tr
         %td{:colspan => (@app ? 5 : 6)}
-          %em No errors have been caught, yet
 \ No newline at end of file
+          %em No errs have been caught, yet
 \ No newline at end of file
-- content_for :title, 'All Errors'
+- content_for :title, 'All Errs'
 - content_for :action_bar do
   = will_paginate(@errs)
   = link_to 'hide resolved', errs_path
-- content_for :title, 'Unresolved Errors'
+- content_for :title, 'Unresolved Errs'
 - content_for :action_bar do
   = will_paginate(@errs)
   = link_to 'show resolved', all_errs_path
@@ -0,0 +1,7 @@
+An err has just occurred in <%= @notice.err.environment %>: <%= @notice.err.message %>
+
+This err has occurred <%= pluralize @notice.err.notices.count, 'time' %>. You should really look into it here:
+
+  <%= app_err_notice_url(@app, @notice.err, @notice) %>
+  
+<%= render :partial => 'signature' %>
 \ No newline at end of file
@@ -1,7 +0,0 @@
-An error has just occurred in <%= @notice.err.environment %>: <%= @notice.err.message %>
-
-This error has occurred <%= pluralize @notice.err.notices.count, 'time' %>. You should really look into it here:
-
-  <%= app_err_notice_url(@app, @notice.err, @notice) %>
-  
-<%= render :partial => 'signature' %>
 \ No newline at end of file
@@ -2,5 +2,5 @@
   %ul
     //%li= link_to 'Dashboard', admin_dashboard_path, :class => active_if_here(:dashboards)
     %li.apps{:class => active_if_here(:apps)}= link_to 'Apps',  apps_path
-    %li.errors{:class => active_if_here(:errs)}= link_to 'Errs',    errs_path
+    %li.errs{:class => active_if_here(:errs)}= link_to 'Errs',    errs_path
   %div.clear
 \ No newline at end of file
@@ -87,7 +87,7 @@ header #site-name {
 }
 #nav-bar li a:hover { color: #666;}
 #nav-bar li.apps a { background-image: url(images/icons/briefcase.png); }
-#nav-bar li.errors a { background-image: url(images/icons/error.png); }
+#nav-bar li.errs a { background-image: url(images/icons/error.png); }
 #nav-bar li:hover { 
   box-shadow: 0 0 3px #69c;
   -moz-box-shadow: 0 0 3px #69c;
@@ -6,27 +6,27 @@ describe ErrsController do
   let(:err) { Factory(:err, :app => app) }
   describe "GET /errs" do
-    it "gets a paginated list of unresolved errors" do
-      errors = WillPaginate::Collection.new(1,30)
-      3.times { errors << Factory(:err) }
+    it "gets a paginated list of unresolved errs" do
+      errs = WillPaginate::Collection.new(1,30)
+      3.times { errs << Factory(:err) }
       Err.should_receive(:unresolved).and_return(
-        mock('proxy', :ordered => mock('proxy', :paginate => errors))
+        mock('proxy', :ordered => mock('proxy', :paginate => errs))
       )
       get :index
-      assigns(:errs).should == errors
+      assigns(:errs).should == errs
     end
   end
   describe "GET /errs/all" do
-    it "gets a paginated list of all errors" do
-      errors = WillPaginate::Collection.new(1,30)
-      3.times { errors << Factory(:err) }
-      3.times { errors << Factory(:err, :resolved => true)}
+    it "gets a paginated list of all errs" do
+      errs = WillPaginate::Collection.new(1,30)
+      3.times { errs << Factory(:err) }
+      3.times { errs << Factory(:err, :resolved => true)}
       Err.should_receive(:ordered).and_return(
-        mock('proxy', :paginate => errors)
+        mock('proxy', :paginate => errs)
       )
       get :index
-      assigns(:errs).should == errors
+      assigns(:errs).should == errs
     end
   end
@@ -4,15 +4,15 @@ describe Err do
   context 'validations' do
     it 'requires a klass' do
-      error = Factory.build(:err, :klass => nil)
-      error.should_not be_valid
-      error.errors[:klass].should include("can't be blank")
+      err = Factory.build(:err, :klass => nil)
+      err.should_not be_valid
+      err.errors[:klass].should include("can't be blank")
     end
     it 'requires an environment' do
-      error = Factory.build(:err, :environment => nil)
-      error.should_not be_valid
-      error.errors[:environment].should include("can't be blank")
+      err = Factory.build(:err, :environment => nil)
+      err.should_not be_valid
+      err.errors[:environment].should include("can't be blank")
     end
   end
@@ -28,16 +28,16 @@ describe Err do
       }
     end
-    it 'returns the correct error if one already exists' do
+    it 'returns the correct err if one already exists' do
       existing = Err.create(@conditions)
       Err.for(@conditions).should == existing
     end
-    it 'assigns the returned error to the given app' do
+    it 'assigns the returned err to the given app' do
       Err.for(@conditions).app.should == @app
     end
-    it 'creates a new error if a matching one does not already exist' do
+    it 'creates a new err if a matching one does not already exist' do
       Err.where(@conditions.except(:app)).exists?.should == false
       lambda {
         Err.for(@conditions)
@@ -47,14 +47,14 @@ describe Err do
   context '#last_notice_at' do
     it "returns the created_at timestamp of the latest notice" do
-      error = Factory(:err)
-      error.last_notice_at.should be_nil
+      err = Factory(:err)
+      err.last_notice_at.should be_nil
-      notice1 = Factory(:notice, :err => error)
-      error.last_notice_at.should == notice1.created_at
+      notice1 = Factory(:notice, :err => err)
+      err.last_notice_at.should == notice1.created_at
-      notice2 = Factory(:notice, :err => error)
-      error.last_notice_at.should == notice2.created_at
+      notice2 = Factory(:notice, :err => err)
+      err.last_notice_at.should == notice2.created_at
     end
   end
@@ -69,28 +69,28 @@ describe Err do
   context "#resolved?" do
     it "should start out as unresolved" do
-      error = Err.new
-      error.should_not be_resolved
-      error.should be_unresolved
+      err = Err.new
+      err.should_not be_resolved
+      err.should be_unresolved
     end
     it "should be able to be resolved" do
-      error = Factory(:err)
-      error.should_not be_resolved
-      error.resolve!
-      error.reload.should be_resolved
+      err = Factory(:err)
+      err.should_not be_resolved
+      err.resolve!
+      err.reload.should be_resolved
     end
   end
   context "resolve!" do
-    it "marks the error as resolved" do
+    it "marks the err as resolved" do
       err = Factory(:err)
       err.should_not be_resolved
       err.resolve!
       err.should be_resolved
     end
-    it "should throw an error if it's not successful" do
+    it "should throw an err if it's not successful" do
       err = Factory(:err)
       err.should_not be_resolved
       err.klass = nil
@@ -103,7 +103,7 @@ describe Err do
   context "Scopes" do
     context "resolved" do
-      it 'only finds resolved Errors' do
+      it 'only finds resolved Errs' do
         resolved = Factory(:err, :resolved => true)
         unresolved = Factory(:err, :resolved => false)
         Err.resolved.all.should include(resolved)
@@ -112,7 +112,7 @@ describe Err do
     end
     context "unresolved" do
-      it 'only finds unresolved Errors' do
+      it 'only finds unresolved Errs' do
         resolved = Factory(:err, :resolved => true)
         unresolved = Factory(:err, :resolved => false)
         Err.unresolved.all.should_not include(resolved)
@@ -34,7 +34,7 @@ describe Notice do
       @notice.err.app.should == @app
     end
-    it 'finds the correct error for the notice' do
+    it 'finds the correct err for the notice' do
       Err.should_receive(:for).with({
         :app      => @app,
         :klass        => 'HoptoadTestingException',
@@ -52,12 +52,12 @@ describe Notice do
       @notice.should be_persisted
     end
-    it 'assigns an error to the notice' do
+    it 'assigns an err to the notice' do
       @notice = Notice.from_xml(@xml)
       @notice.err.should be_a(Err)
     end
-    it 'captures the error message' do
+    it 'captures the err message' do
       @notice = Notice.from_xml(@xml)
       @notice.message.should == 'HoptoadTestingException: Testing hoptoad via "rake hoptoad:test". If you can see this, it works.'
     end
@@ -88,15 +88,15 @@ describe Notice do
   describe "email notifications" do
     before do
       @app = Factory(:app_with_watcher)
-      @error = Factory(:err, :app => @app)
+      @err = Factory(:err, :app => @app)
     end
     Errbit::Config.email_at_notices.each do |threshold|
       it "sends an email notification after #{threshold} notice(s)" do
-        @error.notices.stub(:count).and_return(threshold)
-        Mailer.should_receive(:error_notification).
+        @err.notices.stub(:count).and_return(threshold)
+        Mailer.should_receive(:err_notification).
           and_return(mock('email', :deliver => true))
-        Factory(:notice, :err => @error)
+        Factory(:notice, :err => @err)
       end
     end
   end
	@@ -33,7 +33,7 @@ class AppsController < ApplicationController		@@ -33,7 +33,7 @@ class AppsController < ApplicationController
33	def update	33	def update
34	@app = App.find(params[:id])	34	@app = App.find(params[:id])
35		35
36	- if @app.update_attributes!(params[:app])	36	+ if @app.update_attributes(params[:app])
37	flash[:success] = "Good news everyone! '#{@app.name}' was successfully updated."	37	flash[:success] = "Good news everyone! '#{@app.name}' was successfully updated."
38	redirect_to app_path(@app)	38	redirect_to app_path(@app)
39	else	39	else
	@@ -24,7 +24,7 @@ class ErrsController < ApplicationController		@@ -24,7 +24,7 @@ class ErrsController < ApplicationController
24		24
25	@err.resolve!	25	@err.resolve!
26		26
27	- flash[:success] = 'Great news everyone! The error has been resolved.'	27	+ flash[:success] = 'Great news everyone! The err has been resolved.'
28	redirect_to errs_path	28	redirect_to errs_path
29	end	29	end
30		30
	@@ -2,7 +2,7 @@ class Mailer < ActionMailer::Base		@@ -2,7 +2,7 @@ class Mailer < ActionMailer::Base
2	default :from => Errbit::Config.email_from	2	default :from => Errbit::Config.email_from
3	default_url_options[:host] = Errbit::Config.host	3	default_url_options[:host] = Errbit::Config.host
4		4
5	- def error_notification(notice)	5	+ def err_notification(notice)
6	@notice = notice	6	@notice = notice
7	@app = notice.err.app	7	@app = notice.err.app
8		8
	@@ -14,7 +14,8 @@ class App		@@ -14,7 +14,8 @@ class App
14	before_validation :generate_api_key, :on => :create	14	before_validation :generate_api_key, :on => :create
15		15
16	validates_presence_of :name, :api_key	16	validates_presence_of :name, :api_key
17	- validates_uniqueness_of :name, :api_key, :allow_blank => true, :on => :create	17	+ validates_uniqueness_of :name, :allow_blank => true
		18	+ validates_uniqueness_of :api_key, :allow_blank => true
18		19
19	accepts_nested_attributes_for :watchers, :allow_destroy => true,	20	accepts_nested_attributes_for :watchers, :allow_destroy => true,
20	:reject_if => proc { \|attrs\| attrs.all? { \|k, v\| v.blank? } }	21	:reject_if => proc { \|attrs\| attrs.all? { \|k, v\| v.blank? } }
	@@ -26,7 +26,7 @@ class Notice		@@ -26,7 +26,7 @@ class Notice
26	hoptoad_notice['request']['component'] = 'unknown' if hoptoad_notice['request']['component'].blank?	26	hoptoad_notice['request']['component'] = 'unknown' if hoptoad_notice['request']['component'].blank?
27	hoptoad_notice['request']['action'] = nil if hoptoad_notice['request']['action'].blank?	27	hoptoad_notice['request']['action'] = nil if hoptoad_notice['request']['action'].blank?
28		28
29	- error = Err.for({	29	+ err = Err.for({
30	:app => app,	30	:app => app,
31	:klass => hoptoad_notice['error']['class'],	31	:klass => hoptoad_notice['error']['class'],
32	:component => hoptoad_notice['request']['component'],	32	:component => hoptoad_notice['request']['component'],
	@@ -35,7 +35,7 @@ class Notice		@@ -35,7 +35,7 @@ class Notice
35	:fingerprint => hoptoad_notice['fingerprint']	35	:fingerprint => hoptoad_notice['fingerprint']
36	})	36	})
37		37
38	- error.notices.create!({	38	+ err.notices.create!({
39	:message => hoptoad_notice['error']['message'],	39	:message => hoptoad_notice['error']['message'],
40	:backtrace => hoptoad_notice['error']['backtrace']['line'],	40	:backtrace => hoptoad_notice['error']['backtrace']['line'],
41	:server_environment => hoptoad_notice['server-environment'],	41	:server_environment => hoptoad_notice['server-environment'],
	@@ -61,7 +61,7 @@ class Notice		@@ -61,7 +61,7 @@ class Notice
61	end	61	end
62		62
63	def deliver_notification	63	def deliver_notification
64	- Mailer.error_notification(self).deliver	64	+ Mailer.err_notification(self).deliver
65	end	65	end
66		66
67	def cache_last_notice_at	67	def cache_last_notice_at
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4		4
5	%div.checkbox	5	%div.checkbox
6	= f.check_box :resolve_errs_on_deploy	6	= f.check_box :resolve_errs_on_deploy
7	- = f.label :resolve_errs_on_deploy, 'Resolve errors on deploy'	7	+ = f.label :resolve_errs_on_deploy, 'Resolve errs on deploy'
8		8
9	%fieldset.nested-wrapper	9	%fieldset.nested-wrapper
10	%legend Watchers	10	%legend Watchers
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	%tr	7	%tr
8	%th Name	8	%th Name
9	%th Last Deploy	9	%th Last Deploy
10	- %th Errors	10	+ %th Errs
11	%tbody	11	%tbody
12	- @apps.each do \|app\|	12	- @apps.each do \|app\|
13	%tr	13	%tr
1	- content_for :title, @app.name	1	- content_for :title, @app.name
2	- content_for :meta do	2	- content_for :meta do
3	- %strong Errors Caught:	3	+ %strong Errs Caught:
4	= @app.errs.count	4	= @app.errs.count
5	%strong API Key:	5	%strong API Key:
6	= @app.api_key	6	= @app.api_key
	@@ -27,5 +27,5 @@		@@ -27,5 +27,5 @@
27	%td	27	%td
28	%em Sadly, no one is watching this app	28	%em Sadly, no one is watching this app
29		29
30	-%h3 Errors	30	+%h3 Errs
31	= render 'errs/table', :errs => @errs	31	= render 'errs/table', :errs => @errs
32	\ No newline at end of file	32	\ No newline at end of file
1	-- content_for :title, 'All Errors'	1	+- content_for :title, 'All Errs'
2	- content_for :action_bar do	2	- content_for :action_bar do
3	= will_paginate(@errs)	3	= will_paginate(@errs)
4	= link_to 'hide resolved', errs_path	4	= link_to 'hide resolved', errs_path
1	-- content_for :title, 'Unresolved Errors'	1	+- content_for :title, 'Unresolved Errs'
2	- content_for :action_bar do	2	- content_for :action_bar do
3	= will_paginate(@errs)	3	= will_paginate(@errs)
4	= link_to 'show resolved', all_errs_path	4	= link_to 'show resolved', all_errs_path