wormhole 0.0.3 → 0.1.0

data/Rakefile

@@ -18,7 +18,7 @@ DESCRIPTION       = "The utility library for making a wormhole on the stack fram
 RUBYFORGE_PROJECT = "cocktail-party"
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )
-VERS              = "0.0.3"
+VERS              = "0.1.0"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/lib/wormhole.rb

@@ -1,15 +1,34 @@
-class Wormhole < Exception
-  def initialize(data = {})
-    @data = data
-    callcc{|@cc|}
-    raise self unless @return
+class Wormhole
+  def self.catch(&block)
+    result = nil
+    wormhole = Kernel.catch(:__wormhole__) do
+      result = block.call if block
+      nil
+    end || new
+    wormhole.instance_variable_set(:@result, result)
+    wormhole
+  end
+
+  def self.throw(data = {}, &block)
+    new.send :connect, data, &block
   end
 
-  def close
-    @return = true
+  # returns the result of the catch block.
+  def return(&block)
+    return @result if @cc.nil?
+    block.call @data if block
+    @opened = true
     @cc.call
   end
 
-  def [](key) @data[key] end
-  def []=(key, value) @data[key] = value end
+private
+  def connect(data, &block)
+    @data = data
+    callcc{|@cc|}
+    if @opened
+      @result = block.call @data if block
+    else
+      Kernel.throw :__wormhole__, self
+    end
+  end
 end

data/test/wormhole_test.rb

@@ -8,23 +8,45 @@ class WormholeTest < Test::Unit::TestCase
 
   def foo
     @result << "foo"
-    w = Wormhole.new :foo => 'hello'
-    @result << w[:foo]
+    Wormhole.throw :bar => 'hello' do |data|
+      @result << data[:bar]
+    end
     @result << "bar"
   end
 
   def test_wormhole
-    foo
+    Wormhole.catch do
+      foo
+    end.return do |data|
+      @result << data[:bar]
+      data[:bar] = 'world!'
+    end
     assert !@result.empty?
-    assert_equal [
-      'foo',
-      'hello',
-      'world!',
-      'bar',
-      ], @result
-  rescue Wormhole => w
-    @result << w[:foo]
-    w[:foo] = 'world!'
-    w.close
+    assert_equal ['foo', 'hello', 'world!', 'bar'], @result
+  end
+
+  def test_wormhole_without_throw
+    w = Wormhole.catch do
+      "test"
+    end
+    assert_equal "test", w.return
+  end
+
+  def test_wormhole_without_symbol
+    w = Wormhole.catch do
+      @result << "foo"
+      Wormhole.throw :bar => 'hello' do |data|
+        @result << data[:bar]
+      end
+      @result << "bar"
+      'result'
+    end
+    result = w.return do |data|
+      @result << data[:bar]
+      data[:bar] = 'world!'
+    end
+    assert_equal 'result', result
+    assert !@result.empty?
+    assert_equal ['foo', 'hello', 'world!', 'bar'], @result
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wormhole
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Genki Takiuchi