@@ -7,18 +7,18 @@ module EMRPC # 2. include MarshalProtocol.new(YAML) # 3. include MarshalProtocol.new(JSON) def self.new(marshal_const) - const_name = marshal_const.name mod = Module.new - mod.class_eval <<-EOF, __FILE__, __LINE__ + mod.module_eval <<-EOF, __FILE__, __LINE__ def send_marshalled_message(msg) - send_message(#{const_name}.dump(msg)) + send_message(MarshalBackend.dump(msg)) end def receive_message(msg) - receive_marshalled_message(#{const_name}.load(msg)) + receive_marshalled_message(MarshalBackend.load(msg)) rescue Exception => e rescue_marshal_error(e) end EOF + mod.const_set(:MarshalBackend, marshal_const) mod end lib/emrpc/protocols/marshal_protocol.rb @@ -48,3 +48,20 @@ end it_should_behave_like "Generic MarshalProtocol" end end + +describe MarshalProtocol, "with some object" do + before(:each) do + interface = Object.new + def interface.load(x) + Marshal.load(x) + end + def interface.dump(x) + Marshal.dump(x) + end + # FIXME: fixture containing 3.1415 may cause floating point issues. + @msg = ["Hello", {"a" => "b", "arr" => [true, false, nil]}, 1, 3.1415] + @instance = create_marshal_protocol_instance(interface) + end + it_should_behave_like "Generic MarshalProtocol" +end + spec/util/marshal_protocol_spec.rb 952dbc939218c164f32bc5bafebba616b5af2d38 Oleg Andreev oleganza@gmail.com http://github.com/oleganza/emrpc/commit/d9535c00689e7161552acff194b5a34a08158193 d9535c00689e7161552acff194b5a34a08158193 2008-11-27T02:08:17-08:00 2008-11-27T02:08:17-08:00 refactored MarshalProtocol: now accepting any object, not only constants 08054aec153645c9aefb24097346194d9d15428b Oleg Andreev oleganza@gmail.com