Updated mongoid to 2.4.10, renamed :klass fields to :error_class (including migration)

Nathan Broadbent
1 parent c84a9925
Showing 15 changed files with 47 additions and 30 deletions Show diff stats
Gemfile
Gemfile.lock
app/models/app.rb
app/models/err.rb
app/models/error_report.rb
app/models/notice.rb
app/models/problem.rb
app/views/errs/show.html.haml
app/views/notices/_summary.html.haml
db/migrate/20120530005915_rename_klass_to_error_class.rb
lib/hoptoad/v2.rb
lib/tasks/errbit/demo.rake
spec/fabricators/err_fabricator.rb
spec/models/app_spec.rb
spec/models/err_spec.rb
@@ -3,7 +3,7 @@ source &#39;http://rubygems.org&#39;
 gem 'rails', '~> 3.2.0'
 gem 'nokogiri'
-gem 'mongoid', '~> 2.2.2'
+gem 'mongoid', '~> 2.4.10'
 gem 'haml'
 gem 'htmlentities', "~> 4.3.0"
@@ -105,8 +105,8 @@ GEM
     mime-types (1.18)
     mongo (1.3.1)
       bson (>= 1.3.1)
-    mongoid (2.2.5)
-      activemodel (~> 3.0)
+    mongoid (2.4.10)
+      activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     mongoid_rails_migrations (0.0.14)
@@ -242,7 +242,7 @@ DEPENDENCIES
   kaminari
   lighthouse-api
   mongo (= 1.3.1)
-  mongoid (~> 2.2.2)
+  mongoid (~> 2.4.10)
   mongoid_rails_migrations
   nokogiri
   octokit (= 0.6.4)
@@ -47,7 +47,7 @@ class App
   #
   # Accepts either XML or a hash with the following attributes:
   #
-  # * <tt>:klass</tt> - the class of error
+  # * <tt>:error_class</tt> - the class of error
   # * <tt>:message</tt> - the error message
   # * <tt>:backtrace</tt> - an array of stack trace lines
   #
@@ -67,7 +67,7 @@ class App
   #
   # Accepts a hash with the following attributes:
   #
-  # * <tt>:klass</tt> - the class of error
+  # * <tt>:error_class</tt> - the class of error
   # * <tt>:message</tt> - the error message
   # * <tt>:backtrace</tt> - an array of stack trace lines
   #
@@ -6,7 +6,7 @@ class Err
   include Mongoid::Document
   include Mongoid::Timestamps
-  field :klass
+  field :error_class
   field :component
   field :action
   field :environment
@@ -14,11 +14,11 @@ class Err
   belongs_to :problem
   index :problem_id
-  index :klass
+  index :error_class
   has_many :notices, :inverse_of => :err, :dependent => :destroy
-  validates_presence_of :klass, :environment
+  validates_presence_of :error_class, :environment
   delegate :app, :resolved?, :to => :problem
@@ -2,7 +2,7 @@ require &#39;digest/md5&#39;
 require 'hoptoad_notifier'
 class ErrorReport
-  attr_reader :klass, :message, :backtrace, :request, :server_environment, :api_key, :notifier, :user_attributes
+  attr_reader :error_class, :message, :backtrace, :request, :server_environment, :api_key, :notifier, :user_attributes
   def initialize(xml_or_attributes)
     @attributes = (xml_or_attributes.is_a?(String) ? Hoptoad.parse_xml!(xml_or_attributes) : xml_or_attributes).with_indifferent_access
@@ -36,6 +36,7 @@ class ErrorReport
   def generate_notice!
     notice = Notice.new(
       :message => message,
+      :error_class => error_class,
       :backtrace => backtrace,
       :request => request,
       :server_environment => server_environment,
@@ -43,7 +44,7 @@ class ErrorReport
       :user_attributes => user_attributes)
     err = app.find_or_create_err!(
-      :klass => klass,
+      :error_class => error_class,
       :component => component,
       :action => action,
       :environment => rails_env,
@@ -11,7 +11,7 @@ class Notice
   field :request, :type => Hash
   field :notifier, :type => Hash
   field :user_attributes, :type => Hash
-  field :klass
+  field :error_class
   belongs_to :err
   index :created_at
@@ -16,7 +16,7 @@ class Problem
   field :notices_count, :type => Integer, :default => 0
   field :message
   field :environment
-  field :klass
+  field :error_class
   field :where
   field :user_agents, :type => Hash, :default => {}
   field :messages,    :type => Hash, :default => {}
@@ -128,7 +128,7 @@ class Problem
     attrs.merge!(
       :message => notice.message,
       :environment => notice.environment_name,
-      :klass => notice.klass,
+      :error_class => notice.error_class,
       :where => notice.where,
       :messages    => attribute_count_increase(:messages, notice.message),
       :hosts       => attribute_count_increase(:hosts, notice.host),
 - content_for :page_title, @problem.message
-- content_for :title, @problem.klass
+- content_for :title, @problem.error_class
 - content_for :meta do
   %strong App:
   = link_to @app.name, app_path(@app)
@@ -3,6 +3,9 @@
     %tr
       %th Message
       %td.main.nowrap= message_graph(problem)
+    %tr
+      %th Error Class
+      %td= notice.error_class
     - if notice.request['url'].present?
       %tr
         %th URL
@@ -0,0 +1,13 @@
+class RenameKlassToErrorClass < Mongoid::Migration
+  def self.up
+    [Problem, Err, Notice].each do |model|
+      model.collection.update({}, {'$rename' => {'klass' => 'error_class'}}, multi: true, safe: true)
+    end
+  end
+
+  def self.down
+    [Problem, Err, Notice].each do |model|
+      model.collection.update({}, {'$rename' => {'error_class' => 'klass'}}, multi: true, safe: true)
+    end
+  end
+end
@@ -50,7 +50,7 @@ module Hoptoad
     def self.for_errbit_api(notice)
       {
-        :klass              => notice['error']['class'] || notice['error']['key'],
+        :error_class        => notice['error']['class'] || notice['error']['key'],
         :message            => notice['error']['message'],
         :backtrace          => notice['error']['backtrace']['line'],
@@ -9,22 +9,22 @@ namespace :errbit do
     app.problems.delete_all
     errors = [{
-      :klass => "ArgumentError",
+      :error_class => "ArgumentError",
       :message => "wrong number of arguments (3 for 0)"
     }, {
-      :klass => "RuntimeError",
+      :error_class => "RuntimeError",
       :message => "Could not find Red October"
     }, {
-      :klass => "TypeError",
+      :error_class => "TypeError",
       :message => "can't convert Symbol into Integer"
     }, {
-      :klass => "ActiveRecord::RecordNotFound",
+      :error_class => "ActiveRecord::RecordNotFound",
       :message => "could not find a record with the id 5"
     }, {
-      :klass => "NameError",
+      :error_class => "NameError",
       :message => "uninitialized constant Tag"
     }, {
-      :klass => "SyntaxError",
+      :error_class => "SyntaxError",
       :message => "unexpected tSTRING_BEG, expecting keyword_do or '{' or '('"
     }]
@@ -44,7 +44,7 @@ namespace :errbit do
       rand(34).times do
         error_report = error_template.reverse_merge({
-          :klass => "StandardError",
+          :error_class => "StandardError",
           :message => "Oops. Something went wrong!",
           :backtrace => random_backtrace,
           :request => {
 Fabricator :err do
   problem!
-  klass!         { 'FooError' }
+  error_class!         { 'FooError' }
   component     'foo'
   action        'bar'
   environment   'production'
@@ -117,7 +117,7 @@ describe App do
     before do
       @app = Fabricate(:app)
       @conditions = {
-        :klass        => 'Whoops',
+        :error_class  => 'Whoops',
         :component    => 'Foo',
         :action       => 'bar',
         :environment  => 'production'
@@ -158,7 +158,7 @@ describe App do
     it 'finds the correct err for the notice' do
       App.should_receive(:find_by_api_key!).and_return(@app)
       @app.should_receive(:find_or_create_err!).with({
-        :klass        => 'HoptoadTestingException',
+        :error_class  => 'HoptoadTestingException',
         :component    => 'application',
         :action       => 'verify',
         :environment  => 'development',
@@ -171,7 +171,7 @@ describe App do
     it 'marks the err as unresolved if it was previously resolved' do
       App.should_receive(:find_by_api_key!).and_return(@app)
       @app.should_receive(:find_or_create_err!).with({
-        :klass        => 'HoptoadTestingException',
+        :error_class  => 'HoptoadTestingException',
         :component    => 'application',
         :action       => 'verify',
         :environment  => 'development',
@@ -3,10 +3,10 @@ require &#39;spec_helper&#39;
 describe Err do
   context 'validations' do
-    it 'requires a klass' do
-      err = Fabricate.build(:err, :klass => nil)
+    it 'requires a error_class' do
+      err = Fabricate.build(:err, :error_class => nil)
       err.should_not be_valid
-      err.errors[:klass].should include("can't be blank")
+      err.errors[:error_class].should include("can't be blank")
     end
     it 'requires an environment' do
	@@ -3,7 +3,7 @@ source 'http://rubygems.org'		@@ -3,7 +3,7 @@ source 'http://rubygems.org'
3	gem 'rails', '~> 3.2.0'	3	gem 'rails', '~> 3.2.0'
4		4
5	gem 'nokogiri'	5	gem 'nokogiri'
6	-gem 'mongoid', '~> 2.2.2'	6	+gem 'mongoid', '~> 2.4.10'
7		7
8	gem 'haml'	8	gem 'haml'
9	gem 'htmlentities', "~> 4.3.0"	9	gem 'htmlentities', "~> 4.3.0"
	@@ -105,8 +105,8 @@ GEM		@@ -105,8 +105,8 @@ GEM
105	mime-types (1.18)	105	mime-types (1.18)
106	mongo (1.3.1)	106	mongo (1.3.1)
107	bson (>= 1.3.1)	107	bson (>= 1.3.1)
108	- mongoid (2.2.5)
109	- activemodel (~> 3.0)	108	+ mongoid (2.4.10)
		109	+ activemodel (~> 3.1)
110	mongo (~> 1.3)	110	mongo (~> 1.3)
111	tzinfo (~> 0.3.22)	111	tzinfo (~> 0.3.22)
112	mongoid_rails_migrations (0.0.14)	112	mongoid_rails_migrations (0.0.14)
	@@ -242,7 +242,7 @@ DEPENDENCIES		@@ -242,7 +242,7 @@ DEPENDENCIES
242	kaminari	242	kaminari
243	lighthouse-api	243	lighthouse-api
244	mongo (= 1.3.1)	244	mongo (= 1.3.1)
245	- mongoid (~> 2.2.2)	245	+ mongoid (~> 2.4.10)
246	mongoid_rails_migrations	246	mongoid_rails_migrations
247	nokogiri	247	nokogiri
248	octokit (= 0.6.4)	248	octokit (= 0.6.4)
	@@ -47,7 +47,7 @@ class App		@@ -47,7 +47,7 @@ class App
47	#	47	#
48	# Accepts either XML or a hash with the following attributes:	48	# Accepts either XML or a hash with the following attributes:
49	#	49	#
50	- # * <tt>:klass</tt> - the class of error	50	+ # * <tt>:error_class</tt> - the class of error
51	# * <tt>:message</tt> - the error message	51	# * <tt>:message</tt> - the error message
52	# * <tt>:backtrace</tt> - an array of stack trace lines	52	# * <tt>:backtrace</tt> - an array of stack trace lines
53	#	53	#
	@@ -67,7 +67,7 @@ class App		@@ -67,7 +67,7 @@ class App
67	#	67	#
68	# Accepts a hash with the following attributes:	68	# Accepts a hash with the following attributes:
69	#	69	#
70	- # * <tt>:klass</tt> - the class of error	70	+ # * <tt>:error_class</tt> - the class of error
71	# * <tt>:message</tt> - the error message	71	# * <tt>:message</tt> - the error message
72	# * <tt>:backtrace</tt> - an array of stack trace lines	72	# * <tt>:backtrace</tt> - an array of stack trace lines
73	#	73	#
	@@ -6,7 +6,7 @@ class Err		@@ -6,7 +6,7 @@ class Err
6	include Mongoid::Document	6	include Mongoid::Document
7	include Mongoid::Timestamps	7	include Mongoid::Timestamps
8		8
9	- field :klass	9	+ field :error_class
10	field :component	10	field :component
11	field :action	11	field :action
12	field :environment	12	field :environment
	@@ -14,11 +14,11 @@ class Err		@@ -14,11 +14,11 @@ class Err
14		14
15	belongs_to :problem	15	belongs_to :problem
16	index :problem_id	16	index :problem_id
17	- index :klass	17	+ index :error_class
18		18
19	has_many :notices, :inverse_of => :err, :dependent => :destroy	19	has_many :notices, :inverse_of => :err, :dependent => :destroy
20		20
21	- validates_presence_of :klass, :environment	21	+ validates_presence_of :error_class, :environment
22		22
23	delegate :app, :resolved?, :to => :problem	23	delegate :app, :resolved?, :to => :problem
24		24
	@@ -11,7 +11,7 @@ class Notice		@@ -11,7 +11,7 @@ class Notice
11	field :request, :type => Hash	11	field :request, :type => Hash
12	field :notifier, :type => Hash	12	field :notifier, :type => Hash
13	field :user_attributes, :type => Hash	13	field :user_attributes, :type => Hash
14	- field :klass	14	+ field :error_class
15		15
16	belongs_to :err	16	belongs_to :err
17	index :created_at	17	index :created_at
	@@ -16,7 +16,7 @@ class Problem		@@ -16,7 +16,7 @@ class Problem
16	field :notices_count, :type => Integer, :default => 0	16	field :notices_count, :type => Integer, :default => 0
17	field :message	17	field :message
18	field :environment	18	field :environment
19	- field :klass	19	+ field :error_class
20	field :where	20	field :where
21	field :user_agents, :type => Hash, :default => {}	21	field :user_agents, :type => Hash, :default => {}
22	field :messages, :type => Hash, :default => {}	22	field :messages, :type => Hash, :default => {}
	@@ -128,7 +128,7 @@ class Problem		@@ -128,7 +128,7 @@ class Problem
128	attrs.merge!(	128	attrs.merge!(
129	:message => notice.message,	129	:message => notice.message,
130	:environment => notice.environment_name,	130	:environment => notice.environment_name,
131	- :klass => notice.klass,	131	+ :error_class => notice.error_class,
132	:where => notice.where,	132	:where => notice.where,
133	:messages => attribute_count_increase(:messages, notice.message),	133	:messages => attribute_count_increase(:messages, notice.message),
134	:hosts => attribute_count_increase(:hosts, notice.host),	134	:hosts => attribute_count_increase(:hosts, notice.host),
1	- content_for :page_title, @problem.message	1	- content_for :page_title, @problem.message
2	-- content_for :title, @problem.klass	2	+- content_for :title, @problem.error_class
3	- content_for :meta do	3	- content_for :meta do
4	%strong App:	4	%strong App:
5	= link_to @app.name, app_path(@app)	5	= link_to @app.name, app_path(@app)
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class RenameKlassToErrorClass < Mongoid::Migration
	2	+ def self.up
	3	+ [Problem, Err, Notice].each do \|model\|
	4	+ model.collection.update({}, {'$rename' => {'klass' => 'error_class'}}, multi: true, safe: true)
	5	+ end
	6	+ end
	7	+
	8	+ def self.down
	9	+ [Problem, Err, Notice].each do \|model\|
	10	+ model.collection.update({}, {'$rename' => {'error_class' => 'klass'}}, multi: true, safe: true)
	11	+ end
	12	+ end
	13	+end
	@@ -50,7 +50,7 @@ module Hoptoad		@@ -50,7 +50,7 @@ module Hoptoad
50		50
51	def self.for_errbit_api(notice)	51	def self.for_errbit_api(notice)
52	{	52	{
53	- :klass => notice['error']['class'] \|\| notice['error']['key'],	53	+ :error_class => notice['error']['class'] \|\| notice['error']['key'],
54	:message => notice['error']['message'],	54	:message => notice['error']['message'],
55	:backtrace => notice['error']['backtrace']['line'],	55	:backtrace => notice['error']['backtrace']['line'],
56		56
	@@ -9,22 +9,22 @@ namespace :errbit do		@@ -9,22 +9,22 @@ namespace :errbit do
9	app.problems.delete_all	9	app.problems.delete_all
10		10
11	errors = [{	11	errors = [{
12	- :klass => "ArgumentError",	12	+ :error_class => "ArgumentError",
13	:message => "wrong number of arguments (3 for 0)"	13	:message => "wrong number of arguments (3 for 0)"
14	}, {	14	}, {
15	- :klass => "RuntimeError",	15	+ :error_class => "RuntimeError",
16	:message => "Could not find Red October"	16	:message => "Could not find Red October"
17	}, {	17	}, {
18	- :klass => "TypeError",	18	+ :error_class => "TypeError",
19	:message => "can't convert Symbol into Integer"	19	:message => "can't convert Symbol into Integer"
20	}, {	20	}, {
21	- :klass => "ActiveRecord::RecordNotFound",	21	+ :error_class => "ActiveRecord::RecordNotFound",
22	:message => "could not find a record with the id 5"	22	:message => "could not find a record with the id 5"
23	}, {	23	}, {
24	- :klass => "NameError",	24	+ :error_class => "NameError",
25	:message => "uninitialized constant Tag"	25	:message => "uninitialized constant Tag"
26	}, {	26	}, {
27	- :klass => "SyntaxError",	27	+ :error_class => "SyntaxError",
28	:message => "unexpected tSTRING_BEG, expecting keyword_do or '{' or '('"	28	:message => "unexpected tSTRING_BEG, expecting keyword_do or '{' or '('"
29	}]	29	}]
30		30
	@@ -44,7 +44,7 @@ namespace :errbit do		@@ -44,7 +44,7 @@ namespace :errbit do
44	rand(34).times do	44	rand(34).times do
45		45
46	error_report = error_template.reverse_merge({	46	error_report = error_template.reverse_merge({
47	- :klass => "StandardError",	47	+ :error_class => "StandardError",
48	:message => "Oops. Something went wrong!",	48	:message => "Oops. Something went wrong!",
49	:backtrace => random_backtrace,	49	:backtrace => random_backtrace,
50	:request => {	50	:request => {