local_message 0.0.1 → 0.0.3

data/lib/local_message/local_message_client.rb

@@ -12,27 +12,18 @@ class LocalMessageClient
   end
 
   def register
-    send("@register #{username} #{listen_port}")
+    send_message("@register #{username} #{listen_port}")
   end
 
-  def send(message)
+  def send_message(message)
     socket = TCPSocket.open(server, port)
-    sleep 1
     socket.write(message)
     socket.close
-    #puts "Waiting for server acknowledgement..."
-    #listen
-  end
-
-  def new_listen_port
-    @listen_port = Random.rand(1000..30_000)
   end
 
   def listen
-    #puts "Listening on #{listen_port}..."
     server = TCPServer.open(listen_port)
     client = server.accept
-    #puts "Connection open, waiting for message..."
     message = client.read
     client.close
     server.close

data/lib/local_message/local_message_router.rb

@@ -7,53 +7,38 @@ class LocalMessageRouter
   def initialize(listening_port)
     @port = listening_port
     @registered_users = {}
-    @open_ports = []
   end
 
   def start
     server = TCPServer.open(port)
     begin
 
-      puts "Listening on port: #{port}..."
       Thread.start(server.accept) do |client|
         fam, port, hostname, ip = client.peeraddr
-        puts "Connection initiated from #{hostname}:#{port}"
         message = client.read
-        puts "Message from #{hostname}:#{port}: #{message}"
-        puts handle(message, port, ip)
-        puts "Closing connection from #{hostname}:#{port}"
+        handle(message, port, ip)
         client.close
       end
 
     end while true
   end
 
+private
+
   def handle(message, port, ip)
     if register?(message)
       username, port = strip_username_port(message)
-      register(username, port.to_i, ip)
-      if registered?(username)
-        puts "Registered #{username} => #{ip}:#{port}"
-      else
-        puts "Couldn't register #{username}"
-      end
-      #send_register_ack(ip, port, username)
+      register(username, port, ip)
+
     elsif has_recipient?(message)
       recipient = strip_recipient(message)
       sender = username_by_ip(ip)
       forward_message(sender, recipient, message)
-      if registered?(recipient)
-        #send_ack(ip, port, recipient, message)
-      else
-        #send_ack(ip, port, recipient, "No such recipient")
-      end
-    else
-      "Message not handled"
     end
   end
 
   def register?(message)
-    return true if /@register/.match(message)
+    return true if /^@register/.match(message)
     false
   end
 
@@ -65,16 +50,6 @@ class LocalMessageRouter
     registered_users[username] = LocalMessageUser.new(port, ip)
   end
 
-  def send_register_ack(hostname, port, username)
-    if registered?(username)
-      send(hostname, port, "Successfully registered #{username}")
-      "Successfully registered #{username}"
-    else
-      send(hostname, port, "Failed to register #{username}")
-      "Failed to register #{username}"
-    end
-  end
-
   def username_by_ip(ip)
     registered_users.values.each do |user|
       return registered_users.key(user) if user.hostname == ip
@@ -83,7 +58,7 @@ class LocalMessageRouter
 
   def strip_username_port(message)
     /@register\s+(.+)\s+(\d+)/.match(message)
-    [$1, $2]
+    [$1, $2.to_i]
   end
 
   def has_recipient?(message)
@@ -96,35 +71,23 @@ class LocalMessageRouter
   end
 
   def strip_message(message)
-    message.split[1..-1].join(" ")
+    message.split(" ", 2)[1]
   end
 
   def forward_message(sender, recipient, message)
     if registered?(recipient)
       info = registered_users[recipient]
       message_with_sender = "@#{sender} #{strip_message(message)}"
-      puts "Sending message to #{recipient}, host: #{info.hostname} port: #{info.port}"
-      send(info.hostname, info.port, message_with_sender)
+      send_message(info.hostname, info.port, message_with_sender)
     end
   end
 
-  def port_open?(port)
-    open_ports.include?(port)
-  end
-
-  def send(hostname, port, message)
+  def send_message(hostname, port, message)
     Thread.new do
-      puts "Sending #{message} to #{hostname}:#{port}"
       socket = TCPSocket.open(hostname, port)
-      sleep 1
       socket.write(message)
       socket.close
     end
   end
 
-  def send_ack(hostname, port, recipient, message)
-    send(hostname, port, "Sent #{message} to #{recipient}")
-    "Sent #{message} to #{hostname}:#{port}"
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local_message
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies: []
 description: Routes messages across a local network.
 email: elliot@sandbochs.com
@@ -21,7 +21,7 @@ files:
 - lib/local_message/local_message_router.rb
 - lib/local_message/local_message_client.rb
 - lib/local_message/local_message_user.rb
-homepage: http://www.github.com/sandbochs
+homepage: http://www.github.com/sandbochs/local_message
 licenses: []
 post_install_message: 
 rdoc_options: []