wunderbar 0.10.0 → 0.10.1

data/README.md

@@ -182,8 +182,6 @@ 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
-* `_.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:
 
@@ -262,9 +260,6 @@ output stream, which provides access to other useful methods, for example:
 
 Globals provided
 ---
-* `$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
@@ -292,10 +287,6 @@ HTML methods
 Note that adding an exclamation mark to the end of the tag name disables this
 behavior.
 
-OpenStruct methods (for $params and $env)
----
-* `untaint_if_match`: untaints value if it matches a regular expression
-
 Builder extensions
 ---
 * `indented_text!`: matches text indentation to markup

data/lib/wunderbar/builder.rb

@@ -188,17 +188,25 @@ module Wunderbar
     end
   end
 
-  class TextBuilder
-    def initialize
+  class BuilderBase
+    def set_variables_from_params
+      @_scope.params.each do |key,value|
+        value = value.first if Array === value
+        value.gsub! "\r\n", "\n" if String === value
+        instance_variable_set "@#{key}", value if key =~ /^\w+$/
+      end
+    end
+  end
+
+  class TextBuilder < BuilderBase
+    def initialize(scope)
       require 'stringio'
       @_target = StringIO.new
+      @_scope = scope
     end
 
-    def encode(params = {}, &block)
-      params.each do |key,value|
-        instance_variable_set "@#{key}", value.first if key =~ /^\w+$/
-      end
-
+    def encode(&block)
+      set_variables_from_params
       self.instance_eval(&block)
       @_target.string
     end
@@ -221,22 +229,35 @@ module Wunderbar
       end
     end
 
+    def _exception(*args)
+      exception = args.first
+      if exception.respond_to? :backtrace
+        Wunderbar.error exception.inspect
+        @_target.puts unless size == 0
+        @_target.puts exception.inspect
+        exception.backtrace.each do |frame| 
+          next if CALLERS_TO_IGNORE.any? {|re| frame =~ re}
+          Wunderbar.warn "  #{frame}"
+          @_target.puts "  #{frame}"
+        end
+      else
+        super
+      end
+    end
+
     def target!
       @_target.string
     end
   end
 
-  class JsonBuilder
-    def initialize(scope=nil)
+  class JsonBuilder < BuilderBase
+    def initialize(scope)
       @_scope = scope
       @_target = {}
     end
 
-    def encode(params = {}, &block)
-      params.each do |key,value|
-        instance_variable_set "@#{key}", value.first if key =~ /^\w+$/
-      end
-
+    def encode(&block)
+      set_variables_from_params
       self.instance_eval(&block)
       @_target
     end
@@ -258,13 +279,13 @@ module Wunderbar
 
       if args.length == 0
         return self unless block
-        result = JsonBuilder.new.encode(&block)
+        result = JsonBuilder.new(@_scope).encode(&block)
       elsif args.length == 1
         result = args.first
 
         if block
           if Symbol === result or String === result
-            result = {result.to_s => JsonBuilder.new.encode(&block)}
+            result = {result.to_s => JsonBuilder.new(@_scope).encode(&block)}
           else
             result = result.map {|n| @_target = {}; block.call(n); @_target} 
           end
@@ -310,6 +331,22 @@ module Wunderbar
       @_target = object
     end
 
+    def _exception(*args)
+      exception = args.first
+      if exception.respond_to? :backtrace
+        Wunderbar.error exception.inspect
+        super(exception.inspect)
+        @_target['backtrace'] = []
+        exception.backtrace.each do |frame| 
+          next if CALLERS_TO_IGNORE.any? {|re| frame =~ re}
+          Wunderbar.warn "  #{frame}"
+          @_target['backtrace'] << frame 
+        end
+      else
+        super
+      end
+    end
+
     def target!
       begin
         JSON.pretty_generate(@_target)+ "\n"

data/lib/wunderbar/cgi-methods.rb

@@ -1,77 +1,59 @@
 module Wunderbar
-
   module CGI
 
-    HIDE_FRAME = [ %r{/(wunderbar|webrick)/},
-                   %r{/gems/.*/(builder|rack|sinatra)/} ]
-
     # produce json
