revent 0.2.3 → 0.3

data/lib/revent/Client.as

@@ -12,23 +12,6 @@
 		private var _socket:Socket;
 		private var _bytes:ByteArray;
 
-		public static function bytesToByteArray(bytes:Array):ByteArray {
-			var ba:ByteArray = new ByteArray();
-			ba.objectEncoding = ObjectEncoding.AMF3;
-			for (var i:int = 0; i < bytes.length; i++) {
-				ba.writeByte(bytes[i]);
-			}
-			return ba;
-		}
-
-		public static function bytesToObject(bytes:Array, compressed:Boolean = false):Object {
-			var ba:ByteArray = bytesToByteArray(bytes);
-			if (compressed) {
-				ba.uncompress();
-			}
-			return ba.readObject();
-		}
-
 		public function Client():void {
 			_socket = new Socket();
 			_socket.objectEncoding = ObjectEncoding.AMF3;

data/lib/revent/amf3/io/amf_serializer.rb

@@ -3,6 +3,7 @@ module RubyAMF
     class AMFSerializer
 
       require "#{File.dirname(__FILE__)}/read_write"
+      require "#{File.dirname(__FILE__)}/byte_array"
 
       include RubyAMF::Configuration
       include RubyAMF::IO::BinaryWriter
@@ -43,7 +44,7 @@ module RubyAMF
             else
               write_amf3_number(value)
             end
-          elsif(value.is_a?(Float))
+          elsif value.is_a?(Float)
             @stream << "\005" # represents an amf3 complex number
             write_double(value)
           elsif value.is_a?(BigDecimal) # Aryk: BigDecimal does not relate to Float, so keep it as a seperate check.
@@ -53,17 +54,20 @@ module RubyAMF
             write_double(value)
           end
 
-        elsif(value.is_a?(String))
+        elsif value.is_a?(String)
           @stream << "\006" # represents an amf3 string
           write_amf3_string(value)
 
-        elsif(value.is_a?(Array))
+        elsif value.is_a?(Array)
           write_amf3_array(value)
 
-        elsif(value.is_a?(Hash))
+        elsif value.is_a?(ByteArray)
+          write_amf3_byte_array(value)
+
+        elsif value.is_a?(Hash)
           write_amf3_object(value)
 
-        elsif (value.is_a?(Time)||value.is_a?(Date))
+        elsif value.is_a?(Time) || value.is_a?(Date)
           @stream << "\b" # represents an amf3 date
           write_amf3_date(value)
 
@@ -83,19 +87,19 @@ module RubyAMF
       def write_amf3_integer(int)
         @stream << (@write_amf3_integer_results[int] ||= (
             int = int & 0x1fffffff
-            if(int < 0x80)
+            if int < 0x80
               [int].pack('c')
-            elsif(int < 0x4000)
-              [int >> 7 & 0x7f | 0x80].pack('c')+
+            elsif int < 0x4000
+              [int >> 7 & 0x7f | 0x80].pack('c') +
                 [int & 0x7f].pack('c')
-            elsif(int < 0x200000)
-              [int >> 14 & 0x7f | 0x80].pack('c')+
-                [int >> 7 & 0x7f | 0x80].pack('c')+
+            elsif int < 0x200000
+              [int >> 14 & 0x7f | 0x80].pack('c') +
+                [int >> 7 & 0x7f | 0x80].pack('c') +
                 [int & 0x7f].pack('c')
             else
-              [int >> 22 & 0x7f | 0x80].pack('c')+
-                [int >> 15 & 0x7f | 0x80].pack('c')+
-                [int >> 8 & 0x7f | 0x80].pack('c')+
+              [int >> 22 & 0x7f | 0x80].pack('c') +
+                [int >> 15 & 0x7f | 0x80].pack('c') +
+                [int >> 8 & 0x7f | 0x80].pack('c') +
                 [int & 0xff].pack('c')
             end
           ))
@@ -167,7 +171,16 @@ module RubyAMF
           # datetime = Time.gm( datetime.year, datetime.month, datetime.day )
           # datetime = Time.gm( datetime.year, datetime.month, datetime.day, datetime.hour, datetime.min, datetime.sec )      
         end
-        write_double( (seconds*1000).to_i ) # used to be total_milliseconds = datetime.to_i * 1000 + ( datetime.usec/1000 )
+        write_double((seconds*1000).to_i) # used to be total_milliseconds = datetime.to_i * 1000 + ( datetime.usec/1000 )
+      end
+
+      def write_amf3_byte_array(byte_array)
+        write_word8(AMF3_BYTE_ARRAY)
+        bytes = byte_array.bytes
+        length = bytes.length << 1
+        length = length | 0x1
+        write_amf3_integer(length)
+        @stream << bytes
       end
 
       def write_amf3_xml(value)

data/lib/revent/amf3/io/byte_array.rb

@@ -0,0 +1,11 @@
+module RubyAMF
+  module IO
+    class ByteArray
+      attr_reader :bytes
+
+      def initialize(string)
+        @bytes = string
+      end
+    end
+  end
+end

data/lib/revent/as_r.rb

@@ -133,8 +133,7 @@ module Revent
       s = @enc.stream
       @enc.reset
 
-      s = Zlib::Deflate.deflate(s)
-      s.unpack('c*')
+      Zlib::Deflate.deflate(s)
     end
   end
 

data/test/as_r/Document.as

@@ -57,8 +57,7 @@
 			_status.text += "onResult";
 			_status.text += "cmd:" + event.cmd;
 
-			var b:Array = event.value as Array;
-			//trace(b);
+			var b:ByteArray = event.value as ByteArray;
 			_status.text += "Received bytes: " + b.length;
 			_size += 1024;
 			_status.text += "Testing byte array with size: " + _size;

data/test/as_r/server.rb

@@ -24,11 +24,9 @@ class Server
 
   def on_call(client, cmd, value)
     puts "on_call:", cmd, value
-    a = []
-    (0...value).each do |i|
-      a << i
+    if cmd == CMD_TEST_BYTE_ARRAY
+      test_byte_array(client, value)
     end
-    client.result(CMD_TEST_BYTE_ARRAY, a)
   end
 
   def on_result(client, cmd, value)
@@ -44,6 +42,17 @@ class Server
     puts cmd
     puts error
   end
+
+  # ----------------------------------------------------------------------------
+
+  def test_byte_array(client, length)
+    bytes = ''
+    length.times do
+      bytes << rand(256)
+    end
+    byte_array = RubyAMF::IO::ByteArray.new(bytes)
+    client.result(CMD_TEST_BYTE_ARRAY, byte_array)
+  end
 end
 
 EventMachine::run do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: revent
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: "0.3"
 platform: ruby
 authors: 
 - Ngoc DAO Thanh
@@ -45,6 +45,7 @@ files:
 - 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/util
 - lib/revent/amf3/util/vo_helper.rb
 - lib/revent/amf3/util/string.rb