slack-notifier 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9efa003e30e2530dfdb328138ac6b10e9c1ee92b
-  data.tar.gz: 388a86cc5af5c0ce1547a2f4b351b81420ec0c40
+  metadata.gz: 3ed944b7001667e3e533abc25325fec4d7bfa99b
+  data.tar.gz: 4d0ae7eb667f225b42b5621afdc2ffbac463f471
 SHA512:
-  metadata.gz: f5d939b3ec86e70ee8d13bf9438ebf9cbb1957a374c3622d8e5510df0d5c504f83067ec729cdfd38450f292f52c09eb2acb72aef4d2765a7352241cd4d41efc6
-  data.tar.gz: ea3ff1b881b8dcc442bc2fd6939b24a56208e38592e961fad1c1dbdf56713f0221d929787bca67b526f98ef55bd652e04772f2d42b705fded3d37639d08ba657
+  metadata.gz: 53703f1a9413e12505c0d2338776738eb25c5383c1448fd4e2efeb65f71eaccd4b6bf101263639e25bc957c588af4d4b094c77ae45f61ffb3adf0e8707db20d0
+  data.tar.gz: f35eb71b3e57950f2e648e241682a054fbe98d6a7c96719f766d478c704d8afdefd96b853d8237f9dcbef2ebbf3a69195196b717a4242128f58db5ef2e84436a

data/lib/slack-notifier.rb

@@ -7,17 +7,19 @@ require_relative 'slack-notifier/link_formatter'
 
 module Slack
   class Notifier
+    attr_reader :team, :token, :hook_name, :default_payload
 
-    # these act as defaults
-    # if they are set
-    attr_accessor :channel, :username
-
-    attr_reader :team, :token, :hook_name
-
-    def initialize team, token, hook_name = default_hook_name
+    def initialize team, token, hook_name=default_hook_name, default_payload={}
       @team  = team
       @token = token
-      @hook_name = hook_name
+
+      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
     end
 
     def ping message, options={}
@@ -27,12 +29,20 @@ module Slack
       HTTPPost.to endpoint, payload: payload.to_json
     end
 
+    def channel
+      default_payload[:channel]
+    end
+
     def channel= channel
-      @channel = if channel.start_with? '#', "@"
-        channel
-      else
-        "##{channel}"
-      end
+      default_payload[:channel] = channel
+    end
+
+    def username
+      default_payload[:username]
+    end
+
+    def username= username
+      default_payload[:username] = username
     end
 
     private
@@ -41,13 +51,6 @@ module Slack
         'incoming-webhook'
       end
 
-      def default_payload
-        payload = {}
-        payload[:channel]  = channel  if channel
-        payload[:username] = username if username
-        payload
-      end
-
       def endpoint
         URI.parse "https://#{team}.slack.com/services/hooks/#{hook_name}?token=#{token}"
       end

data/lib/slack-notifier/version.rb

@@ -1,5 +1,5 @@
 module Slack
   class Notifier
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   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']
+notifier = Slack::Notifier.new ENV['SLACK_TEAM'], ENV['SLACK_TOKEN'], username: 'notifier'
 puts "testing with ruby #{RUBY_VERSION}"
 notifier.ping "hello from notifier test script on ruby: #{RUBY_VERSION}"

data/spec/lib/slack-notifier_spec.rb

@@ -12,10 +12,21 @@ describe Slack::Notifier do
       expect( subject.token ).to eq 'token'
     end
 
-    it 'sets the optional service hook name' do
+    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'
     end
+
+    it "sets the default_payload options" do
+      subject = described_class.new 'team', 'token', 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'
+    end
   end
 
   describe "#ping" do
@@ -99,18 +110,12 @@ describe Slack::Notifier do
       subject.channel = "#foo"
       expect( subject.channel ).to eq "#foo"
     end
+  end
 
-    it "maintains channel prefix if it is '#' or '@'" do
-      subject.channel = "#foo"
-      expect( subject.channel ).to eq "#foo"
-
-      subject.channel = "@foo"
-      expect( subject.channel ).to eq "@foo"
-    end
-
-    it "adds a '#' prefix to channel if it has no prefix" do
-      subject.channel = "foo"
-      expect( subject.channel ).to eq "#foo"
+  describe "#username=" do
+    it "sets the given username" do
+      subject.username = "foo"
+      expect( subject.username ).to eq "foo"
     end
   end
 end

metadata

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