magent 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/magent/web_socket_server.rb

@@ -7,60 +7,60 @@ module Magent
       $stdout.puts ">> Server running and up! #{options}}" if options[:debug]
 
       EventMachine.run do
-        @channel = EM::Channel.new
-        @channels = {}
-        @channel_ids = {}
-        @sids = {}
+        setup
 
         EM.run do
-        EventMachine.add_periodic_timer(options.delete(:interval)||10) do
-          while message = Magent::WebSocketChannel.dequeue
-            if (channel = @channels[message["channel_id"]])
-              channel.push(message.to_json)
+          EventMachine.add_periodic_timer(options.delete(:interval)||10) do
+            while message = Magent::WebSocketChannel.dequeue
+              if (channel = @channels[message["channel_id"]])
+                channel.push(message.to_json)
+              end
             end
           end
         end
-        end
 
         EventMachine::WebSocket.start(options) do |ws|
           ws.onopen do
             ws.onmessage do |msg|
               data = JSON.parse(msg) rescue {}
 
-              case data["id"]
-              when 'start'
-                if data["channel_id"].present? && (channel_id = validate_channel_id(data["channel_id"]))
-                  key = generate_unique_key(data["key"])
-                  @channels[channel_id] ||= EM::Channel.new
-                  @channel_ids[key] = channel_id
-
-                  sid = @channels[channel_id].subscribe { |msg| ws.send(msg) }
-
-                  @sids[key] = sid
-                  ws.onclose do
-                    @channel_ids.delete(key)
-                    @channels[channel_id].unsubscribe(sid)
-                    @sids.delete(key)
+              if !handle_message(ws, data)
+                case data["id"]
+                when 'start'
+                  if data["channel_id"].present? && (channel_id = validate_channel_id(data["channel_id"]))
+                    key = generate_unique_key(data["key"])
+                    @channels[channel_id] ||= EM::Channel.new
+                    @channel_ids[key] = channel_id
+
+                    sid = @channels[channel_id].subscribe { |msg| ws.send(msg) }
+
+                    @sids[key] = sid
+                    ws.onclose do
+                      @channel_ids.delete(key)
+                      @channels[channel_id].unsubscribe(sid)
+                      @sids.delete(key)
+                    end
+
+                    ws.send({:id => "ack", :key => key}.to_json)
+                    send(:on_ack, ws, channel_id) if respond_to?(:on_ack)
+                  else
+                    ws.close_connection
                   end
+                when 'chatmessage'
+                  key = data["key"]
+                  return invalid_key(ws) if key.blank? || @sids[key].blank?
 
-                  ws.send({:id => "ack", :key => key}.to_json)
-                else
-                  ws.close_connection
-                end
-              when 'chatmessage'
-                key = data["key"]
-                return invalid_key if key.blank? || @sids[key].blank?
+                  channel_id = @channel_ids[key]
 
-                channel_id = @channel_ids[key]
+                  if channel_id
+                    chat_message = {:id => 'chatmessage', :from => user_name(key, @sids[key]), :message => data["message"]}
 
-                if channel_id
-                  @channels[channel_id].push({:id => 'chatmessage', :from => user_name(key, @sids[key]), :message => data["message"]}.to_json)
-                else
-                  ws.send({:id => 'announcement', :type => "error", :message => "cannot find the channel"}.to_json)
+                    @channels[channel_id].push(validate_chat_message(channel_id, chat_message).to_json)
+                  else
+                    ws.send({:id => 'announcement', :type => "error", :message => "cannot find the channel"}.to_json)
+                  end
                 end
-              else
-                handle_message(ws, data)
-              end
+              end # if
             end
           end
         end # EM::WebSocket
@@ -71,13 +71,24 @@ module Magent
       self.new(options)
     end
 
+    def setup
+      @channel = EM::Channel.new
+      @channels = {}
+      @channel_ids = {}
+      @sids = {}
+    end
+
     protected
     def invalid_key(ws)
       ws.send({:id => 'announcement', :type => "error", :message => "you must provide your unique key"}.to_json)
     end
 
     def handle_message(ws, data)
-      ws.send({:id => 'announcement', :type => "error", :message => "unhandled message: #{data.inspect}"}.to_json)
+      false
+    end
+
+    def validate_chat_message(channel_id, chat_message)
+      chat_message
     end
 
     protected

data/magent.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{magent}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - David A. Cuadrado