realtime-slackbot 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a79b3cf82fbab72c62706f8a80b4e6412b4f7a64
-  data.tar.gz: 25d33eb53caf8fd8b6583141b26398a844f6829e
+  metadata.gz: 883564a8619951253252b18061d9621e99bb2090
+  data.tar.gz: 876583a388ca028b4b8c2104451f0b0732527968
 SHA512:
-  metadata.gz: 6c5b65cf27eeee8b1fad311404703fadc0266de28fb6ecfda1a48d4d094183598aa348cb5d6f66d85963d542bd03bf80326ed64e71f73c0e8e3db2d6bfa0b927
-  data.tar.gz: 06e51f1d0bf0badad597d7929baa0e40c927a9db141803a9b368baca2c8e46fe14612e9b77a675ff495b7bb3f5b9c03e6dcbfcd780df30f7646320deafdc861d
+  metadata.gz: d5e96150c5702f5274e8a61efd94d8374ca6a522e0ad3ab7bd1893a08f39706a17f0aa72380f15bd8a8987c1cc2d9024c367c08d25c6be3ee4cbcdeac2cd9488
+  data.tar.gz: 6e03e2678ae703a7f638e2bff3ac6413ab68816562bd9c9ac80b091b8a3e1ed5492e036be4bb03e507cf5f76bf04db6244c6ce472cbd072315f85777bda1c123

data/lib/realtime-slackbot.rb

@@ -1,2 +1,3 @@
 require_relative 'slack/slack'
-require_relative 'slack/bot'
+require_relative 'slack/wrappers/bot'
+require_relative 'slack/ext/redis_session'

data/lib/slack/ext/redis_session.rb

@@ -0,0 +1,36 @@
+module SlackBot::Ext
+  class RedisSession
+    attr_reader :prefix
+    
+    def initialize(team_id, args={})
+      @prefix = args[:prefix] || "team:#{team_id}:"
+      @store = args[:store]
+      @user_scoped = Hash.new
+      @channel_scoped = Hash.new
+    end
+
+    def [](key)
+      @store["#{@prefix}#{key}"]
+    end
+
+    def []=(key, val)
+      @store["#{@prefix}#{key}"] = val
+    end
+
+    def for_user(id)
+      @user_scoped[id] ||= RedisSession.new(nil, prefix: "#{@prefix}user:#{id}:", store: @store)
+    end
+
+    def for_channel(id)
+      @channel_scoped[id] ||= RedisSession.new(nil, prefix: "#{@prefix}channel:#{id}:", store: @store)
+    end
+    
+    def core
+      @store
+    end
+
+    def to_s
+      @store.to_s
+    end
+  end
+end

data/lib/slack/helpers.rb

@@ -0,0 +1,63 @@
+module SlackBot
+  def channels
+    @channels ||= load_channels
+  end
+  
+  def channel(id)
+    channels[id]
+  end
+   
+  def user_channels
+    @user_channels ||= load_user_channels
+  end
+  
+  def user_channel(user)
+    if user.is_a? User
+      id = user.id
+    else
+      id = user
+    end
+    user_channels[id]
+  end
+  
+  def users
+    @users ||= load_users
+  end
+  
+  def user(id)
+    users[id]
+  end
+  
+  def me
+    @team_info['self']
+  end
+  
+  def [](key)
+    @team_info[key]
+  end
+
+  private
+  def load_channels
+    channels = Hash.new
+    @team_info['channels'].each do |chan|
+      channels[chan['id']] = Channel.new chan, self
+    end
+    channels
+  end
+ 
+  def load_user_channels
+    channels = Hash.new
+    @team_info['ims'].each do |chan|
+      channels[chan['user']] = Channel.new chan, self
+    end
+    channels
+  end
+
+  def load_users
+    users = Hash.new
+    (@team_info['users'] + @team_info['bots']).map do |info| 
+      users[info['id']] = User.new info, self
+    end
+    users
+  end
+end

data/lib/slack/session.rb

@@ -0,0 +1,29 @@
+module SlackBot
+  class Session
+    def initialize(team_id, args={})
+      @user_scoped = Hash.new
+      @channel_scoped = Hash.new
+      @general = Hash.new
+    end
+
+    def [](key)
+      @general[key]
+    end
+
+    def []=(key, val)
+      @general[key] = val
+    end
+
+    def for_user(id)
+      @user_scoped[id] ||= Hash.new
+    end
+
+    def for_channel(id)
+      @channel_scoped[id] ||= Hash.new
+    end
+
+    def to_s
+      @general.to_s
+    end
+  end
+end

data/lib/slack/slack.rb

@@ -1,7 +1,9 @@
-require_relative 'user'
-require_relative 'message'
-require_relative 'channel'
+require_relative 'wrappers/user'
+require_relative 'wrappers/message'
+require_relative 'wrappers/channel'
+require_relative 'session'
 require_relative 'matchers/matcher_group'
+require_relative 'helpers'
 require 'net/http'
 require 'faye/websocket'
 require 'eventmachine'
@@ -12,18 +14,36 @@ module SlackBot
   attr_accessor :socket
   attr_writer :debug
   attr_reader :team_info
+  attr_reader :session
+  attr_accessor :auth_url
   
   def initialize(auth_key, options={})
-    @debug = options[:log]
+    setup(options)
     @key = auth_key.strip
+  end
+  
+  def setup(options={})
+    @debug = options[:log]
     @matchers = Hash.new
+    if options[:session]
+      @session_type = options[:session].delete(:use)
+      @session_args = options[:session]
+    else
+      @session_type = Session
+      @session_args = {}
+    end
+    @auth_url = SLACK_AUTH_URL
   end
   
   def get_url
-    data = Net::HTTP.get(URI(SLACK_AUTH_URL + @key))
+    data = Net::HTTP.get(URI(@auth_url + @key))
     json = JSON.parse(data)
     @team_info = json
-    json['url']
+    if json['ok']
+      return json['url']
+    else
+      raise "ERROR: #{json.to_s}"
+    end
   end
   
   def run
@@ -33,6 +53,7 @@ module SlackBot
 
       ws.on :open do |event|
         log(:open, event.to_s)
+        create_session(team_info['team']['id'])
         hook(:opened)
       end
 
@@ -56,29 +77,7 @@ module SlackBot
         log(:close, "#{event.code} #{event.reason}")
         @socket = ws = nil
         hook(:closed)
-      end
-    end
-  end
-  
-  def hook(action, *args)
-    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
-      begin
-        @matchers[action].respond_for(args.first)
-      rescue Exception => e
-        puts e.message
-        puts e.backtrace.join "\n"
-      end
-    elsif self.respond_to? action
-      begin
-        send(action, *args)
-      rescue Exception => e
-        puts e.message
-        puts e.backtrace.join "\n"
+        EM.stop
       end
     end
   end
@@ -104,68 +103,6 @@ module SlackBot
     post(msg['channel'], text)
   end
   
-  def load_channels
-    channels = Hash.new
-    @team_info['channels'].each do |chan|
-      channels[chan['id']] = Channel.new chan, self
-    end
-    channels
-  end
-  
-  def channels
-    @channels ||= load_channels
-  end
-  
-  def channel(id)
-    channels[id]
-  end
-  
-  def load_user_channels
-    channels = Hash.new
-    @team_info['ims'].each do |chan|
-      channels[chan['user']] = Channel.new chan, self
-    end
-    channels
-  end
-  
-  def user_channels
-    @user_channels ||= load_user_channels
-  end
-  
-  def user_channel(user)
-    if user.is_a? User
-      id = user.id
-    else
-      id = user
-    end
-    user_channels[id]
-  end
-      
-  
-  def load_users
-    users = Hash.new
-    (@team_info['users'] + @team_info['bots']).map do |info| 
-      users[info['id']] = User.new info
-    end
-    users
-  end
-  
-  def users
-    @users ||= load_users
-  end
-  
-  def user(id)
-    users[id]
-  end
-  
-  def me
-    @team_info['self']
-  end
-  
-  def [](key)
-    @team_info[key]
-  end
-  
   def log(type, message)
     if debug?
       puts "#{type}: #{message}"
@@ -175,4 +112,32 @@ module SlackBot
   def debug?
     @debug
   end
-end
+
+  private
+  def hook(action, *args)
+    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
+      begin
+        @matchers[action].respond_for(args.first)
+      rescue Exception => e
+        puts e.message
+        puts e.backtrace.join "\n"
+      end
+    elsif self.respond_to? action
+      begin
+        send(action, *args)
+      rescue Exception => e
+        puts e.message
+        puts e.backtrace.join "\n"
+      end
+    end
+  end
+  
+  def create_session(team_id)
+    @session = @session_type.new(team_id, @session_args)
+  end
+end

data/lib/slack/{bot.rb → wrappers/bot.rb}

@@ -1,4 +1,4 @@
-require_relative 'slack'
+require_relative '../slack'
 
 module SlackBot
   class Bot

data/lib/slack/{channel.rb → wrappers/channel.rb}

@@ -34,6 +34,9 @@ module SlackBot
       p = @data['topic']
       p && p['value']
     end
+    def session
+      @bot.session.for_channel(self.id)
+    end
     
     def to_s
       if user_channel?
@@ -43,4 +46,4 @@ module SlackBot
       end
     end
   end
-end
+end

data/lib/slack/{message.rb → wrappers/message.rb}

@@ -15,7 +15,7 @@ module SlackBot
     end
   
     def to_s
-      "#{@user.name}: #{self.text}"
+      "#{@user}: #{self.text}"
     end
   
     def [](key)
@@ -35,7 +35,7 @@ module SlackBot
     end
     def channel
       chan = @data['channel']
-      @bot.channel chan
+      @bot.channel(chan) || @bot.user_channel(chan)
     end
   end
 end

data/lib/slack/{user.rb → wrappers/user.rb}

@@ -1,7 +1,8 @@
 module SlackBot
   class User
-    def initialize(data)
+    def initialize(data, bot)
       @data = data
+      @bot = bot
     end
     
     def to_s
@@ -35,5 +36,8 @@ module SlackBot
     def bot?; @data['is_bot'] end
     def presence; @data['presence'] end
     def user_channel; @bot.user_channel self end
+    def session
+      @bot.session.for_user(self.id)
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: realtime-slackbot
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Will Richardson
@@ -45,13 +45,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/realtime-slackbot.rb
-- lib/slack/bot.rb
-- lib/slack/channel.rb
+- lib/slack/ext/redis_session.rb
+- lib/slack/helpers.rb
 - lib/slack/matchers/matcher.rb
 - lib/slack/matchers/matcher_group.rb
-- lib/slack/message.rb
+- lib/slack/session.rb
 - lib/slack/slack.rb
-- lib/slack/user.rb
+- lib/slack/wrappers/bot.rb
+- lib/slack/wrappers/channel.rb
+- lib/slack/wrappers/message.rb
+- lib/slack/wrappers/user.rb
 homepage: http://github.com/javanut13/realtime-slackbot
 licenses:
 - MIT