revent 0.4.4 → 0.5

data/example/as_r/Document.as

@@ -0,0 +1 @@
+package {

data/example/as_r/README

@@ -0,0 +1,3 @@
+To permit the flash client to connect make connection to the server:
+* Go to http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html
+* Add the folder of the client to trusted location list

data/{test → example}/as_r/server.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'revent/as_r'
 
 HOST = 'localhost'
@@ -13,34 +14,26 @@ class Server
   end
 
   def on_connect(client)
-    puts "on_connect:"
-    puts client.remote_ip
+    puts "on_connect: ", client.remote_ip
   end
 
   def on_close(client)
-    puts "on_close:"
-    puts client.remote_ip
+    puts "on_close:", client.remote_ip
   end
 
-  def on_call(client, cmd, value)
-    puts "on_call:", cmd, value
+  def on_invoke(client, cmd, value)
+    puts "on_invoke: ", cmd, value
     if cmd == CMD_TEST_BYTE_ARRAY
       test_byte_array(client, value)
     end
   end
 
   def on_result(client, cmd, value)
-    puts "on_result:"
-    puts client.remote_ip
-    puts cmd
-    puts result
+    puts "on_result: ", client.remote_ip, cmd, result
   end
 
   def on_error(client, cmd, value)
-    puts "on_error:"
-    puts client.remote_ip
-    puts cmd
-    puts error
+    puts "on_error: ", client.remote_ip, cmd, error
   end
 
   # ----------------------------------------------------------------------------

data/example/r_r/client.rb

@@ -0,0 +1,46 @@
+require 'rubygems'
+require 'revent/r_r'
+
+class Client
+  include Revent::RRClient
+
+  def initialize
+    @data_prefix = ''
+    50.times { |i| @data_prefix << i.to_s }
+
+    connect('localhost', 1943)
+  end
+
+  N = 10**4
+
+  def on_connect
+    @now = Time.now
+    @count = 0
+    N.times do |i|
+      invoke("#{@data_prefix}#{i}", i)
+    end
+  end
+
+  def on_invoke(cmd, value)
+    cmd =~ /#{@data_prefix}(.+)/
+    puts 'Error at on_invoke' if value != $1.to_i
+    value
+  end
+
+  def on_result(cmd, value)
+    cmd =~ /#{@data_prefix}(.+)/
+    puts 'Error at on_result' if value != $1.to_i
+
+    @count += 1
+    if @count == N
+      dt = Time.now - @now
+      puts N
+      puts dt
+      puts N/dt
+    end
+  end
+end
+
+EventMachine::run do
+  Client.new
+end

data/example/r_r/server.rb

@@ -0,0 +1,46 @@
+require 'rubygems'
+require 'revent/r_r'
+
+class Server
+  include Revent::RRServer
+
+  def initialize
+    @data_prefix = ''
+    50.times { |i| @data_prefix << i.to_s }
+
+    start_server('localhost', 1943)
+  end
+
+  N = 10**4
+
+  def on_connect(con)
+    @count = 0
+    @now = Time.now
+    N.times do |i|
+      con.invoke("#{@data_prefix}#{i}", i)
+    end
+  end
+
+  def on_invoke(con, cmd, value)
+    cmd =~ /#{@data_prefix}(.+)/
+    puts 'Error at on_invoke' if value != $1.to_i
+    value
+  end
+
+  def on_result(con, cmd, value)
+    cmd =~ /#{@data_prefix}(.+)/
+    puts 'Error at on_result' if value != $1.to_i
+
+    @count += 1
+    if @count == N
+      dt = Time.now - @now
+      puts N
+      puts dt
+      puts N/dt
+    end
+  end
+end
+
+EventMachine::run do
+  Server.new
+end

data/lib/revent/Client.as

@@ -5,7 +5,7 @@
 	import flash.utils.ByteArray;
 
 	public class Client extends EventDispatcher {
-		private static const TYPE_CALL:int   = 0;
+		private static const TYPE_INVOKE:int = 0;
 		private static const TYPE_RESULT:int = 1;
 		private static const TYPE_ERROR:int  = 2;
 
@@ -15,7 +15,7 @@
 		public function Client():void {
 			_socket = new Socket();
 			_socket.objectEncoding = ObjectEncoding.AMF3;
-			
+
 			_socket.addEventListener(Event.CONNECT, onConnect);
 			_socket.addEventListener(Event.CLOSE, onClose);
 			_socket.addEventListener(IOErrorEvent.IO_ERROR, onIOError);
@@ -37,8 +37,8 @@
 			return _socket.connected;
 		}
 
-		public function call(cmd:Object, value:Object):void {
-			_socket.writeObject([TYPE_CALL, cmd, value]);
+		public function invoke(cmd:Object, value:Object):void {
+			_socket.writeObject([TYPE_INVOKE, cmd, value]);
 			_socket.flush();
 		}
 
@@ -55,19 +55,19 @@
 		// ---------------------------------------------------------------------------
 
 		private function onConnect(event:Event):void {
-			dispatchEvent(new CallEvent(CallEvent.CONNECT, null, null));
+			dispatchEvent(new InvokeEvent(InvokeEvent.CONNECT, null, null));
 		}
 
 		private function onClose(event:Event):void {
-			dispatchEvent(new CallEvent(CallEvent.CLOSE, null, null));
+			dispatchEvent(new InvokeEvent(InvokeEvent.CLOSE, null, null));
 		}
 
 		private function onIOError(event:IOErrorEvent):void {
-			dispatchEvent(new CallEvent(CallEvent.IO_ERROR, null, null));
+			dispatchEvent(new InvokeEvent(InvokeEvent.IO_ERROR, null, null));
 		}
 
 		private function onSecurityError(event:SecurityErrorEvent):void {
-			dispatchEvent(new CallEvent(CallEvent.SECURITY_ERROR, null, null));
+			dispatchEvent(new InvokeEvent(InvokeEvent.SECURITY_ERROR, null, null));
 		}
 
 		private function onData(event:ProgressEvent):void {
@@ -86,16 +86,16 @@
 					var cmd:Object   = o[1];
 					var value:Object = o[2];
 
-					var e:CallEvent;
+					var e:InvokeEvent;
 					switch (type) {
-					case TYPE_CALL:
-						e = new CallEvent(CallEvent.CALL, cmd, value);
+					case TYPE_INVOKE:
+						e = new InvokeEvent(InvokeEvent.INVOKE, cmd, value);
 						break;
 					case TYPE_RESULT:
-						e = new CallEvent(CallEvent.RESULT, cmd, value);
+						e = new InvokeEvent(InvokeEvent.RESULT, cmd, value);
 						break;
 					case TYPE_ERROR:
-						e = new CallEvent(CallEvent.ERROR, cmd, value);
+						e = new InvokeEvent(InvokeEvent.ERROR, cmd, value);
 						break;
 					}
 					dispatchEvent(e);
@@ -110,4 +110,4 @@
 			}
 		}
 	}
-}
+}

