ernie 0.3.4 → 0.3.5

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.files.include(["ext"])
     gem.extensions << 'ext/extconf.rb'
     gem.add_dependency('erlectricity', '>= 1.0.1')
-    gem.add_dependency('bertrpc', '>= 0.2.0')
+    gem.add_dependency('bertrpc', '>= 0.3.4')
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

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

data/elib/ernie_server.erl

@@ -71,9 +71,7 @@ handle_call(_Request, _From, State) ->
 handle_cast({process, Sock}, State) ->
   Request = #request{sock = Sock},
   State2 = receive_term(Request, State),
-  Count = State2#state.count,
-  State3 = State2#state{count = Count + 1},
-  {noreply, State3};
+  {noreply, State2};
 handle_cast({asset_freed}, State) ->
   case queue:is_empty(State#state.pending) of
     false ->
@@ -187,15 +185,17 @@ process_request(Request, State) ->
   end.
 
 try_process_now(Request, State) ->
+  Count = State#state.count,
+  State2 = State#state{count = Count + 1},
   case asset_pool:lease() of
     {ok, Asset} ->
       % io:format("i", []),
       spawn(fun() -> process_now(Request, Asset) end),
-      State;
+      State2;
     empty ->
       % io:format("q", []),
       Pending2 = queue:in(Request, State#state.pending),
-      State#state{pending = Pending2}
+      State2#state{pending = Pending2}
   end.
 
 process_now(Request, Asset) ->

data/ernie.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ernie}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-09-06}
+  s.date = %q{2009-09-25}
   s.default_executable = %q{ernie}
   s.email = %q{tom@mojombo.com}
   s.executables = ["ernie"]
@@ -37,9 +37,11 @@ Gem::Specification.new do |s|
      "ext/Makefile",
      "ext/extconf.rb",
      "lib/ernie.rb",
+     "test/ernie_server_test.rb",
      "test/ernie_test.rb",
-     "test/load.rb",
-     "test/test_helper.rb"
+     "test/handler.rb",
+     "test/helper.rb",
+     "test/load.rb"
   ]
   s.homepage = %q{http://github.com/mojombo/ernie}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -47,9 +49,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ernie is a BERT-RPC server implementation.}
   s.test_files = [
-    "test/ernie_test.rb",
+    "test/ernie_server_test.rb",
+     "test/ernie_test.rb",
+     "test/handler.rb",
+     "test/helper.rb",
      "test/load.rb",
-     "test/test_helper.rb",
      "examples/calc.rb"
   ]
 
@@ -59,13 +63,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<erlectricity>, [">= 1.0.1"])
-      s.add_runtime_dependency(%q<bertrpc>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<bertrpc>, [">= 0.3.4"])
     else
       s.add_dependency(%q<erlectricity>, [">= 1.0.1"])
-      s.add_dependency(%q<bertrpc>, [">= 0.2.0"])
+      s.add_dependency(%q<bertrpc>, [">= 0.3.4"])
     end
   else
     s.add_dependency(%q<erlectricity>, [">= 1.0.1"])
-    s.add_dependency(%q<bertrpc>, [">= 0.2.0"])
+    s.add_dependency(%q<bertrpc>, [">= 0.3.4"])
   end
 end

data/lib/ernie.rb

@@ -59,7 +59,7 @@ class Ernie
   def self.dispatch(mod, fun, args)
     xargs = deconvert(args)
     self.log("-- " + [mod, fun, xargs].inspect)
-    self.mods[mod] || raise(ServerError.new("No such module: '#{mod}'"))
+    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)
     convert(res)
@@ -77,12 +77,12 @@ class Ernie
           self.log("<- " + xres.inspect)
           f.send!(xres)
         rescue ServerError => e
-          xres = [:error, [:server, 0, e.message, e.backtrace]]
+          xres = [:error, [:server, 0, e.class.to_s, e.message, e.backtrace]]
           self.log("<- " + xres.inspect)
           self.log(e.backtrace.join("\n"))
           f.send!(xres)
         rescue Object => e
-          xres = [:error, [:user, 0, e.message, e.backtrace]]
+          xres = [:error, [:user, 0, e.class.to_s, e.message, e.backtrace]]
           self.log("<- " + xres.inspect)
           self.log(e.backtrace.join("\n"))
           f.send!(xres)

data/test/ernie_server_test.rb

@@ -0,0 +1,73 @@
+require File.dirname(__FILE__) + '/helper'
+
+PORT = 27118
+
+class ErnieServerTest < Test::Unit::TestCase
+  context "An Ernie Server" do
+    setup do
+      `#{ERNIE_ROOT}/bin/ernie -h #{ERNIE_ROOT}/test/handler.rb \
+                               -P /tmp/ernie.pid \
+                               -p #{PORT} \
+                               -d`
+      @svc = BERTRPC::Service.new('localhost', PORT)
+      loop do
+        begin
+          @svc.call.test.zeronary
+          break
+        rescue Object => e
+          sleep 0.1
+        end
+      end
+    end
+
+    context "call" do
+      should "handle zeronary" do
+        assert_equal :foo, @svc.call.test.zeronary
+      end
+
+      should "handle unary" do
+        assert_equal 5, @svc.call.test.unary(5)
+      end
+
+      should "handle binary" do
+        assert_equal 7, @svc.call.test.binary(5, 2)
+      end
+
+      should "handle ternary" do
+        assert_equal 10, @svc.call.test.ternary(5, 2, 3)
+      end
+
+      should "get an error on missing module" do
+        begin
+          @svc.call.failboat.mcfail(:fail)
+          fail "Expected a BERTRPC::ServerError"
+        rescue BERTRPC::ServerError => e
+          assert_equal "No such module 'failboat'", e.message
+        end
+      end
+
+      should "get an error on missing function" do
+        begin
+          @svc.call.test.mcfail(:fail)
+          fail "Expected a BERTRPC::ServerError"
+        rescue BERTRPC::ServerError => e
+          assert_equal "No such function 'test:mcfail'", e.message
+        end
+      end
+    end
+
+    context "cast" do
+      should "be received and return immediately" do
+        t0 = Time.now
+        assert_equal nil, @svc.cast.test.set_state(7)
+        assert Time.now - t0 < 1
+        assert_equal 7, @svc.call.test.get_state
+      end
+    end
+
+    teardown do
+      pid = File.read('/tmp/ernie.pid')
+      `kill -9 #{pid}`
+    end
+  end
+end

data/test/ernie_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class ErnieTest < Test::Unit::TestCase
   context "mod" do

data/test/handler.rb

@@ -0,0 +1,37 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ernie'
+
+state = 0
+
+# Just about the easiest example I could thing of.
+mod(:test) do
+  fun(:zeronary) do
+    :foo
+  end
+
+  fun(:unary) do |a|
+    a
+  end
+
+  fun(:binary) do |a, b|
+    a + b
+  end
+
+  fun(:ternary) do |a, b, c|
+    a + b + c
+  end
+
+  fun(:set_state) do |x|
+    state = x
+    sleep 5
+    nil
+  end
+
+  fun(:get_state) do
+    state
+  end
+
+  fun(:cry) do
+    raise "abandon hope!"
+  end
+end

data/test/helper.rb

@@ -0,0 +1,17 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+
+ERNIE_ROOT = File.join(File.dirname(__FILE__), *%w[..])
+
+$:.unshift(File.join(ERNIE_ROOT, 'lib'))
+
+require 'ernie'
+begin
+  require 'bertrpc'
+rescue LoadError
+  puts "You need bertrpc gem installed to run tests."
+  exit!(1)
+end
+
+$test = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ernie
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-06 00:00:00 -07:00
+date: 2009-09-25 00:00:00 -07:00
 default_executable: ernie
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.3.4
     version: 
 description: 
 email: tom@mojombo.com
@@ -63,9 +63,11 @@ files:
 - ext/Makefile
 - ext/extconf.rb
 - lib/ernie.rb
+- test/ernie_server_test.rb
 - test/ernie_test.rb
+- test/handler.rb
+- test/helper.rb
 - test/load.rb
-- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/mojombo/ernie
 licenses: []
@@ -95,7 +97,9 @@ signing_key:
 specification_version: 3
 summary: Ernie is a BERT-RPC server implementation.
 test_files: 
+- test/ernie_server_test.rb
 - test/ernie_test.rb
+- test/handler.rb
+- test/helper.rb
 - test/load.rb
-- test/test_helper.rb
 - examples/calc.rb

data/test/test_helper.rb

@@ -1,12 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'ernie'
-
-class Test::Unit::TestCase
-end
-
-$test = true