slack-notifier 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 381988fd2d67aa541bc06565270991713da8f7d0
-  data.tar.gz: 36d7e7196a763ef4b07eb698f0f072eccba597ef
+  metadata.gz: b724540f4fb01a3f48950fee034eda3af6b3fb4a
+  data.tar.gz: a56880a665af231f4ce81d5bead28f7db048abdf
 SHA512:
-  metadata.gz: 2109923737e8d0f772b2aa54100b363c79f8d1d51d016bb2207634de817cbbc2e4673d7a944f486712a9f46667bddd6059a975e46781c98d6504449f61d9ed82
-  data.tar.gz: 358d437fa6484dd9ff544a12fd84d87534038a348b989bacce57ac8a6b085c363304029e473467517150e06ad682759bb9fb1b7ab90b42383f30729434056df2
+  metadata.gz: d843ebf95f96255e4c4fc470876ab1937af610b0a94805ebd0acd02673e508ed8c63772dd9ebff22773daa5c693f42daa5d55f20a34d3b436d151d7a67ad0252
+  data.tar.gz: 78f341412567858fca8ff81bb1f5fc9e222d4cc6b734de43c6a1781fcc552e9a3c7147f9733e76b71768ee25a8f2ef5271b774c83dcc449866bc410564c5a1b2

data/lib/slack-notifier/link_formatter.rb

@@ -11,7 +11,11 @@ module Slack
       end
 
       def initialize string
-        @orig = fix_encoding string
+        @orig = if string.respond_to? :scrub
+          string.scrub
+        else
+          string
+        end
       end
 
       def formatted
@@ -24,17 +28,17 @@ module Slack
           text = Regexp.last_match[1]
           slack_link link, text
         end
+
+      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
       end
 
       private
 
-        def fix_encoding string
-          string.encode 'UTF-8',
-            'binary',
-            :invalid => :replace,
-            :undef   => :replace
-        end
-
         def slack_link link, text=nil
           out = "<#{link}"
           out << "|#{text}" if text && !text.empty?

data/lib/slack-notifier/version.rb

@@ -1,5 +1,5 @@
 module Slack
   class Notifier
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/spec/integration/ping_integration_test.rb

@@ -1,5 +1,6 @@
+# encoding: utf-8
 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}"
+notifier.ping "hello/こんにちは from notifier test script on ruby: #{RUBY_VERSION}\225"

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe Slack::Notifier::LinkFormatter do
@@ -37,15 +38,24 @@ describe Slack::Notifier::LinkFormatter do
       expect( formatted ).to include("<http://example2.com|this2>")
     end
 
-    it "handles invalid unicode sequences" do
-      expect {
-        described_class.format("This sequence is invalid: \255")
-      }.not_to raise_error
+    if "".respond_to? :scrub
+      context "when on ruby 2.1+ or have string-scrub installed" do
+        it "handles invalid unicode sequences" do
+          expect {
+            described_class.format("This sequence is invalid: \255")
+          }.not_to raise_error
+        end
+
+        it "replaces invalid unicode sequences with the unicode replacement character" do
+          formatted = described_class.format("\255")
+          expect(formatted).to eq "\uFFFD"
+        end
+      end
     end
 
-    it "replaces invalid unicode sequences with the unicode replacement character" do
-      formatted = described_class.format("\255")
-      expect(formatted).to eq "\uFFFD"
+    it "doesn't replace valid Japanese" do
+      formatted = described_class.format("こんにちは")
+      expect(formatted).to eq "こんにちは"
     end
 
   end

data/spec/spec_helper.rb

@@ -10,4 +10,4 @@ RSpec.configure do |config|
     mocks.verify_doubled_constant_names = true
     mocks.verify_partial_doubles        = true
   end
-end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: slack-notifier
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-18 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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A slim ruby wrapper for posting to slack webhooks