adding support to gtalk notification

Shuky Dvir
1 parent 3db48ca3
Showing 10 changed files with 70 additions and 5 deletions Show diff stats
Gemfile
Gemfile.lock
app/assets/images/gtalk_create.png
app/assets/images/gtalk_goto.png
app/assets/images/gtalk_inactive.png
app/models/notice_observer.rb
app/models/notification_services/gtalk_service.rb
spec/fabricators/notification_service_fabricator.rb
spec/models/notification_service/gtalk_service_spec.rb
spec/spec_helper.rb
@@ -33,6 +33,7 @@ gem &#39;rack-ssl-enforcer&#39;
 gem 'fabrication', "~> 1.3.0"   # Both for tests, and loading demo data
 gem 'rails_autolink', '~> 1.0.9'
 gem 'campy'
+gem 'xmpp4r'
 # Please don't update this to airbrake - We override the send_notice method
 # to handle internal errors.
@@ -287,6 +287,7 @@ GEM
     webmock (1.8.7)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
+    xmpp4r (0.5)
     xpath (0.1.4)
       nokogiri (~> 1.3)
     yajl-ruby (1.1.0)
@@ -341,4 +342,5 @@ DEPENDENCIES
   unicorn
   useragent (~> 0.3.1)
   webmock
+  xmpp4r
   yajl-ruby
@@ -9,15 +9,16 @@ class NoticeObserver &lt; Mongoid::Observer
       notice.app.notification_service.create_notification(notice.problem)
     end
-    Mailer.err_notification(notice).deliver
+    if notice.app.notification_recipients.any?
+      Mailer.err_notification(notice).deliver
+    end
   end
   private
   def should_notify? notice
     app = notice.app
-    app.notify_on_errs? &&
-      (Errbit::Config.per_app_email_at_notices && app.email_at_notices || Errbit::Config.email_at_notices).include?(notice.problem.notices_count) &&
-      app.notification_recipients.any?
+    app.notify_on_errs? and (app.notification_recipients.any? or !app.notification_service.nil?) and
+      (app.email_at_notices or Errbit::Config.email_at_notices).include?(notice.problem.notices_count)
   end
 end
@@ -0,0 +1,33 @@
+class NotificationServices::GtalkService < NotificationService
+  Label = "gtalk"
+  Fields = [
+      [:subdomain, {
+          :placeholder => "username@example.com",
+          :label       => "Username"
+      }],
+      [:api_token, {
+          :placeholder => "password",
+          :label       => "Password"
+      }],
+      [:room_id, {
+          :placeholder => "touser@example.com",
+          :label       => "Send To User"
+      }],
+  ]
+
+  def check_params
+    if Fields.detect {|f| self[f[0]].blank? }
+      errors.add :base, 'You must specify your XMPP Domain, Username and Room Name'
+    end
+  end
+
+  def create_notification(problem)
+    # build the xmpp client
+    client = Jabber::Client.new(Jabber::JID.new(subdomain))
+    client.connect("talk.google.com")
+    client.auth(api_token)
+
+    # post the issue to the xmpp room
+    client.send(Jabber::Message.new(room_id, "[errbit] http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_description problem}"))
+  end
+end
 \ No newline at end of file
@@ -5,6 +5,6 @@ Fabricator :notification_service  do
   subdomain { sequence :word }
 end
-%w(campfire).each do |t|
+%w(campfire gtalk).each do |t|
   Fabricator "#{t}_notification_service".to_sym, :from => :notification_service, :class_name => "NotificationService::#{t.camelcase}Service"
 end
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe NotificationService::GtalkService do
+  it "it should send a notification to gtalk" do
+    # setup
+    notice = Fabricate :notice
+    notification_service = Fabricate :gtalk_notification_service, :app => notice.app
+    problem = notice.problem
+
+    #gtalk stubbing
+    gtalk = mock('GtalkService')
+    jid = double("jid")
+    message = double("message")
+    Jabber::JID.should_receive(:new).with(notification_service.subdomain).and_return(jid)
+    Jabber::Client.should_receive(:new).with(jid).and_return(gtalk)
+    gtalk.should_receive(:connect)
+    gtalk.should_receive(:auth).with(notification_service.api_token)
+    Jabber::Message.should_receive(:new).with(notification_service.room_id, "[errbit] http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_service.notification_description problem}").and_return(message)
+
+    #assert
+    gtalk.should_receive(:send).with(message)
+
+
+    notification_service.create_notification(problem)
+  end
+end
+
@@ -5,6 +5,7 @@ require File.expand_path(&quot;../../config/environment&quot;, __FILE__)
 require 'rspec/rails'
 require 'database_cleaner'
 require 'webmock/rspec'
+require 'xmpp4r'
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
	@@ -33,6 +33,7 @@ gem 'rack-ssl-enforcer'		@@ -33,6 +33,7 @@ gem 'rack-ssl-enforcer'
33	gem 'fabrication', "~> 1.3.0" # Both for tests, and loading demo data	33	gem 'fabrication', "~> 1.3.0" # Both for tests, and loading demo data
34	gem 'rails_autolink', '~> 1.0.9'	34	gem 'rails_autolink', '~> 1.0.9'
35	gem 'campy'	35	gem 'campy'
		36	+gem 'xmpp4r'
36		37
37	# Please don't update this to airbrake - We override the send_notice method	38	# Please don't update this to airbrake - We override the send_notice method
38	# to handle internal errors.	39	# to handle internal errors.
	@@ -287,6 +287,7 @@ GEM		@@ -287,6 +287,7 @@ GEM
287	webmock (1.8.7)	287	webmock (1.8.7)
288	addressable (>= 2.2.7)	288	addressable (>= 2.2.7)
289	crack (>= 0.1.7)	289	crack (>= 0.1.7)
		290	+ xmpp4r (0.5)
290	xpath (0.1.4)	291	xpath (0.1.4)
291	nokogiri (~> 1.3)	292	nokogiri (~> 1.3)
292	yajl-ruby (1.1.0)	293	yajl-ruby (1.1.0)
	@@ -341,4 +342,5 @@ DEPENDENCIES		@@ -341,4 +342,5 @@ DEPENDENCIES
341	unicorn	342	unicorn
342	useragent (~> 0.3.1)	343	useragent (~> 0.3.1)
343	webmock	344	webmock
		345	+ xmpp4r
344	yajl-ruby	346	yajl-ruby
	@@ -0,0 +1,33 @@		@@ -0,0 +1,33 @@
		1	+class NotificationServices::GtalkService < NotificationService
		2	+ Label = "gtalk"
		3	+ Fields = [
		4	+ [:subdomain, {
		5	+ :placeholder => "username@example.com",
		6	+ :label => "Username"
		7	+ }],
		8	+ [:api_token, {
		9	+ :placeholder => "password",
		10	+ :label => "Password"
		11	+ }],
		12	+ [:room_id, {
		13	+ :placeholder => "touser@example.com",
		14	+ :label => "Send To User"
		15	+ }],
		16	+ ]
		17	+
		18	+ def check_params
		19	+ if Fields.detect {\|f\| self[f[0]].blank? }
		20	+ errors.add :base, 'You must specify your XMPP Domain, Username and Room Name'
		21	+ end
		22	+ end
		23	+
		24	+ def create_notification(problem)
		25	+ # build the xmpp client
		26	+ client = Jabber::Client.new(Jabber::JID.new(subdomain))
		27	+ client.connect("talk.google.com")
		28	+ client.auth(api_token)
		29	+
		30	+ # post the issue to the xmpp room
		31	+ client.send(Jabber::Message.new(room_id, "[errbit] http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_description problem}"))
		32	+ end
		33	+end
0	\ No newline at end of file	34	\ No newline at end of file
	@@ -5,6 +5,6 @@ Fabricator :notification_service do		@@ -5,6 +5,6 @@ Fabricator :notification_service do
5	subdomain { sequence :word }	5	subdomain { sequence :word }
6	end	6	end
7		7
8	-%w(campfire).each do \|t\|	8	+%w(campfire gtalk).each do \|t\|
9	Fabricator "#{t}_notification_service".to_sym, :from => :notification_service, :class_name => "NotificationService::#{t.camelcase}Service"	9	Fabricator "#{t}_notification_service".to_sym, :from => :notification_service, :class_name => "NotificationService::#{t.camelcase}Service"
10	end	10	end
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+require 'spec_helper'
	2	+
	3	+describe NotificationService::GtalkService do
	4	+ it "it should send a notification to gtalk" do
	5	+ # setup
	6	+ notice = Fabricate :notice
	7	+ notification_service = Fabricate :gtalk_notification_service, :app => notice.app
	8	+ problem = notice.problem
	9	+
	10	+ #gtalk stubbing
	11	+ gtalk = mock('GtalkService')
	12	+ jid = double("jid")
	13	+ message = double("message")
	14	+ Jabber::JID.should_receive(:new).with(notification_service.subdomain).and_return(jid)
	15	+ Jabber::Client.should_receive(:new).with(jid).and_return(gtalk)
	16	+ gtalk.should_receive(:connect)
	17	+ gtalk.should_receive(:auth).with(notification_service.api_token)
	18	+ Jabber::Message.should_receive(:new).with(notification_service.room_id, "[errbit] http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_service.notification_description problem}").and_return(message)
	19	+
	20	+ #assert
	21	+ gtalk.should_receive(:send).with(message)
	22	+
	23	+
	24	+ notification_service.create_notification(problem)
	25	+ end
	26	+end
	27	+
	@@ -5,6 +5,7 @@ require File.expand_path("../../config/environment", __FILE__)		@@ -5,6 +5,7 @@ require File.expand_path("../../config/environment", __FILE__)
5	require 'rspec/rails'	5	require 'rspec/rails'
6	require 'database_cleaner'	6	require 'database_cleaner'
7	require 'webmock/rspec'	7	require 'webmock/rspec'
		8	+require 'xmpp4r'
8		9
9	# Requires supporting files with custom matchers and macros, etc,	10	# Requires supporting files with custom matchers and macros, etc,
10	# in ./support/ and its subdirectories.	11	# in ./support/ and its subdirectories.