rack-amf 0.0.1 → 0.0.2

data/Rakefile

@@ -23,7 +23,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name    = 'rack-amf'
-  s.version = '0.0.1'
+  s.version = '0.0.2'
   s.summary = 'AMF serializer/deserializer and AMF gateway packaged as a rack middleware'
 
   s.files        = FileList['README.rdoc', 'Rakefile', 'lib/**/*.rb', 'spec/**/*.rb']

data/lib/amf/class_mapping.rb

@@ -194,7 +194,8 @@ module AMF
 
       # Fallback serializer
       props = {}
-      ruby_obj.public_methods(false).each do |method_name|
+      @ignored_props ||= Object.new.public_methods
+      (ruby_obj.public_methods - @ignored_props).each do |method_name|
         # Add them to the prop hash if they take no arguments
         method_def = ruby_obj.method(method_name)
         props[method_name] = ruby_obj.send(method_name) if method_def.arity == 0

data/lib/amf/constants.rb

@@ -34,12 +34,12 @@ module AMF
   AMF3_XML_MARKER          =  0x0B #"\v"
   AMF3_BYTE_ARRAY_MARKER   =  0x0C #"\f"
 
-  # Other Markers, some reused
-  EMPTY_STRING             = AMF3_NULL_MARKER
-  ANONYMOUS_OBJECT         = AMF3_NULL_MARKER
-  DYNAMIC_OBJECT           = AMF3_XML_MARKER
-  CLOSE_DYNAMIC_OBJECT     = AMF3_NULL_MARKER
-  CLOSE_DYNAMIC_ARRAY      = AMF3_NULL_MARKER
+  # Other Markers
+  EMPTY_STRING             = 0x01
+  ANONYMOUS_OBJECT         = 0x01
+  DYNAMIC_OBJECT           = 0x0B
+  CLOSE_DYNAMIC_OBJECT     = 0x01
+  CLOSE_DYNAMIC_ARRAY      = 0x01
 
   MAX_INTEGER              = 268435455
   MIN_INTEGER              = -268435456

data/lib/amf/pure/serializer.rb

@@ -136,14 +136,11 @@ module AMF
           # Cache object
           @object_cache.add_obj obj
 
-          class_name = ClassMapper.get_as_class_name obj
-
-          # Any object that has a class name isn't dynamic
-          unless class_name
-            stream << DYNAMIC_OBJECT
-          end
+          # Always serialize things as dynamic objects
+          stream << DYNAMIC_OBJECT
 
           # Write class name/anonymous
+          class_name = ClassMapper.get_as_class_name obj
           if class_name
             write_utf8_vr class_name, stream
           else

data/lib/amf/values/messages.rb

@@ -11,11 +11,11 @@ module AMF
       attr_accessor :headers
       attr_accessor :body
 
+      protected
       def rand_uuid
         [8,4,4,4,12].map {|n| rand_hex_3(n)}.join('-').to_s
       end
 
-      private
       def rand_hex_3(l)
         "%0#{l}x" % rand(1 << l*4)
       end

data/spec/amf/class_mapping_spec.rb

@@ -92,6 +92,17 @@ describe AMF::ClassMapping do
       hash.should == {'prop_a' => 'Test A', 'prop_b' => 'Test B', 'prop_c' => nil}
     end
 
+    it "should extract inherited object properties" do
+      class RubyClass2 < RubyClass
+      end
+      obj = RubyClass2.new
+      obj.prop_a = 'Test A'
+      obj.prop_b = 'Test B'
+
+      hash = @mapper.props_for_serialization obj
+      hash.should == {'prop_a' => 'Test A', 'prop_b' => 'Test B', 'prop_c' => nil}
+    end
+
     it "should allow custom serializers" do
       class CustomSerializer
         def can_handle? obj

data/spec/amf/remoting_spec.rb

@@ -34,4 +34,16 @@ describe "when handling responses" do
     expected = request_fixture('simple-response.bin')
     resp.serialize.should == expected
   end
+
+  it "should serialize a AcknowledgeMessage response" do
+    ak = AMF::Values::AcknowledgeMessage.new
+    ak.clientId = "7B0ACE15-8D57-6AE5-B9D4-99C2D32C8246"
+    ak.messageId = "7B0ACE15-8D57-6AE5-B9D4-99C2D32C8246"
+    ak.timestamp = 0
+    resp = AMF::Response.new
+    resp.messages << AMF::Message.new('/1/onResult', '', ak)
+
+    expected = request_fixture('acknowledge-response.bin')
+    resp.serialize.should == expected
+  end
 end

data/spec/amf/values/messages_spec.rb

@@ -6,7 +6,7 @@ describe AMF::Values::AbstractMessage do
   end
 
   it "should generate conforming uuids" do
-    @message.rand_uuid.should =~ /[A-F0-9]{8}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{12}/i
+    @message.send(:rand_uuid).should =~ /[A-F0-9]{8}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{12}/i
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-amf
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tony Hillerson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-03 00:00:00 -04:00
+date: 2009-10-04 00:00:00 -04:00
 default_executable: 
 dependencies: []