slack-notify 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57d6d5e9bc2495e9e867ebb9c15123cbff6432a0
-  data.tar.gz: ece231fb7b78c6b715dacdfadf4b622d9697dca8
+  metadata.gz: 43f177e7190a379067808a7a424ba8b6e11cbdc6
+  data.tar.gz: 1e500c4795f082d1ea07327ecc1d8a6c49be9032
 SHA512:
-  metadata.gz: d5ae0948e81205f17980748fed744f81e218db8105675696a7c421205980f592cb57f3f3a59310330397ed30b70021f17a9753bfa2bde4967c467bb76819414a
-  data.tar.gz: 0c688b5b481e6c43a7bf6589085aef0ac4284e73709348f34c0b6dfa659f8652c16133aefd9319b85cb730b1625d2c5201f19e7d861805738a465a4b838e0511
+  metadata.gz: 251c13145bf1ee1abf9026dbfc2543716e5275e1a3df0f3cc42de365d72911e807b29291927c5e8796cb989cce259fcbce3ce6060de204174af73da5de17b2f6
+  data.tar.gz: 3d5bce3eb6d4422ae811b62a2f93152556984abc01f9691cdd8805be7b28d7cf5b313d72bf7f8862c5c7994119ed11d8d4fdde7be888577fc787bc144d8c1dd8

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Dan Sosedoff
+Copyright (c) 2013-2014 Dan Sosedoff, dan.sosedoff@gmail.com
 
 MIT License
 

data/README.md

@@ -68,6 +68,6 @@ Some of the issues while Slack is in beta:
 
 ## License
 
-Copyright (c) 2013 Dan Sosedoff
+Copyright (c) 2013-2014 Dan Sosedoff, <dan.sosedoff@gmail.com>
 
 MIT License

data/lib/slack-notify.rb

@@ -6,21 +6,22 @@ require "faraday"
 
 module SlackNotify
   class Client
-    def initialize(team, token, options={})
+    def initialize(team, token, options = {})
       @team     = team
       @token    = token
       @username = options[:username] || "webhookbot"
-      @channel  = options[:channel] || "#general"
+      @channel  = options[:channel]  || "#general"
 
       raise ArgumentError, "Team name required" if @team.nil?
       raise ArgumentError, "Token required"     if @token.nil?
+      raise ArgumentError, "Invalid team name"  unless valid_team_name?
     end
 
     def test
       notify("This is a test message!")
     end
 
-    def notify(text, channel=nil)
+    def notify(text, channel = nil)
       channels = [channel || @channel].flatten.compact.uniq
 
       channels.each do |chan|
@@ -34,13 +35,20 @@ module SlackNotify
     private
 
     def send_payload(payload)
-      response = Faraday.post(hook_url) do |req|
+      conn = Faraday.new(hook_url, { timeout: 5, open_timeout: 5 }) do |c|
+        c.use(Faraday::Request::UrlEncoded)
+        c.adapter(Faraday.default_adapter)
+      end
+
+      response = conn.post do |req|
         req.body = JSON.dump(payload)
       end
 
-      if response.success?
-        true
-      else
+      handle_response(response)
+    end
+
+    def handle_response(response)
+      unless response.success?
         if response.body.include?("\n")
           raise SlackNotify::Error
         else
@@ -49,8 +57,16 @@ module SlackNotify
       end
     end
 
+    def valid_team_name?
+      @team =~ /^[a-z\d\-]+$/ ? true : false
+    end
+
     def hook_url
-      "https://#{@team}.slack.com/services/hooks/incoming-webhook?token=#{@token}"
+      "#{base_url}/services/hooks/incoming-webhook?token=#{@token}"
+    end
+
+    def base_url
+      "https://#{@team}.slack.com"
     end
   end
 end

data/lib/slack-notify/version.rb

@@ -1,3 +1,3 @@
 module SlackNotify
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/slack-notify.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = SlackNotify::VERSION
   spec.authors       = ["Dan Sosedoff"]
   spec.email         = ["dan.sosedoff@gmail.com"]
-  spec.description   = %q{Send notifications to Slack channel}
-  spec.summary       = %q{Send notifications to Slack channel}
-  spec.homepage      = ""
+  spec.description   = %q{Send notifications to a Slack channel}
+  spec.summary       = %q{Send notifications to a Slack channel}
+  spec.homepage      = "https://github.com/sosedoff/slack-notify"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec",     "~> 2.13"
   spec.add_development_dependency "webmock",   "~> 1.0"
 
-  spec.add_dependency "faraday", "~> 0.8"
+  spec.add_dependency "faraday", "< 0.9.0"
   spec.add_dependency "json",    "~> 1.8"
 end

data/spec/slack-notify/client_spec.rb

@@ -11,6 +11,15 @@ describe SlackNotify::Client do
       expect { described_class.new("foobar", nil) }.
         to raise_error ArgumentError, "Token required"
     end
+
+    it "raises error on invalid team name" do
+      names = ["foo bar", "foo $bar", "foo.bar"]
+
+      names.each do |name|
+        expect { described_class.new(name, "token") }.
+          to raise_error "Invalid team name"
+      end
+    end
   end
 
   describe "#test" do
@@ -80,7 +89,7 @@ describe SlackNotify::Client do
     it "delivers payload" do
       stub_request(:post, "https://foo.slack.com/services/hooks/incoming-webhook?token=token").
          with(:body => {"{\"text\":\"Message\",\"username\":\"webhookbot\",\"channel\":\"#general\"}"=>true},
-              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.8.8'}).
+              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded'}).
          to_return(:status => 200, :body => "", :headers => {})
 
       expect(client.notify("Message")).to eq true
@@ -110,7 +119,7 @@ describe SlackNotify::Client do
       before do
         stub_request(:post, "https://foo.slack.com/services/hooks/incoming-webhook?token=token").
          with(:body => {"{\"text\":\"Message\",\"username\":\"webhookbot\",\"channel\":\"#general\"}"=>true},
-              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.8.8'}).
+              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded'}).
          to_return(:status => 404, :body => "Line 1\nLine 2\nLine 3", :headers => {})
       end
 
@@ -123,8 +132,8 @@ describe SlackNotify::Client do
       before do
         stub_request(:post, "https://foo.slack.com/services/hooks/incoming-webhook?token=token").
          with(:body => {"{\"text\":\"Message\",\"username\":\"webhookbot\",\"channel\":\"#general\"}"=>true},
-              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.8.8'}).
-         to_return(:status => 400, :body => "No hooks", :headers => {})
+              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+         to_return(:status => 500, :body => "No hooks", :headers => {})
       end
 
       it "raises error" do
@@ -132,5 +141,19 @@ describe SlackNotify::Client do
           .to raise_error SlackNotify::Error, "No hooks"
       end
     end
+
+    context "when channel is invalid" do
+      before do
+        stub_request(:post, "https://foo.slack.com/services/hooks/incoming-webhook?token=token").
+         with(:body => {"{\"text\":\"message\",\"username\":\"webhookbot\",\"channel\":\"#foobar\"}"=>true},
+              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+         to_return(:status => 500, :body => "Invalid channel specified", :headers => {})
+      end
+
+      it "raises error" do
+        expect { client.notify("message", "foobar") }.
+          to raise_error SlackNotify::Error, "Invalid channel specified"
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-notify
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
-description: Send notifications to Slack channel
+description: Send notifications to a Slack channel
 email:
 - dan.sosedoff@gmail.com
 executables: []
@@ -127,7 +127,7 @@ files:
 - slack-notify.gemspec
 - spec/slack-notify/client_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/sosedoff/slack-notify
 licenses:
 - MIT
 metadata: {}
@@ -147,10 +147,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: Send notifications to Slack channel
+summary: Send notifications to a Slack channel
 test_files:
 - spec/slack-notify/client_spec.rb
 - spec/spec_helper.rb