del 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c574a58daf5543a9f5d1f49c78d7fd78f67864eb1050e7188dcb4e14b7039c24
-  data.tar.gz: d55ed1168a7a9b1aaeb5a0acc6fa250660e91d0911620a6a9f58ac1a0f0dada4
+  metadata.gz: 7f262a1fbdb6bb5a8928920aaa055ac37d1fde2cd789b17bbd66bb9ed0216d6b
+  data.tar.gz: 525e7f6afa5e20b3f59bc6df19b013b0eea9b8e33208dbb100ddd819f2df2e6f
 SHA512:
-  metadata.gz: a7a6b876e15aa871a6269535dad1a5c2fbdd8271aa65bef32ae6b24f57bc300c482619351e03484aaff40cadbaa89a743242e6f653481105469a707c08ed9421
-  data.tar.gz: c9033ec43b82049cc6c5adbb1a77236f7c615929139a9b4493221840860aeb85000cdf13cb795d9e71f14c69e27ab65c10cc341af7b8a29cd456a2642afed6d0
+  metadata.gz: 4916e972d8a2f76b43b74c26fecc74491defdde8664039a7278ea17962e42a823430e106c9c0dd004ad744ea11de7a88ef3a90e06fc4b3fd8a60e077569e6351
+  data.tar.gz: bfd3f1bda27c2b65a6222aa1cedc79f004e592a91880fddac74ffca32f2f59154bb32c3c14fc787cdf6f61fa7efd0b565eb5e160a25b866928357b92032e7e94

data/lib/del.rb

@@ -7,8 +7,11 @@ require "xmpp4r/roster/helper/roster"
 
 require "del/connection"
 require "del/default_router"
-require "del/robot"
+require "del/message"
 require "del/repository"
+require "del/robot"
+require "del/source"
+require "del/user"
 require "del/version"
 
 module Del
@@ -16,6 +19,7 @@ module Del
     puts "Loading... #{dotenv_file}"
     Dotenv.load(dotenv_file.to_s)
     puts "It's fire! 🔥"
+    Del.logger.level = Logger::INFO
     del = Robot.new(configuration: configuration)
     del.get_funky!
   end
@@ -26,10 +30,12 @@ module Del
 
   def self.configuration
     @configuration ||= {
+      default_rooms: ENV.fetch("DEL_ROOMS", '').split(','),
       host: ENV.fetch("DEL_HOST"),
       jid: ENV.fetch("DEL_JID"),
       logger: Logger.new(STDOUT),
       muc_domain: ENV.fetch("DEL_MUC_DOMAIN"),
+      name: ENV.fetch("DEL_FULL_NAME"),
       password: ENV.fetch("DEL_PASSWORD"),
       rooms: Repository.new,
       router: DefaultRouter.new,

data/lib/del/connection.rb

@@ -6,6 +6,7 @@ module Del
       @configuration = configuration
       @rooms = configuration[:rooms]
       @users = configuration[:users]
+      @mucs = {}
     end
 
     def connect(robot)
@@ -18,15 +19,31 @@ module Del
       client.auth(configuration[:password])
       roster = Jabber::Roster::Helper.new(client, false)
       roster.add_update_callback do |old_item, item|
-        users.upsert(item['jid'], item.attributes.to_h) if item
+        users.upsert(item['jid'], User.new(item['jid'], item)) if item
       end
       roster.get_roster
       roster.wait_for_roster
       client.add_message_callback do |message|
         next if message.type == :error || message.body.nil?
-        robot.receive(message)
+        user = configuration[:users].find_by(message.from.strip)
+        robot.receive(message.body, source: Source.new(user: user))
       end
       client.send(Jabber::Presence.new(:chat))
+      configuration[:default_rooms].each do |room|
+        Del.logger.debug("Joining #{room} as #{robot.name}")
+        room_jid = jid_for(room, configuration[:muc_domain].dup, robot.name)
+        stripped_jid = room_jid.strip.to_s
+        next if @mucs[stripped_jid]
+
+        muc = Jabber::MUC::SimpleMUCClient.new(client)
+        @mucs[stripped_jid] = muc
+        muc.on_message do |_, nickname, message|
+          Del.logger.debug([nickname, message].inspect)
+          other_jid = roster.items.find { |jid, item| item.iname == nickname }
+          robot.receive(message, source: Source.new(user: User.new(other_jid[0], other_jid[1]), room: stripped_jid))
+        end
+        muc.join(room_jid)
+      end
       list_rooms(configuration[:muc_domain]).each do |room|
         rooms.upsert(room)
       end
@@ -38,9 +55,16 @@ module Del
       client.send(message)
     end
 
+    def deliver_to_room(jid, message)
+      muc = @mucs[jid.strip.to_s]
+      muc.say(encode_string(message)) if muc
+    end
+
     def disconnect
       puts "byte me!"
       client.close
+    rescue IOError, SystemCallError => error
+      Del.logger.error(error)
     end
 
     private
@@ -50,9 +74,7 @@ module Del
     end
 
     def jid
-      jid = Jabber::JID.new(configuration[:jid])
-      jid.resource = "bot"
-      jid
+      @jid ||= jid_for(configuration[:jid], "chat.hipchat.com", "bot")
     end
 
     def list_rooms(muc_domain)
@@ -64,5 +86,15 @@ module Del
     def encode_string(s)
       s.encode("UTF-8", invalid: :replace, undef: :replace)
     end
+
+    def jid_for(jid, domain, resource)
+      jid = Jabber::JID.new(jid)
+      jid.resource = resource
+      unless jid.node
+        jid.node = jid.domain
+        jid.domain = domain
+      end
+      jid
+    end
   end
 end

data/lib/del/default_router.rb

@@ -1,7 +1,9 @@
 module Del
   class DefaultRouter
     def route(message)
-      Del.logger.debug(message)
+      Del.logger.info(message.to_s)
+
+      message.reply(message.text.reverse)
     end
   end
 end

data/lib/del/message.rb

@@ -0,0 +1,19 @@
+module Del
+  class Message
+    attr_reader :text, :robot, :source
+
+    def initialize(text, robot:, source:)
+      @text = text
+      @robot = robot
+      @source = source
+    end
+
+    def reply(message)
+      source.reply(robot, message)
+    end
+
+    def to_s
+      "#{source}: #{text}"
+    end
+  end
+end

data/lib/del/repository.rb

@@ -2,15 +2,26 @@ module Del
   class Repository
     def initialize(storage = {})
       @storage = storage
+      @lock = Mutex.new
+    end
+
+    def [](id)
+      find_by(id)
     end
 
     def find_by(id)
-      @storage[id]
+      @lock.synchronize { @storage[id.to_s] }
+    end
+
+    def find_all
+      @lock.synchronize { @storage.keys }
     end
 
     def upsert(id, attributes = {})
       Del.logger.debug([id, attributes].inspect)
-      @storage[id] = attributes
+      @lock.synchronize do
+        @storage[id.to_s] = attributes
+      end
     end
   end
 end

data/lib/del/robot.rb

@@ -2,9 +2,12 @@ module Del
   class Robot
     attr_reader :connection, :router
     attr_reader :users, :rooms
+    attr_reader :jid, :name
 
     def initialize(configuration:)
       @connection = Connection.new(configuration: configuration)
+      @jid = configuration[:jid]
+      @name = configuration[:name]
       @router = configuration[:router]
       @users = configuration[:users]
       @rooms = configuration[:rooms]
@@ -17,12 +20,17 @@ module Del
       connection.disconnect
     end
 
-    def receive(message)
-      router.route(message)
+    def receive(message, source:)
+      return if source.from?(self)
+      router.route(Message.new(message, robot: self, source: source))
     end
 
-    def send_message(jid, message)
-      connection.deliver(jid, message)
+    def send_message(jid, message, room: nil)
+      if room.nil?
+        connection.deliver(jid, message)
+      else
+        connection.deliver_to_room(room, message)
+      end
     end
   end
 end

data/lib/del/source.rb

@@ -0,0 +1,22 @@
+module Del
+  class Source
+    attr_reader :user, :room
+
+    def initialize(user:, room: nil)
+      @user = user
+      @room = room
+    end
+
+    def from?(robot)
+      user.attributes.jid == robot.jid.to_s
+    end
+
+    def reply(robot, message)
+      robot.send_message(user.jid, message, room: room)
+    end
+
+    def to_s
+      "#{user.mention_name}:#{room}:"
+    end
+  end
+end

data/lib/del/user.rb

@@ -0,0 +1,14 @@
+module Del
+  class User
+    attr_reader :jid, :attributes
+
+    def initialize(jid, attributes)
+      @jid = jid
+      @attributes = attributes || {}
+    end
+
+    def mention_name
+      attributes[:mention_name]
+    end
+  end
+end

data/lib/del/version.rb

@@ -1,3 +1,3 @@
 module Del
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: del
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - mo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -102,8 +102,11 @@ files:
 - lib/del.rb
 - lib/del/connection.rb
 - lib/del/default_router.rb
+- lib/del/message.rb
 - lib/del/repository.rb
 - lib/del/robot.rb
+- lib/del/source.rb
+- lib/del/user.rb
 - lib/del/version.rb
 homepage: https://www.mokhan.ca
 licenses: