genki-wormhole 0.1.1 → 0.1.2

data/ChangeLog

@@ -1,3 +1,22 @@
+== 0.1.2 / 2008-07-12
+
+* Implemented the named wormhole. catch and throw methods now receive a name
+parameter as the first param which is a symbol.
+* Added an exception class to make a constraint for syntax
+
+Now you must call return method after the catch block like this:
+
+  Wormhole.catch do
+    # something
+  end.return
+
+This code raises Wormhole::LateReturnError
+
+  w = Wormhole.catch do
+    # something
+  end
+	w.return
+
 == 0.1.1 / 2008-07-04
 
 * changed API according to the suggestion of @yugui.

data/README

@@ -19,6 +19,9 @@ depth of stack to outside.
 
 == Features/Problems
 
+* Named wormhole
+* Syntax constraint
+
 == Synopsis
 
 Here is an example of use.
@@ -30,10 +33,9 @@ Here is an example of use.
     Wormhole.throw
   end
 
-  w = Wormhole.catch do
+  Wormhole.catch do
     some_method
-  end
-  w.return
+  end.return
 
 == Copyright
 

data/Rakefile

@@ -9,6 +9,7 @@ require 'rake/contrib/rubyforgepublisher'
 require 'rake/contrib/sshpublisher'
 require 'rubyforge'
 require 'fileutils'
+require 'lib/wormhole'
 include FileUtils
 
 NAME              = "wormhole"
@@ -18,7 +19,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.1.1"
+VERS              = Wormhole::VERSION
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -59,7 +60,7 @@ spec = Gem::Specification.new do |s|
 	s.autorequire       = ""
 	s.test_files        = Dir["test/test_*.rb"]
 
-	#s.add_dependency('activesupport', '>=1.3.1')
+	s.add_dependency('redgreen', '>=1.2.1')
 	#s.required_ruby_version = '>= 1.8.2'
 
 	s.files = %w(README ChangeLog Rakefile) +
@@ -135,3 +136,9 @@ desc 'Show information about the gem.'
 task :debug_gem do
   puts spec.to_ruby
 end
+
+
+desc 'Update gem spec'
+task :gemspec do
+  open("#{NAME}.gemspec", 'w').write spec.to_ruby
+end

data/lib/wormhole.rb

@@ -1,16 +1,30 @@
 class Wormhole
-  def self.catch(&block)
+  VERSION = '0.1.2'
+  DEFAULT_NAME = :__wormhole__
+
+  class LateReturnError < SyntaxError
+    def initialize
+      super "You must call the return method at after the catch block."
+    end
+  end
+
+  def self.catch(name = DEFAULT_NAME, &block)
     result = nil
-    wormhole = Kernel.catch(:__wormhole__) do
+    wormhole = Kernel.catch(name) do
       result = block.call if block
       nil
     end || new
     wormhole.instance_variable_set(:@result, result)
+    set_trace_func(proc do |event, file, line, id, binding, klass|
+      set_trace_func nil or raise LateReturnError if klass != Wormhole
+      set_trace_func nil if [event, id] == ['call', :return]
+    end)
     wormhole
   end
 
-  def self.throw(data = {}, &block)
-    new.send :connect, data, &block
+  def self.throw(*args, &block)
+    args.unshift DEFAULT_NAME unless args[0].is_a?(Symbol)
+    new.send :connect, *args, &block
   end
 
   # returns the result of the catch block.
@@ -22,14 +36,14 @@ class Wormhole
   end
 
 private
-  def connect(data, &block)
+  def connect(name, data = {}, &block)
     @data = data
     callcc{|@cc|}
     if @opened
       @result = block.call @data if block
       @data
     else
-      Kernel.throw :__wormhole__, self
+      Kernel.throw name, self
     end
   end
 end

data/test/test_helper.rb

@@ -1,7 +1,4 @@
 require 'test/unit'
 require 'rubygems'
-begin
-  require 'redgreen'
-rescue Exception
-end
+require 'redgreen'
 require File.dirname(__FILE__) + '/../lib/wormhole'

data/test/wormhole_test.rb

@@ -25,22 +25,47 @@ class WormholeTest < Test::Unit::TestCase
   end
 
   def test_wormhole_without_throw
-    w = Wormhole.catch do
+    result = Wormhole.catch do
       "test"
+    end.return
+    assert_equal "test", result
+  end
+
+  def test_nested_wormhole
+    array = []
+    result = Wormhole.catch(:foo) do
+      Wormhole.catch(:bar) do
+        Wormhole.throw :foo, 1
+        Wormhole.throw :bar, 2
+        "test"
+      end.return do |value|
+        array << value
+      end
+    end.return do |value|
+      array << value
+    end
+    assert_equal [1, 2], array
+    assert_equal 'test', result
+  end
+
+  def test_wormhole_without_trailing_return
+    assert_raise Wormhole::LateReturnError do
+      w = Wormhole.catch do
+        "test"
+      end
+      w.return
     end
-    assert_equal "test", w.return
   end
 
   def test_wormhole_without_symbol
-    w = Wormhole.catch do
+    result = Wormhole.catch do
       @result << "foo"
       Wormhole.throw :bar => 'hello' do |data|
         @result << data[:bar]
       end
       @result << "bar"
       'result'
-    end
-    result = w.return do |data|
+    end.return do |data|
       @result << data[:bar]
       data[:bar] = 'world!'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-wormhole
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -9,10 +9,18 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2008-07-02 00:00:00 -07:00
+date: 2008-07-12 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: redgreen
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.1
+    version: 
 description: The utility library for making a wormhole on the stack frame.
 email: genki@s21g.com
 executables: []