del 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a4e9193a7e58ecb7c4195cc44959af6ae915e8d189cb68367419af260419844
-  data.tar.gz: cc390be8a96218d8d8d6ececf6c944f90c46e1d4a44940bfba6c448e59b93cc9
+  metadata.gz: c574a58daf5543a9f5d1f49c78d7fd78f67864eb1050e7188dcb4e14b7039c24
+  data.tar.gz: d55ed1168a7a9b1aaeb5a0acc6fa250660e91d0911620a6a9f58ac1a0f0dada4
 SHA512:
-  metadata.gz: b9c261aa11e6a3c6aedb608ec33f4c7cf8b1095d000cf7ffd9e161b2ec48cc23a82e1debfa34e05339327cbedee4419a573730fd514a7a5ba78926085ae8b78a
-  data.tar.gz: 409e76bd0714896bc2cf469b32664defda74df568a7062e41173ed1511e5b06f10088d81d290116186fb360bad0604f441a432d7fb80b1b85b5c2738c2df587a
+  metadata.gz: a7a6b876e15aa871a6269535dad1a5c2fbdd8271aa65bef32ae6b24f57bc300c482619351e03484aaff40cadbaa89a743242e6f653481105469a707c08ed9421
+  data.tar.gz: c9033ec43b82049cc6c5adbb1a77236f7c615929139a9b4493221840860aeb85000cdf13cb795d9e71f14c69e27ab65c10cc341af7b8a29cd456a2642afed6d0

data/exe/del

@@ -3,7 +3,6 @@
 require "del"
 require "pathname"
 
-home = Pathname.new(Dir.home)
 Del.start(
-  dotenv_file: ENV.fetch("DELRC", home.join(".delrc").to_s)
+  dotenv_file: ENV.fetch("DELRC", Pathname.new(Dir.home).join(".delrc"))
 )

data/lib/del/connection.rb

@@ -2,14 +2,15 @@ module Del
   class Connection
     attr_reader :configuration, :rooms, :users
 
-    def initialize(configuration:, users:, rooms:)
+    def initialize(configuration:)
       @configuration = configuration
-      @rooms = rooms
-      @users = users
+      @rooms = configuration[:rooms]
+      @users = configuration[:users]
     end
 
     def connect(robot)
       client.on_exception do |error, connection, error_source|
+        Del.logger.error(error)
         disconnect
       end
       client.connect(configuration[:host])
@@ -17,7 +18,7 @@ module Del
       client.auth(configuration[:password])
       roster = Jabber::Roster::Helper.new(client, false)
       roster.add_update_callback do |old_item, item|
-        users.create(item) if item
+        users.upsert(item['jid'], item.attributes.to_h) if item
       end
       roster.get_roster
       roster.wait_for_roster

data/lib/del/default_router.rb

@@ -0,0 +1,7 @@
+module Del
+  class DefaultRouter
+    def route(message)
+      Del.logger.debug(message)
+    end
+  end
+end

data/lib/del/repository.rb

@@ -0,0 +1,16 @@
+module Del
+  class Repository
+    def initialize(storage = {})
+      @storage = storage
+    end
+
+    def find_by(id)
+      @storage[id]
+    end
+
+    def upsert(id, attributes = {})
+      Del.logger.debug([id, attributes].inspect)
+      @storage[id] = attributes
+    end
+  end
+end

data/lib/del/robot.rb

@@ -1,13 +1,13 @@
 module Del
   class Robot
-    attr_reader :connection
+    attr_reader :connection, :router
+    attr_reader :users, :rooms
 
     def initialize(configuration:)
-      @connection = Connection.new(
-        configuration: configuration,
-        users: users,
-        rooms: rooms,
-      )
+      @connection = Connection.new(configuration: configuration)
+      @router = configuration[:router]
+      @users = configuration[:users]
+      @rooms = configuration[:rooms]
     end
 
     def get_funky!
@@ -18,21 +18,11 @@ module Del
     end
 
     def receive(message)
-      send_message(message.from, message.body)
+      router.route(message)
     end
 
     def send_message(jid, message)
       connection.deliver(jid, message)
     end
-
-    private
-
-    def users
-      @users ||= UserRepository.new
-    end
-
-    def rooms
-      @rooms ||= RoomRepository.new
-    end
   end
 end

data/lib/del/version.rb

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

data/lib/del.rb

@@ -1,20 +1,20 @@
 require "dotenv"
+require "logger"
 require "xmpp4r"
 require "xmpp4r/muc/helper/mucbrowser"
 require "xmpp4r/muc/helper/simplemucclient"
 require "xmpp4r/roster/helper/roster"
 
 require "del/connection"
+require "del/default_router"
 require "del/robot"
-require "del/room_repository"
-require "del/user"
-require "del/user_repository"
+require "del/repository"
 require "del/version"
 
 module Del
   def self.start(dotenv_file:)
     puts "Loading... #{dotenv_file}"
-    Dotenv.load(dotenv_file)
+    Dotenv.load(dotenv_file.to_s)
     puts "It's fire! 🔥"
     del = Robot.new(configuration: configuration)
     del.get_funky!
@@ -28,8 +28,16 @@ module Del
     @configuration ||= {
       host: ENV.fetch("DEL_HOST"),
       jid: ENV.fetch("DEL_JID"),
+      logger: Logger.new(STDOUT),
       muc_domain: ENV.fetch("DEL_MUC_DOMAIN"),
       password: ENV.fetch("DEL_PASSWORD"),
+      rooms: Repository.new,
+      router: DefaultRouter.new,
+      users: Repository.new,
     }
   end
+
+  def self.logger
+    @logger ||= configuration[:logger]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: del
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - mo
@@ -101,10 +101,9 @@ files:
 - exe/del
 - lib/del.rb
 - lib/del/connection.rb
+- lib/del/default_router.rb
+- lib/del/repository.rb
 - lib/del/robot.rb
-- lib/del/room_repository.rb
-- lib/del/user.rb
-- lib/del/user_repository.rb
 - lib/del/version.rb
 homepage: https://www.mokhan.ca
 licenses:

data/lib/del/room_repository.rb

@@ -1,11 +0,0 @@
-module Del
-  class RoomRepository
-    def initialize
-      @rooms = Set.new
-    end
-
-    def upsert(room)
-      @rooms << room
-    end
-  end
-end

data/lib/del/user.rb

@@ -1,7 +0,0 @@
-module Del
-  class User
-    def initialize(attributes)
-      @attributes = attributes
-    end
-  end
-end

data/lib/del/user_repository.rb

@@ -1,11 +0,0 @@
-module Del
-  class UserRepository
-    def initialize
-      @users = Set.new
-    end
-
-    def create(item)
-      @users << User.new(item.attributes)
-    end
-  end
-end