slack-notifier 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a423a9d3657e72895726732371162ca6999c1cb6
-  data.tar.gz: d929fe769de577f03331eebac18796eb2ab06b28
+  metadata.gz: 31725a6d5391e72e7d0b4c40733209b2f07cca3a
+  data.tar.gz: 52ac6b2e70a4bc138a5957b0131136109bae87bd
 SHA512:
-  metadata.gz: 74aa5dfc1e49ab07922382bc69e8357ac5a7f5cca7ca9df110bee939da04a77eccb719db27c49864d65a317a4f3d224876b210bb5cebf2a5b14018064d950139
-  data.tar.gz: a4716f34f9e618a016d691830a82ee6b589e51af8b53a3d44625585b042b0c47b17f57db8426bcabaed5a798839a4d984a31dc213bc530e8a4da2a10a970f606
+  metadata.gz: 75075f1cb873ce237063f7f68425d9745a85b007744fa78741c0a04954de6d5b0d7647480bde366d739fedc48175aaa677841a001eea5fe2d83f501e8be91343
+  data.tar.gz: c0546c41a9eec3ccd44bf8537ca415ea2183a30f4859cde34d40b3d0e71baf6a9732cf68056a72cba06de4bd95dfd9d92ba7da3f8d42aa79c27553dc2f2bebd8

data/lib/slack-notifier.rb

@@ -7,20 +7,27 @@ require_relative 'slack-notifier/link_formatter'
 
 module Slack
   class Notifier
-    attr_reader :endpoint, :http_client, :default_payload
+    attr_reader :endpoint, :default_payload
 
     def initialize webhook_url, options={}
       @endpoint        = URI.parse webhook_url
-      @http_client     = options.delete(:http_client) || DefaultHTTPClient
       @default_payload = options
     end
 
     def ping message, options={}
-      message = LinkFormatter.format(message)
-      payload = { text: message }.merge(default_payload).merge(options)
+      message      = LinkFormatter.format(message)
+      payload      = default_payload.merge(options).merge(text: message)
+      client       = payload.delete(:http_client) || http_client
+      http_options = payload.delete(:http_options)
 
+      params = { payload: payload.to_json }
+      params[:http_options] = http_options if http_options
 
-      http_client.post endpoint, payload: payload.to_json
+      client.post endpoint, params
+    end
+
+    def http_client
+      default_payload.fetch :http_client, DefaultHTTPClient
     end
 
     def channel

data/lib/slack-notifier/default_http_client.rb

@@ -9,11 +9,12 @@ module Slack
         end
       end
 
-      attr_reader :uri, :params
+      attr_reader :uri, :params, :http_options
 
       def initialize uri, params
-        @uri    = uri
-        @params = params
+        @uri          = uri
+        @http_options = params.delete(:http_options) || {}
+        @params       = params
       end
 
       def call
@@ -33,6 +34,14 @@ module Slack
           http = Net::HTTP.new uri.host, uri.port
           http.use_ssl = (uri.scheme == "https")
 
+          http_options.each do |opt, val|
+            if http.respond_to? "#{opt}="
+              http.send "#{opt}=", val
+            else
+              warn "Net::HTTP doesn't respond to `#{opt}=`, ignoring that option"
+            end
+          end
+
           return http
         end
 

data/lib/slack-notifier/version.rb

@@ -1,5 +1,5 @@
 module Slack
   class Notifier
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/spec/lib/slack-notifier/default_http_client_spec.rb

@@ -18,4 +18,20 @@ describe Slack::Notifier::DefaultHTTPClient do
     # where the internals are run through
   end
 
-end
+  describe "#initialize" do
+    it "allows setting of options for Net::HTTP" do
+      net_http_double = instance_double("Net::HTTP")
+      http_client     = described_class.new( URI.parse('http://example.com'), http_options: { open_timeout: 5 })
+
+      allow( Net::HTTP ).to receive(:new)
+                        .and_return(net_http_double)
+      allow( net_http_double ).to receive(:use_ssl=)
+      allow( net_http_double ).to receive(:request)
+
+      expect( net_http_double ).to receive(:open_timeout=).with(5)
+
+      http_client.call
+    end
+  end
+
+end

data/spec/lib/slack-notifier_spec.rb

@@ -50,7 +50,7 @@ describe Slack::Notifier do
       it "uses default channel" do
         expect( Slack::Notifier::DefaultHTTPClient ).to receive(:post)
                           .with @endpoint_double,
-                                payload: '{"text":"the message","channel":"#default"}'
+                                payload: '{"channel":"#default","text":"the message"}'
 
         subject.ping "the message"
       end
@@ -58,7 +58,7 @@ describe Slack::Notifier do
       it "allows override channel to be set" do
         expect( Slack::Notifier::DefaultHTTPClient ).to receive(:post)
                           .with @endpoint_double,
-                                payload: '{"text":"the message","channel":"new"}'
+                                payload: '{"channel":"new","text":"the message"}'
 
         subject.ping "the message", channel: "new"
       end
@@ -74,7 +74,7 @@ describe Slack::Notifier do
 
           expect( Slack::Notifier::DefaultHTTPClient ).to receive(:post)
                             .with @endpoint_double,
-                                  payload: '{"text":"the message","channel":"channel"}'
+                                  payload: '{"channel":"channel","text":"the message"}'
 
           described_class.new("http://example.com").ping "the message", channel: "channel"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-notifier
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies: []
 description: " A slim ruby wrapper for posting to slack webhooks "
 email: