realtime-slackbot 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9d023b117fafe8b1b591162ef4eed2f80a93f2f
-  data.tar.gz: 8df38b12ab08cc2b7bbe7538c8d399e67d360c56
+  metadata.gz: a79b3cf82fbab72c62706f8a80b4e6412b4f7a64
+  data.tar.gz: 25d33eb53caf8fd8b6583141b26398a844f6829e
 SHA512:
-  metadata.gz: 3ad79d64285a5c817ef085dcc90ddad5aef433851b2bc9d792f82649724db01b643d755aeab8819f13763d55e34f26f5827fc4ccfc158237d294337ad9015be7
-  data.tar.gz: c84af173eabf5a0143fefd4a644b801f8e20736726497b993983eb9220aca404368f67f4a4fc64d34a2fdf7743374780976a30a17b238df37503e3fef236a120
+  metadata.gz: 6c5b65cf27eeee8b1fad311404703fadc0266de28fb6ecfda1a48d4d094183598aa348cb5d6f66d85963d542bd03bf80326ed64e71f73c0e8e3db2d6bfa0b927
+  data.tar.gz: 06e51f1d0bf0badad597d7929baa0e40c927a9db141803a9b368baca2c8e46fe14612e9b77a675ff495b7bb3f5b9c03e6dcbfcd780df30f7646320deafdc861d

data/lib/slack/channel.rb

@@ -0,0 +1,46 @@
+module SlackBot
+  class Channel
+    def initialize(info, bot)
+      @data = info
+      @bot = bot
+    end
+    
+    def [](key)
+      @data[key]
+    end
+    
+    # Helpers!
+    def creator
+      @bot.user @data['creator']
+    end
+    def id; @data['id'] end
+    def name; @data['name'] end
+    def user; @bot.user @data['user'] end
+    def channel?; @data['is_channel'] end
+    def user_channel?; @data['is_im'] end
+    def archived?; @data['is_archived'] end
+    def members
+      if user_channel?
+        return [self.user]
+      else
+        return @data['members'].map { |id| @bot.user id }
+      end
+    end
+    def purpose
+      p = @data['purpose']
+      p && p['value']
+    end
+    def topic
+      p = @data['topic']
+      p && p['value']
+    end
+    
+    def to_s
+      if user_channel?
+        user.to_s
+      else
+        "##{name}"
+      end
+    end
+  end
+end

data/lib/slack/message.rb

@@ -1,10 +1,9 @@
 require 'json'
-require_relative 'matchers/matcher'
 
 module SlackBot
   class Message
-    attr_accessor :user
-  
+    attr_reader :user
+    
     def initialize(data, bot)
       @data = data
       @bot = bot
@@ -16,11 +15,7 @@ module SlackBot
     end
   
     def to_s
-      "#{@user.name}: #{@data['text']}"
-    end
-    
-    def user
-      @bot.user(@data['user'])
+      "#{@user.name}: #{self.text}"
     end
   
     def [](key)
@@ -30,14 +25,17 @@ module SlackBot
     def []=(key, val)
       @data[key] = val
     end
-  
-    def method_missing(name, *args)
-      # 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
+    
+    # Helpers!
+    def id; @data['id'] end
+    def text; @data['text'] end
+    def time
+      ts = @data['ts']
+      ts && Time.at(ts.to_i)
+    end
+    def channel
+      chan = @data['channel']
+      @bot.channel chan
     end
   end
 end

data/lib/slack/slack.rb

@@ -1,5 +1,6 @@
 require_relative 'user'
 require_relative 'message'
+require_relative 'channel'
 require_relative 'matchers/matcher_group'
 require 'net/http'
 require 'faye/websocket'
@@ -83,23 +84,64 @@ module SlackBot
   end
   
   def post(channel, message)
+    if channel.is_a? String
+      chan = channel
+    elsif channel.is_a? Channel
+      chan = channel.id
+    else
+      raise "Not a valid channel: #{channel}"
+    end
     data = {
       id: 1,
       type: 'message',
-      channel: channel,
-      text: message
+      channel: chan,
+      text: message.to_s
     }
     @socket.send data.to_json
   end
   
-  def reply_to(data, message)
-    post(data['channel'], message)
+  def reply_to(msg, text)
+    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)
-    @team_info['channels'].select { |ch| ch['id'] == id }.first rescue nil
+    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| 
@@ -110,16 +152,18 @@ module SlackBot
   
   def users
     @users ||= load_users
-    @users.values
   end
   
   def user(id)
-    @users ||= load_users
-    @users[id]
+    users[id]
+  end
+  
+  def me
+    @team_info['self']
   end
   
-  def channel(name)
-    @team_info['channels'].select { |c| c['name'] == name }.first
+  def [](key)
+    @team_info[key]
   end
   
   def log(type, message)

data/lib/slack/user.rb

@@ -1,32 +1,11 @@
 module SlackBot
-  DEFAULT_ATTRS = [
-    :id,
-    :team_id,
-    :name,
-    :deleted,
-    :status,
-    :color,
-    :real_name,
-    :tz,
-    :tz_label,
-    :tz_offset,
-    :profile,
-    :is_admin,
-    :is_owner,
-    :is_primary_owner,
-    :is_restricted,
-    :is_ultra_restricted,
-    :is_bot,
-    :presence
-  ]
   class User
-    
     def initialize(data)
       @data = data
     end
     
     def to_s
-      "#{real_name} (#{name})"
+      "@#{name}"
     end
     
     def pretty_name
@@ -34,17 +13,27 @@ module SlackBot
     end
     
     def pretty_first_name
-      (real_name && real_name.split(' ').first) || name
+      first_name || name
     end
     
-    def method_missing(sym)
-      if @data.has_key? sym.to_s
-        return @data[sym.to_s]
-      elsif DEFAULT_ATTRS.include? sym.to_sym
-        return nil
-      else
-        super
-      end
+    def [](key)
+      @data[key]
     end
+    
+    # Helper methods for getting info
+    def profile; @data['profile'] || {} end
+    def real_name; profile['real_name'] end
+    def first_name; profile['first_name'] end
+    def last_name; profile['last_name'] end
+    
+    def id; @data['id'] end
+    def name; @data['name'] end
+    def deleted; @data['deleted'] end
+    def admin?; @data['admin'] end
+    def owner?; @data['owner'] end
+    def primary_owner?; @data['primary_owner'] end
+    def bot?; @data['is_bot'] end
+    def presence; @data['presence'] end
+    def user_channel; @bot.user_channel self end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: realtime-slackbot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Will Richardson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -46,6 +46,7 @@ extra_rdoc_files: []
 files:
 - lib/realtime-slackbot.rb
 - lib/slack/bot.rb
+- lib/slack/channel.rb
 - lib/slack/matchers/matcher.rb
 - lib/slack/matchers/matcher_group.rb
 - lib/slack/message.rb
@@ -76,3 +77,4 @@ signing_key:
 specification_version: 4
 summary: Slackbot realtime API
 test_files: []
+has_rdoc: