Merge pull request smartinez87#243 from a-suenami/use_webhook_url_for_slack_notifier

Use webhook url for slack notifier.

Author: smartinez87

Gemfile.lock

@@ -127,7 +127,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slack-notifier (0.5.0)
+    slack-notifier (1.0.0)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -169,6 +169,6 @@ DEPENDENCIES
   rails (>= 3.0.4)
   resque (~> 1.2.0)
   sidekiq (~> 3.0)
-  slack-notifier (>= 0.5)
+  slack-notifier (>= 1.0.0)
   sqlite3 (>= 1.3.4)
   tinder (~> 1.8)

README.md

@@ -571,8 +571,7 @@ Whatever::Application.config.middleware.use ExceptionNotification::Rack,
     :exception_recipients => %w{[email protected]}
   },
   :slack => {
-    :team => "myteam",
-    :token => "secret-token",
+    :webhook_url => "[Your webhook url]",
     :channel => "#exceptions",
     :additional_parameters => {
       :icon_url => "http://image.jpg"

exception_notification.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "appraisal", "~> 1.0.0"
   s.add_development_dependency "hipchat", ">= 1.0.0"
   s.add_development_dependency "carrier-pigeon", ">= 0.7.0"
-  s.add_development_dependency "slack-notifier", ">= 0.5"
+  s.add_development_dependency "slack-notifier", ">= 1.0.0"
 end

lib/exception_notifier/slack_notifier.rb

@@ -5,17 +5,10 @@ class SlackNotifier
 
     def initialize(options)
       begin
-        team = options.fetch(:team)
-        token = options.fetch(:token)
-        custom_hook = options.fetch(:custom_hook, nil)
+        webhook_url = options.fetch(:webhook_url)
         options[:username] ||= 'ExceptionNotifierBot'
         @message_opts = options.fetch(:additional_parameters, {})
-
-        if custom_hook.nil?
-          @notifier = Slack::Notifier.new team, token, options
-        else
-          @notifier = Slack::Notifier.new team, token, custom_hook, options
-        end
+        @notifier = Slack::Notifier.new webhook_url, options
       rescue
         @notifier = nil
       end

test/exception_notifier/slack_notifier_test.rb

@@ -5,8 +5,7 @@ class SlackNotifierTest < ActiveSupport::TestCase
 
   test "should send a slack notification if properly configured" do
     options = {
-      token: "token",
-      team:  "team"
+      webhook_url: "http://slack.webhook.url"
     }
 
     Slack::Notifier.any_instance.expects(:ping).with(fake_notification, {})
@@ -15,25 +14,9 @@ class SlackNotifierTest < ActiveSupport::TestCase
     slack_notifier.call(fake_exception)
   end
 
-  test "should send a notification as the specified hook" do
-    options = {
-      token: "token",
-      team:  "team",
-      custom_hook: "custom"
-    }
-
-    Slack::Notifier.any_instance.expects(:ping).with(fake_notification, {})
-
-    slack_notifier = ExceptionNotifier::SlackNotifier.new(options)
-    slack_notifier.call(fake_exception)
-
-    assert_equal slack_notifier.notifier.hook_name, "custom"
-  end
-
   test "should send the notification to the specified channel" do
     options = {
-      token: "token",
-      team:  "team",
+      webhook_url: "http://slack.webhook.url",
       channel: "channel"
     }
 
@@ -47,8 +30,7 @@ class SlackNotifierTest < ActiveSupport::TestCase
 
   test "should send the notification to the specified username" do
     options = {
-      token: "token",
-      team:  "team",
+      webhook_url: "http://slack.webhook.url",
       username: "username"
     }
 
@@ -62,8 +44,7 @@ class SlackNotifierTest < ActiveSupport::TestCase
 
   test "should have the username 'ExceptionNotifierBot' when unspecified" do
     options = {
-      token: "token",
-      team:  "team",
+      webhook_url: "http://slack.webhook.url",
     }
 
     Slack::Notifier.any_instance.expects(:ping).with(fake_notification, {})
@@ -76,8 +57,7 @@ class SlackNotifierTest < ActiveSupport::TestCase
 
   test "should pass the additional parameters to Slack::Notifier.ping" do
     options = {
-      token: "token",
-      team:  "team",
+      webhook_url: "http://slack.webhook.url",
       username: "test",
       custom_hook: "hook",
       additional_parameters: {
@@ -91,21 +71,8 @@ class SlackNotifierTest < ActiveSupport::TestCase
     slack_notifier.call(fake_exception)
   end
 
-  test "shouldn't send a slack notification if token is missing" do
-    options = {
-      team: "test"
-    }
-
-    slack_notifier = ExceptionNotifier::SlackNotifier.new(options)
-
-    assert_nil slack_notifier.notifier
-    assert_nil slack_notifier.call(fake_exception)
-  end
-
-  test "shouldn't send a slack notification if team is missing" do
-    options = {
-      token: "test"
-    }
+  test "shouldn't send a slack notification if webhook url is missing" do
+    options = {}
 
     slack_notifier = ExceptionNotifier::SlackNotifier.new(options)