Download as
Browse Code »

Commit f2b9af95ee46a799901bf3c686a28b2a0039403f

Authored by Barry Hess
1 parent 5d9ffe65
Exists in master and in 1 other branch production

Add backtrace to emails, add awesome_print, update err notification style. 

Conflicts:

	Gemfile
	Gemfile.lock
	app/views/mailer/err_notification.text.erb
Showing 3 changed files with 45 additions and 37 deletions   Show diff stats
Gemfile
  Diff comments   View file @f2b9af9
... ... @@ -17,6 +17,7 @@ platform :ruby do
17 17 end
18 18  
19 19 group :development, :test do
  20 + gem 'awesome_print'
20 21 gem 'rspec-rails', '~> 2.5'
21 22 gem 'webmock', :require => false
22 23 end
... ...
Gemfile.lock
  Diff comments   View file @f2b9af9
... ... @@ -35,11 +35,12 @@ GEM
35 35 activemodel (= 3.0.5)
36 36 activesupport (= 3.0.5)
37 37 activesupport (3.0.5)
38   - addressable (2.2.5)
39   - arel (2.0.9)
  38 + addressable (2.2.6)
  39 + arel (2.0.10)
  40 + awesome_print (0.4.0)
40 41 bcrypt-ruby (2.1.4)
41   - bson (1.3.0)
42   - bson_ext (1.3.0)
  42 + bson (1.3.1)
  43 + bson_ext (1.3.1)
43 44 builder (2.1.2)
44 45 crack (0.1.8)
45 46 database_cleaner (0.6.7)
... ... @@ -47,7 +48,8 @@ GEM
47 48 bcrypt-ruby (~> 2.1.2)
48 49 warden (~> 1.0.2)
49 50 diff-lcs (1.1.2)
50   - email_spec (1.1.1)
  51 + email_spec (1.2.1)
  52 + mail (~> 2.2)
51 53 rspec (~> 2.0)
52 54 erubis (2.6.6)
53 55 abstract (>= 1.0.0)
... ... @@ -55,40 +57,40 @@ GEM
55 57 factory_girl_rails (1.0.1)
56 58 factory_girl (~> 1.3)
57 59 railties (>= 3.0.0)
58   - haml (3.0.25)
  60 + haml (3.1.2)
59 61 happymapper (0.3.2)
60 62 libxml-ruby (~> 1.1.3)
61   - i18n (0.5.0)
  63 + i18n (0.6.0)
62 64 libxml-ruby (1.1.4)
63 65 lighthouse-api (2.0)
64 66 activeresource (>= 3.0.0)
65 67 activesupport (>= 3.0.0)
66   - mail (2.2.17)
  68 + mail (2.2.19)
67 69 activesupport (>= 2.3.6)
68 70 i18n (>= 0.4.0)
69 71 mime-types (~> 1.16)
70 72 treetop (~> 1.4.8)
71 73 mime-types (1.16)
72   - mongo (1.3.0)
73   - bson (>= 1.3.0)
  74 + mongo (1.3.1)
  75 + bson (>= 1.3.1)
74 76 mongoid (2.0.0.rc.8)
75 77 activemodel (~> 3.0)
76 78 mongo (~> 1.2)
77 79 tzinfo (~> 0.3.22)
78 80 will_paginate (~> 3.0.pre)
79   - mongoid_rails_migrations (0.0.10)
80   - activesupport (~> 3.0.0)
81   - bundler (>= 0.9.19)
82   - rails (~> 3.0.0)
83   - railties (~> 3.0.0)
84   - nokogiri (1.4.4)
85   - pivotal-tracker (0.2.0)
  81 + mongoid_rails_migrations (0.0.14)
  82 + activesupport (>= 3.0.0)
  83 + bundler (>= 1.0.0)
  84 + rails (>= 3.0.0)
  85 + railties (>= 3.0.0)
  86 + nokogiri (1.4.3.1)
  87 + pivotal-tracker (0.3.1)
86 88 builder
87   - happymapper (>= 0.2.4)
88   - nokogiri (~> 1.4.1)
89   - rest-client (~> 1.5.1)
  89 + happymapper (>= 0.3.2)
  90 + nokogiri (~> 1.4.3.1)
  91 + rest-client (~> 1.6.0)
90 92 polyglot (0.3.1)
91   - rack (1.2.2)
  93 + rack (1.2.3)
92 94 rack-mount (0.6.14)
93 95 rack (>= 1.0.0)
94 96 rack-test (0.5.7)
... ... @@ -106,31 +108,31 @@ GEM
106 108 activesupport (= 3.0.5)
107 109 rake (>= 0.8.7)
108 110 thor (~> 0.14.4)
109   - rake (0.8.7)
110   - rest-client (1.5.1)
  111 + rake (0.9.2)
  112 + rest-client (1.6.3)
111 113 mime-types (>= 1.16)
112   - rspec (2.5.0)
113   - rspec-core (~> 2.5.0)
114   - rspec-expectations (~> 2.5.0)
115   - rspec-mocks (~> 2.5.0)
116   - rspec-core (2.5.1)
117   - rspec-expectations (2.5.0)
  114 + rspec (2.6.0)
  115 + rspec-core (~> 2.6.0)
  116 + rspec-expectations (~> 2.6.0)
  117 + rspec-mocks (~> 2.6.0)
  118 + rspec-core (2.6.4)
  119 + rspec-expectations (2.6.0)
118 120 diff-lcs (~> 1.1.2)
119   - rspec-mocks (2.5.0)
120   - rspec-rails (2.5.0)
  121 + rspec-mocks (2.6.0)
  122 + rspec-rails (2.6.1)
121 123 actionpack (~> 3.0)
122 124 activesupport (~> 3.0)
123 125 railties (~> 3.0)
124   - rspec (~> 2.5.0)
  126 + rspec (~> 2.6.0)
125 127 thor (0.14.6)
126 128 treetop (1.4.9)
127 129 polyglot (>= 0.3.1)
128   - tzinfo (0.3.26)
  130 + tzinfo (0.3.28)
129 131 useragent (0.3.1)
130   - warden (1.0.3)
131   - rack (>= 1.0.0)
132   - webmock (1.6.2)
133   - addressable (>= 2.2.2)
  132 + warden (1.0.4)
  133 + rack (>= 1.0)
  134 + webmock (1.6.4)
  135 + addressable (~> 2.2, > 2.2.5)
134 136 crack (>= 0.1.7)
135 137 will_paginate (3.0.pre2)
136 138  
... ... @@ -138,6 +140,7 @@ PLATFORMS
138 140 ruby
139 141  
140 142 DEPENDENCIES
  143 + awesome_print
141 144 bson_ext (~> 1.2)
142 145 database_cleaner (~> 0.6.0)
143 146 devise (~> 1.1.8)
... ...
app/views/mailer/err_notification.text.erb
  Diff comments   View file @f2b9af9
... ... @@ -4,4 +4,8 @@ This err has occurred <%= pluralize @notice.err.notices_count, 'time' %>. You sh
4 4  
5 5 <%= app_err_url(@app, @notice.err) %>
6 6  
  7 +Backtrace follows:
  8 +
  9 +<%= @notice.backtrace.collect { |l| l ? " #{l['file']}:#{l['number']}" : nil }.compact.join("\n") %>
  10 +
7 11 <%= render :partial => 'signature' %>
... ...