slack-notifier 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b26d815a68d346fe2726a68a896d54276b91b6f9
-  data.tar.gz: 92803f407f329b8b908062a033adc583b86f00cc
+  metadata.gz: 2912c5289963e0ecbc66d6b89fb0bbfb288ab43a
+  data.tar.gz: 78e320255b7ffc02f5dcc363acae1154f40c2b5f
 SHA512:
-  metadata.gz: b08f9faeb71b9cd2d20fc96d30f8585ca530b16c6a02af6ed13b14ef47c7fca513c2173aae7cb344e02f247df40b4d258d4cf35d6c2251d7250d7a8aafc53af5
-  data.tar.gz: f611a92dbe367be0cced5b590b58fbaddde92f17fc9eb50e170086bda195291569906956d4b6d1000279fbfb1b14f6456d23e11c40df566ee0edf3fd0092ce8c
+  metadata.gz: 714ae944d20a181d147bbd88b62a42e73763f6f204c958ac69581fc33bdd91f406ee7c8f495c34028e936340ffea988cb3fe3bff32a09bb43db73e35ba89127a
+  data.tar.gz: c0138c50280c0f56ec1c3bd0094650f3c39a323be3acd818cca361f41febf920b2f63a6d36157c84612ba455625b2ae3c563891df746585e993bfa832cd8f447

data/lib/slack-notifier.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "uri"
 require "json"
 

data/lib/slack-notifier/config.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
+
 module Slack
   class Notifier
     class Config
       def initialize
         @http_client = Util::HTTPClient
         @defaults    = {}
