del 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e85d9b9946bae3f1de83c5b5aa9ca4233f857f709442a1b936db6ec844966407
-  data.tar.gz: de3491021d7b76d98f1ac3c589333a13853ac11175ce64c08ff1172421b3656f
+  metadata.gz: 4c692700ff52b08475986f45fd13437d99d69dfa93123bde4d96021200894cd4
+  data.tar.gz: 3343f38e6ae8c7760d5bcee2315abe2c20f972b298beb1a201c34c1001ee26c3
 SHA512:
-  metadata.gz: 56f686105ffd29d6e69948cc0c0788ce57c86d562a2433457b41df1562145c8db58becbbabb6c84b9abfa4e3b80c36bd7c222d78f176655d3937317f354240fe
-  data.tar.gz: 7f5bbcccc027f0a5ada5d7802fe4b2c69aa8991f8a830299687f3477a10b4c29be59f1f705a0dc0e644a23a781e285b5a1576912ed5c14eb80025d69cd27d3e2
+  metadata.gz: e68e68bad8620911482ae6a029bd4bab2e41e0ce7c21ee295221e68327a39c5cd8702a256a408751623c09522b63d96ca0f95f92f4f401d4c322b7aa78fb0842
+  data.tar.gz: 57f62a3bc023b8003d8c872864e94be4f6a3fc4ad7e6352793846d8deb6ed8b63689cbf4feda04f73bbdbaefae29b31018131eb3df7d769478fe6ead240d5dba

data/lib/del/configuration.rb

@@ -9,7 +9,6 @@ module Del
     attr_accessor :muc_domain
     attr_accessor :name
     attr_accessor :password
-    attr_accessor :rooms
     attr_accessor :router
     attr_accessor :users
     attr_accessor :socket_file
@@ -23,7 +22,6 @@ module Del
       @muc_domain = settings.fetch(:muc_domain, "conf.hipchat.com")
       @name = settings.fetch(:full_name)
       @password = settings.fetch(:password)
-      @rooms = Repository.new
       @router = DefaultRouter.new
       @socket_file = settings.fetch(:socket_file, SOCKET_FILE)
       @users = Repository.new

data/lib/del/connection.rb

@@ -1,11 +1,9 @@
 module Del
   class Connection
-    attr_reader :configuration, :rooms, :users
+    attr_reader :configuration
 
     def initialize(configuration:)
       @configuration = configuration
-      @rooms = configuration.rooms
-      @users = configuration.users
       @mucs = {}
     end
 
@@ -19,7 +17,7 @@ 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) if item
+        configuration.users.upsert(item['jid'], item.attributes) if item
       end
       roster.get_roster
       roster.wait_for_roster
@@ -30,7 +28,7 @@ module Del
       end
       client.send(Jabber::Presence.new(:chat))
       configuration.default_rooms.each do |room|
-        Del.logger.debug("Joining #{room} as #{robot.name}")
+        Del.logger.debug("Joining room '#{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]
@@ -44,9 +42,9 @@ module Del
         end
         muc.join(room_jid)
       end
-      list_rooms(configuration.muc_domain).each do |room|
-        rooms.upsert(room)
-      end
+      #list_rooms(configuration.muc_domain).each do |room|
+        #rooms.upsert(room)
+      #end
     end
 
     def deliver(jid, message)
@@ -77,14 +75,14 @@ module Del
       @jid ||= jid_for(configuration.jid, "chat.hipchat.com", "bot")
     end
 
-    def list_rooms(muc_domain)
-      Jabber::MUC::MUCBrowser.new(client).muc_rooms(muc_domain).map do |jid, name|
-        jid.to_s
-      end
-    end
+    #def list_rooms(muc_domain)
+      #Jabber::MUC::MUCBrowser.new(client).muc_rooms(muc_domain).map do |jid, name|
+        #jid.to_s
+      #end
+    #end
 
     def encode_string(s)
-      s.encode("UTF-8", invalid: :replace, undef: :replace)
+      s.to_s.encode("UTF-8", invalid: :replace, undef: :replace)
     end
 
     def jid_for(jid, domain, resource)

data/lib/del/repository.rb

@@ -10,7 +10,9 @@ module Del
     end
 
     def find_by(id)
-      @lock.synchronize { Del::User.new(id, @storage[id.to_s]) }
+      @lock.synchronize do
+        Del::User.new(id, @storage[id.to_s])
+      end
     end
 
     def find_all

data/lib/del/user.rb

@@ -10,5 +10,9 @@ module Del
     def mention_name
       attributes[:mention_name]
     end
+
+    def to_s
+      YAML.dump(attributes)
+    end
   end
 end

data/lib/del/version.rb

@@ -1,3 +1,3 @@
 module Del
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: del
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - mo