slackbotsy 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ec8e606f409b90614e9919d98281ecd3d0201c9
-  data.tar.gz: ac463292ad660a4299d29e8c01081e871897ad52
+  metadata.gz: efaf22afe32e29bb0cfac385bcc9333c055ab4bc
+  data.tar.gz: 37f4cc88d4eb8dcac0650a57c1e0355fc4f096d0
 SHA512:
-  metadata.gz: 044072463462a5d5933abe0f33e7471a73e85774750579df1d44028cbc4bf7a7ecee113002ca2b8fd1ea88b62f51a9ab30381a01930900a8910d3a480825c592
-  data.tar.gz: df970d1c61fb5b57e99d60ce8143cc84f445c36b7e27ae0aeb32f53a704ddec1124960b1a866e7babb40476824d5377cf6ae4edc6d3b1fbc7cc7e85ef952e31e
+  metadata.gz: f35c27cdd50c04f7a24a43a17ce7f57bcab1124673dbae7b44a2ad05ca09fde25d0f7be043496c18303849a514d8289376a6589fb0dc97e0ce301a891e16c99e
+  data.tar.gz: 95ce12f01ea5921415a781a91a7bc89b5a41cb5f35f3524783d72c8fff233ffb74cb9fa23f3a35398c931aa526caf25bbed27c9ca1d1cce8098dabbb5df2057e

data/lib/slackbotsy/bot.rb

@@ -13,7 +13,6 @@ module Slackbotsy
 
       ## use set of tokens for (more or less) O(1) lookup on multiple channels
       @options['outgoing_token'] = Array(@options['outgoing_token']).to_set
-      
       @regexes = {}
       setup_incoming_webhook    # http connection for async replies
       yield if block_given?     # run any hear statements in block
@@ -27,28 +26,28 @@ module Slackbotsy
       @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
     end
 
-    ## format to send text to incoming webhook
-    def encode_payload(text, options = {})
+    ## raw post of hash to slack
+    def post(options)
       payload = {
-        text:     text,
         username: @options['name'],
-        channel:  @options['channel'].gsub(/^#?/, '#'), # ensure channel begins with #
+        channel:  @options['channel']
       }.merge(options)
-
-      "payload=#{payload.to_json.to_s}"
+      payload[:channel] = payload[:channel].gsub(/^#?/, '#') #slack api needs leading # on channel
+      request = Net::HTTP::Post.new(@uri.request_uri)
+      request.set_form_data(payload: payload.to_json)
+      @http.request(request)
+      return nil # so as not to trigger text in outgoing webhook reply
     end
 
-    ## send text to slack using incoming webhook
+    ## simple wrapper on post to send text
     def say(text, options = {})
-      request = Net::HTTP::Post.new(@uri.request_uri)
-      request.body = encode_payload(text, options)
-      response = @http.request(request)
-      return nil                # so as not to trigger text in outgoing webhook reply
+      post({ text: text }.merge(options))
     end
 
-    def attach(text, attachment, options = {})
-      options = { attachments: [ attachment ] }.merge(options)
-      say(text, options)
+    ## simple wrapper on post to send attachment(s)
+    def attach(ary, options = {})
+      attachments = ary.is_a?(Array) ? ary : [ ary ] #force first arg to array
+      post({ attachments: attachments }.merge(options))
     end
 
     ## add regex to things to hear
@@ -62,7 +61,7 @@ module Slackbotsy
         self.instance_eval File.open(file).read
       end
     end
-    
+
     ## check message and run blocks for any matches
     def handle_item(msg)
       return nil unless @options['outgoing_token'].include? msg[:token] # ensure messages are for us from slack

data/lib/slackbotsy/message.rb

@@ -2,7 +2,7 @@ module Slackbotsy
 
   class Message < Hash
     include Helper              # mixin client helper methods
-    
+
     ## convert message from a Hash obj to a Message obj
     def initialize(caller, msg)
       super()
@@ -10,10 +10,20 @@ module Slackbotsy
       @caller = caller          # bot object
     end
 
-    ## call say without bot object
+    ## convenience wrapper in message scope, so we can call it without @caller
+    ## and set default channel to same as received message
+    def post(options)
+      @caller.post({ channel: self['channel_name'] }.merge(options))
+    end
+
+    ## ditto
     def say(text, options = {})
-      options[:channel] ||= self['channel_name'] # default to same channel as msg
-      @caller.say(text, options)
+      @caller.say(text, { channel: self['channel_name'] }.merge(options))
+    end
+
+    ## ditto
+    def attach(attachments, options = {})
+      @caller.attach(attachments, { channel: self['channel_name'] }.merge(options))
     end
 
     ## convenience getter methods for message properties
@@ -22,7 +32,7 @@ module Slackbotsy
         self.fetch(method, nil)
       end
     end
-    
+
   end
 
 end

data/lib/slackbotsy/version.rb

@@ -1,3 +1,3 @@
 module Slackbotsy
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackbotsy
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Richard Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,8 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby bot for Slack chat.
 test_files: []
+has_rdoc: