slack-notifier 1.3.1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5924bad4c5a0afb1f1a02528a516fb9ddc0aad85
-  data.tar.gz: 376a76a81211128232dc6a013605ea527ce82334
+  metadata.gz: e74413c9d125dd2a973d6035bdc86e6f28549839
+  data.tar.gz: 6081e63972a12dc07acc866e13f8e6bae8a1992d
 SHA512:
-  metadata.gz: 02fb792d70de5843919aafa2d08442c450200afe8cd80aaa037e5aad71ff6edd20f13d89a675b7df28541044daa42927f1c932d4d988157ad4cfb3210dba4cdf
-  data.tar.gz: 76578fba2c0e256d4e74f6d55852bf099315ea7ae3f720aaab379a2782978500110568ecf49856d1e779cd449b06182ec30bc8305b9859cc2c5b025a1ff1c8d4
+  metadata.gz: 252d1d23a8bb02cfe9ebee51c8d68436799daa59c95572dd18bc481797069ed2fa6fac96869845ffeae900fbf5d73c9df9b4e910f9190f7ca85937293e8d3e31
+  data.tar.gz: bda7747d3bd8e34a0ca2798d50c06c4f2b6e426c2552c2d389247f6ed60ce48a82d26e7f77e7e9c179388e831163d36a237dfe139cdddec689fdb154ee3b7d1b

data/lib/slack-notifier/link_formatter.rb

@@ -52,9 +52,9 @@ module Slack
           / <a (?:.*?) href=['"](.+?)['"] (?:.*?)> (.+?) <\/a> /x
         end
 
-        # http://rubular.com/r/fLEdmTSghW
+        # http://rubular.com/r/guJbTK6x1f
         def markdown_pattern
-          /\[ ([^\[\]]*?) \] \( (https?:\/\/.*?) \) /x
+          /\[ ([^\[\]]*?) \] \( ((https?:\/\/.*?) | (mailto:.*?)) \) /x
         end
 
     end

data/lib/slack-notifier/version.rb

@@ -1,5 +1,5 @@
 module Slack
   class Notifier
-    VERSION = "1.3.1"
+    VERSION = "1.5.1"
   end
 end

data/lib/slack-notifier.rb

@@ -15,11 +15,26 @@ module Slack
     end
 
     def ping message, options={}
-      message      = LinkFormatter.format(message)
-      payload      = default_payload.merge(options).merge(text: message)
+      if message.is_a?(Hash)
+        message, options = nil, message
+      end
+
+      if attachments = options[:attachments] || options["attachments"]
+        wrap_array(attachments).each do |attachment|
+          ["text", :text].each do |key|
+            attachment[key] = LinkFormatter.format(attachment[key]) if attachment.has_key?(key)
+          end
+        end
+      end
+
+      payload      = default_payload.merge(options)
       client       = payload.delete(:http_client) || http_client
       http_options = payload.delete(:http_options)
 
+      unless message.nil?
+        payload.merge!(text: LinkFormatter.format(message))
+      end
+
       params = { payload: payload.to_json }
       params[:http_options] = http_options if http_options
 
@@ -52,5 +67,15 @@ module Slack
     def escape(text)
       text.gsub(HTML_ESCAPE_REGEXP, HTML_ESCAPE)
     end
+
+    def wrap_array(object)
+      if object.nil?
+        []
+      elsif object.respond_to?(:to_ary)
+        object.to_ary || [object]
+      else
+        [object]
+      end
+    end
   end
 end

data/spec/integration/ping_integration_test.rb

@@ -4,3 +4,4 @@ require_relative '../../lib/slack-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}\225"
+notifier.ping attachments: [{color:"#1BF5AF",fallback:"fallback",text:"attachment"}]

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

@@ -63,6 +63,16 @@ describe Slack::Notifier::LinkFormatter do
       expect(formatted).to eq "こんにちは"
     end
 
+    it "handles mailto links in markdown" do
+      formatted = described_class.format("[John](mailto:john@example.com)")
+      expect(formatted).to eq "<mailto:john@example.com|John>"
+    end
+
+    it "handles mailto links in html" do
+      formatted = described_class.format("<a href='mailto:john@example.com'>John</a>")
+      expect(formatted).to eq "<mailto:john@example.com|John>"
+    end
+
   end
 
 end

data/spec/lib/slack-notifier_spec.rb

@@ -32,6 +32,49 @@ describe Slack::Notifier do
       described_class.new('http://example.com').ping "the message", channel: 'foo'
     end
 
+    it "passes attachment messages through LinkFormatter" do
+      expect( Slack::Notifier::LinkFormatter ).to receive(:format)
+                                              .with("the message")
+      expect( Slack::Notifier::LinkFormatter ).to receive(:format)
+                                              .with("attachment message")
+
+      described_class.new('http://example.com').ping "the message", channel: 'foo',
+                                                                    attachments: [{
+                                                                      color: "#000",
+                                                                      text: "attachment message",
+                                                                      fallback: "fallback message"
+                                                                    }]
+    end
+
+    it "allows sending only an attachment" do
+      expect( Slack::Notifier::DefaultHTTPClient ).to receive(:post).with(
+        URI.parse('http://example.com'),
+        payload: '{"channel":"foo","attachments":[{"text":"attachment","fallback":"fallback"}]}'
+      )
+
+      expect{
+        described_class.new('http://example.com')
+                       .ping channel: 'foo',
+                             attachments: [{
+                              text: 'attachment',
+                              fallback: 'fallback'
+                             }]
+      }.not_to raise_error
+    end
+
+    it "passes attachment messages through LinkFormatter, even if a single value is passed" do
+      expect( Slack::Notifier::LinkFormatter ).to receive(:format)
+                                              .with("a random message")
+      expect( Slack::Notifier::LinkFormatter ).to receive(:format)
+                                              .with("attachment message")
+      attachment = {
+        color: "#000",
+        text: "attachment message",
+        fallback: "fallback message"
+      }
+      subject.ping "a random message", attachments: attachment
+    end
+
     context "with a default channel set" do
 
       before :each do

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: slack-notifier
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies: []
-description: ' A slim ruby wrapper for posting to slack webhooks '
+description: " A slim ruby wrapper for posting to slack webhooks "
 email:
 - stevenosloan@gmail.com
 executables: []
@@ -36,17 +36,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A slim ruby wrapper for posting to slack webhooks