ernie 1.1.0 → 1.2.0

data/History.txt

@@ -1,3 +1,9 @@
+= 1.2.0 / 2009-11-23
+  * API Additions
+    * Add Ernie.expose
+  * Internal Changes
+    * Remove 15s internal timeout
+
 = 1.1.0 / 2009-10-28
   * Major changes
     * Remove dependency on Erlectricity

data/README.md

@@ -51,6 +51,8 @@ Running
 Example Handler
 ---------------
 
+Using the DSL:
+
     require 'ernie'
     
     mod(:calc) do
@@ -59,6 +61,18 @@ Example Handler
       end
     end
 
+Using Ernie.expose:
+
+    require 'ernie'
+    
+    module Calc
+      def add(a, b)
+        a + b
+      end
+    end
+    
+    Ernie.expose(:calc, Calc)
+
 
 Example BERT-RPC call for above example
 ---------------------------------------

data/VERSION.yml

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

data/elib/port_wrapper.erl

@@ -15,8 +15,6 @@ rpc(WrappedPort, Message) ->
   send(WrappedPort, Message),
   receive
     {WrappedPort, Result} -> {ok, Result}
-  after 15000 ->
-    {error, timed_out, WrappedPort}
   end.
 
 send(WrappedPort, Message) ->

data/ernie.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ernie}
-  s.version = "1.1.0"
+  s.version = "1.2.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-28}
+  s.date = %q{2009-11-23}
   s.default_executable = %q{ernie}
   s.email = %q{tom@mojombo.com}
   s.executables = ["ernie"]
@@ -37,7 +37,8 @@ Gem::Specification.new do |s|
      "elib/logger_sup.erl",
      "elib/port_wrapper.erl",
      "ernie.gemspec",
-     "examples/calc.rb",
+     "examples/dsl.rb",
+     "examples/expose.rb",
      "ext/Makefile",
      "ext/extconf.rb",
      "lib/ernie.rb",
@@ -58,7 +59,8 @@ Gem::Specification.new do |s|
      "test/handler.rb",
      "test/helper.rb",
      "test/load.rb",
-     "examples/calc.rb"
+     "examples/dsl.rb",
+     "examples/expose.rb"
   ]
 
   if s.respond_to? :specification_version then

data/examples/dsl.rb

@@ -0,0 +1,25 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ernie'
+
+mod(:test) do
+  # Add two numbers together
+  fun(:add) do |a, b|
+    a + b
+  end
+
+  # Return the given number of bytes
+  fun(:bytes) do |bytes|
+    'x' * bytes
+  end
+
+  # Sleep for +sec+ and then return :ok
+  fun(:slow) do |sec|
+    sleep(sec)
+    :ok
+  end
+
+  # Throw an error
+  fun(:error) do |a, b|
+    raise "abandon hope!"
+  end
+end

data/examples/expose.rb

@@ -0,0 +1,27 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'ernie'
+
+module Test
+  # Add two numbers together
+  def add(a, b)
+    a + b
+  end
+
+  # Return the given number of bytes
+  def bytes(n)
+    'x' * n
+  end
+
+  # Sleep for +sec+ and then return :ok
+  def slow(sec)
+    sleep(sec)
+    :ok
+  end
+
+  # Throw an error
+  def error
+    raise "abandon hope!"
+  end
+end
+
+Ernie.expose(:test, Test)

data/lib/ernie.rb

@@ -32,6 +32,22 @@ class Ernie
     self.current_mod.fun(name, block)
   end
 
+  # Expose all public methods in a Ruby module:
+  #   +name+ is the ernie module Symbol
+  #   +mixin+ is the ruby module whose public methods are exposed
+  #
+  # Returns nothing
+  def self.expose(name, mixin)
+    context = Object.new
+    context.extend mixin
+    mod(name, lambda {
+      mixin.public_instance_methods.each do |meth|
+        fun(meth.to_sym, context.method(meth))
+      end
+    })
+    context
+  end
+
   # Set the logfile to given path.
   #   +file+ is the String path to the logfile
   #
@@ -182,4 +198,4 @@ end
 
 at_exit do
   Ernie.start unless $test
-end
+end

data/test/ernie_test.rb

@@ -15,4 +15,44 @@ class ErnieTest < Test::Unit::TestCase
       assert Ernie.mods[:foo].funs[:bar]
     end
   end
+
+  module TestExposingModule
+    def foo
+    end
+
+    def bar(a, b, c=nil)
+      [a, b, c]
+    end
+
+  protected
+    def baz
+    end
+
+  private
+    def bling
+    end
+  end
+
+  context "expose" do
+    setup { Ernie.expose :expo, TestExposingModule }
+    teardown { Ernie.mods.clear }
+
+    should "add all public methods from the module" do
+      assert_not_nil Ernie.mods[:expo].funs[:foo]
+      assert_not_nil Ernie.mods[:expo].funs[:bar]
+    end
+
+    should "not expose protected methods" do
+      assert_nil Ernie.mods[:expo].funs[:baz]
+    end
+
+    should "not expose private methods" do
+      assert_nil Ernie.mods[:expo].funs[:bling]
+    end
+
+    should "dispatch to module methods properly" do
+      res = Ernie.dispatch(:expo, :bar, ['a', :b, { :fiz => 42 }])
+      assert_equal ['a', :b, { :fiz => 42 }], res
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ernie
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -07:00
+date: 2009-11-23 00:00:00 -08:00
 default_executable: ernie
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,8 @@ files:
 - elib/logger_sup.erl
 - elib/port_wrapper.erl
 - ernie.gemspec
-- examples/calc.rb
+- examples/dsl.rb
+- examples/expose.rb
 - ext/Makefile
 - ext/extconf.rb
 - lib/ernie.rb
@@ -103,4 +104,5 @@ test_files:
 - test/handler.rb
 - test/helper.rb
 - test/load.rb
-- examples/calc.rb
+- examples/dsl.rb
+- examples/expose.rb

data/examples/calc.rb

@@ -1,28 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'ernie'
-
-# Just about the easiest example I could thing of.
-mod(:calc) do
-  fun(:add) do |a, b|
-    a + b
-  end
-end
-
-# Useful for tests that need to simulate longer running functions.
-mod(:slowcalc) do
-  fun(:add) do |a, b|
-    sleep(rand * 2)
-    a + b
-  end
-
-  fun(:superslow) do
-    sleep 10
-  end
-end
-
-# Throw an error
-mod(:errorcalc) do
-  fun(:add) do |a, b|
-    raise "abandon hope!"
-  end
-end