wunderbar 0.9.0 → 0.10.0

data/README.md

@@ -181,7 +181,9 @@ number of other convenience methods are defined:
 
 * `_.post?`  -- was this invoked via HTTP POST?
 * `_.system` -- invokes a shell command, captures stdin, stdout, and stderr
-* `_.submit`: runs command (or block) as a deamon process
+* `_.submit` -- runs command (or block) as a deamon process
+* `_.SELF`   -- Request URI
+* `_.SELF?`  -- Request URI with '?' appended (avoids spoiling the cache)
 
 Access to all of the builder _defined_ methods (typically these end in an esclamation mark) and all of the Wunderbar module methods can be accessed in this way.  Examples:
 
@@ -260,21 +262,14 @@ output stream, which provides access to other useful methods, for example:
 
 Globals provided
 ---
-* `$cgi`   - Common Gateway Interface
-* `$param` - Access to parameters (read-only OpenStruct like interface)
-* `$env`  - Access to environment variables (read-only OpenStruct like interface)
-* `$USER`  - Host user id
-* `$HOME`  - Home directory
-* `$SERVER`- Server name
-* `SELF`   - Request URI
-* `SELF?`  - Request URI with '?' appended (avoids spoiling the cache)
+* `$cgi`    - Common Gateway Interface
+* `$params` - Access to parameters (read-only OpenStruct like interface)
+* `$env`    - Access to environment variables (read-only OpenStruct like interface)
+* `$USER`   - Host user id
+* `$HOME`   - Home directory
+* `$SERVER` - Server name
 * `$HOME`   - user's home directory
 * `$HOST`   - server host
-* `$HTTP_GET`   - request is an HTTP GET
-* `$HTTP_POST`  - request is an HTTP POST
-* `$XHR_JSON`   - request is XmlHttpRequest for JSON
-* `$XHTML`      - user agent accepts XHTML responses
-* `$TEXT`       - user agent accepts plain text responses
 
 Also, the following environment variables are set if they aren't already:
 
@@ -292,6 +287,7 @@ HTML methods
 * `_svg`: insert svg namespace
 * `_math`: insert math namespace
 * `_coffeescript`: convert [coffeescript](http://coffeescript.org/) to JS and insert script tag
+* `xhtml?`: output as XHTML?
 
 Note that adding an exclamation mark to the end of the tag name disables this
 behavior.

data/lib/wunderbar/builder.rb

@@ -75,29 +75,47 @@ module Wunderbar
   end
 
   class XmlMarkup
-    def initialize(*args)
-      @x = SpacedMarkup.new(*args)
+    def initialize(args)
+      @_scope = args.delete(:scope)
+      @_builder = SpacedMarkup.new(args)
     end
 
-    # forward to either Wunderbar or XmlMarkup
+    # forward to Wunderbar, XmlMarkup, or @_scope
     def method_missing(method, *args, &block)
       if Wunderbar.respond_to? method
         Wunderbar.send method, *args, &block
       elsif SpacedMarkup.public_instance_methods.include? method
-        @x.__send__ method, *args, &block
+        @_builder.__send__ method, *args, &block
       elsif SpacedMarkup.public_instance_methods.include? method.to_s
-        @x.__send__ method, *args, &block
+        @_builder.__send__ method, *args, &block
+      elsif @_scope and @_scope.respond_to? method
+        @_scope.send method, *args, &block
       else
         super
       end
     end
 
+    def methods
+      result = super + Wunderbar.methods
+      result += SpacedMarkup.public_instance_methods
+      result += @_scope.methods if @_scope
+      result.uniq
+    end
+
+    def respond_to?(method)
+      respond true if Wunderbar.respond_to? method
+      respond true if SpacedMarkup.public_instance_methods.include? method
+      respond true if SpacedMarkup.public_instance_methods.include?  method.to_s
+      respond true if @_scope and @_scope.respond_to? method?
+      super
+    end
+
     # avoid method_missing overhead for the most common case
     def tag!(sym, *args, &block)
       if !block and (args.empty? or args == [''])
-        CssProxy.new(@x, @x.target!, sym, args)
+        CssProxy.new(@_builder, @_builder.target!, sym, args)
       else
-        @x.tag! sym, *args, &block
+        @_builder.tag! sym, *args, &block
       end
     end
 
@@ -122,7 +140,7 @@ module Wunderbar
       stdout = output_class[:stdout] || '_stdout'
       stderr = output_class[:stderr] || '_stderr'
 
-      @x.tag! tag, command, :class=>stdin unless opts[:echo] == false
+      @_builder.tag! tag, command, :class=>stdin unless opts[:echo] == false
 
       require 'thread'
       semaphore = Mutex.new
@@ -131,14 +149,18 @@ module Wunderbar
           Thread.new do
             until pout.eof?
               out_line = pout.readline.chomp
-              semaphore.synchronize { @x.tag! tag, out_line, :class=>stdout }
+              semaphore.synchronize do
+                @_builder.tag! tag, out_line, :class=>stdout
+              end
             end
           end,
 
           Thread.new do
             until perr.eof?
               err_line = perr.readline.chomp
-              semaphore.synchronize { @x.tag! tag, err_line, :class=>stderr }
+              semaphore.synchronize do 
+                @_builder.tag! tag, err_line, :class=>stderr
+              end
             end
           end,
 
@@ -157,17 +179,12 @@ module Wunderbar
 
     # declaration (DOCTYPE, etc)
     def declare(*args)
-      @x.declare!(*args)
+      @_builder.declare!(*args)
     end
 
     # comment
     def comment(*args)
-      @x.comment! *args
-    end
-
-    # was this invoked via HTTP POST?
-    def post?
-      $HTTP_POST
+      @_builder.comment! *args
     end
   end
 
@@ -191,12 +208,14 @@ module Wunderbar
       self
     end
 
-    # forward to either Wunderbar or @_target
+    # forward to Wunderbar, @_target, or @_scope
     def method_missing(method, *args, &block)
       if Wunderbar.respond_to? method
         return Wunderbar.send method, *args, &block
       elsif @_target.respond_to? method
         return @_target.send method, *args, &block
+      elsif @_scope and @_scope.respond_to? method
+        return @_scope.send method, *args, &block
       else
         super
       end
@@ -208,7 +227,8 @@ module Wunderbar
   end
 
   class JsonBuilder
-    def initialize
+    def initialize(scope=nil)
+      @_scope = scope
       @_target = {}
     end
 
@@ -221,7 +241,7 @@ module Wunderbar
       @_target
     end
 
-    # forward to either Wunderbar or @_target
+    # forward to Wunderbar, @_target, or @_scope
     def method_missing(method, *args, &block)
 
       if method.to_s =~ /^_(\w*)$/
@@ -230,6 +250,8 @@ module Wunderbar
         return Wunderbar.send method, *args, &block
       elsif @_target.respond_to? method
         return @_target.send method, *args, &block
+      elsif @_scope and @_scope.respond_to? method
+        return @_scope.send method, *args, &block
       else
         super
       end

data/lib/wunderbar/cgi-methods.rb

@@ -2,18 +2,21 @@ module Wunderbar
 
   module CGI
 
+    HIDE_FRAME = [ %r{/(wunderbar|webrick)/},
+                   %r{/gems/.*/(builder|rack|sinatra)/} ]
+
     # produce json
     def self.json(&block)
+      headers = { 'type' => 'application/json', 'Cache-Control' => 'no-cache' }
       builder = JsonBuilder.new
-      output = builder.encode($param, &block)
-      Kernel.print "Status: 404 Not Found\r\n" if output == {}
+      output = builder.encode($params, &block)
+      headers['status'] =  "404 Not Found" if output == {}
     rescue Exception => exception
-      Kernel.print "Status: 500 Internal Error\r\n"
       Wunderbar.error exception.inspect
+      headers['status'] =  "500 Internal Server Error"
       backtrace = []
       exception.backtrace.each do |frame| 
-        next if frame =~ %r{/wunderbar/}
-        next if frame =~ %r{/gems/.*/builder/}
+        next if HIDE_FRAME.any? {|re| frame =~ re}
         Wunderbar.warn "  #{frame}"
         backtrace << frame 
       end
@@ -21,31 +24,27 @@ module Wunderbar
       builder._exception exception.inspect
       builder._backtrace backtrace
     ensure
-      out? 'type' => 'application/json', 'Cache-Control' => 'no-cache' do
-        builder.target!
-      end
+      out?(headers) { builder.target! }
     end
 
     # produce text
     def self.text &block
+      headers = {'type' => 'text/plain', 'charset' => 'UTF-8'}
       builder = TextBuilder.new
-      output = builder.encode($param, &block)
-      Kernel.print "Status: 404 Not Found\r\n" if output == ''
+      output = builder.encode($params, &block)
+      headers['status'] =  "404 Not Found" if output == ''
     rescue Exception => exception
       Wunderbar.error exception.inspect
-      Kernel.print "Status: 500 Internal Error\r\n"
+      headers['status'] =  "500 Internal Server Error"
       builder.puts unless builder.size == 0
       builder.puts exception.inspect
       exception.backtrace.each do |frame| 
-        next if frame =~ %r{/wunderbar/}
-        next if frame =~ %r{/gems/.*/builder/}
+        next if HIDE_FRAME.any? {|re| frame =~ re}
         Wunderbar.warn "  #{frame}"
         builder.puts "  #{frame}"
       end
     ensure
-      out? 'type' => 'text/plain', 'Cache-Control' => 'no-cache' do
-        builder.target!
-      end
+      out?(headers) { builder.target! }
     end
 
     # Conditionally provide output, based on ETAG
@@ -54,8 +53,11 @@ module Wunderbar
       require 'digest/md5'
       etag = Digest::MD5.hexdigest(content)
 
-      if ENV['HTTP_IF_NONE_MATCH'] == etag.inspect
-        Kernel.print "Status: 304 Not Modified\r\n\r\n"
+      if $env.HTTP_IF_NONE_MATCH == etag.inspect
+        headers['Date'] = ::CGI.rfc1123_date(Time.now)
+        $cgi.out headers.merge('status' => '304 Not Modified') do
+          ''
+        end
       else
         $cgi.out headers.merge('Etag' => etag.inspect) do
           content
@@ -66,33 +68,30 @@ module Wunderbar
 
     # produce html/xhtml
     def self.html(*args, &block)
-      args << {} if args.empty?
-      if Hash === args.first
-        args.first[:xmlns] ||= 'http://www.w3.org/1999/xhtml'
-      end
-      mimetype = ($XHTML ? 'application/xhtml+xml' : 'text/html')
+      headers = { 'type' => 'text/html', 'charset' => 'UTF-8' }
+      headers['type'] = 'application/xhtml+xml' if @xhtml
+
       x = HtmlMarkup.new
-      x._! "\xEF\xBB\xBF"
-      x._.declare :DOCTYPE, :html
 
       begin
-        output = x.html *args, &block
+        if @xhtml
+          output = x.xhtml *args, &block
+        else
+          output = x.html *args, &block
+        end
       rescue ::Exception => exception
-        Kernel.print "Status: 500 Internal Error\r\n"
+        headers['status'] =  "500 Internal Server Error"
         x.clear!
-        x._! "\xEF\xBB\xBF"
-        x._.declare :DOCTYPE, :html
         output = x.html(*args) do
           _head do
-            _title 'Internal Error'
+            _title 'Internal Server Error'
           end
           _body do
-            _h1 'Internal Error'
+            _h1 'Internal Server Error'
             text = exception.inspect
             Wunderbar.error text
             exception.backtrace.each do |frame| 
-              next if frame =~ %r{/wunderbar/}
-              next if frame =~ %r{/gems/.*/builder/}
+              next if HIDE_FRAME.any? {|re| frame =~ re}
               Wunderbar.warn "  #{frame}"
               text += "\n  #{frame}"
             end
@@ -102,10 +101,73 @@ module Wunderbar
         end
       end
 
-      out? 'type' => mimetype, 'charset' => 'UTF-8' do
-        output
+      out?(headers) { output }
+    end
+
+    def self.call(env)
+      require 'etc'
+      $USER = ENV['REMOTE_USER'] ||= ENV['USER'] || Etc.getlogin
+
+      accept         = $env.HTTP_ACCEPT.to_s
+      request_uri    = $env.REQUEST_URI.to_s
+
+      # implied request types
+      xhr_json = Wunderbar::Options::XHR_JSON  || (accept =~ /json/)
+      text = Wunderbar::Options::TEXT || 
+        (accept =~ /plain/ and accept !~ /html/)
+      @xhtml = (accept =~ /xhtml/ or accept == '')
+
+      # overrides via the uri query parameter
+      xhr_json  ||= (request_uri =~ /\?json$/)
+      text       ||= (request_uri =~ /\?text$/)
+
+      # overrides via the command line
+      xhtml_override = ARGV.include?('--xhtml')
+      html_override  = ARGV.include?('--html')
+
+      # disable conneg if only one handler is provided
+      if Wunderbar.queue.length == 1
+        type = Wunderbar.queue.first.first
+        xhr_json = (type == :json)
+        text     = (type == :text)
+      end
+
+      Wunderbar.queue.each do |type, args, block|
+        case type
+        when :html, :xhtml
+          unless xhr_json or text
+            if type == :html
+              @xhtml = false unless xhtml_override
+            else
+              @xhtml = false if html_override
+            end
+
+            self.html(*args, &block)
+            return
+          end
+        when :json
+          if xhr_json
+            self.json(*args, &block)
+            return
+          end
+        when :text
+          if text
+            self.text(*args, &block)
+            return
+          end
+        end
       end
     end
+
+    # map Ruby CGI headers to Rack headers
+    def self.headers(headers)
+      result = headers.dup
+      type = result.delete('type') || 'text/html'
+      charset = result.delete('charset')
+      type = "#{type}; charset=#{charset}" if charset
+      result['Content-Type'] ||= type
+      result
+    end
   end
 
   @queue = []
@@ -127,40 +189,7 @@ module Wunderbar
     @queue << [:text, args, block]
   end
 
-  def self.evaluate
-    queue, @queue = @queue, []
-    xhtml = ARGV.delete('--xhtml')
-    html  = ARGV.delete('--html')
-
-    queue.each do |type, args, block|
-      case type
-      when :html
-        unless $XHR_JSON or $TEXT
-          $XHTML = false unless xhtml
-          CGI.html(*args, &block)
-          break
-        end
-      when :xhtml
-        unless $XHR_JSON or $TEXT
-          $XHTML = false if html
-          CGI.html(*args, &block)
-          break
-        end
-      when :json
-        if $XHR_JSON
-          CGI.json(*args, &block)
-          break
-        end
-      when :text
-        if $TEXT
-          CGI.text(*args, &block)
-          break
-        end
-      end
-    end
+  def self.queue
+    @queue
   end
 end
-
-at_exit do
-  Wunderbar.evaluate
-end

data/lib/wunderbar/environment.rb

@@ -1,46 +1,36 @@
 # explicit request types
-$HTTP_GET  = ARGV.delete('--get')
-$HTTP_POST = ARGV.delete('--post')
-$XHR_JSON  = ARGV.delete('--json')
-$TEXT      = ARGV.delete('--text')
-
-# Only prompt if explicitly asked for
-ARGV.push '' if ARGV.empty?
-ARGV.delete('--prompt') or ARGV.delete('--offline')
-
-# standard objects
-$cgi = CGI.new
-$param = $cgi.params
-
-# implied request types
-$HTTP_GET  ||= ($cgi.request_method == 'GET')
-$HTTP_POST ||= ($cgi.request_method == 'POST')
-$XHR_JSON  ||= ($cgi.accept.to_s =~ /json/)
-$TEXT      ||= ($cgi.accept.to_s =~ /plain/ and $cgi.accept.to_s !~ /html/)
-$XHTML     = ($cgi.accept.to_s =~ /xhtml/ or $cgi.accept == nil)
-
-# get arguments if CGI couldn't find any... 
-$param.merge!(CGI.parse(ARGV.join('&'))) if $param.empty?
-
 module Wunderbar
+  module Options
+    XHR_JSON  = ARGV.delete('--json')
+    TEXT      = ARGV.delete('--text')
+  end
+
   module Untaint
     def untaint_if_match regexp
       self.untaint if regexp.match(self)
     end
   end
-end
 
-# fast path for accessing CGI parameters
-def $param.method_missing(name)
-  if has_key? name.to_s
-    if self[name.to_s].length == 1
-      self[name.to_s].first.extend(Wunderbar::Untaint)
+  # quick access to request_uri
+  def self.SELF 
+    $env.REQUEST_URI
+  end
+
+  def self.SELF?
+    if SELF '?'
+      self.self
     else
-      self[name.to_s].join 
+      SELF + "?" # avoids spoiling the cache
     end
   end
+
+  # was this invoked via HTTP POST?
+  def self.post?
+    $env.REQUEST_METHOD.to_s.upcase == 'POST'
+  end
 end
 
+# environment objects
 $env = {}
 def $env.method_missing(name)
   delete name.to_s if ENV[name.to_s] != self[name.to_s]
@@ -50,32 +40,9 @@ def $env.method_missing(name)
   self[name.to_s]
 end
 
-# quick access to request_uri
-SELF = ENV['REQUEST_URI'].to_s
-def SELF?
-  if SELF.include? '?'
-    SELF
-  else
-    SELF + "?" # avoids spoiling the cache
-  end
-end
-
-# environment objects
-$USER = ENV['REMOTE_USER'] || ENV['USER'] ||
-  if RUBY_PLATFORM =~ /darwin/
-    `dscl . -search /Users UniqueID #{Process.uid}`.split.first
-  else
-    `getent passwd #{Process.uid}`.split(':').first
-  end
-
-ENV['REMOTE_USER'] ||= $USER
-
-$HOME = ENV['HOME'] ||= File.expand_path('~' + $USER)
-$SERVER = ENV['HTTP_HOST'] || `hostname`.chomp
-
-# more implied request types
-$XHR_JSON  ||= ($env.REQUEST_URI.to_s =~ /\?json$/)
-$TEXT      ||= ($env.REQUEST_URI.to_s =~ /\?text$/)
+require 'socket'
+$SERVER = ENV['HTTP_HOST'] || Socket::gethostname
+$HOME = ENV['HOME'] ||= Dir.home() rescue nil
 
 # set encoding to UTF-8
 ENV['LANG'] ||= "en_US.UTF-8"

data/lib/wunderbar/html-methods.rb

@@ -5,23 +5,54 @@ class HtmlMarkup
     link meta param source track wbr
   )
 
-  def initialize(*args, &block)
-    @x = Wunderbar::XmlMarkup.new :indent => 2, :target => []
+  def initialize(scope = nil)
+    @_scope = scope
+    @x = Wunderbar::XmlMarkup.new :scope => scope, :indent => 2, :target => []
+    @xthml = false
+  end
+
+  def xhtml(*args, &block)
+    @xhtml = true
+    html(*args, &block)
   end
 
   def html(*args, &block)
+    # default namespace
+    args << {} if args.empty?
+    args.first[:xmlns] ||= 'http://www.w3.org/1999/xhtml' if Hash === args.first
+
+    @x.text! "\xEF\xBB\xBF"
+    @x.declare! :DOCTYPE, :html
     @x.tag! :html, *args do 
-      $param.each do |key,value| 
-        instance_variable_set "@#{key}", value.first if key =~ /^\w+$/
+      if $params
+        $params.each do |key,value| 
+          value = value.first if Array === value
+          instance_variable_set "@#{key}", value if key =~ /^\w+$/
+        end
       end
       instance_exec(@x, &block)
     end
     @x.target!.join
   end
 
+  def _html(*args, &block)
+    html(*args, &block)
+  end
+
+  def _xhtml(*args, &block)
+    @xhtml = true
+    html(*args, &block)
+  end
+
+  def xhtml?
+    @xhtml
+  end
+
   def method_missing(name, *args, &block)
     if name.to_s =~ /^_(\w+)(!|\?|)$/
       name, flag = $1, $2
+    elsif @_scope and @_scope.respond_to? name
+      return @_scope.__send__ name, *args, &block
     else
       error = NameError.new "undefined local variable or method `#{name}'", name
       error.set_backtrace caller
@@ -36,7 +67,7 @@ class HtmlMarkup
       if %w(script style).include?(name)
         if String === args.first and not block
           text = args.shift
-          if $XHTML
+          if @xhtml
             block = Proc.new {@x.indented_text! text}
           else
             block = Proc.new {@x.indented_data! text}
@@ -82,8 +113,7 @@ class HtmlMarkup
           text = exception.inspect
           Wunderbar.warn text
           exception.backtrace.each do |frame| 
-            next if frame =~ %r{/wunderbar/}
-            next if frame =~ %r{/gems/.*/builder/}
+            next if Wunderbar::CGI::HIDE_FRAME.any? {|re| frame =~ re}
             Wunderbar.warn "  #{frame}"
             text += "\n  #{frame}"
           end

data/lib/wunderbar/installation.rb

@@ -1,3 +1,18 @@
+module Wunderbar
+  # Extract data from the script (after __END__)
+  def self.data
+    data = DATA.read 
+
+    # process argument overrides
+    data.scan(/^\s*([A-Z]\w*)\s*=\s*(['"]).*\2$/).each do |name, q|
+      override = ARGV.find {|arg| arg =~ /--#{name}=(.*)/i}
+      data[/^\s*#{name}\s*=\s*(.*)/,1] = $1.inspect if override
+    end
+
+    data
+  end
+end
+
 # option to create an suexec callable wrapper
 install = ARGV.find {|arg| arg =~ /--install=(.*)/}
 if install and ARGV.delete(install)
@@ -40,17 +55,7 @@ if install and ARGV.delete(install)
     file.puts "Dir.chdir #{File.dirname(main).inspect}"
 
     # Optional data from the script (after __END__)
-    if Object.const_defined? :DATA
-      data = DATA.read 
-
-      # process argument overrides
-      data.scan(/^\s*([A-Z]\w*)\s*=\s*(['"]).*\2$/).each do |name, q|
-        override = ARGV.find {|arg| arg =~ /--#{name}=(.*)/}
-        data[/^\s*#{name}\s*=\s*(.*)/,1] = $1.inspect if override
-      end
-
-      file.puts "\n#{data}\n"
-    end
+    file.puts "\n#{Wunderbar.data}\n" if Object.const_defined? :DATA
 
     # Load script
     require = "require #{"./#{File.basename(main).sub(/\.rb$/,'')}".inspect}"

data/lib/wunderbar/server.rb

@@ -0,0 +1,112 @@
+at_exit do
+  # Only prompt if explicitly asked for
+  ARGV.push '' if ARGV.empty?
+  ARGV.delete('--prompt') or ARGV.delete('--offline')
+
+  $cgi = CGI.new
+
+  port = ARGV.find {|arg| arg =~ /--port=(.*)/}
+  if port and ARGV.delete(port)
+    port = $1.to_i
+
+    # entry point for Rack
+    def $cgi.call(env)
+      @request = Rack::Request.new(env)
+      @response = Rack::Response.new
+      $env = OpenStruct.new(env)
+      $params = @request.params
+
+      Wunderbar::CGI.call(env)
+      @response.finish
+    end
+
+    # redirect the output produced
+    def $cgi.out(headers,&block)
+      status = headers.delete('status')
+      @response.status = status if status
+
+      headers = Wunderbar::CGI.headers(headers)
+      headers.each { |key, value| @response[key] = value }
+
+      @response.write block.call unless @request.head?
+    end
+
+    # Evaluate optional data from the script (after __END__)
+    eval Wunderbar.data if Object.const_defined? :DATA
+
+    # start the server
+    require 'rack'
+    require 'rack/showexceptions'
+    app = Rack::ShowExceptions.new(Rack::Lint.new($cgi))
+    Rack::Server.start :app => app, :Port => port
+
+  elsif defined? Sinatra
+
+    require 'wunderbar/template'
+    Tilt.register '_html',  Wunderbar::Template::Html
+    Tilt.register '_xhtml', Wunderbar::Template::Xhtml
+    Tilt.register '_json',  Wunderbar::Template::Json
+    Tilt.register '_text',  Wunderbar::Template::Text
+
+    # define helpers
+    helpers do
+      def _html(*args, &block)
+        if block
+          Wunderbar::Template::Html.evaluate('_html', self) do
+            _html(*args) { instance_eval &block }
+          end
+        else
+          Wunderbar::Template::Html.evaluate('_html', self, *args)
+        end
+      end
+
+      def _xhtml(*args, &block)
+        if env['HTTP_ACCEPT'] and not env['HTTP_ACCEPT'].include? 'xhtml'
+          return _html(*args, &block)
+        end
+
+        if block
+          Wunderbar::Template::Xhtml.evaluate('_xhtml', self) do
+            _xhtml(*args) { instance_eval &block }
+          end
+        else
+          Wunderbar::Template::Xhtml.evaluate('_xhtml', self, *args)
+        end
+      end
+
+      def _json(*args, &block)
+        Wunderbar::Template::Json.evaluate('_json', self, *args, &block)
+      end
+
+      def _text(*args, &block)
+        Wunderbar::Template::Text.evaluate('_text', self, *args, &block)
+      end
+    end
+
+  else
+
+    # allow the REQUEST_METHOD to be set for command line invocations
+    ENV['REQUEST_METHOD'] ||= 'POST' if ARGV.delete('--post')
+    ENV['REQUEST_METHOD'] ||= 'GET'  if ARGV.delete('--get')
+
+    # standard objects
+    $params = $cgi.params
+
+    # get arguments if CGI couldn't find any... 
+    $params.merge!(CGI.parse(ARGV.join('&'))) if $params.empty?
+
+    # fast path for accessing CGI parameters
+    def $params.method_missing(name)
+      if has_key? name.to_s
+        if self[name.to_s].length == 1
+          self[name.to_s].first.extend(Wunderbar::Untaint)
+        else
+          self[name.to_s].join 
+        end
+      end
+    end
+
+    # CGI or command line
+    Wunderbar::CGI.call(ENV)
+  end
+end

data/lib/wunderbar/template.rb

@@ -0,0 +1,91 @@
+require 'tilt/template'
+
+module Wunderbar
+  # Tilt template implementation
+  module Template
+    class Base < Tilt::Template
+      def self.engine_initialized?
+        defined? ::Wunderbar
+      end
+
+      def initialize_engine
+        require_template_library 'wunderbar'
+      end
+
+      def prepare
+      end
+
+      def precompiled_template(locals)
+        raise NotImplementedError.new("dynamic only")
+      end
+
+      def precompiled_preamble(locals)
+        raise NotImplementedError.new("dynamic only")
+      end
+
+      def precompiled_postamble(locals)
+        raise NotImplementedError.new("dynamic only")
+      end
+
+      def self.evaluate(template, scope, *args, &block)
+        scope.content_type default_mime_type
+        if block
+          new(&Proc.new {}).evaluate(scope, {}, &block)
+        else
+          scope.send :render, template, *args
+        end
+      end
+
+    private
+
+      def _evaluate(builder, scope, locals, &block)
+        builder.instance_eval do
+          scope.params.merge(locals).each do |key,value|
+            value = value.first if ::Array === value
+            instance_variable_set "@#{key}", value if key =~ /^[a-z]\w+$/
+          end
+        end
+        if block
+          builder.instance_eval(&block)
+        else
+          builder.instance_eval(data, eval_file)
+        end
+      end
+    end
+
+    class Html < Base
+      self.default_mime_type = 'text/html'
+
+      def evaluate(scope, locals, &block)
+        builder = HtmlMarkup.new(scope)
+        _evaluate(builder, scope, locals, &block)
+        builder._.target!.join
+      end
+    end
+
+    class Xhtml < Html
+      self.default_mime_type = 'application/xhtml+xml'
+    end
+
+    class Json < Base
+      self.default_mime_type = 'application/json'
+
+      def evaluate(scope, locals, &block)
+        builder = JsonBuilder.new(scope)
+        _evaluate(builder, scope, locals)
+        builder.target!
+      end
+    end
+
+    class Text < Base
+      self.default_mime_type = 'text/plain'
+
+      def evaluate(scope, locals, &block)
+        builder = JsonBuilder.new(scope)
+        _evaluate(builder, scope, locals)
+        builder.target!
+      end
+    end
+  end
+end
+

data/lib/wunderbar/version.rb

@@ -1,7 +1,7 @@
 module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 9
+    MINOR = 10
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/wunderbar.rb

@@ -3,12 +3,13 @@ require 'builder'
 require 'json'
 
 require 'wunderbar/environment'
+require 'wunderbar/builder'
 require 'wunderbar/cgi-methods'
 require 'wunderbar/cssproxy'
 require 'wunderbar/html-methods'
-require 'wunderbar/job-control'
 require 'wunderbar/installation'
-require 'wunderbar/builder'
+require 'wunderbar/job-control'
 require 'wunderbar/logger'
+require 'wunderbar/server'
 
 W_ = Wunderbar

data/wunderbar.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.9.0"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-04-01"
+  s.date = "2012-04-07"
   s.description = "    Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode\n    (utf-8), consistently indented, readable applications.  This includes\n    output that conforms to the Polyglot specification and the emerging\n    results from the XML Error Recovery Community Group.\n"
   s.email = "rubys@intertwingly.net"
-  s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/installation.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/version.rb"]
+  s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/installation.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/template.rb", "lib/wunderbar/server.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/version.rb"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.21"
   s.summary = "HTML Generator and CGI application support"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wunderbar
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-01 00:00:00 Z
+date: 2012-04-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -62,6 +62,8 @@ files:
 - lib/wunderbar/installation.rb
 - lib/wunderbar/html-methods.rb
 - lib/wunderbar/job-control.rb
+- lib/wunderbar/template.rb
+- lib/wunderbar/server.rb
 - lib/wunderbar/logger.rb
 - lib/wunderbar/builder.rb
 - lib/wunderbar/environment.rb
@@ -97,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: HTML Generator and CGI application support