bertrem 0.0.4 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.6

data/{bertem.gemspec → bertrem.gemspec}

@@ -4,12 +4,12 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{bertem}
-  s.version = "0.0.4"
+  s.name = %q{bertrem}
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benjamin Black"]
-  s.date = %q{2009-12-30}
+  s.date = %q{2010-01-02}
   s.email = %q{b@b3k.us}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -20,18 +20,18 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
-     "bertem.gemspec",
-     "lib/bertem.rb",
-     "lib/bertem/action.rb",
-     "lib/bertem/client.rb",
-     "lib/bertem/mod.rb",
-     "lib/bertem/server.rb"
+     "bertrem.gemspec",
+     "lib/bertrem.rb",
+     "lib/bertrem/action.rb",
+     "lib/bertrem/client.rb",
+     "lib/bertrem/mod.rb",
+     "lib/bertrem/server.rb"
   ]
-  s.homepage = %q{http://github.com/b/bertem}
+  s.homepage = %q{http://github.com/b/bertrem}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{BERTEM is a Ruby EventMachine BERT-RPC client and server library.}
+  s.summary = %q{BERTREM is a Ruby EventMachine BERT-RPC client and server library.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/bertrem/action.rb

@@ -4,10 +4,9 @@ require 'bertrpc'
 module BERTRPC
   class Action
 
-    undef_method :execute
-    undef_method :write
-    undef_method :transaction
-    undef_method :connect_to
+    [:execute, :write, :transaction, :connect_to].each do |m|
+      remove_method m if method_defined?(m)
+    end
 
     def execute
       transaction(encode_ruby_request(t[@req.kind, @mod, @fun, @args]))

data/lib/bertrem/client.rb

@@ -3,13 +3,12 @@ require 'logger'
 require 'eventmachine'
 
 module BERTREM
-  # NOTE: ernie (and all other BERTRPC servers?) closes connections after
-  #       responding, so we can't send multiple requests per connection.
-  #       Hence, the default for persistent is false.  If you are dealing
-  #       with a more sophisticated server that supports more than one
-  #       request per connection, call BERTREM.service with
-  #       persistent = true and it should Just Work.
-
+  # NOTE: ernie closes connections after responding, so we can't send
+  #       multiple requests per connection.  Hence, the default for
+  #       persistent is false.  If you are working with a server that
+  #       supports more than one request per connection, like
+  #       BERTREM::Server, call BERTREM.service with persistent = true
+  #       and it will Just Work.
   class Client < EventMachine::Connection
     include BERTRPC::Encodes
 
@@ -33,7 +32,7 @@ module BERTREM
     class << self
       attr_accessor :persistent
     end
-    
+
     self.persistent = false
 
     def self.service(host, port, persistent = false, timeout = nil)
@@ -44,38 +43,51 @@ module BERTREM
     end
 
     def post_init
+      @receive_buf = ""; @receive_len = 0; @more = false
       @requests = []
     end
 
     def unbind
-			super
-			(@requests || []).each {|r| r.fail}
+      super
+      @receive_buf = ""; @receive_len = 0; @more = false
+      (@requests || []).each {|r| r.fail}
+      raise BERTREM::ConnectionError.new("Connection to server lost!") if error?
     end
-    
+
     def persistent
       Client.persistent
     end
 
     def receive_data(bert_response)
-      # This needs to be much more intelligent (retain a buffer, append new response data
-      # to the buffer, remember the length of the msg it is working with if it is incomplete,
-      # etc.)
-      while bert_response.length > 4 do
-        begin
-          raise BERTRPC::ProtocolError.new(BERTRPC::ProtocolError::NO_HEADER) unless bert_response.length > 4
-          len = bert_response.slice!(0..3).unpack('N').first # just here to strip the length header
-          raise BERTRPC::ProtocolError.new(BERTRPC::ProtocolError::NO_DATA) unless bert_response.length > 0
-        rescue Exception => e
-          log "Bad BERT message: #{e.message}\n#{e.backtrace.inspect}\n"          
+      @receive_buf << bert_response
+
+      while @receive_buf.length > 0
+        unless @more
+          begin
+            if @receive_buf.length > 4
+              @receive_len = @receive_buf.slice!(0..3).unpack('N').first if @receive_len == 0
+              raise BERTRPC::ProtocolError.new(BERTRPC::ProtocolError::NO_DATA) unless @receive_buf.length > 0
+            else
+              raise BERTRPC::ProtocolError.new(BERTRPC::ProtocolError::NO_HEADER)
+            end
+          rescue Exception => e
+            log "Bad BERT message: #{e.message}"
+            return       
+          end
         end
-        
-        bert = bert_response.slice!(0..(len - 1))
-        @requests.pop.succeed(decode_bert_response(bert))  
-        unless persistent
-          close_connection
+
+        if @receive_buf.length >= @receive_len
+          bert = @receive_buf.slice!(0..(@receive_len - 1))
+          @receive_len = 0; @more = false
+          @requests.pop.succeed(decode_bert_response(bert))
+          break unless persistent
+        else
+          @more = true
           break
         end
       end
+
+      close_connection unless (persistent || @more)
     end
 
     def call(options = nil)
@@ -103,3 +115,5 @@ module BERTREM
   end
 
 end
+
+class BERTREM::ConnectionError < StandardError ; end

data/lib/bertrem/server.rb

@@ -5,22 +5,22 @@ require 'eventmachine'
 module BERTREM
   class Server < EventMachine::Connection
     include BERTRPC::Encodes
-    
+
     # This class derived from Ernie/ernie.rb
-    
+
     class << self
       attr_accessor :mods, :current_mod, :log
     end
-    
+
     self.mods = {}
     self.current_mod = nil
     self.log = Logger.new(STDOUT)
     self.log.level = Logger::INFO
-    
+
     def self.start(host, port)
       EM.start_server(host, port, self)
     end
-    
+
     # Record a module.
     #   +name+ is the module Symbol
     #   +block+ is the Block containing function definitions
@@ -73,7 +73,7 @@ module BERTREM
     def self.loglevel(level)
       self.log.level = level
     end
-    
+
     # Dispatch the request to the proper mod:fun.
     #   +mod+ is the module Symbol
     #   +fun+ is the function Symbol
@@ -96,69 +96,85 @@ module BERTREM
       send_data([data.length].pack("N"))
       send_data(data)
     end
-    
+
     def post_init
+      @receive_buf = ""; @receive_len = 0; @more = false
       Server.log.info("(#{Process.pid}) Starting")
-      Server.log.debug(Server.mods.inspect)  
+      Server.log.debug(Server.mods.inspect)
     end
-    
+
     # Receive data on the connection.
     #
-    def receive_data(data)
-      # This needs to be much more intelligent (retain a buffer, append new request data
-      # to the buffer, remember the length of the msg it is working with if it is incomplete,
-      # etc.)
-      while data.length > 4 do
-        raw = data.slice!(0..3)
-        puts "Could not find BERP length header.  Weird, huh?" unless raw
-        packet_size = raw.unpack('N').first
-        puts "Could not understand BERP packet length.  What gives?" unless packet_size
-        bert = data.slice!(0..(packet_size - 1))
-        iruby = BERT.decode(bert)
-        
-        unless iruby
-          Server.log.info("(#{Process.pid}) No Ruby in this here packet.  On to the next one...")
-          next
-        end
+    def receive_data(bert_request)
+      @receive_buf << bert_request
 
-        if iruby.size == 4 && iruby[0] == :call
-          mod, fun, args = iruby[1..3]
-          Server.log.info("-> " + iruby.inspect)
+      while @receive_buf.length > 0 do
+        unless @more
           begin
-            res = Server.dispatch(mod, fun, args)
-            oruby = t[:reply, res]
-            Server.log.debug("<- " + oruby.inspect)
-            write_berp(oruby)
-          rescue ServerError => e
-            oruby = t[:error, t[:server, 0, e.class.to_s, e.message, e.backtrace]]
-            Server.log.error("<- " + oruby.inspect)
-            Server.log.error(e.backtrace.join("\n"))
-            write_berp(oruby)
-          rescue Object => e
-            oruby = t[:error, t[:user, 0, e.class.to_s, e.message, e.backtrace]]
+            if @receive_buf.length > 4
+              @receive_len = @receive_buf.slice!(0..3).unpack('N').first if @receive_len == 0
+              raise BERTRPC::ProtocolError.new(BERTRPC::ProtocolError::NO_DATA) unless @receive_buf.length > 0
+            else
+              raise BERTRPC::ProtocolError.new(BERTRPC::ProtocolError::NO_HEADER)
+            end
+          rescue Exception => e
+            log "Bad BERT message: #{e.message}"
+            return       
+          end
+        end
+
+        if @receive_buf.length >= @receive_len
+          bert = @receive_buf.slice!(0..(@receive_len - 1))     
+          @receive_len = 0; @more = false   
+          iruby = BERT.decode(bert)
+
+          unless iruby
+            Server.log.info("(#{Process.pid}) No Ruby in this here packet.  On to the next one...")
+            next
+          end
+
+          if iruby.size == 4 && iruby[0] == :call
+            mod, fun, args = iruby[1..3]
+            Server.log.info("-> " + iruby.inspect)
+            begin
+              res = Server.dispatch(mod, fun, args)
+              oruby = t[:reply, res]
+              Server.log.debug("<- " + oruby.inspect)
+              write_berp(oruby)
+            rescue ServerError => e
+              oruby = t[:error, t[:server, 0, e.class.to_s, e.message, e.backtrace]]
+              Server.log.error("<- " + oruby.inspect)
+              Server.log.error(e.backtrace.join("\n"))
+              write_berp(oruby)
+            rescue Object => e
+              oruby = t[:error, t[:user, 0, e.class.to_s, e.message, e.backtrace]]
+              Server.log.error("<- " + oruby.inspect)
+              Server.log.error(e.backtrace.join("\n"))
+              write_berp(oruby)
+            end
+          elsif iruby.size == 4 && iruby[0] == :cast
+            mod, fun, args = iruby[1..3]
+            Server.log.info("-> " + [:cast, mod, fun, args].inspect)
+            begin
+              Server.dispatch(mod, fun, args)
+            rescue Object => e
+              # ignore
+            end
+            write_berp(t[:noreply])
+          else
+            Server.log.error("-> " + iruby.inspect)
+            oruby = t[:error, t[:server, 0, "Invalid request: #{iruby.inspect}"]]
             Server.log.error("<- " + oruby.inspect)
-            Server.log.error(e.backtrace.join("\n"))
             write_berp(oruby)
           end
-        elsif iruby.size == 4 && iruby[0] == :cast
-          mod, fun, args = iruby[1..3]
-          Server.log.info("-> " + [:cast, mod, fun, args].inspect)
-          begin
-            Server.dispatch(mod, fun, args)
-          rescue Object => e
-            # ignore
-          end
-          write_berp(t[:noreply])
         else
-          Server.log.error("-> " + iruby.inspect)
-          oruby = t[:error, t[:server, 0, "Invalid request: #{iruby.inspect}"]]
-          Server.log.error("<- " + oruby.inspect)
-          write_berp(oruby)
+          @more = true
+          break
         end
       end
     end
   end
-    
+
 end
 
 class BERTREM::ServerError < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bertrem
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors: 
 - Benjamin Black
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 -08:00
+date: 2010-01-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,7 +49,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- bertem.gemspec
+- bertrem.gemspec
 - lib/bertrem.rb
 - lib/bertrem/action.rb
 - lib/bertrem/client.rb