slack-notifier 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ed944b7001667e3e533abc25325fec4d7bfa99b
-  data.tar.gz: 4d0ae7eb667f225b42b5621afdc2ffbac463f471
+  metadata.gz: a423a9d3657e72895726732371162ca6999c1cb6
+  data.tar.gz: d929fe769de577f03331eebac18796eb2ab06b28
 SHA512:
-  metadata.gz: 53703f1a9413e12505c0d2338776738eb25c5383c1448fd4e2efeb65f71eaccd4b6bf101263639e25bc957c588af4d4b094c77ae45f61ffb3adf0e8707db20d0
-  data.tar.gz: f35eb71b3e57950f2e648e241682a054fbe98d6a7c96719f766d478c704d8afdefd96b853d8237f9dcbef2ebbf3a69195196b717a4242128f58db5ef2e84436a
+  metadata.gz: 74aa5dfc1e49ab07922382bc69e8357ac5a7f5cca7ca9df110bee939da04a77eccb719db27c49864d65a317a4f3d224876b210bb5cebf2a5b14018064d950139
+  data.tar.gz: a4716f34f9e618a016d691830a82ee6b589e51af8b53a3d44625585b042b0c47b17f57db8426bcabaed5a798839a4d984a31dc213bc530e8a4da2a10a970f606

data/lib/slack-notifier/{http_post.rb → default_http_client.rb}

@@ -1,11 +1,11 @@
 module Slack
   class Notifier
 
-    class HTTPPost
+    class DefaultHTTPClient
 
       class << self
-        def to uri, params
-          HTTPPost.new( uri, params ).call
+        def post uri, params
+          DefaultHTTPClient.new( uri, params ).call
         end
       end
 

data/lib/slack-notifier/link_formatter.rb

@@ -37,7 +37,7 @@ module Slack
         end
 
         def html_pattern
-          / <a (?:.*?) href=['"](.+)['"] (?:.*)> (.+?) <\/a> /x
+          / <a (?:.*?) href=['"](.+?)['"] (?:.*?)> (.+?) <\/a> /x
         end
 
         def markdown_pattern

data/lib/slack-notifier/version.rb

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

data/lib/slack-notifier.rb

@@ -2,31 +2,25 @@ require 'net/http'
 require 'uri'
 require 'json'
 
-require_relative 'slack-notifier/http_post'
+require_relative 'slack-notifier/default_http_client'
 require_relative 'slack-notifier/link_formatter'
 
 module Slack
   class Notifier
-    attr_reader :team, :token, :hook_name, :default_payload
-
-    def initialize team, token, hook_name=default_hook_name, default_payload={}
-      @team  = team
-      @token = token
-
-      if hook_name.is_a? Hash
-        @hook_name = default_hook_name
-        @default_payload = hook_name
-      else
-        @hook_name = hook_name
-        @default_payload = default_payload
-      end
+    attr_reader :endpoint, :http_client, :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)
 
-      HTTPPost.to endpoint, payload: payload.to_json
+
+      http_client.post endpoint, payload: payload.to_json
     end
 
     def channel
@@ -45,15 +39,5 @@ module Slack
       default_payload[:username] = username
     end
 
-    private
-
-      def default_hook_name
-        'incoming-webhook'
-      end
-
-      def endpoint
-        URI.parse "https://#{team}.slack.com/services/hooks/#{hook_name}?token=#{token}"
-      end
-
   end
 end

data/spec/integration/ping_integration_test.rb

@@ -1,5 +1,5 @@
 require_relative '../../lib/slack-notifier'
 
-notifier = Slack::Notifier.new ENV['SLACK_TEAM'], ENV['SLACK_TOKEN'], username: 'notifier'
+notifier = Slack::Notifier.new ENV['SLACK_WEBHOOK_URL'], username: 'notifier'
 puts "testing with ruby #{RUBY_VERSION}"
 notifier.ping "hello from notifier test script on ruby: #{RUBY_VERSION}"

data/spec/lib/slack-notifier/{http_post_spec.rb → default_http_client_spec.rb}

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-describe Slack::Notifier::HTTPPost do
+describe Slack::Notifier::DefaultHTTPClient do
 
-  describe "::to" do
-    it "initializes HTTPPost with the given uri and params then calls" do
-      http_post_double = instance_double("Slack::Notifier::HTTPPost")
+  describe "::post" do
+    it "initializes DefaultHTTPClient with the given uri and params then calls" do
+      http_post_double = instance_double("Slack::Notifier::DefaultHTTPClient")
 
       expect( described_class ).to receive(:new)
                                .with( 'uri', 'params' )
                                .and_return( http_post_double )
       expect( http_post_double ).to receive(:call)
 
-      described_class.to 'uri', 'params'
+      described_class.post 'uri', 'params'
     end
 
     # http_post is really tested in the integration spec,

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

@@ -19,6 +19,24 @@ describe Slack::Notifier::LinkFormatter do
       expect( formatted ).to include("<http://example.com>")
     end
 
+    it "handles multiple html links" do
+      formatted = described_class.format("Hello World, enjoy <a href='http://example.com'>this</a><a href='http://example2.com'>this2</a>.")
+      expect( formatted ).to include("<http://example.com|this>")
+      expect( formatted ).to include("<http://example2.com|this2>")
+    end
+
+    it "handles multiple markdown links" do
+      formatted = described_class.format("Hello World, enjoy [this](http://example.com)[this2](http://example2.com).")
+      expect( formatted ).to include("<http://example.com|this>")
+      expect( formatted ).to include("<http://example2.com|this2>")
+    end
+
+    it "handles mixed html & markdown links" do
+      formatted = described_class.format("Hello World, enjoy [this](http://example.com)<a href='http://example2.com'>this2</a>.")
+      expect( formatted ).to include("<http://example.com|this>")
+      expect( formatted ).to include("<http://example2.com|this2>")
+    end
+
   end
 
 end

data/spec/lib/slack-notifier_spec.rb

@@ -1,44 +1,35 @@
 require 'spec_helper'
 
 describe Slack::Notifier do
-  subject { described_class.new 'team', 'token' }
+  subject { described_class.new 'http://example.com' }
 
   describe "#initialize" do
-    it "sets the given team" do
-      expect( subject.team ).to eq 'team'
-    end
-
-    it "sets the given token" do
-      expect( subject.token ).to eq 'token'
-    end
-
-    it "sets the optional service hook name" do
-      subject = described_class.new 'team', 'token', 'custom_hook_name'
-      expect( subject.hook_name ).to eq 'custom_hook_name'
+    it "sets the given hook_url to the endpoint URI" do
+      expect( subject.endpoint ).to eq URI.parse 'http://example.com'
     end
 
     it "sets the default_payload options" do
-      subject = described_class.new 'team', 'token', channel: 'foo'
+      subject = described_class.new 'http://example.com', channel: 'foo'
       expect( subject.channel ).to eq 'foo'
     end
 
-    it "can set service hook & default_payload options" do
-      subject = described_class.new 'team', 'token', 'hook_name', channel: 'foo'
-      expect( subject.channel ).to eq 'foo'
-      expect( subject.hook_name ).to eq 'hook_name'
+    it "sets a custom http client" do
+      client  = double("CustomClient")
+      subject = described_class.new 'http://example.com', http_client: client
+      expect( subject.http_client ).to eq client
     end
   end
 
   describe "#ping" do
     before :each do
-      allow( Slack::Notifier::HTTPPost ).to receive(:to)
+      allow( Slack::Notifier::DefaultHTTPClient ).to receive(:post)
     end
 
     it "passes the message through LinkFormatter" do
       expect( Slack::Notifier::LinkFormatter ).to receive(:format)
                                               .with("the message")
 
-      described_class.new('team','token').ping "the message", channel: 'foo'
+      described_class.new('http://example.com').ping "the message", channel: 'foo'
     end
 
     context "with a default channel set" do
@@ -57,7 +48,7 @@ describe Slack::Notifier do
       end
 
       it "uses default channel" do
-        expect( Slack::Notifier::HTTPPost ).to receive(:to)
+        expect( Slack::Notifier::DefaultHTTPClient ).to receive(:post)
                           .with @endpoint_double,
                                 payload: '{"text":"the message","channel":"#default"}'
 
@@ -65,7 +56,7 @@ describe Slack::Notifier do
       end
 
       it "allows override channel to be set" do
-        expect( Slack::Notifier::HTTPPost ).to receive(:to)
+        expect( Slack::Notifier::DefaultHTTPClient ).to receive(:post)
                           .with @endpoint_double,
                                 payload: '{"text":"the message","channel":"new"}'
 
@@ -78,29 +69,29 @@ describe Slack::Notifier do
       it "posts with the correct endpoint & data" do
           @endpoint_double = instance_double "URI::HTTP"
           allow( URI ).to receive(:parse)
-                      .with("https://team.slack.com/services/hooks/incoming-webhook?token=token")
+                      .with("http://example.com")
                       .and_return(@endpoint_double)
 
-          expect( Slack::Notifier::HTTPPost ).to receive(:to)
+          expect( Slack::Notifier::DefaultHTTPClient ).to receive(:post)
                             .with @endpoint_double,
                                   payload: '{"text":"the message","channel":"channel"}'
 
-          described_class.new("team","token").ping "the message", channel: "channel"
+          described_class.new("http://example.com").ping "the message", channel: "channel"
       end
     end
 
-    context "with custom webhook name" do
-      it "posts with the correct endpoint & data" do
-        @endpoint_double = instance_double "URI::HTTP"
+    context "with a custom http_client set" do
+      it "uses it" do
+        endpoint_double = instance_double "URI::HTTP"
         allow( URI ).to receive(:parse)
-                    .with("https://team.slack.com/services/hooks/custom_hook_name?token=token")
-                    .and_return(@endpoint_double)
-
-        expect( Slack::Notifier::HTTPPost ).to receive(:to)
-                          .with @endpoint_double,
-                                payload: '{"text":"the message","channel":"channel"}'
-
-        described_class.new("team","token","custom_hook_name").ping "the message", channel: "channel"
+                    .with("http://example.com")
+                    .and_return(endpoint_double)
+        client = double("CustomClient")
+        expect( client ).to receive(:post)
+                        .with endpoint_double,
+                        payload: '{"text":"the message"}'
+
+        described_class.new('http://example.com',http_client: client).ping "the message"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-notifier
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies: []
 description: " A slim ruby wrapper for posting to slack webhooks "
 email:
@@ -18,11 +18,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/slack-notifier.rb
-- lib/slack-notifier/http_post.rb
+- lib/slack-notifier/default_http_client.rb
 - lib/slack-notifier/link_formatter.rb
 - lib/slack-notifier/version.rb
 - spec/integration/ping_integration_test.rb
-- spec/lib/slack-notifier/http_post_spec.rb
+- spec/lib/slack-notifier/default_http_client_spec.rb
 - spec/lib/slack-notifier/link_formatter_spec.rb
 - spec/lib/slack-notifier_spec.rb
 - spec/spec_helper.rb
@@ -52,8 +52,7 @@ specification_version: 4
 summary: A slim ruby wrapper for posting to slack webhooks
 test_files:
 - spec/integration/ping_integration_test.rb
-- spec/lib/slack-notifier/http_post_spec.rb
+- spec/lib/slack-notifier/default_http_client_spec.rb
 - spec/lib/slack-notifier/link_formatter_spec.rb
 - spec/lib/slack-notifier_spec.rb
 - spec/spec_helper.rb
-has_rdoc: