marilyn-rpc 0.0.3 → 0.0.4

data/lib/marilyn-rpc/version.rb

@@ -1,3 +1,3 @@
 module MarilynRPC
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/envelope_spec.rb

@@ -3,68 +3,77 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe MarilynRPC::Envelope do
   before(:each) do
     @envelope = MarilynRPC::Envelope.new
+    @enc = MarilynRPC::Envelope::HEADER_ENCODING
   end
   
   it "should be possible to parse really small envelope pieces" do
     size = 100
     content = "X" * size
-    data = [size].pack("N") + content
+    data = [size, 1].pack(@enc) + content
     data.each_byte do |byte|
       overhang = @envelope.parse!(byte.chr)
       overhang.should == nil
     end
     @envelope.finished?.should == true
     @envelope.content.should == content
+    @envelope.type.should == 1
   end
   
   it "should be possible to parse complete envelopes" do
     size = 100
     content = "X" * size
-    overhang = @envelope.parse!([size].pack("N") + content)
+    overhang = @envelope.parse!([size, 1].pack(@enc) + content)
     overhang.should == nil
     @envelope.finished?.should == true
     @envelope.content.should == content
+    @envelope.type.should == 1
   end
   
   it "shold be possible to parse an empty envelope" do
-    overhang = @envelope.parse!([0].pack("N"))
+    overhang = @envelope.parse!([0, 1].pack(@enc))
     overhang.should == nil
     @envelope.content.should == ""
+    @envelope.type.should == 1
     @envelope.finished?.should == true
   end
   
   it "should be possible to detect overhangs correctly" do
     content = "X" * 120
-    overhang = @envelope.parse!([100].pack("N") + content)
+    overhang = @envelope.parse!([100, 1].pack(@enc) + content)
     overhang.should == "X" * 20
     @envelope.finished?.should == true
     @envelope.content.should == "X" * 100
+    @envelope.type.should == 1
   end
   
   it "should be possible to lead an envelope from the overhang" do
-    content = ([20].pack("N") + ("X" * 20)) * 2
+    content = ([20, 1].pack(@enc) + ("X" * 20)) * 2
     overhang = @envelope.parse!(content)
-    overhang.should == ([20].pack("N") + ("X" * 20))
+    overhang.should == ([20, 1].pack(@enc) + ("X" * 20))
     @envelope.finished?.should == true
     @envelope.content.should == "X" * 20
+    @envelope.type.should == 1
     @envelope = MarilynRPC::Envelope.new
     overhang = @envelope.parse!(overhang)
     overhang.should == nil
     @envelope.finished?.should == true
     @envelope.content.should == "X" * 20
+    @envelope.type.should == 1
   end
   
-  it "should be possible to encode a envelope correctly" do
+  it "should be possible to @encode a envelope correctly" do
     content = "Hallo Welt"
     @envelope.content = content
-    @envelope.encode.should == [content.size].pack("N") + content
+    @envelope.type = 1
+    @envelope.encode.should == [content.size, 1].pack(@enc) + content
   end
   
   it "should be possible to create a envelope using the initalizer" do
     size = 100
     content = "X" * size
-    @envelope = MarilynRPC::Envelope.new(content)
+    @envelope = MarilynRPC::Envelope.new(content, 1)
     @envelope.finished?.should == true
     @envelope.content.should == content
+    @envelope.type == 1
   end
 end

data/spec/gentleman_spec.rb

@@ -22,7 +22,7 @@ describe MarilynRPC::Gentleman do
 
     class ConnectionMock
       attr_accessor :data
-      def send_mail(obj)
+      def send_data(obj)
         @data = obj
       end
     end
@@ -36,7 +36,18 @@ describe MarilynRPC::Gentleman do
     end
     g.connection = ConnectionMock.new
     deferable.call(1, 2)
-    g.connection.data.result.should == 3
+    unpack_envelope(g.connection.data).result.should == 3
+  end
+  
+  it "should be possible to defer a process to a gentleman" do
+    deferable = DeferObjectMock.new
+    
+    g = MarilynRPC::Gentleman.new(deferable) do |a, b|
+      raise Exception.new
+    end
+    g.connection = ConnectionMock.new
+    deferable.call(1, 2)
+    unpack_envelope(g.connection.data).exception.should be_a(Exception)
   end
   
   it "should be possible to create a gentleman helper" do
@@ -52,6 +63,6 @@ describe MarilynRPC::Gentleman do
     
     g.connection = ConnectionMock.new
     callback.call(1, 2)
-    g.connection.data.result.should == 3
+    unpack_envelope(g.connection.data).result.should == 3
   end
 end

data/spec/mails_spec.rb

@@ -62,7 +62,8 @@ describe "MarilynRPC Mails" do
       tag = Time.now.to_f
       mail = MarilynRPC::CallRequestMail.new(
         tag, "/user", :find_by_name, ["mr.x"])
-      envelope = MarilynRPC::Envelope.new(mail.encode)
+      envelope = MarilynRPC::Envelope.new(mail.encode, 
+                                          MarilynRPC::CallRequestMail::TYPE)
       mail = MarilynRPC::MailFactory.unpack(envelope)
       mail.should be_a(MarilynRPC::CallRequestMail)
     end

data/spec/server_spec.rb

@@ -20,14 +20,14 @@ describe MarilynRPC::Server do
   
   it "should be possible to send multiple letters to the server" do
     @server.post_init
-    @server.receive_data(MarilynRPC::Envelope.new("Test1").encode)
+    @server.receive_data(MarilynRPC::Envelope.new("Test1", 1).encode)
     envelope = MarilynRPC::Envelope.new
     envelope.parse!(@server.data)
     mail = MarilynRPC::ExceptionMail.new
     mail.decode(envelope.content)
-    mail.exception.message.should == "The passed envelope is broken!"
-    @server.receive_data(MarilynRPC::Envelope.new("Test2").encode)
-    @server.receive_data(MarilynRPC::Envelope.new("Test3").encode)
+    mail.exception.message.should include("incompatible marshal file format")
+    @server.receive_data(MarilynRPC::Envelope.new("Test2", 1).encode)
+    @server.receive_data(MarilynRPC::Envelope.new("Test3", 1).encode)
     @server.unbind
   end
 end

data/spec/service_cache_spec.rb

@@ -59,6 +59,7 @@ describe MarilynRPC::ServiceCache do
   
   it "should be possible to call a sync method" do
     answer = @cache.call(envelope_call(1, "/test", :sync_method, 1, 2))
+    answer = unpack_envelope(answer)
     answer.should be_a(MarilynRPC::CallResponseMail)
     answer.result.should == 3
   end
@@ -100,11 +101,13 @@ describe MarilynRPC::ServiceCache do
     
     it "should be possible to call the normal method" do
       answer = @cache.call(envelope_call(1, "/test", :normal))
+      answer = unpack_envelope(answer)
       answer.result.should == true
     end
     
     it "should not be possible to call an secure method without authentication" do
       answer = @cache.call(envelope_call(1, "/test", :secure))
+      answer = unpack_envelope(answer)
       answer.should be_a(MarilynRPC::ExceptionMail)
       answer.exception.should be_a(MarilynRPC::PermissionDeniedError)
     end
@@ -113,27 +116,32 @@ describe MarilynRPC::ServiceCache do
       @cache.call(envelope_call(1, MarilynRPC::Service::AUTHENTICATION_PATH, 
                                   :authenticate_plain, "testuserid", "secret"))
       answer = @cache.call(envelope_call(1, "/test", :secure))
+      answer = unpack_envelope(answer)
       answer.result.should == true
     end
     
     it "should be possible to call the username from within the service without an authenticated user" do
       answer = @cache.call(envelope_call(1, "/test", :username))
+      answer = unpack_envelope(answer)
       answer.result.should == nil
     end
     
     it "should be possible to call the username from within the service with an authenticated user" do
       @cache.username = "test"
       answer = @cache.call(envelope_call(1, "/test", :username))
+      answer = unpack_envelope(answer)
       answer.result.should == "test"
     end
     
     it "should be possible to call the authentication from within the service" do
       answer = @cache.call(envelope_call(1, "/test", :logged_in?))
+      answer = unpack_envelope(answer)
       answer.result.should == false
       
       # set the username
       @cache.username = "test"
       answer = @cache.call(envelope_call(1, "/test", :logged_in?))
+      answer = unpack_envelope(answer)
       answer.result.should == true
     end
   end

data/spec/spec_helper.rb

@@ -2,6 +2,13 @@ $:.push(File.join(File.dirname(__FILE__), "..", "lib"))
 require "marilyn-rpc"
 
 def envelope_call(tag, path, method, *args)
-  mail = MarilynRPC::CallRequestMail.new(tag, path, method, args)
-  MarilynRPC::Envelope.new(mail.encode)
+  e = MarilynRPC::Envelope.new
+  e.parse!(MarilynRPC::MailFactory.build_call(tag, path, method, args))
+  e
+end
+
+def unpack_envelope(data)
+  envelope = MarilynRPC::Envelope.new
+  envelope.parse!(data)
+  MarilynRPC::MailFactory.unpack(envelope)
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: marilyn-rpc
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Vincent Landgraf
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 12
-        - 10
         version: 0.12.10
   type: :runtime
   version_requirements: *id001
@@ -42,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 4
         version: "2.4"
   type: :development
   version_requirements: *id002
@@ -62,6 +48,33 @@ extra_rdoc_files: []
 files: 
 - benchmark/client.rb
 - benchmark/server.rb
+- doc/_index.html
+- doc/class_list.html
+- doc/css/common.css
+- doc/css/full_list.css
+- doc/css/style.css
+- doc/file.README.html
+- doc/file_list.html
+- doc/frames.html
+- doc/index.html
+- doc/js/app.js
+- doc/js/full_list.js
+- doc/js/jquery.js
+- doc/MarilynRPC/CallRequestMail.html
+- doc/MarilynRPC/CallResponseMail.html
+- doc/MarilynRPC/Envelope.html
+- doc/MarilynRPC/ExceptionMail.html
+- doc/MarilynRPC/Gentleman.html
+- doc/MarilynRPC/MailFactory.html
+- doc/MarilynRPC/MailHelper.html
+- doc/MarilynRPC/NativeClient.html
+- doc/MarilynRPC/NativeClientProxy.html
+- doc/MarilynRPC/Server.html
+- doc/MarilynRPC/Service.html
+- doc/MarilynRPC/ServiceCache.html
+- doc/MarilynRPC.html
+- doc/method_list.html
+- doc/top-level-namespace.html
 - examples/async/client.rb
 - examples/async/server.rb
 - examples/authentication/client.rb
@@ -82,6 +95,7 @@ files:
 - lib/marilyn-rpc/version.rb
 - lib/marilyn-rpc.rb
 - LICENCE
+- marilyn-rpc-0.0.2.gem
 - marilyn-rpc.gemspec
 - README.md
 - spec/envelope_spec.rb
@@ -105,23 +119,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Simple, beautiful event-based RPC