RocketAMF 0.0.6 → 0.0.7

data/README.rdoc

@@ -8,13 +8,49 @@ A fast AMF serializer/deserializer and request/response wrappers to simplify rem
 
 == EXAMPLE:
 
-NEED TO WRITE SOMETHING HERE
+  # helloworld.ru
+
+  require 'rocketamf'
+
+  class HelloWorldApp
+    APPLICATION_AMF = 'application/x-amf'.freeze
+
+    def call env
+      if is_amf?(env)
+        # Wrap request and response
+        env['rack.input'].rewind
+        request = RocketAMF::Request.new.populate_from_stream(env['rack.input'].read)
+        response = RocketAMF::Response.new
+
+        # Handle request
+        response.each_method_call request do |method, args|
+          raise "Service #{method} does not exists" unless method == 'App.helloWorld'
+          'Hello world'
+        end
+
+        # Pass back response
+        response_str = response.serialize
+        return [200, {'Content-Type' => APPLICATION_AMF, 'Content-Length' => response_str.length.to_s}, [response_str]]
+      else
+        return [200, {'Content-Type' => 'text/plain', 'Content-Length' => '16' }, ["Rack AMF gateway"]]
+      end
+    end
+
+    private
+    def is_amf? env
+      return false unless env['CONTENT_TYPE'] == APPLICATION_AMF
+      return false unless env['PATH_INFO'] == '/amf'
+      return true
+    end
+  end
+
+  run HelloWorldApp.new
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2009 Tony Hillerson based on work by Aaron Smith
+Copyright (c) 2009 Stephen Augenstein and Jacob Smith
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -33,4 +69,4 @@ 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.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -23,7 +23,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name    = 'RocketAMF'
-  s.version = '0.0.6'
+  s.version = '0.0.7'
   s.summary = 'Fast AMF serializer/deserializer and request/response wrappers to simplify remoting implementation'
 
   s.files        = FileList['README.rdoc', 'Rakefile', 'lib/**/*.rb', 'spec/**/*.rb', 'spec/**/*.bin', 'spec/spec.opts']

data/lib/rocketamf/pure/deserializer.rb

@@ -191,7 +191,7 @@ module RocketAMF
         when AMF3_XML_MARKER
           #read_amf3_xml
         when AMF3_BYTE_ARRAY_MARKER
-          #read_amf3_byte_array
+          read_amf3_byte_array source
         else
           raise AMFError, "Invalid type: #{type}"
         end
@@ -242,11 +242,7 @@ module RocketAMF
           return @string_cache[reference]
         else
           length = type >> 1
-          #HACK needed for ['',''] array of empty strings
-          #It may be better to take one more parameter that
-          #would specify whether or not they expect us to return
-          #a string
-          str = "" #if stringRequest
+          str = ""
           if length > 0
             str = source.read(length)
             @string_cache << str
@@ -255,6 +251,21 @@ module RocketAMF
         end
       end
 
+      def read_amf3_byte_array source
+        type = read_integer source
+        isReference = (type & 0x01) == 0
+
+        if isReference
+          reference = type >> 1
+          return @object_cache[reference]
+        else
+          length = type >> 1
+          obj = StringIO.new source.read(length)
+          @object_cache << obj
+          obj
+        end
+      end
+
       def read_array source
         type = read_integer source
         isReference = (type & 0x01) == 0

data/lib/rocketamf/pure/serializer.rb

@@ -157,6 +157,8 @@ module RocketAMF
           write_string obj.to_s, stream
         elsif obj.is_a?(Time)
           write_date obj, stream
+        elsif obj.is_a?(StringIO)
+          write_byte_array obj, stream
         elsif obj.is_a?(Array)
           write_array obj, stream
         elsif obj.is_a?(Hash) || obj.is_a?(Object)
@@ -217,6 +219,16 @@ module RocketAMF
         end
       end
 
+      def write_byte_array array, stream
+        stream << AMF3_BYTE_ARRAY_MARKER
+        if @object_cache[array] != nil
+          write_reference @object_cache[array], stream
+        else
+          @object_cache.add_obj array
+          write_utf8_vr array.string, stream
+        end
+      end
+
       def write_array array, stream
         stream << AMF3_ARRAY_MARKER
         if @object_cache[array] != nil

data/lib/rocketamf/version.rb

@@ -1,6 +1,6 @@
 module RocketAMF
   # AMF version
-  VERSION         = '0.0.6'
+  VERSION         = '0.0.7'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/spec/amf/deserializer_spec.rb

@@ -168,7 +168,7 @@ describe "when deserializing" do
       end
 
       #BAH! Who sends XML over AMF?
-      it "should deserialize a REXML document"
+      it "should deserialize XML"
     end
 
     describe "objects" do
@@ -227,7 +227,13 @@ describe "when deserializing" do
         output.should == [h1, h2, so1, {:foo_three => nil}, {}, [h1, h2, so1], [], 42, "", [], "", {}, "bar_one", so1]
       end
 
-      it "should deserialize a byte array"
+      it "should deserialize a byte array" do
+        input = object_fixture("amf3-byteArray.bin")
+        output = RocketAMF.deserialize(input, 3)
+
+        output.should be_a StringIO
+        output.string.should == "\000\003これtest\100"
+      end
     end
 
     describe "and implementing the AMF Spec" do
@@ -299,7 +305,13 @@ describe "when deserializing" do
       end
 
       it "should keep references of duplicate XML and XMLDocuments"
-      it "should keep references of duplicate byte arrays"
+
+      it "should keep references of duplicate byte arrays" do
+        input = object_fixture("amf3-byteArrayRef.bin")
+        output = RocketAMF.deserialize(input, 3)
+        output[0].object_id.should == output[1].object_id
+        output[0].string.should == "ASDF"
+      end
 
       it "should deserialize a deep object graph with circular references" do
         input = object_fixture("amf3-graphMember.bin")

data/spec/amf/serializer_spec.rb

@@ -155,7 +155,7 @@ describe "when serializing" do
       end
 
       #BAH! Who sends XML over AMF?
-      it "should serialize a REXML document"
+      it "should serialize XML"
     end
 
     describe "objects" do
@@ -225,7 +225,12 @@ describe "when serializing" do
         output.should == expected
       end
 
-      it "should serialize a byte array"
+      it "should serialize a byte array" do
+        expected = object_fixture("amf3-byteArray.bin")
+        input = StringIO.new "\000\003これtest\100"
+        output = RocketAMF.serialize(input, 3)
+        output.should == expected
+      end
     end
 
     describe "and implementing the AMF Spec" do
@@ -296,7 +301,15 @@ describe "when serializing" do
       end
 
       it "should keep references of duplicate XML and XMLDocuments"
-      it "should keep references of duplicate byte arrays"
+
+      it "should keep references of duplicate byte arrays" do
+        b = StringIO.new "ASDF"
+
+        expected = object_fixture("amf3-byteArrayRef.bin")
+        input = [b, b]
+        output = RocketAMF.serialize(input, 3)
+        output.should == expected
+      end
 
       it "should serialize a deep object graph with circular references" do
         class GraphMember

data/spec/fixtures/objects/amf3-byteArrayRef.bin

@@ -0,0 +1 @@
+	
	ASDF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: RocketAMF
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Tony Hillerson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 -05:00
+date: 2010-03-30 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -62,6 +62,8 @@ files:
 - spec/fixtures/objects/amf3-0.bin
 - spec/fixtures/objects/amf3-arrayRef.bin
 - spec/fixtures/objects/amf3-bigNum.bin
+- spec/fixtures/objects/amf3-byteArray.bin
+- spec/fixtures/objects/amf3-byteArrayRef.bin
 - spec/fixtures/objects/amf3-date.bin
 - spec/fixtures/objects/amf3-datesRef.bin
 - spec/fixtures/objects/amf3-dynObject.bin