eventd 1.0.2 → 1.0.3

data/LICENSE.md

@@ -0,0 +1,7 @@
+Copyright (c) 2013 Jesse A Dunlap
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -3,7 +3,7 @@ Introduction
 
 Eventd is a web socket client and server wrapper around **em-websockets**. Eventd strives to provide an event-based
 structure, which provides the basis for web-socket enabled applications. Eventd implements a Server and a Client, which
-both implement a base ``EventdObject``.
+both inherit from ``EventdObject``.
 
 
 Installation

data/lib/eventd/eventd_client.rb

@@ -18,9 +18,10 @@ class EventdClient < EventdObject
 	# em-websocket socket object
 	attr_accessor :socket
 
-	def initialize(socket)
+	def initialize(socket, server)
 		super()
 		@socket = socket
+    @server = server
 		setup_socket unless @socket == nil
 	end
 
@@ -34,10 +35,18 @@ class EventdClient < EventdObject
 		end
 
 		@socket.onmessage do |message|
-			self.emit('message', message, true)
+      begin
+			  emission = JSON.parse message
 
-			emission = JSON.parse message
-			self.emit emission['channel'], emission['data']
+        if emission['broadcast']
+          self.broadcast emission['channel'], emission['data']
+        end
+
+        self.emit emission['channel'], emission['data']
+        self.emit('message', message, true)
+      rescue Exception
+        self.emit('message', message, true)
+      end
 		end
 	end
 
@@ -48,5 +57,9 @@ class EventdClient < EventdObject
 			emission = { 'channel' => channel, 'priority' => 'normal', 'data' => data }
 			@socket.send emission.to_json
 		end
-	end
+  end
+
+  def broadcast(channel, data = nil)
+    @server.clients.each do |client| client.emit channel, data end
+  end
 end

data/lib/eventd/eventd_server.rb

@@ -21,14 +21,18 @@ class EventdServer < EventdObject
 	# Callback block which is called when the server starts for threading purposed
 	attr_accessor :run_callback
 
+  # List of active clients on the server
+  attr_accessor :clients
+
 	# Initialize the EventdServer with configuration options
 	#
 	# == Attributes
 	# * +options+ - Configuration hash which will be used as the initial EventdServer configuration
 
-	def initialize(options)
+	def initialize(options = { :host => '127.0.0.1', :port => 8080 })
 		super()
 		@options = options
+    @clients = []
 	end
 
 	# Add to the EventdServer configuration
@@ -47,8 +51,11 @@ class EventdServer < EventdObject
 			@run_callback.call
 
 			EM::WebSocket.run @options do |socket|
-				client = EventdClient.new socket
+				client = EventdClient.new socket, self
 				self.emit 'connection', client
+
+        self.clients.push client
+        handle_disconnection_for client
 			end
 		end
 	end
@@ -57,5 +64,14 @@ class EventdServer < EventdObject
 
 	def run(&callback)
 		@run_callback = callback
-	end
+  end
+
+  private
+
+  def handle_disconnection_for(client)
+    client.on 'disconnect' do
+      @clients.delete_if do |c| c == client end
+      self.emit 'disconnection', client
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventd
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket