slack-notifier 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5599f6fb6901d7b9c7009d6343288916829b97a
-  data.tar.gz: 60d21036bd104a7bda04b8dbb9da0b4a0747a8b7
+  metadata.gz: 8d741922d25b1c2a19c397045f22e37565f6f665
+  data.tar.gz: 25b452bb8bb9ffee8ed85c60a5c9e9dd522470a8
 SHA512:
-  metadata.gz: b6199f52c950a2470e651937f2f91ceb67abf95d0987b3c7cf441f9fe3e2e8b405a14a3570d110f367c308bdebafe7bd4f797661c9ce6f563d1ec5d54ea077bf
-  data.tar.gz: 9b7efc69cbeaa137a68e6240f94a198e8932ec4ea7deb48b45d9b46b5091b8118a1ad511d455c4eb91de7d38471c5e54119f5122586d7fed6b9463b6b4525daa
+  metadata.gz: 2d54f11cc362ca57bd76792dc38d2e7755cc0f483144cce7721da028825a53227b4ecf703eac2fa910225a8a2ac02748e982b7fd3d372250cf9fe4bc1ce57519
+  data.tar.gz: c9eee1509416474730ff6a7f4aa63819c9f3297ce3720f28505489359cb12f7426e004b76ce3fc04b9047166eab36a2beed4c45e186ed5389211b4b5e806388e

data/lib/slack-notifier/payload_middleware/format_attachments.rb

@@ -8,15 +8,21 @@ module Slack
         options formats: [:html, :markdown]
 
         def call payload={}
-          attachments = payload.fetch(:attachments, payload["attachments"])
-          wrap_array(attachments).each do |attachment|
+          payload = payload.dup
+          attachments = payload.delete(:attachments)
+          attachments = payload.delete("attachments") unless attachments
+
+          attachments = wrap_array(attachments).map do |attachment|
             ["text", :text].each do |key|
               if attachment.key?(key)
                 attachment[key] = Util::LinkFormatter.format(attachment[key], options)
               end
             end
+
+            attachment
           end
 
+          payload[:attachments] = attachments if attachments && !attachments.empty?
           payload
         end
 

data/lib/slack-notifier/util/link_formatter.rb

@@ -24,6 +24,8 @@ module Slack
 
         # rubocop:disable Style/GuardClause
         def formatted
+          return @orig unless @orig.respond_to?(:gsub)
+
           sub_markdown_links(sub_html_links(@orig))
         rescue => e
           if RUBY_VERSION < "2.1" && e.message.include?("invalid byte sequence")

data/lib/slack-notifier/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Slack
   class Notifier
-    VERSION = "2.2.1".freeze # rubocop:disable Style/RedundantFreeze
+    VERSION = "2.2.2".freeze # rubocop:disable Style/RedundantFreeze
   end
 end

data/spec/end_to_end_spec.rb

@@ -31,6 +31,9 @@ RSpec.describe Slack::Notifier do
     { text: "hello", channel: "hodor" } =>
     { payload: { text: "hello", channel: "hodor" } },
 
+    { text: nil, attachments: [{ text: "attachment message" }] } =>
+    { payload: { text: nil, attachments: [{ text: "attachment message" }] } },
+
     { text: "the message", channel: "foo", attachments: [{ color: "#000",
                                                            text: "attachment message",
                                                            fallback: "fallback message" }] } =>
@@ -50,9 +53,16 @@ RSpec.describe Slack::Notifier do
     { attachments: { color: "#000",
                      text: "attachment message [hodor](http://winterfell.com)",
                      fallback: "fallback message" } } =>
-    { payload: { attachments: { color: "#000",
+    { payload: { attachments: [{ color: "#000",
                                 text: "attachment message <http://winterfell.com|hodor>",
-                                fallback: "fallback message" } } },
+                                fallback: "fallback message" }] } },
+
+    { attachments: { color: "#000",
+                     text: nil,
+                     fallback: "fallback message" } } =>
+    { payload: { attachments: [{ color: "#000",
+                                text: nil,
+                                fallback: "fallback message" }] } },
 
     { text: "hello", http_options: { timeout: 5 } } =>
     { http_options: { timeout: 5 }, payload: { text: "hello" } }

data/spec/lib/slack-notifier/payload_middleware/format_attachments_spec.rb

@@ -26,6 +26,18 @@ RSpec.describe Slack::Notifier::PayloadMiddleware::FormatAttachments do
     subject.call(attachments: { text: "hello" })
   end
 
+  it "wraps attachment into array if given as a single hash" do
+    params  = {
+      attachments: { text: "hello" }
+    }
+    payload = {
+      attachments: [{ text: "hello" }]
+    }
+    subject = described_class.new(:notifier);
+
+    expect(subject.call(params)).to eq payload
+  end
+
   it "returns the payload unmodified if not :attachments key" do
     payload = { foo: :bar }
     subject = described_class.new(:notifier)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-notifier
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies: []
 description: " A slim ruby wrapper for posting to slack webhooks "
 email: