otaku 0.2.2 → 0.3.0

data/HISTORY.txt

@@ -1,3 +1,11 @@
+=== 0.3.0 2010-08-05
+
+= Features
+* Proc can now be passed as a context to Otaku.start [#ngty]
+
+= Maintenance
+* Cleaning up Otaku::Handler [#ngty]
+
 === 0.2.2 2010-07-21
 
 = Features

data/README.rdoc

@@ -4,7 +4,11 @@ Dead simple server/client service built using eventmachine.
 
 == Introduction
 
-Otaku's original intent is to support testing of cross-process stubbing in cross-stub (http://github.com/ngty/cross-stub). It's usefulness in other aspects of my hacking life prompts me to extract it out, & package it as a generic solution. Its primary intent is to be dead simple to use & easy to customize, of course, both criteria subjected to very my own tastes.
+Otaku's original intent is to support testing of cross-process stubbing in
+cross-stub (http://github.com/ngty/cross-stub). It's usefulness in other
+aspects of my hacking life prompts me to extract it out, & package it as a
+generic solution. Its primary intent is to be dead simple to use & easy to
+customize, of course, both criteria subjected to very my own tastes.
 
 == Getting Started
 
@@ -31,7 +35,8 @@ It's hosted on rubygems.org:
 
 === Unfortunately ...
 
-Most of the times, we won't have anything as simple as above, the following illustrates the problem of contextual reference:
+Most of the times, we won't have anything as simple as above, the following
+illustrates the problem of contextual reference:
 
   mark = '*'
   Otaku.start do |data|
@@ -40,7 +45,9 @@ Most of the times, we won't have anything as simple as above, the following illu
 
   Otaku.process('hello') # failure !!
 
-The reason is that the proc that we passed to Otaku.start is being marshalled while being passed to the server as a handler, in the process, the contextual references are lost. A workaround for this problem is:
+The reason is that the proc that we passed to Otaku.start is being marshalled
+while being passed to the server as a handler, in the process, the contextual
+references are lost. A workaround for this problem is:
 
   Otaku.start(:mark => '*') do |data|
     '%s %s %s' % [mark, data, mark]
@@ -48,6 +55,11 @@ The reason is that the proc that we passed to Otaku.start is being marshalled wh
 
   Otaku.process('hello') # >> '* hello *'
 
+Anything that can be marshalled can be passed as a context. The exception is
+proc, which cannot be marshalled, yet it can still be passed in. However, in
+the process, all contextual references within the proc are lost, so u may
+want to exercise care when playing with proc.
+
 == Configuraing It
 
 Otaku ships with the following defaults:
@@ -88,8 +100,9 @@ Configuring can be done via:
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Commit, do not mess with rakefile, version, or history. (if you want to have
+  your own version, that is fine but bump version in a commit by itself I can
+  ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/examples/unittest/client.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), '..', 'lib', 'otaku')
+
+Otaku.port = 10901
+
+Otaku.start do |test_file|
+  unless $o_stdout
+    $o_stdout, $o_stderr = $stdout, $stderr
+    $stdout, $stderr = StringIO.new, StringIO.new
+  end
+  MiniTest::Unit::TestCase.reset
+  require File.join(File.dirname(__FILE__), test_file)
+  MiniTest::Unit.new.run
+  $stdout.rewind
+  $stdout.lines
+end
+
+

data/examples/unittest/server.rb

@@ -0,0 +1,56 @@
+require 'rubygems'
+require 'pp'
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'otaku')
+
+Otaku.port = 10901
+
+Otaku.start do |test_file|
+
+  unless $o_stdout
+    $o_stdout, $o_stderr = $stdout, $stderr
+    $stdout, $stderr = StringIO.new, StringIO.new
+  end
+
+  require 'rubygems'
+  require 'minitest/unit'
+  MiniTest::Unit::TestCase.reset
+  require test_file
+  MiniTest::Unit.new.run
+
+  results = ($stdout.rewind; $stdout).lines.inject({}) do |memo, line|
+    case line
+    when /(\d+) assertions, (\d+) failures, (\d+) errors, (\d+) skips/
+      a, f, e, s = [$1, $2, $3, $4].map(&:to_i)
+      memo[:stats] = {:assertions => a, :failures => f, :errors => e, :skips => s})
+    when /Finished in ([\d\.]+) seconds/
+      memo[:time_taken] = "#{$1} seconds"
+    else
+      (memo[:buffer] ||= []) << line
+    end
+    memo
+  end
+
+  unless [:errors, :failures].all?{|type| results[:stats][type].zero? }
+    results[:errors] = (results.delete(:buffer) || []).inject([]) do |errors, line|
+      latest = errors[-1]
+      if title = line[/^  (\d+\) (Error|Failure)\:)/,1]
+        errors << [title]
+      elsif latest && [1,2].include?(latest.size)
+        latest << line.strip
+      elsif latest && latest.size == 3 && line.include?(test_file)
+        latest << [test_file, line[/\:(\d+)\:/,1]].join(':')
+      end
+      errors
+    end
+  end
+
+  results
+end
+
+Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'tests', '*.rb')) do |file|
+  pp Otaku.process(file)
+end
+
+at_exit do
+  Otaku.stop
+end

data/examples/unittest/server2.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'pp'
+
+Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'tests', '*.rb')) do |file|
+  require 'rubygems'
+  require 'minitest/unit'
+  MiniTest::Unit::TestCase.reset
+  require file
+  MiniTest::Unit.new.run
+end
+

data/examples/unittest/tests/a_test.rb

@@ -0,0 +1,9 @@
+require 'minitest/unit'
+
+class TestA < MiniTest::Unit::TestCase
+
+  def test_a
+    assert true
+  end
+
+end

data/examples/unittest/tests/b_test.rb

@@ -0,0 +1,9 @@
+require 'minitest/unit'
+
+class TestB < MiniTest::Unit::TestCase
+
+  def test_b
+    assert true
+  end
+
+end

data/lib/otaku.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'forwardable'
 require 'eventmachine'
 require 'logger'
 require 'base64'

data/lib/otaku/handler.rb

@@ -1,124 +1,32 @@
+require 'otaku/handler/magic_proc'
+require 'otaku/handler/context'
+require 'otaku/handler/processor'
+
 module Otaku
   class Handler
 
+    attr_reader :context, :processor
+
     def initialize(context, handler)
-      @context = __context_as_code__(context)
-      magic_proc = MagicProc.new(handler)
-      @proc, @file, @line = [:code, :file, :line].map{|meth| magic_proc.send(meth) }
+      @context = Context.new(context)
+      @processor = Processor.new(handler)
     end
 
     def process(data)
-      (instance = eval(@context, nil, '(generated class)', 1)).
-        instance_exec(data, &(block = eval(@proc, nil, @file, @line)))
+      @context.eval!.instance_exec(data, &@processor.eval!)
     end
 
     def root
-      File.dirname(@file)
+      File.dirname(@processor.file)
     end
 
-    private
-
-      def __context_as_code__(methods_hash)
-        'Class.new{ %s }.new' %
-          methods_hash.map do |method, val|
-            "def #{method}; Encoder.decode(%|#{Encoder.encode(val).gsub('|','\|')}|); end"
-          end.sort.join('; ')
-      end
-
-      class MagicProc
-
-        RUBY_PARSER = RubyParser.new
-        RUBY_2_RUBY = Ruby2Ruby.new
-
-        attr_reader :file, :line, :code
-
-        def initialize(block)
-          @block = block
-          extract_file_and_line_and_code
-        end
-
-        private
-
-          def extract_file_and_line_and_code
-            code, remaining = code_fragments
-
-            while frag = remaining[frag_regexp,1]
-              begin
-                sexp = RUBY_PARSER.parse(replace_magic_vars(code += frag))
-                if sexp.inspect =~ sexp_regexp
-                  @code = revert_magic_vars(RUBY_2_RUBY.process(sexp)).sub('proc {','lambda {')
-                  break
-                end
-              rescue SyntaxError, Racc::ParseError, NoMethodError
-                remaining.sub!(frag,'')
-              end
-            end
-          end
-
-          def code_fragments
-            ignore, start_marker, arg =
-              [:ignore, :start_marker, :arg].map{|key| code_match_args[key] }
-            [
-              "proc #{start_marker} |#{arg}| ",
-              source_code.sub(ignore, '')
-            ]
-          end
-
-          def sexp_regexp
-            @sexp_regexp ||= (
-              Regexp.new([
-                Regexp.quote("s(:iter, s(:call, nil, :"),
-                "(proc|lambda)",
-                Regexp.quote(", s(:arglist)), s(:lasgn, :#{code_match_args[:arg]}), s("),
-              ].join)
-            )
-          end
-
-          def frag_regexp
-            @frag_regexp ||= (
-              end_marker = {'do' => 'end', '{' => '\}'}[code_match_args[:start_marker]]
-              /^(.*?\W#{end_marker})/m
-            )
-          end
-
-          def code_regexp
-            @code_regexp ||=
-              /^(.*?(Otaku\.start.*?|lambda|proc|Proc\.new)\s*(do|\{)\s*\|(\w+)\|\s*)/m
-          end
-
-          def code_match_args
-            @code_match_args ||= (
-              args = source_code.match(code_regexp)
-              {
-                :ignore => args[1],
-                :start_marker => args[3],
-                :arg => args[4]
-              }
-            )
-          end
-
-          def source_code
-            @source_code ||= (
-              file, line = /^#<Proc:0x[0-9A-Fa-f]+@(.+):(\d+).*?>$/.match(@block.inspect)[1..2]
-              @file = File.expand_path(file)
-              @line = line.to_i
-              File.readlines(@file)[@line.pred .. -1].join
-            )
-          end
-
-          def replace_magic_vars(code)
-            %w{__FILE__ __LINE__}.inject(code) do |code, var|
-              code.gsub(var, "%|((#{var}))|")
-            end
-          end
-
-          def revert_magic_vars(code)
-            %w{__FILE__ __LINE__}.inject(code) do |code, var|
-              code.gsub(%|"((#{var}))"|, var)
-            end
-          end
+    def marshal_dump
+      [@context, @processor]
+    end
 
-      end
+    def marshal_load(data)
+      @context, @processor = data
+    end
 
   end
 end

data/lib/otaku/handler/context.rb

@@ -0,0 +1,43 @@
+module Otaku
+  class Handler
+    class Context #:nodoc:
+
+      attr_reader :code
+
+      def initialize(methods_hash)
+        @code = 'Class.new{ %s }.new' %
+          methods_hash.map do |method, val|
+            'def %s; %s; end' % [method, method_body(val)]
+          end.sort.join('; ')
+      end
+
+      def eval!
+        eval(@code, nil, '(generated class)', 1)
+      end
+
+      def marshal_dump
+        [@code]
+      end
+
+      def marshal_load(data)
+        @code, _ = data
+      end
+
+      private
+
+        def method_body(val)
+          if val.is_a?(Proc)
+            "Encoder.decode(%|#{Encoder.encode(magic_proc(val)).gsub('|','\|')}|).eval!"
+          else
+            "Encoder.decode(%|#{Encoder.encode(val).gsub('|','\|')}|)"
+          end
+        end
+
+        def magic_proc(block)
+          MagicProc.new(block)
+        end
+
+    end
+  end
+end
+

data/lib/otaku/handler/magic_proc.rb

@@ -0,0 +1,116 @@
+module Otaku
+  class Handler
+    class MagicProc #:nodoc:
+
+      RUBY_PARSER = RubyParser.new
+      RUBY_2_RUBY = Ruby2Ruby.new
+
+      attr_reader :file, :line, :code
+
+      def initialize(block)
+        @cache = {:block => block}
+        extract_file_and_line_and_code
+        @cache = nil
+      end
+
+      def eval!
+        eval(@code, nil, @file, @line)
+      end
+
+      def marshal_dump
+        [@code, @file, @line]
+      end
+
+      def marshal_load(data)
+        @code, @file, @line = data
+      end
+
+      private
+
+        def extract_file_and_line_and_code
+          code, remaining = code_fragments
+
+          while frag = remaining[frag_regexp,1]
+            begin
+              sexp = RUBY_PARSER.parse(replace_magic_vars(code += frag))
+              if sexp.inspect =~ sexp_regexp
+                @code = revert_magic_vars(RUBY_2_RUBY.process(sexp)).sub('proc {','lambda {')
+                break
+              end
+            rescue SyntaxError, Racc::ParseError, NoMethodError
+              remaining.sub!(frag,'')
+            end
+          end
+        end
+
+        def code_fragments
+          ignore, start_marker, arg =
+            [:ignore, :start_marker, :arg].map{|key| code_match_args[key] }
+          [
+            arg ? "proc #{start_marker} |#{arg}|" : "proc #{start_marker}",
+            source_code.sub(ignore, '')
+          ]
+        end
+
+        def sexp_regexp
+          @cache[:sexp_regexp] ||= (
+            Regexp.new([
+              Regexp.quote("s(:iter, s(:call, nil, :"),
+              "(proc|lambda)",
+              Regexp.quote(", s(:arglist)), "),
+              '(%s|%s|%s)' % [
+                Regexp.quote('s(:masgn, s(:array, s('),
+                Regexp.quote('s(:lasgn, :'),
+                Regexp.quote('nil, s(')
+              ]
+            ].join)
+          )
+        end
+
+        def frag_regexp
+          @cache[:frag_regexp] ||= (
+            end_marker = {'do' => 'end', '{' => '\}'}[code_match_args[:start_marker]]
+            /^(.*?\W#{end_marker})/m
+          )
+        end
+
+        def code_regexp
+          @cache[:code_regexp] ||=
+            /^(.*?(lambda|proc|Proc\.new)?\s*(do|\{)\s*(\|(.*?)\|\s*)?)/m
+        end
+
+        def code_match_args
+          @cache[:code_match_args] ||= (
+            args = source_code.match(code_regexp)
+            {
+              :ignore => args[1],
+              :start_marker => args[3],
+              :arg => args[5]
+            }
+          )
+        end
+
+        def source_code
+          @cache[:source_code] ||= (
+            file, line = /^#<Proc:0x[0-9A-Fa-f]+@(.+):(\d+).*?>$/.match(@cache[:block].inspect)[1..2]
+            @file = File.expand_path(file)
+            @line = line.to_i
+            File.readlines(@file)[@line.pred .. -1].join
+          )
+        end
+
+        def replace_magic_vars(code)
+          %w{__FILE__ __LINE__}.inject(code) do |code, var|
+            code.gsub(var, "%|((#{var}))|")
+          end
+        end
+
+        def revert_magic_vars(code)
+          %w{__FILE__ __LINE__}.inject(code) do |code, var|
+            code.gsub(%|"((#{var}))"|, var)
+          end
+        end
+
+    end
+  end
+end