realtime-slackbot 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c3b6aa10e9b44ed0c22ac2783ac1f7efb3d9d80
-  data.tar.gz: d84623a4d4f82b58c713e3aa8c471942c5958d42
+  metadata.gz: 7c13855c42c7a8a3ff7a09ff6069b60016891ebf
+  data.tar.gz: ec4ba39af1236d7568f6718ee12b975ebd859e04
 SHA512:
-  metadata.gz: 43ecc63ee27b16e0a72648c9855a404f343bb797cbc6e3fa29b76431e574fcda626e9faf8522702ccef332b8945b72e35609a56f22fb54d516f01a23fff3703f
-  data.tar.gz: 1370762e81ad0faa4b187147d675f156c9ef9b7eb2ca54b78ee7cc05a9527ba053a5742f9b3c5ea8abb87bd71bd2f714075da5d0a04ccca65b4ba3d3c578d829
+  metadata.gz: 6c57c00355b00b0b4d208152e7c6c2e8f846adf682158bc5ccda42d201c6f0883b21afd67a18bbfe0bbaab52524de4d0a2722d5c6ac44a981bf8d3c500e2c0e2
+  data.tar.gz: 887ab75eb513edddc1982698b2b366edabb73ee1e0e2830dece5ff39aac5c556042e34af3bde9ca53e1872cb2fdbcba780fed99dd4827fef280e3b4485358213

data/lib/slack/matchers/matcher.rb

@@ -0,0 +1,70 @@
+class SlackBot::Matcher
+  def initialize
+    @tests = []
+    @finally = nil
+  end
+  
+  def run_on(msg)
+    @tests.each do |test|
+      unless test.call(msg)
+        return false
+      end
+    end
+    @finally.call(msg) if @finally
+    return true
+  end
+  
+  def from?(user)
+    @tests << lambda do |msg|
+      user = user.to_s.downcase
+      msg_user = msg.user
+      return false unless msg_user
+      if msg_user.id == user || msg_user.name.downcase == user
+        return true
+      else
+        real = msg_user.real_name
+        return real == user || real.split(' ').map { |n| user == n }.any?
+      end
+    end
+    self
+  end
+  
+  def in?(options={})
+    @tests << lambda do |msg|
+      if options[:id]
+        return msg.channel == options[:id]
+      elsif options[:name]
+        chan = msg.bot.channel(options[:name])
+        return chan['id'] == msg.channel
+      end
+    end
+    self
+  end
+  
+  def include?(text)
+    @tests << Proc.new do |msg|
+      msg.text.downcase.include? text
+    end
+    self
+  end
+  
+  def match?(reg)
+    @tests << Proc.new { |msg| msg.text.downcase.match reg }
+    self
+  end
+  
+  def try?(&block)
+    @tests << block
+    self
+  end
+  
+  def then(&block)
+    @finally = block
+  end
+  
+  def then_reply(*args)
+    @finally = Proc.new do |msg|
+      msg.reply(*args)
+    end
+  end
+end

data/lib/slack/matchers/matcher_group.rb

@@ -0,0 +1,31 @@
+require_relative 'matcher'
+
+module SlackBot
+  class MatcherGroup
+    def initialize(action)
+      @action = action
+      @matchers = []
+    end
+
+    def respond_for(msg)
+      @before_match.call(msg) if @before_match
+      @matchers.each do |m|
+        break if m.run_on(msg)
+      end
+    end
+    
+    def when
+      m = Matcher.new
+      @matchers.push m
+      return m
+    end
+    
+    def before_match(&block)
+      @before_match = block
+    end
+    
+    def to_s
+      "#{@action} #{@matchers.count}"
+    end
+  end
+end

data/lib/slack/message.rb

@@ -1,5 +1,5 @@
 require 'json'
-require_relative 'matcher'
+require_relative 'matchers/matcher'
 
 module SlackBot
   class Message
@@ -18,6 +18,10 @@ module SlackBot
     def to_s
       "#{@user.name}: #{@data['text']}"
     end
+    
+    def user
+      @bot.user(@data['user'])
+    end
   
     def [](key)
       @data[key]
@@ -28,10 +32,11 @@ module SlackBot
     end
   
     def method_missing(name, *args)
-      if Matcher.instance_methods.include? name.to_sym
-        return Matcher.new(self).send(name, *args)
-      else
+      # Access data if no args and is valid key, else throw exception
+      if args.count == 0 && @data.has_key?(name.to_s)
         @data[name.to_s]
+      else
+        super(name, args)
       end
     end
   end

data/lib/slack/slack.rb

@@ -1,5 +1,6 @@
 require_relative 'user'
 require_relative 'message'
+require_relative 'matchers/matcher_group'
 require 'net/http'
 require 'faye/websocket'
 require 'eventmachine'
@@ -14,6 +15,7 @@ module SlackBot
   def initialize(auth_key, options={})
     @debug = options[:log]
     @key = auth_key.strip
+    @matchers = Hash.new
   end
   
   def get_url
@@ -25,7 +27,7 @@ module SlackBot
   
   def run
     url = get_url()
-    EM.run {
+    EM.run do
       @socket = ws = Faye::WebSocket::Client.new(url)
 
       ws.on :open do |event|
@@ -54,11 +56,18 @@ module SlackBot
         @socket = ws = nil
         hook(:closed)
       end
-    }
+    end
   end
   
   def hook(action, *args)
-    if self.respond_to? action
+    if self.respond_to? "#{action}_matcher"
+      unless @matchers.has_key? action
+        matcher_group = MatcherGroup.new(action)
+        self.send("#{action}_matcher", matcher_group)
+        @matchers[action] = matcher_group
+      end
+      @matchers[action].respond_for(args.first)
+    elsif self.respond_to? action
       begin
         send(action, *args)
       rescue Exception => e
@@ -71,7 +80,7 @@ module SlackBot
   def post(channel, message)
     data = {
       id: 1,
-      type: "message",
+      type: 'message',
       channel: channel,
       text: message
     }
@@ -104,6 +113,10 @@ module SlackBot
     @users[id]
   end
   
+  def channel(name)
+    @team_info['channels'].select { |c| c['name'] == name }.first
+  end
+  
   def log(type, message)
     if debug?
       puts "#{type}: #{message}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: realtime-slackbot
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Will Richardson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -46,7 +46,8 @@ extra_rdoc_files: []
 files:
 - lib/realtime-slackbot.rb
 - lib/slack/bot.rb
-- lib/slack/matcher.rb
+- lib/slack/matchers/matcher.rb
+- lib/slack/matchers/matcher_group.rb
 - lib/slack/message.rb
 - lib/slack/slack.rb
 - lib/slack/user.rb

data/lib/slack/matcher.rb

@@ -1,58 +0,0 @@
-class SlackBot::Matcher
-  def initialize(msg)
-    @message = msg
-    @passing = true
-  end
-  
-  def from?(user)
-    return self unless @passing
-    user = user.to_s.downcase
-    if @user
-      if @user.id == user || @user.name.downcase == user
-        res = true
-      else
-        real = @user.real_name
-        res = real == user || real.split(' ').map { |n| user == n }.any?
-      end
-    else
-      res = false
-    end
-    @passing &&= res
-    self
-  end
-  
-  def in?(options={})
-    return self unless @passing
-    res = false
-    if options[:id]
-      res = @message['channel'] == options[:id]
-    elsif options[:name]
-      chans = @bot.team_info['channels'].select { |name| ch[id] == channel }
-      res = chans.first == options[:name]
-    end
-    @passing &&= res
-    self
-  end
-  
-  def include?(text)
-    return self unless @passing
-    @passing &&= @message['text'].downcase.include? text
-    self
-  end
-  
-  def match?(reg)
-    return self unless @passing
-    @passing &&= @message['text'].downcase.match reg
-    self
-  end
-  
-  def then(&block)
-    block.call if @passing
-  end
-  
-  def then_reply(*args)
-    if @passing
-      @message.reply(*args)
-    end
-  end
-end