Merge remote-tracking branch 'upstream/master'

Thomas Cioppettini
2 parents 4cd3fc46 4678fd1d
Showing 29 changed files with 290 additions and 110 deletions Show diff stats
.travis.yml
CONTRIBUTORS.md
Gemfile
Gemfile.lock
README.md
app/controllers/api/v1/problems_controller.rb
app/controllers/apps_controller.rb
app/mailers/mailer.rb
app/models/error_report.rb
app/models/notice.rb
app/models/notification_service.rb
app/models/notification_services/campfire_service.rb
app/models/notification_services/gtalk_service.rb
app/models/notification_services/hoiio_service.rb
app/models/notification_services/pushover_service.rb
app/models/problem.rb
app/views/apps/_fields.html.haml
app/views/notices/_summary.html.haml
config/cloud/cloud66/files/_load_config.rb
config/initializers/_load_config.rb
@@ -4,13 +4,14 @@ env:
 rvm:
   - 2.0.0
   - 1.9.3
-  - rbx-19mode
+  - 2.1.2
+  - rbx-2
   - ruby-head
 services: mongodb
 #script: ./script/rspec-queue-mongoid.rb --format progress spec
 matrix:
   allow_failures:
-    - rvm: rbx-19mode
+    - rvm: rbx-2
     - rvm: ruby-head
@@ -42,11 +42,14 @@
 - [@nashby][]
 - [@shingara][]
 - [@tscolari][]
+- [@callumd][]
+
 [@anicet]: https://github.com/anicet
 [@nashby]: https://github.com/nashby
 [@shingara]: https://github.com/shingara
 [@tscolari]: https://github.com/tscolari
+[@callumd]: https://github.com/callumd
 ## 0.2.0 - 2013-09-11
 source 'https://rubygems.org'
-RAILS_VERSION = '~> 3.2.17'
+RAILS_VERSION = '~> 3.2.19'
 gem 'actionmailer', RAILS_VERSION
 gem 'actionpack', RAILS_VERSION
@@ -79,8 +79,6 @@ group :development, :test do
   gem 'rspec-rails'
   gem 'webmock', :require => false
   gem 'airbrake', :require => false
-  gem 'ruby-debug', :platform => :mri_18
-  gem 'debugger', :platform => :mri_19
   gem 'pry-rails'
 #  gem 'rpm_contrib'
 #  gem 'newrelic_rpm'
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.17)
-      actionpack (= 3.2.17)
+    actionmailer (3.2.19)
+      actionpack (= 3.2.19)
       mail (~> 2.5.4)
     actionmailer_inline_css (1.5.3)
       actionmailer (>= 3.0.0)
       nokogiri (>= 1.4.4)
       premailer (>= 1.7.1)
-    actionpack (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    actionpack (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -18,18 +18,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    activerecord (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
-    activesupport (3.2.17)
+    activeresource (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.5)
@@ -67,7 +67,6 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     coderay (1.0.9)
-    columnize (0.3.6)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -80,12 +79,6 @@ GEM
       addressable
     database_cleaner (1.2.0)
     debug_inspector (0.0.2)
-    debugger (1.6.3)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.4)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.4)
     decent_exposure (2.3.0)
     devise (3.1.1)
       bcrypt-ruby (~> 3.0)
@@ -133,7 +126,7 @@ GEM
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     httpauth (0.2.0)
-    i18n (0.6.9)
+    i18n (0.6.11)
     jira-ruby (0.1.2)
       activesupport
       oauth
@@ -156,8 +149,6 @@ GEM
     lighthouse-api (2.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -183,7 +174,7 @@ GEM
       rails (>= 3.2.0)
       railties (>= 3.2.0)
     moped (1.5.1)
-    multi_json (1.9.2)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     net-scp (1.1.2)
@@ -231,7 +222,7 @@ GEM
       rest-client (~> 1.6.0)
     pjax_rails (0.3.4)
       jquery-rails
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     premailer (1.7.3)
       css_parser (>= 1.1.9)
       htmlentities (>= 4.0.0)
@@ -250,31 +241,30 @@ GEM
       rack (>= 0.4)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.4)
       rack
     rack-ssl-enforcer (0.2.6)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.17)
-      actionmailer (= 3.2.17)
-      actionpack (= 3.2.17)
-      activerecord (= 3.2.17)
-      activeresource (= 3.2.17)
-      activesupport (= 3.2.17)
+    rails (3.2.19)
+      actionmailer (= 3.2.19)
+      actionpack (= 3.2.19)
+      activerecord (= 3.2.19)
+      activeresource (= 3.2.19)
+      activesupport (= 3.2.19)
       bundler (~> 1.0)
-      railties (= 3.2.17)
+      railties (= 3.2.19)
     rails_autolink (1.1.4)
       rails (> 3.1)
-    railties (3.2.17)
-      actionpack (= 3.2.17)
-      activesupport (= 3.2.17)
+    railties (3.2.19)
+      actionpack (= 3.2.19)
+      activesupport (= 3.2.19)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.12.0)
-    rake (10.1.1)
-    rbx-require-relative (0.0.9)
+    rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
@@ -296,11 +286,6 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     ruby-fogbugz (0.1.1)
       crack
     rushover (0.3.0)
@@ -330,7 +315,7 @@ GEM
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.18.1)
+    thor (0.19.1)
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
@@ -342,7 +327,7 @@ GEM
     turbo-sprockets-rails3 (0.3.10)
       railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.0.0)
-    tzinfo (0.3.38)
+    tzinfo (0.3.41)
     uglifier (2.2.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
@@ -366,9 +351,9 @@ PLATFORMS
   ruby
 DEPENDENCIES
-  actionmailer (~> 3.2.17)
+  actionmailer (~> 3.2.19)
   actionmailer_inline_css
-  actionpack (~> 3.2.17)
+  actionpack (~> 3.2.19)
   airbrake
   better_errors
   binding_of_caller
@@ -378,7 +363,6 @@ DEPENDENCIES
   capybara
   coveralls
   database_cleaner
-  debugger
   decent_exposure
   devise
   email_spec
@@ -413,10 +397,9 @@ DEPENDENCIES
   rack-ssl
   rack-ssl-enforcer
   rails_autolink
-  railties (~> 3.2.17)
+  railties (~> 3.2.19)
   ri_cal
   rspec-rails
-  ruby-debug
   ruby-fogbugz
   rushover
   strong_parameters
@@ -175,9 +175,6 @@ heroku config:add HEROKU=true
 heroku config:add SECRET_TOKEN="$(bundle exec rake secret)"
 heroku config:add ERRBIT_HOST=some-hostname.example.com
 heroku config:add ERRBIT_EMAIL_FROM=example@example.com
-# This next line is required to access env variables during asset compilation.
-# For more info, go to this link: https://devcenter.heroku.com/articles/labs-user-env-compile
-heroku labs:enable user-env-compile
 git push heroku master
 ```
 class Api::V1::ProblemsController < ApplicationController
   respond_to :json, :xml
+  FIELDS = %w{app_id app_name environment message where first_notice_at last_notice_at resolved resolved_at notices_count}
+
+  def show
+    result = benchmark("[api/v1/problems_controller/show] query time") do
+      begin
+        Problem.only(FIELDS).find(params[:id])
+      rescue Mongoid::Errors::DocumentNotFound
+        head :not_found
+        return false
+      end
+    end
+
+    respond_to do |format|
+      format.any(:html, :json) { render :json => result } # render JSON if no extension specified on path
+      format.xml  { render :xml  => result }
+    end
+  end
   def index
     query = {}
-    fields = %w{app_id app_name environment message where first_notice_at last_notice_at resolved resolved_at notices_count}
     if params.key?(:start_date) && params.key?(:end_date)
       start_date = Time.parse(params[:start_date]).utc
@@ -11,8 +27,8 @@ class Api::V1::ProblemsController &lt; ApplicationController
       query = {:first_notice_at=>{"$lte"=>end_date}, "$or"=>[{:resolved_at=>nil}, {:resolved_at=>{"$gte"=>start_date}}]}
     end
-    results = benchmark("[api/v1/problems_controller] query time") do
-      Problem.where(query).with(:consistency => :strong).only(fields).to_a
+    results = benchmark("[api/v1/problems_controller/index] query time") do
+      Problem.where(query).with(:consistency => :strong).only(FIELDS).to_a
     end
     respond_to do |format|
@@ -36,6 +36,10 @@ class AppsController &lt; ApplicationController
     app.deploys.order_by(:created_at.desc).limit(5)
   }
+  expose(:users) {
+    User.all.sort_by {|u| u.name.downcase }
+  }
+
   def index; end
   def show
     app
@@ -6,7 +6,12 @@ class Mailer &lt; ActionMailer::Base
   helper ApplicationHelper
   helper BacktraceLineHelper
-  default :from => Errbit::Config.email_from
+  default :from => Errbit::Config.email_from,
+          'X-Errbit-Host' => Errbit::Config.host,
+          'X-Mailer' => 'Errbit',
+          'X-Auto-Response-Suppress' => 'OOF, AutoReply',
+          'Precedence' => 'bulk',
+          'Auto-Submitted' => 'auto-generated'
   def err_notification(notice)
     @notice   = notice
@@ -15,6 +20,10 @@ class Mailer &lt; ActionMailer::Base
     count = @notice.similar_count
     count = count > 1 ? "(#{count}) " : ""
+    errbit_headers 'App' => @app.name,
+                   'Environment' => @notice.environment_name,
+                   'Error-Id' => @notice.err_id
+
     mail :to      => @app.notification_recipients,
          :subject => "#{count}[#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
   end
@@ -23,6 +32,11 @@ class Mailer &lt; ActionMailer::Base
     @deploy   = deploy
     @app  = deploy.app
+    errbit_headers 'App' => @app.name,
+                   'Environment' => @deploy.environment,
+                   'Deploy-Revision' => @deploy.revision,
+                   'Deploy-User' => @deploy.username
+
     mail :to       => @app.notification_recipients,
          :subject  => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"
   end
@@ -36,7 +50,18 @@ class Mailer &lt; ActionMailer::Base
     recipients = @comment.notification_recipients
+    errbit_headers 'App' => @app.name,
+                   'Environment' => @notice.environment_name,
+                   'Problem-Id' => @problem.id,
+                   'Comment-Author' => @user.name
+
     mail :to      => recipients,
          :subject => "#{@user.name} commented on [#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
   end
+
+  private
+
+  def errbit_headers(header)
+    header.each { |key,value| headers["X-Errbit-#{key}"] = value.to_s }
+  end
 end
@@ -15,15 +15,18 @@ require &#39;hoptoad_notifier&#39;
 # * <tt>:notifier</tt> - information to identify the source of the error report
 #
 class ErrorReport
-  attr_reader :error_class, :message, :request, :server_environment, :api_key, :notifier, :user_attributes, :framework
+  attr_reader :error_class, :message, :request, :server_environment, :api_key,
+              :notifier, :user_attributes, :framework, :notice
   cattr_accessor :fingerprint_strategy do
     Fingerprint
   end
   def initialize(xml_or_attributes)
-    @attributes = (xml_or_attributes.is_a?(String) ? Hoptoad.parse_xml!(xml_or_attributes) : xml_or_attributes).with_indifferent_access
-    @attributes.each{|k, v| instance_variable_set(:"@#{k}", v) }
+    @attributes = xml_or_attributes
+    @attributes = Hoptoad.parse_xml!(@attributes) if @attributes.is_a? String
+    @attributes = @attributes.with_indifferent_access
+    @attributes.each { |k, v| instance_variable_set(:"@#{k}", v) }
   end
   def rails_env
@@ -33,30 +36,29 @@ class ErrorReport
   end
   def app
-    @app ||= App.where(:api_key => api_key).first
+    @app ||= App.where(api_key: api_key).first
   end
   def backtrace
-    @normalized_backtrace ||= Backtrace.find_or_create(:raw => @backtrace)
+    @normalized_backtrace ||= Backtrace.find_or_create(raw: @backtrace)
   end
   def generate_notice!
     return unless valid?
     return @notice if @notice
     @notice = Notice.new(
-      :message => message,
-      :error_class => error_class,
-      :backtrace_id => backtrace.id,
-      :request => request,
-      :server_environment => server_environment,
-      :notifier => notifier,
-      :user_attributes => user_attributes,
-      :framework => framework
+      message: message,
+      error_class: error_class,
+      backtrace_id: backtrace.id,
+      request: request,
+      server_environment: server_environment,
+      notifier: notifier,
+      user_attributes: user_attributes,
+      framework: framework
     )
     error.notices << @notice
     @notice
   end
-  attr_reader :notice
   ##
   # Error associate to this error_report
@@ -66,23 +68,22 @@ class ErrorReport
   # @return [ Error ]
   def error
     @error ||= app.find_or_create_err!(
-      :error_class => error_class,
-      :environment => rails_env,
-      :fingerprint => fingerprint
+      error_class: error_class,
+      environment: rails_env,
+      fingerprint: fingerprint
     )
   end
   def valid?
-    !!app
+    app.present?
   end
   def should_keep?
     app_version = server_environment['app-version'] || ''
-    if self.app.current_app_version.present? && ( app_version.length <= 0 || Gem::Version.new(app_version) < Gem::Version.new(self.app.current_app_version) )
-      false
-    else
-      true
-    end
+    current_version = app.current_app_version
+    return true unless current_version.present?
+    return false if app_version.length <= 0
+    Gem::Version.new(app_version) >= Gem::Version.new(current_version)
   end
   private
@@ -90,5 +91,4 @@ class ErrorReport
   def fingerprint
     @fingerprint ||= fingerprint_strategy.generate(notice, api_key)
   end
-
 end
@@ -78,6 +78,17 @@ class Notice
     "N/A"
   end
+  def to_curl
+    return "N/A" if url.blank?
+    headers = %w(Accept Accept-Encoding Accept-Language Cookie Referer User-Agent).each_with_object([]) do |name, h|
+      if value = env_vars["HTTP_#{name.underscore.upcase}"]
+        h << "-H '#{name}: #{value}'"
+      end
+    end
+
+    "curl -X #{env_vars['REQUEST_METHOD'] || 'GET'} #{headers.join(' ')} #{url}"
+  end
+
   def env_vars
     request['cgi-data'] || {}
   end
@@ -54,6 +54,6 @@ class NotificationService
   end
   def problem_url(problem)
-    "http://#{Errbit::Config.host}/apps/#{problem.app.id}/problems/#{problem.id}"
+    "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id}/problems/#{problem.id}"
   end
 end
@@ -30,7 +30,7 @@ if defined? Campy
       # build the campfire client
       campy = Campy::Room.new(:account => subdomain, :token => api_token, :room_id => room_id)
       # post the issue to the campfire room
-      campy.speak "[errbit] #{problem.app.name} #{notification_description problem} - http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}/problems/#{problem.id.to_s}"
+      campy.speak "[errbit] #{problem.app.name} #{notification_description problem} - #{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}/problems/#{problem.id.to_s}"
     end
   end
 end
@@ -47,7 +47,7 @@ class NotificationServices::GtalkService &lt; NotificationService
     #has to look like this to be formatted properly in the client
     message =  """#{problem.app.name.to_s}
-http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
+#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
 #{notification_description problem}"""
     # post the issue to the xmpp room(s)
@@ -35,7 +35,7 @@ class NotificationServices::HoiioService &lt; NotificationService
     # send sms
     room_id.split(',').each do |number|
-      sms.send :dest => number, :msg => "http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_description problem}"
+      sms.send :dest => number, :msg => "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_description problem}"
     end
   end
@@ -26,7 +26,7 @@ class NotificationServices::PushoverService &lt; NotificationService
     notification = Rushover::Client.new(subdomain)
     # send push notification to pushover
-    notification.notify(api_token, "#{notification_description problem}", :priority => 1, :title => "Errbit Notification", :url => "http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}", :url_title => "Link to error")
+    notification.notify(api_token, "#{notification_description problem}", :priority => 1, :title => "Errbit Notification", :url => "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}", :url_title => "Link to error")
   end
 end
@@ -50,7 +50,6 @@ class Problem
   validates_presence_of :last_notice_at, :first_notice_at
-
   def self.all_else_unresolved(fetch_all)
     if fetch_all
       all
@@ -55,7 +55,7 @@
         = w.radio_button :watcher_type, :email
         = label_tag :watcher_type_email, 'Email Address', :for => label_for_attr(w, 'watcher_type_email')
       %div.watcher_params.user{:class => w.object.email.blank? ? 'chosen' : nil}
-        = w.select :user_id, User.all.map{|u| [u.name,u.id.to_s]}, :include_blank => '-- Select a User --'
+        = w.select :user_id, users.map{|u| [u.name,u.id.to_s]}, :include_blank => '-- Select a User --'
       %div.watcher_params.email{:class => w.object.email.present? ? 'chosen' : nil}
         = w.text_field :email
@@ -65,4 +65,3 @@
 = render "issue_tracker_fields", :f => f
 = render "service_notification_fields", :f => f
-
@@ -10,6 +10,9 @@
       %tr
         %th URL
         %td.nowrap= link_to notice.request['url'], notice.request['url']
+      %tr
+        %th &nbsp;
+        %td= notice.to_curl
     %tr
       %th Where
       %td= notice.where
@@ -17,6 +17,7 @@ unless defined?(Errbit::Config)
     Errbit::Config.use_gravatar = ENV['ERRBIT_USE_GRAVATAR']
     Errbit::Config.gravatar_default = ENV['ERRBIT_GRAVATAR_DEFAULT']
+    Errbit::Config.github_url = ENV['GITHUB_URL']
     Errbit::Config.github_authentication = ENV['GITHUB_AUTHENTICATION']
     Errbit::Config.github_client_id = ENV['GITHUB_CLIENT_ID']
     Errbit::Config.github_secret = ENV['GITHUB_SECRET']
@@ -6,9 +6,12 @@ unless defined?(Errbit::Config)
   Errbit::Config = OpenStruct.new
   use_env = ENV['HEROKU'] || ENV['USE_ENV']
+  Errbit::Config.protocol = 'http'
+
   # If Errbit is running on Heroku, config can be set from environment variables.
   if use_env
     Errbit::Config.host = ENV['ERRBIT_HOST']
+    Errbit::Config.protocol = ENV['ERRBIT_PROTOCOL'] || 'http'
     Errbit::Config.port = ENV['ERRBIT_PORT']
     Errbit::Config.email_from = ENV['ERRBIT_EMAIL_FROM']
     #  Not really easy to use like an env because need an array and ENV return a string :(
@@ -34,7 +37,8 @@ unless defined?(Errbit::Config)
       :authentication => :plain,
       :user_name      => ENV['SMTP_USERNAME']   || ENV['SENDGRID_USERNAME'],
       :password       => ENV['SMTP_PASSWORD']   || ENV['SENDGRID_PASSWORD'],
-      :domain         => ENV['SMTP_DOMAIN'] || ENV['SENDGRID_DOMAIN'] || ENV['ERRBIT_EMAIL_FROM'].split('@').last
+      :domain         => ENV['SMTP_DOMAIN'] || ENV['SENDGRID_DOMAIN'] ||
+                           (ENV['ERRBIT_EMAIL_FROM'] ? ENV['ERRBIT_EMAIL_FROM'].split('@').last : nil)
     }
   end
@@ -6,7 +6,7 @@ if config_file.file? &amp;&amp;
 elsif ENV['HEROKU'] || ENV['USE_ENV']
   # No mongoid.yml file. Use ENV variable to define your MongoDB
   # configuration
-  if mongo = ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL'] || ENV['MONGODB_URL']
+  if mongo = ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL'] || ENV['MONGODB_URL'] || ENV['MONGO_URL']
     settings = URI.parse(mongo)
     database_name = settings.path.gsub(/^\//, '')
   else
@@ -50,7 +50,7 @@ Errbit::Application.routes.draw do
   namespace :api do
     namespace :v1 do
-      resources :problems, :only => [:index], :defaults => { :format => 'json' }
+      resources :problems, :only => [:index, :show], :defaults => { :format => 'json' }
       resources :notices,  :only => [:index], :defaults => { :format => 'json' }
       resources :stats, :only => [], :defaults => { :format => 'json' } do
         collection do
@@ -49,7 +49,8 @@ namespace :errbit do
           :backtrace => random_backtrace,
           :request => {
             'component' => 'main',
-            'action' => 'error'
+            'action' => 'error',
+            'url' => "http://example.com/post/#{[111, 222, 333].sample}",
           },
           :server_environment => {'environment-name' => Rails.env.to_s},
           :notifier => {:name => "seeds.rb"},
@@ -7,6 +7,70 @@ describe Api::V1::ProblemsController do
       @user = Fabricate(:user)
     end
+    describe "GET /api/v1/problems/:id" do
+      before do
+        notice = Fabricate(:notice)
+        err = Fabricate(:err, :notices => [notice])
+        @problem = Fabricate(:problem, :errs => [err])
+      end
+
+      it "should return JSON if JSON is requested" do
+        get :show, :auth_token => @user.authentication_token, :format => "json", :id => Problem.first.id
+        expect { JSON.load(response.body) }.not_to raise_error() #JSON::ParserError
+      end
+
+      it "should return XML if XML is requested" do
+        get :index, :auth_token => @user.authentication_token, :format => "xml", :id => @problem.id
+        expect(Nokogiri::XML(response.body).errors).to be_empty
+      end
+
+      it "should return JSON by default" do
+        get :show, :auth_token => @user.authentication_token, :id => @problem.id
+        expect { JSON.load(response.body) }.not_to raise_error()#JSON::ParserError)
+      end
+
+      it "should return the correct problem" do
+        get :show, :auth_token => @user.authentication_token, :format => "json", :id => @problem.id
+
+        returned_problem = JSON.parse(response.body)
+        expect( returned_problem["_id"] ).to eq(@problem.id.to_s)
+      end
+
+      it "should return only the correct fields" do
+        get :show, :auth_token => @user.authentication_token, :format => "json", :id => @problem.id
+        returned_problem = JSON.parse(response.body)
+
+        expect( returned_problem.keys ).to match_array([
+          "app_name",
+          "first_notice_at",
+          "error_class",
+          "messages",
+          "hosts",
+          "created_at",
+          "app_id",
+          "last_notice_at",
+          "_id",
+          "issue_link",
+          "resolved",
+          "updated_at",
+          "resolved_at",
+          "last_deploy_at",
+          "where",
+          "issue_type",
+          "notices_count",
+          "user_agents",
+          "comments_count",
+          "message",
+          "environment"
+        ])
+      end
+
+      it "returns a 404 if the problem cannot be found" do
+        get :show, :auth_token => @user.authentication_token, :format => "json", :id => 'IdontExist'
+        expect( response.status ).to eq(404)
+      end
+    end
+
     describe "GET /api/v1/problems" do
       before do
         Fabricate(:problem, :first_notice_at => Date.new(2012, 8, 01), :resolved_at => Date.new(2012, 8, 02))
@@ -73,6 +73,16 @@ describe AppsController do
         expect(response).to be_success
       end
+      it "should list available watchers by name" do
+        Fabricate(:user, :name => "Carol")
+        Fabricate(:user, :name => "Alice")
+        Fabricate(:user, :name => "Betty")
+
+        get :show, :id => app.id
+
+        expect(controller.users.to_a).to eq(User.all.to_a.sort_by(&:name))
+      end
+
       context "pagination" do
         before(:each) do
           35.times { Fabricate(:err, :problem => Fabricate(:problem, :app => app)) }
@@ -392,4 +402,3 @@ describe AppsController do
   end
 end
-
 require 'spec_helper'
+shared_examples "a notification email" do
+  it "should have X-Mailer header" do
+    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)
+  end
+
+  it "should have Precedence header" do
+    expect(@email).to have_header('Precedence', 'bulk')
+  end
+
+  it "should have Auto-Submitted header" do
+    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')
+  end
+
+  it "should send the email" do
+    expect(ActionMailer::Base.deliveries.size).to eq 1
+  end
+end
+
 describe Mailer do
   context "Err Notification" do
     include EmailSpec::Helpers
@@ -19,9 +46,8 @@ describe Mailer do
       @email = Mailer.err_notification(notice).deliver
     end
-    it "should send the email" do
-      expect(ActionMailer::Base.deliveries.size).to eq 1
-    end
+    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")
@@ -62,10 +88,6 @@ describe Mailer do
       @email = Mailer.comment_notification(comment).deliver
     end
-    it "should send the email" do
-      expect(ActionMailer::Base.deliveries.size).to eq 1
-    end
-
     it "should be sent to comment notification recipients" do
       expect(@email.to).to eq recipients
     end
@@ -35,6 +35,28 @@ describe Notice do
     end
   end
+  describe "to_curl" do
+    let(:notice)  { Fabricate.build(:notice, request: request) }
+
+    context "when it has a request url" do
+      let(:request) { {'url' => "http://example.com/resource/12", 'cgi-data' => {'HTTP_USER_AGENT' => 'Mozilla/5.0'}} }
+
+      it 'has a curl representation' do
+        cmd = notice.to_curl
+        expect(cmd).to eq(%q[curl -X GET -H 'User-Agent: Mozilla/5.0' http://example.com/resource/12])
+      end
+    end
+
+    context "when it has not a request url" do
+      let(:request) { {'cgi-data' => {'HTTP_USER_AGENT' => 'Mozilla/5.0'}} }
+
+      it 'has a curl representation' do
+        cmd = notice.to_curl
+        expect(cmd).to eq "N/A"
+      end
+    end
+  end
+
   describe "user agent" do
     it "should be parsed and human-readable" do
       notice = Fabricate.build(:notice, :request => {'cgi-data' => {
@@ -17,7 +17,7 @@ describe NotificationService::GtalkService do
     expect(gtalk).to receive(:connect).with(notification_service.service)
     expect(gtalk).to receive(:auth).with(notification_service.api_token)
     message_value = """#{problem.app.name.to_s}
-http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
+#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
 #{notification_service.notification_description problem}"""
     expect(Jabber::Message).to receive(:new).with(notification_service.user_id, message_value).and_return(message)
@@ -39,7 +39,7 @@ http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
       @notification_service = Fabricate :gtalk_notification_service, :app => @notice.app
       @problem = @notice.problem
       @error_msg = """#{@problem.app.name.to_s}
-http://#{Errbit::Config.host}/apps/#{@problem.app.id.to_s}
+#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{@problem.app.id.to_s}
 #{@notification_service.notification_description @problem}"""
       # gtalk stubbing
@@ -105,7 +105,7 @@ http://#{Errbit::Config.host}/apps/#{@problem.app.id.to_s}
     expect(gtalk).to receive(:connect)
     expect(gtalk).to receive(:auth).with(notification_service.api_token)
     message_value = """#{problem.app.name.to_s}
-http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
+#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
 #{notification_service.notification_description problem}"""
     expect(Jabber::Message).to receive(:new).with(notification_service.room_id, message_value).and_return(message)
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe NotificationService do
+
+  let(:notice) { Fabricate :notice }
+  let(:notification_service) { Fabricate :notification_service, :app => notice.app }
+  let(:problem) { notice.problem }
+
+  it "it should use http by default in #problem_url" do
+    notification_service.problem_url(problem).should start_with 'http://'
+  end
+
+  it "it should use the protocol value specified in the config in #problem_url" do
+    Errbit::Config.protocol = 'https'
+    notification_service.problem_url(problem).should start_with 'https://'
+  end
+
+end
	@@ -4,13 +4,14 @@ env:		@@ -4,13 +4,14 @@ env:
4	rvm:	4	rvm:
5	- 2.0.0	5	- 2.0.0
6	- 1.9.3	6	- 1.9.3
7	- - rbx-19mode	7	+ - 2.1.2
		8	+ - rbx-2
8	- ruby-head	9	- ruby-head
9	services: mongodb	10	services: mongodb
10	#script: ./script/rspec-queue-mongoid.rb --format progress spec	11	#script: ./script/rspec-queue-mongoid.rb --format progress spec
11	matrix:	12	matrix:
12	allow_failures:	13	allow_failures:
13	- - rvm: rbx-19mode	14	+ - rvm: rbx-2
14	- rvm: ruby-head	15	- rvm: ruby-head
15		16
16		17
1	GEM	1	GEM
2	remote: https://rubygems.org/	2	remote: https://rubygems.org/
3	specs:	3	specs:
4	- actionmailer (3.2.17)
5	- actionpack (= 3.2.17)	4	+ actionmailer (3.2.19)
		5	+ actionpack (= 3.2.19)
6	mail (~> 2.5.4)	6	mail (~> 2.5.4)
7	actionmailer_inline_css (1.5.3)	7	actionmailer_inline_css (1.5.3)
8	actionmailer (>= 3.0.0)	8	actionmailer (>= 3.0.0)
9	nokogiri (>= 1.4.4)	9	nokogiri (>= 1.4.4)
10	premailer (>= 1.7.1)	10	premailer (>= 1.7.1)
11	- actionpack (3.2.17)
12	- activemodel (= 3.2.17)
13	- activesupport (= 3.2.17)	11	+ actionpack (3.2.19)
		12	+ activemodel (= 3.2.19)
		13	+ activesupport (= 3.2.19)
14	builder (~> 3.0.0)	14	builder (~> 3.0.0)
15	erubis (~> 2.7.0)	15	erubis (~> 2.7.0)
16	journey (~> 1.0.4)	16	journey (~> 1.0.4)
	@@ -18,18 +18,18 @@ GEM		@@ -18,18 +18,18 @@ GEM
18	rack-cache (~> 1.2)	18	rack-cache (~> 1.2)
19	rack-test (~> 0.6.1)	19	rack-test (~> 0.6.1)
20	sprockets (~> 2.2.1)	20	sprockets (~> 2.2.1)
21	- activemodel (3.2.17)
22	- activesupport (= 3.2.17)	21	+ activemodel (3.2.19)
		22	+ activesupport (= 3.2.19)
23	builder (~> 3.0.0)	23	builder (~> 3.0.0)
24	- activerecord (3.2.17)
25	- activemodel (= 3.2.17)
26	- activesupport (= 3.2.17)	24	+ activerecord (3.2.19)
		25	+ activemodel (= 3.2.19)
		26	+ activesupport (= 3.2.19)
27	arel (~> 3.0.2)	27	arel (~> 3.0.2)
28	tzinfo (~> 0.3.29)	28	tzinfo (~> 0.3.29)
29	- activeresource (3.2.17)
30	- activemodel (= 3.2.17)
31	- activesupport (= 3.2.17)
32	- activesupport (3.2.17)	29	+ activeresource (3.2.19)
		30	+ activemodel (= 3.2.19)
		31	+ activesupport (= 3.2.19)
		32	+ activesupport (3.2.19)
33	i18n (~> 0.6, >= 0.6.4)	33	i18n (~> 0.6, >= 0.6.4)
34	multi_json (~> 1.0)	34	multi_json (~> 1.0)
35	addressable (2.3.5)	35	addressable (2.3.5)
	@@ -67,7 +67,6 @@ GEM		@@ -67,7 +67,6 @@ GEM
67	rack-test (>= 0.5.4)	67	rack-test (>= 0.5.4)
68	xpath (~> 2.0)	68	xpath (~> 2.0)
69	coderay (1.0.9)	69	coderay (1.0.9)
70	- columnize (0.3.6)
71	coveralls (0.7.0)	70	coveralls (0.7.0)
72	multi_json (~> 1.3)	71	multi_json (~> 1.3)
73	rest-client	72	rest-client
	@@ -80,12 +79,6 @@ GEM		@@ -80,12 +79,6 @@ GEM
80	addressable	79	addressable
81	database_cleaner (1.2.0)	80	database_cleaner (1.2.0)
82	debug_inspector (0.0.2)	81	debug_inspector (0.0.2)
83	- debugger (1.6.3)
84	- columnize (>= 0.3.1)
85	- debugger-linecache (~> 1.2.0)
86	- debugger-ruby_core_source (~> 1.2.4)
87	- debugger-linecache (1.2.0)
88	- debugger-ruby_core_source (1.2.4)
89	decent_exposure (2.3.0)	82	decent_exposure (2.3.0)
90	devise (3.1.1)	83	devise (3.1.1)
91	bcrypt-ruby (~> 3.0)	84	bcrypt-ruby (~> 3.0)
	@@ -133,7 +126,7 @@ GEM		@@ -133,7 +126,7 @@ GEM
133	json (~> 1.8)	126	json (~> 1.8)
134	multi_xml (>= 0.5.2)	127	multi_xml (>= 0.5.2)
135	httpauth (0.2.0)	128	httpauth (0.2.0)
136	- i18n (0.6.9)	129	+ i18n (0.6.11)
137	jira-ruby (0.1.2)	130	jira-ruby (0.1.2)
138	activesupport	131	activesupport
139	oauth	132	oauth
	@@ -156,8 +149,6 @@ GEM		@@ -156,8 +149,6 @@ GEM
156	lighthouse-api (2.0)	149	lighthouse-api (2.0)
157	activeresource (>= 3.0.0)	150	activeresource (>= 3.0.0)
158	activesupport (>= 3.0.0)	151	activesupport (>= 3.0.0)
159	- linecache (0.46)
160	- rbx-require-relative (> 0.0.4)
161	mail (2.5.4)	152	mail (2.5.4)
162	mime-types (~> 1.16)	153	mime-types (~> 1.16)
163	treetop (~> 1.4.8)	154	treetop (~> 1.4.8)
	@@ -183,7 +174,7 @@ GEM		@@ -183,7 +174,7 @@ GEM
183	rails (>= 3.2.0)	174	rails (>= 3.2.0)
184	railties (>= 3.2.0)	175	railties (>= 3.2.0)
185	moped (1.5.1)	176	moped (1.5.1)
186	- multi_json (1.9.2)	177	+ multi_json (1.10.1)
187	multi_xml (0.5.5)	178	multi_xml (0.5.5)
188	multipart-post (1.2.0)	179	multipart-post (1.2.0)
189	net-scp (1.1.2)	180	net-scp (1.1.2)
	@@ -231,7 +222,7 @@ GEM		@@ -231,7 +222,7 @@ GEM
231	rest-client (~> 1.6.0)	222	rest-client (~> 1.6.0)
232	pjax_rails (0.3.4)	223	pjax_rails (0.3.4)
233	jquery-rails	224	jquery-rails
234	- polyglot (0.3.4)	225	+ polyglot (0.3.5)
235	premailer (1.7.3)	226	premailer (1.7.3)
236	css_parser (>= 1.1.9)	227	css_parser (>= 1.1.9)
237	htmlentities (>= 4.0.0)	228	htmlentities (>= 4.0.0)
	@@ -250,31 +241,30 @@ GEM		@@ -250,31 +241,30 @@ GEM
250	rack (>= 0.4)	241	rack (>= 0.4)
251	rack-contrib (1.1.0)	242	rack-contrib (1.1.0)
252	rack (>= 0.9.1)	243	rack (>= 0.9.1)
253	- rack-ssl (1.3.3)	244	+ rack-ssl (1.3.4)
254	rack	245	rack
255	rack-ssl-enforcer (0.2.6)	246	rack-ssl-enforcer (0.2.6)
256	rack-test (0.6.2)	247	rack-test (0.6.2)
257	rack (>= 1.0)	248	rack (>= 1.0)
258	- rails (3.2.17)
259	- actionmailer (= 3.2.17)
260	- actionpack (= 3.2.17)
261	- activerecord (= 3.2.17)
262	- activeresource (= 3.2.17)
263	- activesupport (= 3.2.17)	249	+ rails (3.2.19)
		250	+ actionmailer (= 3.2.19)
		251	+ actionpack (= 3.2.19)
		252	+ activerecord (= 3.2.19)
		253	+ activeresource (= 3.2.19)
		254	+ activesupport (= 3.2.19)
264	bundler (~> 1.0)	255	bundler (~> 1.0)
265	- railties (= 3.2.17)	256	+ railties (= 3.2.19)
266	rails_autolink (1.1.4)	257	rails_autolink (1.1.4)
267	rails (> 3.1)	258	rails (> 3.1)
268	- railties (3.2.17)
269	- actionpack (= 3.2.17)
270	- activesupport (= 3.2.17)	259	+ railties (3.2.19)
		260	+ actionpack (= 3.2.19)
		261	+ activesupport (= 3.2.19)
271	rack-ssl (~> 1.3.2)	262	rack-ssl (~> 1.3.2)
272	rake (>= 0.8.7)	263	rake (>= 0.8.7)
273	rdoc (~> 3.4)	264	rdoc (~> 3.4)
274	thor (>= 0.14.6, < 2.0)	265	thor (>= 0.14.6, < 2.0)
275	raindrops (0.12.0)	266	raindrops (0.12.0)
276	- rake (10.1.1)
277	- rbx-require-relative (0.0.9)	267	+ rake (10.3.2)
278	rdoc (3.12.2)	268	rdoc (3.12.2)
279	json (~> 1.4)	269	json (~> 1.4)
280	ref (1.0.5)	270	ref (1.0.5)
	@@ -296,11 +286,6 @@ GEM		@@ -296,11 +286,6 @@ GEM
296	rspec-core (~> 2.14.0)	286	rspec-core (~> 2.14.0)
297	rspec-expectations (~> 2.14.0)	287	rspec-expectations (~> 2.14.0)
298	rspec-mocks (~> 2.14.0)	288	rspec-mocks (~> 2.14.0)
299	- ruby-debug (0.10.4)
300	- columnize (>= 0.1)
301	- ruby-debug-base (~> 0.10.4.0)
302	- ruby-debug-base (0.10.4)
303	- linecache (>= 0.3)
304	ruby-fogbugz (0.1.1)	289	ruby-fogbugz (0.1.1)
305	crack	290	crack
306	rushover (0.3.0)	291	rushover (0.3.0)
	@@ -330,7 +315,7 @@ GEM		@@ -330,7 +315,7 @@ GEM
330	therubyracer (0.12.0)	315	therubyracer (0.12.0)
331	libv8 (~> 3.16.14.0)	316	libv8 (~> 3.16.14.0)
332	ref	317	ref
333	- thor (0.18.1)	318	+ thor (0.19.1)
334	thread_safe (0.1.3)	319	thread_safe (0.1.3)
335	atomic	320	atomic
336	tilt (1.4.1)	321	tilt (1.4.1)
	@@ -342,7 +327,7 @@ GEM		@@ -342,7 +327,7 @@ GEM
342	turbo-sprockets-rails3 (0.3.10)	327	turbo-sprockets-rails3 (0.3.10)
343	railties (> 3.2.8, < 4.0.0)	328	railties (> 3.2.8, < 4.0.0)
344	sprockets (>= 2.0.0)	329	sprockets (>= 2.0.0)
345	- tzinfo (0.3.38)	330	+ tzinfo (0.3.41)
346	uglifier (2.2.1)	331	uglifier (2.2.1)
347	execjs (>= 0.3.0)	332	execjs (>= 0.3.0)
348	multi_json (~> 1.0, >= 1.0.2)	333	multi_json (~> 1.0, >= 1.0.2)
	@@ -366,9 +351,9 @@ PLATFORMS		@@ -366,9 +351,9 @@ PLATFORMS
366	ruby	351	ruby
367		352
368	DEPENDENCIES	353	DEPENDENCIES
369	- actionmailer (~> 3.2.17)	354	+ actionmailer (~> 3.2.19)
370	actionmailer_inline_css	355	actionmailer_inline_css
371	- actionpack (~> 3.2.17)	356	+ actionpack (~> 3.2.19)
372	airbrake	357	airbrake
373	better_errors	358	better_errors
374	binding_of_caller	359	binding_of_caller
	@@ -378,7 +363,6 @@ DEPENDENCIES		@@ -378,7 +363,6 @@ DEPENDENCIES
378	capybara	363	capybara
379	coveralls	364	coveralls
380	database_cleaner	365	database_cleaner
381	- debugger
382	decent_exposure	366	decent_exposure
383	devise	367	devise
384	email_spec	368	email_spec
	@@ -413,10 +397,9 @@ DEPENDENCIES		@@ -413,10 +397,9 @@ DEPENDENCIES
413	rack-ssl	397	rack-ssl
414	rack-ssl-enforcer	398	rack-ssl-enforcer
415	rails_autolink	399	rails_autolink
416	- railties (~> 3.2.17)	400	+ railties (~> 3.2.19)
417	ri_cal	401	ri_cal
418	rspec-rails	402	rspec-rails
419	- ruby-debug
420	ruby-fogbugz	403	ruby-fogbugz
421	rushover	404	rushover
422	strong_parameters	405	strong_parameters
1	class Api::V1::ProblemsController < ApplicationController	1	class Api::V1::ProblemsController < ApplicationController
2	respond_to :json, :xml	2	respond_to :json, :xml
		3	+ FIELDS = %w{app_id app_name environment message where first_notice_at last_notice_at resolved resolved_at notices_count}
		4	+
		5	+ def show
		6	+ result = benchmark("[api/v1/problems_controller/show] query time") do
		7	+ begin
		8	+ Problem.only(FIELDS).find(params[:id])
		9	+ rescue Mongoid::Errors::DocumentNotFound
		10	+ head :not_found
		11	+ return false
		12	+ end
		13	+ end
		14	+
		15	+ respond_to do \|format\|
		16	+ format.any(:html, :json) { render :json => result } # render JSON if no extension specified on path
		17	+ format.xml { render :xml => result }
		18	+ end
		19	+ end
3		20
4	def index	21	def index
5	query = {}	22	query = {}
6	- fields = %w{app_id app_name environment message where first_notice_at last_notice_at resolved resolved_at notices_count}
7		23
8	if params.key?(:start_date) && params.key?(:end_date)	24	if params.key?(:start_date) && params.key?(:end_date)
9	start_date = Time.parse(params[:start_date]).utc	25	start_date = Time.parse(params[:start_date]).utc
	@@ -11,8 +27,8 @@ class Api::V1::ProblemsController < ApplicationController		@@ -11,8 +27,8 @@ class Api::V1::ProblemsController < ApplicationController
11	query = {:first_notice_at=>{"$lte"=>end_date}, "$or"=>[{:resolved_at=>nil}, {:resolved_at=>{"$gte"=>start_date}}]}	27	query = {:first_notice_at=>{"$lte"=>end_date}, "$or"=>[{:resolved_at=>nil}, {:resolved_at=>{"$gte"=>start_date}}]}
12	end	28	end
13		29
14	- results = benchmark("[api/v1/problems_controller] query time") do
15	- Problem.where(query).with(:consistency => :strong).only(fields).to_a	30	+ results = benchmark("[api/v1/problems_controller/index] query time") do
		31	+ Problem.where(query).with(:consistency => :strong).only(FIELDS).to_a
16	end	32	end
17		33
18	respond_to do \|format\|	34	respond_to do \|format\|
	@@ -6,7 +6,12 @@ class Mailer < ActionMailer::Base		@@ -6,7 +6,12 @@ class Mailer < ActionMailer::Base
6	helper ApplicationHelper	6	helper ApplicationHelper
7	helper BacktraceLineHelper	7	helper BacktraceLineHelper
8		8
9	- default :from => Errbit::Config.email_from	9	+ default :from => Errbit::Config.email_from,
		10	+ 'X-Errbit-Host' => Errbit::Config.host,
		11	+ 'X-Mailer' => 'Errbit',
		12	+ 'X-Auto-Response-Suppress' => 'OOF, AutoReply',
		13	+ 'Precedence' => 'bulk',
		14	+ 'Auto-Submitted' => 'auto-generated'
10		15
11	def err_notification(notice)	16	def err_notification(notice)
12	@notice = notice	17	@notice = notice
	@@ -15,6 +20,10 @@ class Mailer < ActionMailer::Base		@@ -15,6 +20,10 @@ class Mailer < ActionMailer::Base
15	count = @notice.similar_count	20	count = @notice.similar_count
16	count = count > 1 ? "(#{count}) " : ""	21	count = count > 1 ? "(#{count}) " : ""
17		22
		23	+ errbit_headers 'App' => @app.name,
		24	+ 'Environment' => @notice.environment_name,
		25	+ 'Error-Id' => @notice.err_id
		26	+
18	mail :to => @app.notification_recipients,	27	mail :to => @app.notification_recipients,
19	:subject => "#{count}[#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"	28	:subject => "#{count}[#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
20	end	29	end
	@@ -23,6 +32,11 @@ class Mailer < ActionMailer::Base		@@ -23,6 +32,11 @@ class Mailer < ActionMailer::Base
23	@deploy = deploy	32	@deploy = deploy
24	@app = deploy.app	33	@app = deploy.app
25		34
		35	+ errbit_headers 'App' => @app.name,
		36	+ 'Environment' => @deploy.environment,
		37	+ 'Deploy-Revision' => @deploy.revision,
		38	+ 'Deploy-User' => @deploy.username
		39	+
26	mail :to => @app.notification_recipients,	40	mail :to => @app.notification_recipients,
27	:subject => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"	41	:subject => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"
28	end	42	end
	@@ -36,7 +50,18 @@ class Mailer < ActionMailer::Base		@@ -36,7 +50,18 @@ class Mailer < ActionMailer::Base
36		50
37	recipients = @comment.notification_recipients	51	recipients = @comment.notification_recipients
38		52
		53	+ errbit_headers 'App' => @app.name,
		54	+ 'Environment' => @notice.environment_name,
		55	+ 'Problem-Id' => @problem.id,
		56	+ 'Comment-Author' => @user.name
		57	+
39	mail :to => recipients,	58	mail :to => recipients,
40	:subject => "#{@user.name} commented on [#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"	59	:subject => "#{@user.name} commented on [#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
41	end	60	end
		61	+
		62	+ private
		63	+
		64	+ def errbit_headers(header)
		65	+ header.each { \|key,value\| headers["X-Errbit-#{key}"] = value.to_s }
		66	+ end
42	end	67	end
	@@ -78,6 +78,17 @@ class Notice		@@ -78,6 +78,17 @@ class Notice
78	"N/A"	78	"N/A"
79	end	79	end
80		80
		81	+ def to_curl
		82	+ return "N/A" if url.blank?
		83	+ headers = %w(Accept Accept-Encoding Accept-Language Cookie Referer User-Agent).each_with_object([]) do \|name, h\|
		84	+ if value = env_vars["HTTP_#{name.underscore.upcase}"]
		85	+ h << "-H '#{name}: #{value}'"
		86	+ end
		87	+ end
		88	+
		89	+ "curl -X #{env_vars['REQUEST_METHOD'] \|\| 'GET'} #{headers.join(' ')} #{url}"
		90	+ end
		91	+
81	def env_vars	92	def env_vars
82	request['cgi-data'] \|\| {}	93	request['cgi-data'] \|\| {}
83	end	94	end
	@@ -54,6 +54,6 @@ class NotificationService		@@ -54,6 +54,6 @@ class NotificationService
54	end	54	end
55		55
56	def problem_url(problem)	56	def problem_url(problem)
57	- "http://#{Errbit::Config.host}/apps/#{problem.app.id}/problems/#{problem.id}"	57	+ "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id}/problems/#{problem.id}"
58	end	58	end
59	end	59	end
	@@ -30,7 +30,7 @@ if defined? Campy		@@ -30,7 +30,7 @@ if defined? Campy
30	# build the campfire client	30	# build the campfire client
31	campy = Campy::Room.new(:account => subdomain, :token => api_token, :room_id => room_id)	31	campy = Campy::Room.new(:account => subdomain, :token => api_token, :room_id => room_id)
32	# post the issue to the campfire room	32	# post the issue to the campfire room
33	- campy.speak "[errbit] #{problem.app.name} #{notification_description problem} - http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}/problems/#{problem.id.to_s}"	33	+ campy.speak "[errbit] #{problem.app.name} #{notification_description problem} - #{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}/problems/#{problem.id.to_s}"
34	end	34	end
35	end	35	end
36	end	36	end
	@@ -47,7 +47,7 @@ class NotificationServices::GtalkService < NotificationService		@@ -47,7 +47,7 @@ class NotificationServices::GtalkService < NotificationService
47		47
48	#has to look like this to be formatted properly in the client	48	#has to look like this to be formatted properly in the client
49	message = """#{problem.app.name.to_s}	49	message = """#{problem.app.name.to_s}
50	-http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}	50	+#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
51	#{notification_description problem}"""	51	#{notification_description problem}"""
52		52
53	# post the issue to the xmpp room(s)	53	# post the issue to the xmpp room(s)
	@@ -35,7 +35,7 @@ class NotificationServices::HoiioService < NotificationService		@@ -35,7 +35,7 @@ class NotificationServices::HoiioService < NotificationService
35		35
36	# send sms	36	# send sms
37	room_id.split(',').each do \|number\|	37	room_id.split(',').each do \|number\|
38	- sms.send :dest => number, :msg => "http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_description problem}"	38	+ sms.send :dest => number, :msg => "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_description problem}"
39	end	39	end
40		40
41	end	41	end
	@@ -26,7 +26,7 @@ class NotificationServices::PushoverService < NotificationService		@@ -26,7 +26,7 @@ class NotificationServices::PushoverService < NotificationService
26	notification = Rushover::Client.new(subdomain)	26	notification = Rushover::Client.new(subdomain)
27		27
28	# send push notification to pushover	28	# send push notification to pushover
29	- notification.notify(api_token, "#{notification_description problem}", :priority => 1, :title => "Errbit Notification", :url => "http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}", :url_title => "Link to error")	29	+ notification.notify(api_token, "#{notification_description problem}", :priority => 1, :title => "Errbit Notification", :url => "#{Errbit::Config.protocol}://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}", :url_title => "Link to error")
30		30
31	end	31	end
32	end	32	end