-    def self.json(&block)
+    def self.json(scope, &block)
       headers = { 'type' => 'application/json', 'Cache-Control' => 'no-cache' }
-      builder = JsonBuilder.new
-      output = builder.encode($params, &block)
+      builder = JsonBuilder.new(scope)
+      output = builder.encode(&block)
       headers['status'] =  "404 Not Found" if output == {}
     rescue Exception => exception
-      Wunderbar.error exception.inspect
       headers['status'] =  "500 Internal Server Error"
-      backtrace = []
-      exception.backtrace.each do |frame| 
-        next if HIDE_FRAME.any? {|re| frame =~ re}
-        Wunderbar.warn "  #{frame}"
-        backtrace << frame 
-      end
-      builder = JsonBuilder.new
-      builder._exception exception.inspect
-      builder._backtrace backtrace
+      builder._! Hash.new
+      builder._exception exception
     ensure
-      out?(headers) { builder.target! }
+      out?(scope, headers) { builder.target! }
     end
 
     # produce text
-    def self.text &block
+    def self.text(scope, &block)
       headers = {'type' => 'text/plain', 'charset' => 'UTF-8'}
-      builder = TextBuilder.new
-      output = builder.encode($params, &block)
+      builder = TextBuilder.new(scope)
+      output = builder.encode(&block)
       headers['status'] =  "404 Not Found" if output == ''
     rescue Exception => exception
-      Wunderbar.error exception.inspect
       headers['status'] =  "500 Internal Server Error"
-      builder.puts unless builder.size == 0
-      builder.puts exception.inspect
-      exception.backtrace.each do |frame| 
-        next if HIDE_FRAME.any? {|re| frame =~ re}
-        Wunderbar.warn "  #{frame}"
-        builder.puts "  #{frame}"
-      end
+      builder._exception exception
     ensure
-      out?(headers) { builder.target! }
+      out?(scope, headers) { builder.target! }
     end
 
     # Conditionally provide output, based on ETAG
-    def self.out?(headers, &block)
+    def self.out?(scope, headers, &block)
       content = block.call
       require 'digest/md5'
       etag = Digest::MD5.hexdigest(content)
 
-      if $env.HTTP_IF_NONE_MATCH == etag.inspect
+      if scope.env['HTTP_IF_NONE_MATCH'] == etag.inspect
         headers['Date'] = ::CGI.rfc1123_date(Time.now)
-        $cgi.out headers.merge('status' => '304 Not Modified') do
+        scope.out headers.merge('status' => '304 Not Modified') do
           ''
         end
       else
-        $cgi.out headers.merge('Etag' => etag.inspect) do
+        scope.out headers.merge('Etag' => etag.inspect) do
           content
         end
       end
-    rescue
+    rescue Exception => exception
+      Wunderbar.fatal exception.inspect
     end
 
     # produce html/xhtml
-    def self.html(*args, &block)
+    def self.html(scope, *args, &block)
       headers = { 'type' => 'text/html', 'charset' => 'UTF-8' }
       headers['type'] = 'application/xhtml+xml' if @xhtml
 
-      x = HtmlMarkup.new
+      x = HtmlMarkup.new(scope)
 
       begin
         if @xhtml
@@ -88,28 +70,18 @@ module Wunderbar
           end
           _body do
             _h1 'Internal Server Error'
-            text = exception.inspect
-            Wunderbar.error text
-            exception.backtrace.each do |frame| 
-              next if HIDE_FRAME.any? {|re| frame =~ re}
-              Wunderbar.warn "  #{frame}"
-              text += "\n  #{frame}"
-            end
-    
-            _pre text
+            _exception exception
           end
         end
       end
 
-      out?(headers) { output }
+      out?(scope, 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
+    def self.call(scope)
+      env = scope.env
+      accept      = env['HTTP_ACCEPT'].to_s
+      request_uri = env['REQUEST_URI'].to_s
 
       # implied request types
       xhr_json = Wunderbar::Options::XHR_JSON  || (accept =~ /json/)
@@ -118,8 +90,8 @@ module Wunderbar
       @xhtml = (accept =~ /xhtml/ or accept == '')
 
       # overrides via the uri query parameter
-      xhr_json  ||= (request_uri =~ /\?json$/)
-      text       ||= (request_uri =~ /\?text$/)
+      xhr_json ||= (request_uri =~ /\?json$/)
+      text     ||= (request_uri =~ /\?text$/)
 
       # overrides via the command line
       xhtml_override = ARGV.include?('--xhtml')
@@ -142,17 +114,17 @@ module Wunderbar
               @xhtml = false if html_override
             end
 
-            self.html(*args, &block)
+            self.html(scope, *args, &block)
             return
           end
         when :json
           if xhr_json
-            self.json(*args, &block)
+            self.json(scope, *args, &block)
             return
           end
         when :text
           if text
-            self.text(*args, &block)
+            self.text(scope, *args, &block)
             return
           end
         end

data/lib/wunderbar/environment.rb

@@ -11,38 +11,16 @@ module Wunderbar
     end
   end
 
-  # quick access to request_uri
-  def self.SELF 
-    $env.REQUEST_URI
-  end
-
-  def self.SELF?
-    if SELF '?'
-      self.self
-    else
-      SELF + "?" # avoids spoiling the cache
+  class Scope
+    attr_accessor :env
+    def initialize(env)
+      @env = env
     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]
-  if ENV[name.to_s] and not has_key?(name.to_s)
-    self[name.to_s]=ENV[name.to_s].dup.extend(Wunderbar::Untaint)
-  end
-  self[name.to_s]
 end
 
 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"
@@ -52,3 +30,24 @@ if defined? Encoding
 else
   $KCODE = 'U'
 end
+
+# Add methods to the 'main' object
+if self.to_s == 'main'
+  class << self
+    def _html(*args, &block)
+      Wunderbar.html(*args, &block)
+    end
+
+    def _xhtml(*args, &block)
+      Wunderbar.xhtml(*args, &block)
+    end
+
+    def _json(*args, &block)
+      Wunderbar.json(*args, &block)
+    end
+
+    def _text(*args, &block)
+      Wunderbar.text(*args, &block)
+    end
+  end
+end

data/lib/wunderbar/html-methods.rb

@@ -1,11 +1,11 @@
 # Wrapper class that understands HTML
-class HtmlMarkup
+class HtmlMarkup < Wunderbar::BuilderBase
   VOID = %w(
     area base br col command embed hr img input keygen
     link meta param source track wbr
   )
 
-  def initialize(scope = nil)
+  def initialize(scope)
     @_scope = scope
     @x = Wunderbar::XmlMarkup.new :scope => scope, :indent => 2, :target => []
     @xthml = false
@@ -24,13 +24,8 @@ class HtmlMarkup
     @x.text! "\xEF\xBB\xBF"
     @x.declare! :DOCTYPE, :html
     @x.tag! :html, *args do 
-      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)
+      set_variables_from_params
+      instance_eval(&block)
     end
     @x.target!.join
   end
@@ -101,28 +96,13 @@ class HtmlMarkup
       end
     elsif flag == '?'
       # capture exceptions, produce filtered tracebacks
-      options = (Hash === args.last)? args.last : {}
-      traceback_class = options.delete(:traceback_class)
-      traceback_style = options.delete(:traceback_style)
-      traceback_style ||= 'background-color:#ff0; margin: 1em 0; ' +
-        'padding: 1em; border: 4px solid red; border-radius: 1em'
       @x.tag!(name, *args) do
         begin
           block.call
         rescue ::Exception => exception
-          text = exception.inspect
-          Wunderbar.warn text
-          exception.backtrace.each do |frame| 
-            next if Wunderbar::CGI::HIDE_FRAME.any? {|re| frame =~ re}
-            Wunderbar.warn "  #{frame}"
-            text += "\n  #{frame}"
-          end
-    
-          if traceback_class
-            @x.tag! :pre, text, :class=>traceback_class
-          else
-            @x.tag! :pre, text, :style=>traceback_style
-          end
+          options = (Hash === args.last)? args.last : {}
+          options[:log_level] = 'warn'
+          _exception exception, options
         end
       end
     else
@@ -130,6 +110,34 @@ class HtmlMarkup
     end
   end
 
+  def _exception(*args)
+    exception = args.first
+    if exception.respond_to? :backtrace
+      options = (Hash === args.last)? args.last : {}
+      traceback_class = options.delete(:traceback_class)
+      traceback_style = options.delete(:traceback_style)
+      traceback_style ||= 'background-color:#ff0; margin: 1em 0; ' +
+        'padding: 1em; border: 4px solid red; border-radius: 1em'
+
+      text = exception.inspect
+      log_level = options.delete(:log_level) || :error
+      Wunderbar.send log_level, text
+      exception.backtrace.each do |frame| 
+        next if Wunderbar::CALLERS_TO_IGNORE.any? {|re| frame =~ re}
+        Wunderbar.send log_level, "  #{frame}"
+        text += "\n  #{frame}"
+      end
+ 
+      if traceback_class
+        @x.tag! :pre, text, :class=>traceback_class
+      else
+        @x.tag! :pre, text, :style=>traceback_style
+      end
+    else
+      super
+    end
+  end
+
   def _head(*args, &block)
     @x.tag!('head', *args) do
       @x.tag! :meta, :charset => 'utf-8'

data/lib/wunderbar/job-control.rb

@@ -16,8 +16,10 @@ module Wunderbar
       STDERR.reopen STDOUT
 
       # clear environment of cgi cruft
-      ENV.keys.to_a.each do |key|
-        ENV.delete(key) if key =~ /HTTP/ or $cgi.respond_to? key.downcase
+      require 'cgi'
+      ENV.delete_if {|key,value| key =~ /^HTTP_/}
+      CGI::QueryExtension.public_instance_methods.each do |method|
+        ENV.delete method.to_s.upcase
       end
 
       # setup environment

data/lib/wunderbar/rack.rb

@@ -0,0 +1,40 @@
+module Wunderbar
+  class RackApp
+    # entry point for Rack
+    def call(env)
+      @_env = env
+      @_request = Rack::Request.new(env)
+      @_response = Rack::Response.new
+      Wunderbar.logger = @_request.logger
+      Wunderbar::CGI.call(self)
+      @_response.finish
+    end
+
+    # redirect the output produced
+    def 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
+
+    def env
+      @_env
+    end
+
+    def params
+      @_request.params
+    end
+
+    def request
+      @_request
+    end
+
+    def response
+      @_response
+    end
+  end
+end

data/lib/wunderbar/server.rb

@@ -1,112 +1,81 @@
-at_exit do
-  # Only prompt if explicitly asked for
-  ARGV.push '' if ARGV.empty?
-  ARGV.delete('--prompt') or ARGV.delete('--offline')
+# http://rack.rubyforge.org/doc/classes/Rack/Request.html
+# http://rubydoc.info/gems/sinatra/Sinatra/Application
+# http://www.ruby-doc.org/stdlib-1.9.3/libdoc/cgi/rdoc/CGI.html#public-class-method-details
+
+module Wunderbar
 
-  $cgi = CGI.new
+  CALLERS_TO_IGNORE = [
+    %r{/(wunderbar|webrick)/},
+    %r{<internal:},
+    %r{/gems/.*/lib/(builder|rack|sinatra|tilt)/}
+  ]
 
+end
+
+at_exit do
   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
 
+    # Allow optional environment override
+    environment = ARGV.find {|arg| arg =~ /--environment=(.*)/}
+    ENV['RACK_ENV'] = environment if environment and ARGV.delete(environment)
+
     # start the server
     require 'rack'
-    require 'rack/showexceptions'
-    app = Rack::ShowExceptions.new(Rack::Lint.new($cgi))
-    Rack::Server.start :app => app, :Port => port
+    require 'wunderbar/rack'
+    Rack::Server.start :app => Wunderbar::RackApp.new, :Port => port,
+      :environment => (ENV['RACK_ENV'] || 'development')
 
   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
+    require 'wunderbar/sinatra'
 
-      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
+  elsif Wunderbar.queue.length > 0
 
     # 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
+    # Only prompt if explicitly asked for
+    ARGV.push '' if ARGV.empty?
+    ARGV.delete('--prompt') or ARGV.delete('--offline')
 
-    # 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 
+    cgi = CGI.new
+    cgi.instance_variable_set '@env', ENV
+    class << cgi
+      attr_accessor :env
+
+      # was this invoked via HTTP POST?
+      %w(delete get head options post put trace).each do |http_method|
+        define_method "#{http_method}?" do
+          env['REQUEST_METHOD'].to_s.downcase == http_method
         end
       end
     end
 
+    # get arguments if CGI couldn't find any... 
+    cgi.params.merge!(CGI.parse(ARGV.join('&'))) if cgi.params.empty?
+
+    require 'etc'
+    $USER = ENV['REMOTE_USER'] ||= ENV['USER'] || Etc.getlogin
+    if $USER.nil?
+      if RUBY_PLATFORM =~ /darwin/i
+        $USER = `dscl . -search /Users UniqueID #{Process.uid}`.split.first
+      elsif RUBY_PLATFORM =~ /linux/i
+        $USER = `getent passwd #{Process.uid}`.split(':').first
+      end
+
+      ENV['USER'] ||= $USER
+    end
+
+    ENV['HOME'] ||= Dir.home($USER) rescue nil
+    ENV['HOME'] = ENV['DOCUMENT_ROOT'] if not File.exist? ENV['HOME'].to_s
+
     # CGI or command line
-    Wunderbar::CGI.call(ENV)
+    Wunderbar::CGI.call(cgi)
   end
 end

data/lib/wunderbar/sinatra.rb

@@ -0,0 +1,161 @@
+require 'sinatra'
+require 'digest/md5'
+
+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
+          output = new(&Proc.new {}).evaluate(scope, {}, &block)
+        else
+          output = scope.send :render, template, *args
+        end
+        scope.etag Digest::MD5.hexdigest(output)
+        output
+      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)
+        elsif data
+          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)
+        begin
+          _evaluate(builder, scope, locals, &block)
+        rescue Exception => exception
+          scope.response.status = 500
+          builder.clear!
+          builder.html do
+            _head do
+              _title 'Internal Server Error'
+            end
+            _body do
+              _h1 'Internal Server Error'
+              _exception exception
+            end
+          end
+        end
+        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)
+        begin
+          _evaluate(builder, scope, locals, &block)
+        rescue Exception => exception
+          scope.content_type self.class.default_mime_type, :charset => 'utf-8'
+          scope.response.status = 500
+          builder._exception exception
+        end
+        builder.target!
+      end
+    end
+
+    class Text < Base
+      self.default_mime_type = 'text/plain'
+
+      def evaluate(scope, locals, &block)
+        builder = TextBuilder.new(scope)
+        begin
+          _evaluate(builder, scope, locals, &block)
+          scope.response.status = 404 if builder.target!.empty?
+        rescue Exception => exception
+          scope.headers['Content-Type'] = self.class.default_mime_type
+          scope.response.status = 500
+          builder._exception exception
+        end
+        builder.target!
+      end
+    end
+  end
+
+  module SinatraHelpers
+    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
+end
+
+Tilt.register '_html',  Wunderbar::Template::Html
+Tilt.register '_xhtml', Wunderbar::Template::Xhtml
+Tilt.register '_json',  Wunderbar::Template::Json
+Tilt.register '_text',  Wunderbar::Template::Text
+
+helpers Wunderbar::SinatraHelpers

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.10.0"
+  s.version = "0.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-04-07"
+  s.date = "2012-04-12"
   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/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.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/server.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/sinatra.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.21"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wunderbar
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-07 00:00:00 Z
+date: 2012-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -62,10 +62,11 @@ 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/rack.rb
 - lib/wunderbar/builder.rb
+- lib/wunderbar/sinatra.rb
 - lib/wunderbar/environment.rb
 - lib/wunderbar/cgi-methods.rb
 - lib/wunderbar/cssproxy.rb

data/lib/wunderbar/template.rb

@@ -1,91 +0,0 @@
-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
-