ernie 1.0.0 → 1.1.0

data/History.txt

@@ -1,3 +1,8 @@
+= 1.1.0 / 2009-10-28
+  * Major changes
+    * Remove dependency on Erlectricity
+    * Simplify processing loop
+
 = 1.0.0 / 2009-10-19
   * No Changes. Production ready!
 

data/Rakefile

@@ -11,8 +11,7 @@ begin
     gem.authors = ["Tom Preston-Werner"]
     gem.files.include(["ext"])
     gem.extensions << 'ext/extconf.rb'
-    gem.add_dependency('erlectricity', '>= 1.1.0')
-    gem.add_dependency('bert', '>= 1.0.0')
+    gem.add_dependency('bert', '>= 1.1.0')
     gem.add_dependency('bertrpc', '>= 1.0.0')
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:minor: 1
 :patch: 0
 :major: 1
-:minor: 0

data/ernie.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ernie}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-10-19}
+  s.date = %q{2009-10-28}
   s.default_executable = %q{ernie}
   s.email = %q{tom@mojombo.com}
   s.executables = ["ernie"]
@@ -66,17 +66,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<erlectricity>, [">= 1.1.0"])
-      s.add_runtime_dependency(%q<bert>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<bert>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<bertrpc>, [">= 1.0.0"])
     else
-      s.add_dependency(%q<erlectricity>, [">= 1.1.0"])
-      s.add_dependency(%q<bert>, [">= 1.0.0"])
+      s.add_dependency(%q<bert>, [">= 1.1.0"])
       s.add_dependency(%q<bertrpc>, [">= 1.0.0"])
     end
   else
-    s.add_dependency(%q<erlectricity>, [">= 1.1.0"])
-    s.add_dependency(%q<bert>, [">= 1.0.0"])
+    s.add_dependency(%q<bert>, [">= 1.1.0"])
     s.add_dependency(%q<bertrpc>, [">= 1.0.0"])
   end
 end

data/examples/calc.rb

@@ -14,6 +14,10 @@ mod(:slowcalc) do
     sleep(rand * 2)
     a + b
   end
+
+  fun(:superslow) do
+    sleep 10
+  end
 end
 
 # Throw an error

data/lib/ernie.rb

@@ -11,6 +11,11 @@ class Ernie
   self.current_mod = nil
   self.logger = nil
 
+  # Record a module.
+  #   +name+ is the module Symbol
+  #   +block+ is the Block containing function definitions
+  #
+  # Returns nothing
   def self.mod(name, block)
     m = Mod.new(name)
     self.current_mod = m
@@ -18,69 +23,129 @@ class Ernie
     block.call
   end
 
+  # Record a function.
+  #   +name+ is the function Symbol
+  #   +block+ is the Block to associate
+  #
+  # Returns nothing
   def self.fun(name, block)
     self.current_mod.fun(name, block)
   end
 
+  # Set the logfile to given path.
+  #   +file+ is the String path to the logfile
+  #
+  # Returns nothing
   def self.logfile(file)
     self.logger = Logger.new(file)
   end
 
+  # If logging is enabled, log the given text.
+  #   +text+ is the String to log
+  #
+  # Returns nothing
   def self.log(text)
     self.logger.info(text) if self.logger
   end
 
+  # Dispatch the request to the proper mod:fun.
+  #   +mod+ is the module Symbol
+  #   +fun+ is the function Symbol
+  #   +args+ is the Array of arguments
+  #
+  # Returns the Ruby object response
   def self.dispatch(mod, fun, args)
-    xargs = BERT::Decoder.convert(args)
-    self.log("-- " + [mod, fun, xargs].inspect)
     self.mods[mod] || raise(ServerError.new("No such module '#{mod}'"))
     self.mods[mod].funs[fun] || raise(ServerError.new("No such function '#{mod}:#{fun}'"))
-    res = self.mods[mod].funs[fun].call(*xargs)
-    BERT::Encoder.convert(res)
+    self.mods[mod].funs[fun].call(*args)
   end
 
+  # Read the length header from the wire.
+  #   +input+ is the IO from which to read
+  #
+  # Returns the size Integer if one was read
+  # Returns nil otherwise
+  def self.read_4(input)
+    raw = input.read(4)
+    return nil unless raw
+    raw.unpack('N').first
+  end
+
+  # Read a BERP from the wire and decode it to a Ruby object.
+  #   +input+ is the IO from which to read
+  #
+  # Returns a Ruby object if one could be read
+  # Returns nil otherwise
+  def self.read_berp(input)
+    packet_size = self.read_4(input)
+    return nil unless packet_size
+    bert = input.read(packet_size)
+    BERT.decode(bert)
+  end
+
+  # Write the given Ruby object to the wire as a BERP.
+  #   +output+ is the IO on which to write
+  #   +ruby+ is the Ruby object to encode
+  #
+  # Returns nothing
+  def self.write_berp(output, ruby)
+    data = BERT.encode(ruby)
+    output.write([data.length].pack("N"))
+    output.write(data)
+  end
+
+  # Start the processing loop.
+  #
+  # Loops forever
   def self.start
     self.log("Starting")
     self.log(self.mods.inspect)
-    receive do |f|
-      f.when([:call, Symbol, Symbol, Array]) do |mod, fun, args|
-        self.log("-> " + [:call, mod, fun, args].inspect)
+
+    input = IO.new(3)
+    output = IO.new(4)
+    input.sync = true
+    output.sync = true
+
+    loop do
+      iruby = self.read_berp(input)
+      unless iruby
+        puts "Could not read BERP length header. Ernie server may have gone away. Exiting now."
+        exit!
+      end
+
+      if iruby.size == 4 && iruby[0] == :call
+        mod, fun, args = iruby[1..3]
+        self.log("-> " + iruby.inspect)
         begin
           res = self.dispatch(mod, fun, args)
-          xres = [:reply, res]
-          self.log("<- " + xres.inspect)
-          f.send!(xres)
+          oruby = t[:reply, res]
+          self.log("<- " + oruby.inspect)
+          write_berp(output, oruby)
         rescue ServerError => e
-          xres = [:error, [:server, 0, e.class.to_s, e.message, e.backtrace]]
-          self.log("<- " + xres.inspect)
+          oruby = t[:error, t[:server, 0, e.class.to_s, e.message, e.backtrace]]
+          self.log("<- " + oruby.inspect)
           self.log(e.backtrace.join("\n"))
-          f.send!(xres)
+          write_berp(output, oruby)
         rescue Object => e
-          xres = [:error, [:user, 0, e.class.to_s, e.message, e.backtrace]]
-          self.log("<- " + xres.inspect)
+          oruby = t[:error, t[:user, 0, e.class.to_s, e.message, e.backtrace]]
+          self.log("<- " + oruby.inspect)
           self.log(e.backtrace.join("\n"))
-          f.send!(xres)
+          write_berp(output, oruby)
         end
-        f.receive_loop
-      end
-
-      f.when([:cast, Symbol, Symbol, Array]) do |mod, fun, args|
+      elsif iruby.size == 4 && iruby[0] == :cast
+        mod, fun, args = iruby[1..3]
         self.log("-> " + [:cast, mod, fun, args].inspect)
         begin
           self.dispatch(mod, fun, args)
         rescue Object => e
           # ignore
         end
-        f.send!([:noreply])
-        f.receive_loop
-      end
-
-      f.when(Any) do |any|
-        self.log("-> " + any.inspect)
-        xres = [:error, [:server, 0, "Invalid request: #{any.inspect}"]]
-        self.log("<- " + xres.inspect)
-        f.send!(xres)
-        f.receive_loop
+        write_berp(output, t[:noreply])
+      else
+        self.log("-> " + iruby.inspect)
+        oruby = t[:error, t[:server, 0, "Invalid request: #{iruby.inspect}"]]
+        self.log("<- " + oruby.inspect)
+        write_berp(output, oruby)
       end
     end
   end

data/test/ernie_server_test.rb

@@ -37,6 +37,10 @@ class ErnieServerTest < Test::Unit::TestCase
         assert_equal 10, @svc.call.test.ternary(5, 2, 3)
       end
 
+      should "handle massive binaries" do
+        assert_equal 8 * 1024 * 1024, @svc.call.test.big(8 * 1024 * 1024).size
+      end
+
       should "get an error on missing module" do
         begin
           @svc.call.failboat.mcfail(:fail)

data/test/handler.rb

@@ -31,6 +31,10 @@ mod(:test) do
     state
   end
 
+  fun(:big) do |x|
+    'a' * x
+  end
+
   fun(:cry) do
     raise "abandon hope!"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ernie
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 -07:00
+date: 2009-10-28 00:00:00 -07:00
 default_executable: ernie
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: erlectricity
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: bert
   type: :runtime
@@ -30,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: bertrpc