-        @middleware  = [
-          :format_message,
-          :format_attachments,
-          :at,
-          :channels,
+        @middleware  = %i[
+          format_message
+          format_attachments
+          at
+          channels
         ]
       end
 

data/lib/slack-notifier/payload_middleware.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Slack
   class Notifier
     class PayloadMiddleware

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Slack
   class Notifier
     class PayloadMiddleware

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

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
+
 module Slack
   class Notifier
     class PayloadMiddleware
       class FormatAttachments < Base
         middleware_name :format_attachments
 
-        options formats: [:html, :markdown]
+        options formats: %i[html markdown]
 
         def call payload={}
           payload = payload.dup
           attachments = payload.delete(:attachments)
-          attachments = payload.delete("attachments") unless attachments
+          attachments ||= payload.delete("attachments")
 
           attachments = wrap_array(attachments).map do |attachment|
             ["text", :text].each do |key|

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

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 module Slack
   class Notifier
     class PayloadMiddleware
       class FormatMessage < Base
         middleware_name :format_message
 
-        options formats: [:html, :markdown]
+        options formats: %i[html markdown]
 
         def call payload={}
           return payload unless payload[:text]

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Slack
   class Notifier
     class PayloadMiddleware

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Slack
   class Notifier
     module Util

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

@@ -2,7 +2,6 @@
 
 require "net/http"
 
-
 module Slack
   class Notifier
     class APIError < StandardError; end
@@ -23,6 +22,7 @@ module Slack
           @params       = params
         end
 
+        # rubocop:disable Layout/IndentHeredoc
         def call
           http_obj.request(request_obj).tap do |response|
             unless response.is_a?(Net::HTTPSuccess)
@@ -33,6 +33,7 @@ MSG
             end
           end
         end
+        # rubocop:enable Layout/IndentHeredoc
 
         private
 

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

@@ -1,13 +1,31 @@
 # frozen_string_literal: true
+
 module Slack
   class Notifier
     module Util
       class LinkFormatter
         # http://rubular.com/r/19cNXW5qbH
-        HTML_PATTERN = / <a (?:.*?) href=['"](.+?)['"] (?:.*?)> (.+?) <\/a> /x
+        HTML_PATTERN = %r{
+          <a
+          (?:.*?)
+          href=['"](.+?)['"]
+          (?:.*?)>
+          (.+?)
+          </a>
+        }x
+
+        # the path portion of a url can contain these characters
+        VALID_PATH_CHARS = '\w\-\.\~\/\?\#\='
 
-        # http://rubular.com/r/guJbTK6x1f
-        MARKDOWN_PATTERN = /\[ ([^\[\]]*?) \] \( ((https?:\/\/.*?) | (mailto:.*?)) \) /x
+        # Attempt at only matching pairs of parens per
+        # the markdown spec http://spec.commonmark.org/0.27/#links
+        #
+        # http://rubular.com/r/y107aevxqT
+        MARKDOWN_PATTERN = %r{
+            \[ ([^\[\]]*?) \]
+            \( ((https?://.*?) | (mailto:.*?)) \)
+            (?! [#{VALID_PATH_CHARS}]* \) )
+        }x
 
         class << self
           def format string, opts={}
@@ -17,24 +35,21 @@ module Slack
 
         attr_reader :formats
 
-        def initialize string, formats: [:html, :markdown]
+        def initialize string, formats: %i[html markdown]
           @formats = formats
           @orig    = string.respond_to?(:scrub) ? string.scrub : string
         end
 
-        # rubocop:disable Style/GuardClause
+        # rubocop:disable Lint/RescueWithoutErrorClass
         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")
-            raise e, "#{e.message}. Consider including the 'string-scrub' gem to strip invalid characters"
-          else
-            raise e
-          end
+          raise e unless RUBY_VERSION < "2.1" && e.message.include?("invalid byte sequence")
+          raise e, "#{e.message}. Consider including the 'string-scrub' gem to strip invalid characters"
         end
-        # rubocop:enable Style/GuardClause
+        # rubocop:enable Lint/RescueWithoutErrorClass
 
         private
 

data/lib/slack-notifier/version.rb

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

data/spec/end_to_end_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 # encoding: utf-8
+
 require "spec_helper"
 
 RSpec.describe Slack::Notifier do
@@ -54,15 +55,15 @@ RSpec.describe Slack::Notifier do
                      text: "attachment message [hodor](http://winterfell.com)",
                      fallback: "fallback message" } } =>
     { payload: { attachments: [{ color: "#000",
-                                text: "attachment message <http://winterfell.com|hodor>",
-                                fallback: "fallback message" }] } },
+                                 text: "attachment message <http://winterfell.com|hodor>",
+                                 fallback: "fallback message" }] } },
 
     { attachments: { color: "#000",
                      text: nil,
                      fallback: "fallback message" } } =>
     { payload: { attachments: [{ color: "#000",
-                                text: nil,
-                                fallback: "fallback message" }] } },
+                                 text: nil,
+                                 fallback: "fallback message" }] } },
 
     { text: "hello", http_options: { timeout: 5 } } =>
     { http_options: { timeout: 5 }, payload: { text: "hello" } }

data/spec/integration/ping_integration_test.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 # encoding: utf-8
+
 require_relative "../../lib/slack-notifier"
 
 ruby = if defined?(JRUBY_VERSION)

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

@@ -46,17 +46,17 @@ RSpec.describe Slack::Notifier::Config do
     it "is [:format_message, :format_attachments, :at] if not set" do
       subject = described_class.new
 
-      expect(subject.middleware).to eq [:format_message, :format_attachments, :at, :channels]
+      expect(subject.middleware).to eq %i[format_message format_attachments at channels]
     end
 
     it "takes an array or a splat of args" do
       subject = described_class.new
 
       subject.middleware :layer, :two
-      expect(subject.middleware).to eq [:layer, :two]
+      expect(subject.middleware).to eq %i[layer two]
 
-      subject.middleware [:one, :layer]
-      expect(subject.middleware).to eq [:one, :layer]
+      subject.middleware %i[one layer]
+      expect(subject.middleware).to eq %i[one layer]
     end
 
     it "allows passing options to middleware stack" do

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

@@ -3,7 +3,7 @@
 RSpec.describe Slack::Notifier::PayloadMiddleware::At do
   it "can handle array at" do
     subject = described_class.new(:notifier)
-    payload = { text: "hello", at: [:john, :ken, :here] }
+    payload = { text: "hello", at: %i[john ken here] }
 
     expect(subject.call(payload)).to eq text: "<@john> <@ken> <!here> hello"
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 RSpec.describe Slack::Notifier::PayloadMiddleware::Base do
   before(:each) do
     @registry_backup = Slack::Notifier::PayloadMiddleware.registry.dup

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 RSpec.describe Slack::Notifier::PayloadMiddleware::FormatAttachments do
   it "passes the text of attachments through linkformatter with options[:formats]" do
     subject = described_class.new(:notifier, formats: [:html])
@@ -10,30 +11,30 @@ RSpec.describe Slack::Notifier::PayloadMiddleware::FormatAttachments do
   it "searches through string or symbol keys" do
     subject = described_class.new(:notifier)
     expect(Slack::Notifier::Util::LinkFormatter).to receive(:format)
-      .with("hello", formats: [:html, :markdown])
+      .with("hello", formats: %i[html markdown])
     subject.call("attachments" => [{ "text" => "hello" }])
 
     subject = described_class.new(:notifier)
     expect(Slack::Notifier::Util::LinkFormatter).to receive(:format)
-      .with("hello", formats: [:html, :markdown])
+      .with("hello", formats: %i[html markdown])
     subject.call(attachments: [{ text: "hello" }])
   end
 
   it "can handle a single attachment" do
     subject = described_class.new(:notifier)
     expect(Slack::Notifier::Util::LinkFormatter).to receive(:format)
-      .with("hello", formats: [:html, :markdown])
+      .with("hello", formats: %i[html markdown])
     subject.call(attachments: { text: "hello" })
   end
 
   it "wraps attachment into array if given as a single hash" do
-    params  = {
+    params = {
       attachments: { text: "hello" }
     }
     payload = {
       attachments: [{ text: "hello" }]
     }
-    subject = described_class.new(:notifier);
+    subject = described_class.new(:notifier)
 
     expect(subject.call(params)).to eq payload
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 RSpec.describe Slack::Notifier::PayloadMiddleware::FormatMessage do
   it "passes the text through linkformatter with options[:formats]" do
     subject = described_class.new(:notifier, formats: [:html])
@@ -8,7 +9,7 @@ RSpec.describe Slack::Notifier::PayloadMiddleware::FormatMessage do
 
     subject = described_class.new(:notifier)
     expect(Slack::Notifier::Util::LinkFormatter).to receive(:format)
-      .with("hello", formats: [:html, :markdown])
+      .with("hello", formats: %i[html markdown])
     subject.call(text: "hello")
 
     subject = described_class.new(:notifier, formats: [:markdown])

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 RSpec.describe Slack::Notifier::PayloadMiddleware::Stack do
   let(:return_one) do
     double(call: 1)
@@ -113,7 +114,6 @@ RSpec.describe Slack::Notifier::PayloadMiddleware::Stack do
       subject.set(:return_one_twice, :return_one_twice, :return_two)
 
       expect(subject.call(5)).to eq [2, 2, 2, 2]
-
     end
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 RSpec.describe Slack::Notifier::PayloadMiddleware do
   before(:each) do
     @registry_backup = described_class.registry.dup

data/spec/lib/slack-notifier/util/http_client_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 RSpec.describe Slack::Notifier::Util::HTTPClient do
   describe "::post" do
     it "initializes Util::HTTPClient with the given uri and params then calls" do
@@ -6,7 +7,7 @@ RSpec.describe Slack::Notifier::Util::HTTPClient do
 
       expect(described_class)
         .to receive(:new).with("uri", "params")
-        .and_return(http_post_double)
+                         .and_return(http_post_double)
       expect(http_post_double).to receive(:call)
 
       described_class.post "uri", "params"

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 # encoding: utf-8
+
 # rubocop:disable Metrics/LineLength
 RSpec.describe Slack::Notifier::Util::LinkFormatter do
   describe "::format" do
@@ -56,7 +57,7 @@ RSpec.describe Slack::Notifier::Util::LinkFormatter do
       end
     end
 
-    it 'doesn\'t replace valid Japanese' do
+    it "doesn't replace valid Japanese" do
       formatted = described_class.format("こんにちは")
       expect(formatted).to eq "こんにちは"
     end
@@ -71,6 +72,68 @@ RSpec.describe Slack::Notifier::Util::LinkFormatter do
       expect(formatted).to eq "<mailto:john@example.com|John>"
     end
 
+    it "handles links with trailing parentheses" do
+      formatted = described_class.format("Hello World, enjoy [foo(bar)](http://example.com/foo(bar))<a href='http://example.com/bar(foo)'>bar(foo)</a>")
+      expect(formatted).to include("http://example.com/foo(bar)|foo(bar)")
+      expect(formatted).to include("http://example.com/bar(foo)|bar(foo)")
+    end
+
+    it "formats a number of differently formatted links" do
+      input_output = {
+        "Hello World, enjoy [this](http://example.com)." =>
+          "Hello World, enjoy <http://example.com|this>.",
+
+        "Hello World, enjoy [[this](http://example.com) in brackets]." =>
+          "Hello World, enjoy [<http://example.com|this> in brackets].",
+
+        "Hello World, enjoy ([this](http://example.com) in parens)." =>
+          "Hello World, enjoy (<http://example.com|this> in parens).",
+
+        "Hello World, enjoy [](http://example.com)." =>
+          "Hello World, enjoy <http://example.com>.",
+
+        "Hello World, enjoy [link with query](http://example.com?foo=bar)." =>
+          "Hello World, enjoy <http://example.com?foo=bar|link with query>.",
+
+        "Hello World, enjoy [link with fragment](http://example.com/#foo-bar)." =>
+          "Hello World, enjoy <http://example.com/#foo-bar|link with fragment>.",
+
+        "Hello World, enjoy [link with parens](http://example.com/foo(bar)/baz)." =>
+          "Hello World, enjoy <http://example.com/foo(bar)/baz|link with parens>.",
+
+        "Hello World, enjoy [link with query](http://example.com/(parens)?foo=bar)." =>
+          "Hello World, enjoy <http://example.com/(parens)?foo=bar|link with query>.",
+
+        "Hello World, enjoy [link with parens](http://example.com/baz?bang=foo(bar))." =>
+          "Hello World, enjoy <http://example.com/baz?bang=foo(bar)|link with parens>.",
+
+        "Hello World, enjoy [link with fragment](http://example.com/(parens)#foo-bar)." =>
+          "Hello World, enjoy <http://example.com/(parens)#foo-bar|link with fragment>.",
+
+        "Hello World, enjoy [link with fragment](http://example.com/#foo-bar=(baz))." =>
+          "Hello World, enjoy <http://example.com/#foo-bar=(baz)|link with fragment>.",
+
+        "Hello World, enjoy [this](http://example.com?foo=bar)[this2](http://example2.com)." =>
+          "Hello World, enjoy <http://example.com?foo=bar|this><http://example2.com|this2>.",
+
+        "Hello World, enjoy [this](http://example.com?foo=bar) [this2](http://example2.com/#fragment)." =>
+          "Hello World, enjoy <http://example.com?foo=bar|this> <http://example2.com/#fragment|this2>.",
+
+        "Hello World, enjoy [this](http://example.com)<a href='http://example2.com'>this2</a>." =>
+          "Hello World, enjoy <http://example.com|this><http://example2.com|this2>.",
+
+        "Hello world, [John](mailto:john@example.com)." =>
+          "Hello world, <mailto:john@example.com|John>.",
+
+        "Hello World, enjoy [foo(bar)](http://example.com/foo(bar))<a href='http://example.com/bar(foo)'>bar(foo)</a>" =>
+          "Hello World, enjoy <http://example.com/foo(bar)|foo(bar)><http://example.com/bar(foo)|bar(foo)>"
+      }
+
+      input_output.each do |input, output|
+        expect(described_class.format(input)).to eq output
+      end
+    end
+
     context "with a configured stack" do
       it "only formats html if html is the only item in formats" do
         formatted = described_class.format("Hello World, enjoy [this](http://example.com)<a href='http://example2.com'>this2</a>.", formats: [:html])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-notifier
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-12 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies: []
 description: " A slim ruby wrapper for posting to slack webhooks "
 email: