bot_mob 0.1.14 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5120b6a0a96763c9153d61f8f008b8a62972468
-  data.tar.gz: 8a918da1057d9d4831725d7d024df39e20f01cbf
+  metadata.gz: dd3908ac2430717821fdeaea597de6a9e9352825
+  data.tar.gz: 015641eeafc749d5add8796838553f75a129f65c
 SHA512:
-  metadata.gz: 6c6ed0090f5b97e2fac901c4682f085f2009a854e071b28985cade0db02f8c84e0f585981cddf6e7ac478d2753062394461b63fdbcab716ddb3431f9702aae1e
-  data.tar.gz: a5a0392283862e3f4fc4f2b31dbe9f919bd4e883cece9119e975ffeacde8127a8b45edcd1d6d60d2c3fa7defd6b085514ae0ff7a75853f78b348ff15061d46c4
+  metadata.gz: db17341fa132c62760e7866dd9d558b3a8f190f41eb0b5d6b3ccdf0608ef0d154bf1df0b51bd0867d521c4da71ddd80a81a54959358bc2493d713ba6f90982c2
+  data.tar.gz: 4503c2784258e2f5cac51016b775fad1019a30c87d36cf34e6ac45ec86d25d01f771a898b43fb3bfa0b18cf744ce19e66e1e49ece5ffb87ffccfa2cef55dd09b

data/lib/bot_mob/application.rb

@@ -1,50 +1,33 @@
+require 'forwardable'
+
 module BotMob
   # ## BotMob::Application
   #
   # This is the base class for BotMob.
   class Application
-    attr_reader :bot_class, :bots
+    extend Forwardable
 
-    def initialize(bot_class)
-      @bot_class = bot_class
-      @bots = {}
-    end
+    def_delegators :roster, :register
 
     def start!
       BotMob.logger.info("=> BotMob #{BotMob::VERSION} application starting")
-      load_registry
-      wire.connect { |auth| connect(auth) }
+
+      roster.load
+      wire.listen do |bot|
+        roster.connect(bot)
+      end
 
       loop do
         sleep(10)
         # Avoid polling at all for the time being
-        # load_registry if registry_available? && !wire.available?
+        # roster.load if roster.available? && !wire.available?
       end
     end
 
-    def connect(auth)
-      external_id, token = auth['external_id'], auth['token']
-      BotMob.logger.info "Register bot: #{external_id}"
-      bot = bot_class.new(external_id, token)
-      @bots[external_id] ||= bot
-      @bots[external_id].refresh
-    end
-
-    def registry_available?
-      @registry_available.nil? || @registry_available
-    end
-
     private
 
-    def load_registry
-      begin
-        BotMob::Install.all.each { |install| connect(install.auth) }
-        BotMob.logger.info '=> Registry loaded'
-        @registry_available = true
-      rescue ActiveRecord::ConnectionNotEstablished => e
-        @registry_available = false
-        BotMob.logger.info "=> Database unavailable, skipping registry"
-      end
+    def roster
+      @roster ||= BotMob::Roster.new
     end
 
     def wire

data/lib/bot_mob/authority.rb

@@ -4,17 +4,16 @@ module BotMob
   # The Authority class will process an access code
   # and retrieve an access token from Slack
   class Authority
-    attr_accessor :network, :ambassador
+    attr_reader :network, :ambassador
 
     def initialize(network, code)
       @ambassador = BotMob::Ambassador.setup(network, code)
     end
 
-    def process
+    def process(bot_class)
       return unless ambassador.success?
 
-      install = BotMob::Install.create_with_auth(ambassador.auth)
-      wire.publish(external_id: install.external_id, token: install.token)
+      wire.publish(ambassador.auth.merge(bot_class: bot_class.to_s))
     end
 
     private

data/lib/bot_mob/bot.rb

@@ -26,7 +26,7 @@ module BotMob
       client.message(args)
     end
 
-    def handle(message)
+    def respond(message)
       # noop
     end
 

data/lib/bot_mob/connection.rb

@@ -77,7 +77,7 @@ module BotMob
         logger.info "Successfully connected, '#{client.team.name}' team at https://#{client.team.domain}.slack.com."
       end
 
-      logger.info "State[#{bot.external_id}] - #{state}"
+      logger.info "State[#{bot.class.to_s}##{bot.external_id}] - #{state}"
       @state = state
     end
 
@@ -93,7 +93,7 @@ module BotMob
         if bot.respond?(message)
           logger.info("Received message at #{Time.now}")
           logger.info("  Parameters: #{message.data}")
-          bot.handle(message)
+          bot.respond(message)
         end
       end
     end

data/lib/bot_mob/install.rb

@@ -2,9 +2,13 @@ module BotMob
   class Install < ActiveRecord::Base
     self.table_name = "botmob_installs"
 
+    def self.registered_bot(auth)
+      where(bot_class: auth['bot_class'], external_id: auth['external_id'])
+    end
+
     def self.create_with_auth(auth)
-      where(external_id: auth[:external_id]).first_or_initialize.tap do |i|
-        i.token = auth[:token]
+      registered_bot(auth).first_or_initialize.tap do |i|
+        i.token = auth['token']
         i.save!
       end
     end

data/lib/bot_mob/roster.rb

@@ -0,0 +1,55 @@
+module BotMob
+  class Roster
+    attr_reader :registry
+
+    def initialize
+      @registry = {}
+      @bots = {}
+    end
+
+    def connect(auth)
+      class_name = auth['bot_class'].to_s
+      bot_class = registry[class_name]
+      external_id, token = auth['external_id'], auth['token']
+      BotMob.logger.info "Initializing #{bot_class}: #{external_id}"
+
+      puts "Registry: #{registry.inspect}"
+      puts "Using registered bot: #{bot_class.inspect}"
+      unless auth.is_a?(BotMob::Install)
+        BotMob.logger.info "Updating #{bot_class} bot record..."
+        BotMob::Install.create_with_auth(auth)
+      end
+
+      puts "Setting up a new bot with:\n  #{auth.inspect}\n  #{external_id}\n  #{token}"
+      bot = bot_class.new(external_id, token)
+      @bots["#{bot_class}##{external_id}"] ||= bot
+      @bots["#{bot_class}##{external_id}"].refresh
+    end
+
+    def load
+      begin
+        BotMob::Install.all.each do |install|
+          connect(install)
+        end
+
+        BotMob.logger.info '=> Roster loaded'
+        @available = true
+      rescue ActiveRecord::ConnectionNotEstablished => e
+        @available = false
+        BotMob.logger.info "=> Database unavailable, skipping roster load"
+      end
+    end
+
+    def [](key)
+      registry[key.to_s]
+    end
+
+    def register(bot_class)
+      @registry[bot_class.to_s] = bot_class
+    end
+
+    def available?
+      @available.nil? || @available
+    end
+  end
+end

data/lib/bot_mob/version.rb

@@ -1,3 +1,3 @@
 module BotMob
-  VERSION = '0.1.14'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/bot_mob/wire.rb

@@ -10,7 +10,7 @@ module BotMob
       queue.publish(message.to_json, routing_key: queue.name)
     end
 
-    def connect
+    def listen
       return if !block_given? || queue.nil?
 
       queue.subscribe do |_info, _props, body|

data/lib/bot_mob.rb

@@ -15,6 +15,7 @@ module BotMob
   autoload :Connection,     'bot_mob/connection'
   autoload :InboundMessage, 'bot_mob/inbound_message'
   autoload :Install,        'bot_mob/install'
+  autoload :Roster,         'bot_mob/roster'
   autoload :Wire,           'bot_mob/wire'
 
   module Slack

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bot_mob
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.0
 platform: ruby
 authors:
 - Matthew Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -231,6 +231,7 @@ files:
 - lib/bot_mob/connection.rb
 - lib/bot_mob/inbound_message.rb
 - lib/bot_mob/install.rb
+- lib/bot_mob/roster.rb
 - lib/bot_mob/slack/ambassador.rb
 - lib/bot_mob/version.rb
 - lib/bot_mob/wire.rb