data/lib/revent/{CallEvent.as → InvokeEvent.as}

@@ -1,7 +1,7 @@
 package revent {
 	import flash.events.Event;
 
-	public class CallEvent extends Event {
+	public class InvokeEvent extends Event {
 		// The connection has opened, communication is ready.
 		public static const CONNECT:String        = "CONNECT";
 		// The connection has closed, do not do any communication.
@@ -9,17 +9,17 @@
 		public static const IO_ERROR:String       = "IO_ERROR";
 		public static const SECURITY_ERROR:String = "SECURITY_ERROR";
 
-		public static const CALL:String   = "CALL";
+		public static const INVOKE:String = "INVOKE";
 		public static const RESULT:String = "RESULT";
 		public static const ERROR:String  = "ERROR";
 
 		public var cmd:Object;
 		public var value:Object;
 
-		public function CallEvent(type:String, cmd:Object, value:Object):void {
+		public function InvokeEvent(type:String, cmd:Object, value:Object):void {
 			this.cmd = cmd;
 			this.value = value;
 			super(type);
 		}
 	}
-}
+}

data/lib/revent/as_r.rb

@@ -13,13 +13,13 @@ module Revent
     # Called by Flash player
     CMD_POLICY = '<policy-file-request/>' + "\0"
 
-    TYPE_CALL   = 0
+    TYPE_INVOKE = 0
     TYPE_RESULT = 1
     TYPE_ERROR  = 2
 
-    attr_writer :me
+    attr_writer   :me
     attr_accessor :session  # Something that you want to associate with this connection
-    attr_writer :cons
+    attr_writer   :cons
 
     def post_init
       @connected = true
@@ -55,6 +55,7 @@ module Revent
       end
     rescue
       @me.logger.error($!)
+      @me.logger.error($!.backtrace.join("\n"))
       close_connection
     end
 
@@ -64,8 +65,8 @@ module Revent
       value = o[2]
 
       case type
-      when TYPE_CALL
-        @me.on_call(self, cmd, value)
+      when TYPE_INVOKE
+        @me.on_invoke(self, cmd, value)
       when TYPE_RESULT
         @me.on_result(self, cmd, value)
       when TYPE_ERROR
@@ -73,6 +74,7 @@ module Revent
       end
     rescue
       @me.logger.error($!)
+      @me.logger.error($!.backtrace.join("\n"))
       close_connection
     end
 
@@ -100,16 +102,17 @@ module Revent
       peername = get_peername
       return @last_ip if peername.nil?
 
-      a = get_peername[2,6].unpack("nC4")
+      a = get_peername[2, 6].unpack("nC4")
       a.delete_at(0)
       @last_ip = a.join('.')
     end
 
-    def call(cmd, value, close_connection_after_writing = false)
-      send_amf3_data([TYPE_CALL, cmd, value])
+    def invoke(cmd, value, close_connection_after_writing = false)
+      send_amf3_data([TYPE_INVOKE, cmd, value])
       self.close_connection_after_writing if close_connection_after_writing
     rescue
       @me.logger.error($!)
+      @me.logger.error($!.backtrace.join("\n"))
     end
 
     def result(cmd, value, close_connection_after_writing = false)
@@ -117,6 +120,7 @@ module Revent
       self.close_connection_after_writing if close_connection_after_writing
     rescue
       @me.logger.error($!)
+      @me.logger.error($!.backtrace.join("\n"))
     end
 
     def error(cmd, value, close_connection_after_writing = false)
@@ -124,6 +128,7 @@ module Revent
       self.close_connection_after_writing if close_connection_after_writing
     rescue
       @me.logger.error($!)
+      @me.logger.error($!.backtrace.join("\n"))
     end
 
     def compress(value)
@@ -149,11 +154,11 @@ module Revent
       @logger = Logger.new(STDOUT) if @logger.nil?
       @max_cmd_length = DEFAULT_MAX_CMD_LENGTH if @max_cmd_length.nil?
       if @policy.nil?
-        @policy = <<EOF
+        @policy = %Q{
 <cross-domain-policy>
 <allow-access-from domain="*" to-ports="#{port}" />
 </cross-domain-policy>
-EOF
+}
       end
 
       @revent_cons = []
@@ -182,7 +187,7 @@ EOF
     def on_close(client)
     end
 
-    def on_call(client, cmd, value)
+    def on_invoke(client, cmd, value)
     end
 
     def on_result(client, cmd, value)

data/lib/revent/captcha.rb

@@ -32,7 +32,7 @@ module Revent
       code.upcase == code0 and Time.now.to_i - timestamp0 < @valid_period
     end
 
-  private
+    private
 
     # Returns [code (a string of A-Z), img]
     VOCA = ('A'..'Z').to_a.freeze

data/lib/revent/r_r.rb

@@ -7,13 +7,13 @@ require "#{File.dirname(__FILE__)}/synchronize"
 module Revent
   # Included by both Revent::RRServer and Revent::RRClient.
   module RRCon
-    TYPE_CALL   = 0
+    TYPE_INVOKE = 0
     TYPE_RESULT = 1
     TYPE_ERROR  = 2
 
-    attr_writer :me
+    attr_writer   :me
     attr_accessor :session  # Something that you want to associate with this connection
-    attr_writer :cons  # Only used for Revent::RRServer
+    attr_writer   :cons     # Only used for Revent::RRServer
 
     def post_init
       @connected = true
@@ -37,8 +37,8 @@ module Revent
       value = o[2]
 
       case type
-      when TYPE_CALL
-        value = @cons.nil? ? @me.on_call(cmd, value) : @me.on_call(self, cmd, value)
+      when TYPE_INVOKE
+        value = @cons.nil? ? @me.on_invoke(cmd, value) : @me.on_invoke(self, cmd, value)
         o = [TYPE_RESULT, cmd, value]
         send_data(Marshal.dump(o))
       when TYPE_RESULT
@@ -61,7 +61,7 @@ module Revent
       end
     end
 
-  # ----------------------------------------------------------------------------
+    # --------------------------------------------------------------------------
 
     def connected?
       @connected
@@ -72,13 +72,13 @@ module Revent
       peername = get_peername
       return @last_ip if peername.nil?
 
-      a = get_peername[2,6].unpack("nC4")
+      a = get_peername[2, 6].unpack("nC4")
       a.delete_at(0)
       @last_ip = a.join('.')
     end
 
-    def call(cmd, value)
-      o = [TYPE_CALL, cmd, value]
+    def invoke(cmd, value)
+      o = [TYPE_INVOKE, cmd, value]
       send_data(Marshal.dump(o))
     end
   end
@@ -112,7 +112,7 @@ module Revent
     def on_close(client)
     end
 
-    def on_call(client, cmd, value)
+    def on_invoke(client, cmd, value)
     end
 
     def on_result(client, cmd, value)
@@ -150,8 +150,8 @@ module Revent
       @revent_con.remote_ip if connected?
     end
 
-    def call(cmd, value)
-      @revent_con.call(cmd, value) if connected?
+    def invoke(cmd, value)
+      @revent_con.invoke(cmd, value) if connected?
     end
 
     def close_connection
@@ -170,7 +170,7 @@ module Revent
     def on_close
     end
 
-    def on_call(cmd, value)
+    def on_invoke(cmd, value)
     end
 
     def on_result(cmd, value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: revent
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: "0.5"
 platform: ruby
 authors: 
 - Ngoc DAO Thanh
@@ -9,10 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-28 00:00:00 +09:00
+date: 2008-09-24 00:00:00 +09:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: crypt
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: ngocdaothanh@gmail.com
 executables: []
@@ -22,43 +41,44 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- test
-- test/as_r
-- test/as_r/Document.as
-- test/as_r/client.fla
-- test/as_r/server.rb
-- test/as_r/client.swf
-- test/r_r
-- test/r_r/client.rb
-- test/r_r/server.rb
+- example
+- example/as_r
+- example/as_r/client.fla
+- example/as_r/client.swf
+- example/as_r/Document.as
+- example/as_r/README
+- example/as_r/server.rb
+- example/r_r
+- example/r_r/client.rb
+- example/r_r/server.rb
+- INSTALL
 - lib
 - lib/revent
-- lib/revent/r_r.rb
-- lib/revent/as_r.rb
-- lib/revent/Client.as
-- lib/revent/synchronize.rb
-- lib/revent/captcha.rb
 - lib/revent/amf3
+- lib/revent/amf3/amf3.rb
 - lib/revent/amf3/app
-- lib/revent/amf3/app/fault_object.rb
 - lib/revent/amf3/app/configuration.rb
-- lib/revent/amf3/LICENSE
+- lib/revent/amf3/app/fault_object.rb
+- lib/revent/amf3/exception
+- lib/revent/amf3/exception/rubyamf_exception.rb
 - lib/revent/amf3/io
 - lib/revent/amf3/io/amf_deserializer.rb
-- lib/revent/amf3/io/read_write.rb
 - lib/revent/amf3/io/amf_serializer.rb
 - lib/revent/amf3/io/byte_array.rb
+- lib/revent/amf3/io/read_write.rb
+- lib/revent/amf3/LICENSE
+- lib/revent/amf3/README
 - lib/revent/amf3/util
-- lib/revent/amf3/util/vo_helper.rb
 - lib/revent/amf3/util/string.rb
-- lib/revent/amf3/README
-- lib/revent/amf3/exception
-- lib/revent/amf3/exception/rubyamf_exception.rb
-- lib/revent/amf3/amf3.rb
-- lib/revent/CallEvent.as
-- setup.rb
-- INSTALL
+- lib/revent/amf3/util/vo_helper.rb
+- lib/revent/as_r.rb
+- lib/revent/captcha.rb
+- lib/revent/Client.as
+- lib/revent/InvokeEvent.as
+- lib/revent/r_r.rb
+- lib/revent/synchronize.rb
 - README
+- setup.rb
 has_rdoc: false
 homepage: http://revent.rubyforge.org
 post_install_message: 
@@ -81,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: revent
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: RPC based on EventMachine

data/test/as_r/Document.as

@@ -1,81 +0,0 @@
-package {
-	import flash.display.Sprite;
-	import flash.events.MouseEvent;
-	import flash.utils.ByteArray;
-
-	import revent.Client;
-	import revent.CallEvent;
-
-	public class Document extends Sprite {
-		private static const HOST:String = "localhost";
-		private static const PORT:int    = 1935;
-
-		private static const CMD_TEST_BYTE_ARRAY:int = 0;
-
-		private var _client:Client;
-		private var _size:int;
-
-		public function Document():void {
-			_byteArrayBtn.addEventListener(MouseEvent.CLICK, onByteArrayBtnClick);
-
-			_client = new Client();
-			_client.addEventListener(CallEvent.CONNECT, onConnect);
-			_client.addEventListener(CallEvent.CLOSE, onClose);
-			_client.addEventListener(CallEvent.IO_ERROR, onIOError);
-			_client.addEventListener(CallEvent.SECURITY_ERROR, onSecurityError);
-			_client.addEventListener(CallEvent.CALL, onCall);
-			_client.addEventListener(CallEvent.RESULT, onResult);
-			_client.addEventListener(CallEvent.ERROR, onError);
-			_client.connect(HOST, PORT);
-		}
-
-		// ---------------------------------------------------------------------------
-
-		private function onConnect(event:CallEvent):void {
-			_status.text += "onConnect\n";
-		}
-
-		private function onClose(event:CallEvent):void {
-			_status.text += "onClose\n";
-		}
-
-		private function onIOError(event:CallEvent):void {
-			_status.text += "onIOError\n";
-		}
-
-		private function onSecurityError(event:CallEvent):void {
-			_status.text += "onSecurityError\n";
-		}
-
-		private function onCall(event:CallEvent):void {
-			_status.text += "onCall\n";
-			_status.text += "cmd:" + event.cmd;
-			_status.text += "value:" + event.value;
-		}
-
-		private function onResult(event:CallEvent):void {
-			_status.text += "onResult";
-			_status.text += "cmd:" + event.cmd;
-
-			var b:ByteArray = event.value as ByteArray;
-			_status.text += "Received bytes: " + b.length;
-			_size += 1024;
-			_status.text += "Testing byte array with size: " + _size;
-			_client.call(CMD_TEST_BYTE_ARRAY, _size);
-		}
-
-		private function onError(event:CallEvent):void {
-			_status.text += "onError";
-			_status.text += "cmd: " + event.cmd;
-			_status.text += "value: " + event.value;
-		}
-
-		// ---------------------------------------------------------------------------
-
-		private function onByteArrayBtnClick(event:MouseEvent):void {
-			_size = 1024;
-			_status.text += "Testing byte array with size: " + _size;
-			_client.call(CMD_TEST_BYTE_ARRAY, _size);
-		}
-	}
-}

data/test/r_r/client.rb

@@ -1,34 +0,0 @@
-require 'revent'
-
-class Client
-  include ReventClient
-
-  def initialize
-    connect('localhost', 1943)
-  end
-
-  N = 10**5
-
-  def on_connect
-    @now = Time.now
-    @x = 0
-    N.times do |i|
-      call('hello', i)
-    end
-  end
-
-  def on_result(cmd, arg)
-    @x += 1
-    #puts @x
-    if @x == N
-      dt = Time.now - @now
-      puts N
-      puts dt
-      puts N/dt
-    end
-  end
-end
-
-EventMachine::run do
-  Client.new
-end

data/test/r_r/server.rb

@@ -1,33 +0,0 @@
-require 'revent'
-
-class Server
-  include ReventServer
-
-  def initialize
-    start_server('localhost', 1943)
-  end
-
-  N = 10**5
-
-  def on_connect(con)
-    @x = 0
-    @now = Time.now
-    N.times do |i|
-      con.call('hello', i)
-    end
-  end
-
-  def on_result(con, cmd, arg)
-    @x += 1
-    if @x == N
-      dt = Time.now - @now
-      puts N
-      puts dt
-      puts N/dt
-    end
-  end
-end
-
-EventMachine::run do
-  Server.new
-end