slack-post 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbcc725463980506c2af9898e9d37f0b92163350
-  data.tar.gz: fb11f3587bc82ca8ed87f1505a323ad67b7292ae
+  metadata.gz: 84c9ebf0228144d31f8bc86bdd3ad6276771b556
+  data.tar.gz: 14eb6e6c814e9b15acee434961f73460f8a92e1b
 SHA512:
-  metadata.gz: f8b7b559d66708268f01c54f7b0cc5edde281029be145da1971d79f6a0d3f5ad2a02695a00940aa4c23987e418dd74350041ad8aa118deb0912a4a26cb736f0d
-  data.tar.gz: e63c4596bcb406078bd0e15dfb236461ce575338f43bef9765bdcf6098b152090a7692bcf56eb2e4e1f248dd4f34a2ecbae1e6bafa91b7d6d530e742aff26555
+  metadata.gz: c961880f1c93adfddb80b6bebf7b7a50a500515a57339c03d91b677cee9cbe603c85e20dd8539fceecd345448cb035c023351729b237466475637cf6bb10be93
+  data.tar.gz: 92ac2e49c819bdfec26adbf250d28f9a979a13e9a5bf27f39520809ea6990480f795a2e775ad20c7606af321c14acefc7cacba9b3d5778ca9221479096266c79

data/lib/slack/post/version.rb

@@ -1,5 +1,5 @@
 module Slack
   module Post
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/slack/post.rb

@@ -12,7 +12,7 @@ module Slack
 		}.freeze
 		
 		def self.post_with_attachments(message,attachments,chan=nil,opts={})
-			raise "You need to call Slack::Post.configure before trying to send messages." unless configured?(chan.nil?)
+			raise "Slack::Post.configure was not called or configuration was invalid" unless configured?(chan)
 			pkt = {
 				channel: chan || config[:channel],
 				text: message,
@@ -64,8 +64,10 @@ module Slack
 		
 		LegacyConfigParams = [:subdomain,:token].freeze
 		
-		def self.configured?(needs_channel=true)
-			return false if needs_channel and !config[:channel]
+		def self.configured?(channel_was_overriden=false)
+			# if a channel was not manually specified, then we must have a channel option in the config OR
+			# we must be using the webhook_url which provided its own default channel on the Slack-side config.
+			return false if !channel_was_overriden && !config[:channel] && !config[:webhook_url]
 
 			# we need _either_ a webhook url or all LegacyConfigParams
 			return true if config[:webhook_url]
@@ -75,11 +77,15 @@ module Slack
 		end
 		
 		def self.config
-			@config ||= DefaultOpts
+			@config ||= {}
 		end
 		
 		def self.configure(opts)
 			@config = config.merge(prune(opts))
+
+			# If a channel has not been configured, add the default channel
+			# unless we are using a webhook_url, which provides its own default channel.
+			@config.merge!(DefaultOpts) unless ( @config[:webhook_url] || @config[:channel] )
 		end
 		
 		KnownConfigParams = [:webhook_url,:username,:channel,:subdomain,:token,:icon_url,:icon_emoji].freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-post
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler