wunderbar 0.8.13 → 0.8.14

data/README.md

@@ -192,15 +192,6 @@ HTML methods
 Note that adding an exclamation mark to the end of the tag name disables this
 behavior.
 
-CGI methods (deprecated?)
----
-* `json`    - produce JSON output using the block specified
-* `json!`   - produce JSON output using the block specified and exit
-* `html`    - produce HTML output using the block specified
-* `html!`   - produce HTML output using the block specified and exit
-* `post`    - execute block only if method is POST
-* `post!`   - if POST, produce HTML output using the block specified and exit
-
 OpenStruct methods (for $params and $env)
 ---
 * `untaint_if_match`: untaints value if it matches a regular expression

data/lib/wunderbar/cgi-methods.rb

@@ -1,135 +1,163 @@
-# produce json
-def $cgi.json(&block)
-  return unless $XHR_JSON
-  $param.each {|key,value| instance_variable_set "@#{key}", value.first}
-  output = instance_eval(&block)
-rescue Exception => exception
-  Kernel.print "Status: 500 Internal Error\r\n"
-  output = {
-    :exception => exception.inspect,
-    :backtrace => exception.backtrace
-  }
-ensure
-  if $XHR_JSON
-    Kernel.print "Status: 404 Not Found\r\n" unless output
-    $cgi.out? 'type' => 'application/json', 'Cache-Control' => 'no-cache' do
-      begin
-        JSON.pretty_generate(output)+ "\n"
-      rescue
-        output.to_json + "\n"
+module Wunderbar
+
+  module CGI
+
+    # produce json
+    def self.json(&block)
+      $param.each do |key,value| 
+        instance_variable_set "@#{key}", value.first if key =~ /^\w+$/
+      end
+      output = instance_eval(&block)
+    rescue Exception => exception
+      Kernel.print "Status: 500 Internal Error\r\n"
+      output = {
+        :exception => exception.inspect,
+        :backtrace => exception.backtrace
+      }
+    ensure
+      Kernel.print "Status: 404 Not Found\r\n" unless output
+      out? 'type' => 'application/json', 'Cache-Control' => 'no-cache' do
+        begin
+          JSON.pretty_generate(output)+ "\n"
+        rescue
+          output.to_json + "\n"
+        end
       end
     end
-  end
-end
 
-# produce json and quit
-def $cgi.json! &block
-  return unless $XHR_JSON
-  json(&block)
-  Process.exit
-end
-
-# produce text
-def $cgi.text &block
-  return unless $TEXT
-  @output = []
-  def $cgi.puts(line='')
-    @output << line + "\n"
-  end
-  def $cgi.print(line=nil)
-    @output << line
-  end
-  $param.each {|key,value| instance_variable_set "@#{key}", value.first}
-  self.instance_eval &block
-rescue Exception => exception
-  Kernel.print "Status: 500 Internal Error\r\n"
-  @output << "\n" unless @output.empty?
-  @output << exception.inspect + "\n"
-  exception.backtrace.each {|frame| @output << "  #{frame}\n"}
-ensure
-  class << $cgi
-    undef puts
-    undef print
-  end
-  if $TEXT
-    Kernel.print "Status: 404 Not Found\r\n" if @output.empty?
-    $cgi.out? 'type' => 'text/plain', 'Cache-Control' => 'no-cache' do
-      @output.join
+    # produce text
+    def self.text &block
+      require 'stringio'
+      buffer = StringIO.new
+      $param.each do |key,value| 
+        instance_variable_set "@#{key}", value.first if key =~ /^\w+$/
+      end
+      buffer.instance_eval &block
+    rescue Exception => exception
+      Kernel.print "Status: 500 Internal Error\r\n"
+      buffer << "\n" unless buffer.size == 0
+      buffer << exception.inspect + "\n"
+      exception.backtrace.each {|frame| buffer << "  #{frame}\n"}
+    ensure
+      Kernel.print "Status: 404 Not Found\r\n" if buffer.size == 0
+      out? 'type' => 'text/plain', 'Cache-Control' => 'no-cache' do
+        buffer.string
+      end
     end
-    @output = nil
-  end
-end
 
-# produce text and quit
-def $cgi.text! &block
-  return unless $TEXT
-  json(&block)
-  Process.exit
-end
+    # Conditionally provide output, based on ETAG
+    def self.out?(headers, &block)
+      content = block.call
+      require 'digest/md5'
+      etag = Digest::MD5.hexdigest(content)
 
-# Conditionally provide output, based on ETAG
-def $cgi.out?(headers, &block)
-  content = block.call
-  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"
-  else
-    $cgi.out headers.merge('Etag' => etag.inspect) do
-      content
+      if ENV['HTTP_IF_NONE_MATCH'] == etag.inspect
+        Kernel.print "Status: 304 Not Modified\r\n\r\n"
+      else
+        $cgi.out headers.merge('Etag' => etag.inspect) do
+          content
+        end
+      end
+    rescue
     end
-  end
-end
 
-# produce html/xhtml
-def $cgi.html(*args, &block)
-  return if $XHR_JSON or $TEXT
-  args << {} if args.empty?
-  args.first[:xmlns] ||= 'http://www.w3.org/1999/xhtml' if Hash === args.first
-  mimetype = ($XHTML ? 'application/xhtml+xml' : 'text/html')
-  x = HtmlMarkup.new
-  $cgi.out? 'type' => mimetype, 'charset' => 'UTF-8' do
-    x._! "\xEF\xBB\xBF"
-    x._.declare :DOCTYPE, :html
-    x.html *args, &block
-  end
-end
+    # 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')
+      x = HtmlMarkup.new
+      x._! "\xEF\xBB\xBF"
+      x._.declare :DOCTYPE, :html
 
-# produce html and quit
-def $cgi.html! *args, &block
-  return if $XHR_JSON or $TEXT
-  html(*args, &block)
-  Process.exit
-end
+      begin
+        output = x.html *args, &block
+      rescue ::Exception => exception
+        Kernel.print "Status: 500 Internal Error\r\n"
+        x.clear!
+        x._! "\xEF\xBB\xBF"
+        x._.declare :DOCTYPE, :html
+        output = x.html(*args) do
+          _head do
+            _title 'Internal Error'
+          end
+          _body do
+            _h1 'Internal Error'
+            text = exception.inspect
+            Wunderbar.error text
+            exception.backtrace.each do |frame| 
+              next if frame =~ %r{/wunderbar/}
+              next if frame =~ %r{/gems/.*/builder/}
+              Wunderbar.warn "  #{frame}"
+              text += "\n  #{frame}"
+            end
+    
+            _pre text
+          end
+        end
+      end
 
-# post specific logic (doesn't produce output)
-def $cgi.post
-  yield if $HTTP_POST
-end
+      out? 'type' => mimetype, 'charset' => 'UTF-8' do
+        output
+      end
+    end
+  end
 
-# post specific content (produces output)
-def $cgi.post! &block
-  html!(&block) if $HTTP_POST
-end
+  @queue = []
 
-# canonical interface
-module Wunderbar
+  # canonical interface
   def self.html(*args, &block)
-    $XHTML = false unless ARGV.delete('--xhtml')
-    $cgi.html!(*args, &block)
+    @queue << [:html, args, block]
   end
 
   def self.xhtml(*args, &block)
-    $XHTML = false if ARGV.delete('--html')
-    $cgi.html!(*args, &block)
+    @queue << [:xhtml, args, block]
   end
 
   def self.json(*args, &block)
-    $cgi.json!(*args, &block)
+    @queue << [:json, args, block]
   end
 
   def self.text(*args, &block)
-    $cgi.text!(*args, &block)
+    @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
+  end
+end
+
+at_exit do
+  Wunderbar.evaluate
 end

data/lib/wunderbar/html-methods.rb

@@ -16,7 +16,7 @@ class HtmlMarkup
       end
       instance_exec(@x, &block)
     end
-    target!
+    @x.target!.join
   end
 
   def method_missing(name, *args, &block)
@@ -138,7 +138,7 @@ class HtmlMarkup
     _script text, :lang => 'text/coffeescript'
   end
 
-  def target!
-    @x.target!.join
+  def clear!
+    @x.target!.clear
   end
 end

data/lib/wunderbar/logger.rb

@@ -25,6 +25,14 @@ module Wunderbar
     end
   end
 
+  def self.log_level
+    return 'debug' if logger.level == Logger::DEBUG
+    return 'info'  if logger.level == Logger::INFO
+    return 'warn'  if logger.level == Logger::WARN
+    return 'error' if logger.level == Logger::ERROR
+    return 'fatal' if logger.level == Logger::FATAL
+  end
+
   # convenience methods
   def self.debug(*args, &block)
     logger.debug *args, &block

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,35 +2,31 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.8.13"
+  s.version = "0.8.14"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-03-24"
-  s.description = "    Provides a number of globals, helper methods, and monkey patches which\n    simplify the generation of HTML and the development of CGI scripts.\n"
+  s.date = "2012-03-30"
+  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.extra_rdoc_files = ["COPYING", "README.md", "lib/wunderbar.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/version.rb"]
-  s.files = ["COPYING", "README.md", "Rakefile", "demo/envdump.rb", "demo/helloworld.rb", "demo/wiki.html", "demo/wiki.rb", "lib/wunderbar.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/version.rb", "test/test_builder.rb", "test/test_html_markup.rb", "test/test_logger.rb", "tools/web2script.rb", "wunderbar.gemspec", "Manifest"]
+  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.homepage = "http://github.com/rubys/wunderbar"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Wunderbar", "--main", "README.md"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = "wunderbar"
   s.rubygems_version = "1.8.15"
   s.summary = "HTML Generator and CGI application support"
-  s.test_files = ["test/test_logger.rb", "test/test_html_markup.rb", "test/test_builder.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<builder>, [">= 0"])
+      s.add_runtime_dependency(%q<builder>, [">= 3.0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
     else
-      s.add_dependency(%q<builder>, [">= 0"])
+      s.add_dependency(%q<builder>, [">= 3.0"])
       s.add_dependency(%q<json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<builder>, [">= 0"])
+    s.add_dependency(%q<builder>, [">= 3.0"])
     s.add_dependency(%q<json>, [">= 0"])
   end
 end

metadata

@@ -1,111 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: wunderbar
-version: !ruby/object:Gem::Version
-  version: 0.8.13
+version: !ruby/object:Gem::Version 
+  hash: 35
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 14
+  version: 0.8.14
 platform: ruby
-authors:
+authors: 
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: builder
-  requirement: &13219860 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *13219860
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &13219000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *13219000
-description: ! "    Provides a number of globals, helper methods, and monkey patches
-  which\n    simplify the generation of HTML and the development of CGI scripts.\n"
+  version_requirements: *id002
+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"
 email: rubys@intertwingly.net
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- COPYING
+
+extra_rdoc_files: []
+
+files: 
+- wunderbar.gemspec
 - README.md
+- COPYING
 - lib/wunderbar.rb
-- lib/wunderbar/builder.rb
-- lib/wunderbar/cgi-methods.rb
-- lib/wunderbar/cssproxy.rb
-- lib/wunderbar/environment.rb
-- lib/wunderbar/html-methods.rb
 - lib/wunderbar/installation.rb
+- lib/wunderbar/html-methods.rb
 - lib/wunderbar/job-control.rb
 - lib/wunderbar/logger.rb
-- lib/wunderbar/version.rb
-files:
-- COPYING
-- README.md
-- Rakefile
-- demo/envdump.rb
-- demo/helloworld.rb
-- demo/wiki.html
-- demo/wiki.rb
-- lib/wunderbar.rb
 - lib/wunderbar/builder.rb
+- lib/wunderbar/environment.rb
 - lib/wunderbar/cgi-methods.rb
 - lib/wunderbar/cssproxy.rb
-- lib/wunderbar/environment.rb
-- lib/wunderbar/html-methods.rb
-- lib/wunderbar/installation.rb
-- lib/wunderbar/job-control.rb
-- lib/wunderbar/logger.rb
 - lib/wunderbar/version.rb
-- test/test_builder.rb
-- test/test_html_markup.rb
-- test/test_logger.rb
-- tools/web2script.rb
-- wunderbar.gemspec
-- Manifest
 homepage: http://github.com/rubys/wunderbar
 licenses: []
+
 post_install_message: 
-rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- Wunderbar
-- --main
-- README.md
-require_paths:
+rdoc_options: []
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '1.2'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-rubyforge_project: wunderbar
+
+rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: HTML Generator and CGI application support
-test_files:
-- test/test_logger.rb
-- test/test_html_markup.rb
-- test/test_builder.rb
+test_files: []
+

data/Manifest

@@ -1,23 +0,0 @@
-COPYING
-README.md
-Rakefile
-demo/envdump.rb
-demo/helloworld.rb
-demo/wiki.html
-demo/wiki.rb
-lib/wunderbar.rb
-lib/wunderbar/builder.rb
-lib/wunderbar/cgi-methods.rb
-lib/wunderbar/cssproxy.rb
-lib/wunderbar/environment.rb
-lib/wunderbar/html-methods.rb
-lib/wunderbar/installation.rb
-lib/wunderbar/job-control.rb
-lib/wunderbar/logger.rb
-lib/wunderbar/version.rb
-test/test_builder.rb
-test/test_html_markup.rb
-test/test_logger.rb
-tools/web2script.rb
-wunderbar.gemspec
-Manifest

data/Rakefile

@@ -1,27 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
-
-require File.expand_path(File.dirname(__FILE__) + "/lib/wunderbar/version")
-
-mkdir_p 'pkg' unless File.exist? 'pkg'
-
-Echoe.new('wunderbar', Wunderbar::VERSION::STRING) do |p|
-  p.summary    = "HTML Generator and CGI application support"
-  p.description    = <<-EOF
-    Provides a number of globals, helper methods, and monkey patches which
-    simplify the generation of HTML and the development of CGI scripts.
-  EOF
-  p.url            = "http://github.com/rubys/wunderbar"
-  p.author         = "Sam Ruby"
-  p.email          = "rubys@intertwingly.net"
-  p.dependencies   = %w(
-    builder
-    json
-  )
-end
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/test*.rb']
-end

data/demo/envdump.rb

@@ -1,36 +0,0 @@
-require 'wunderbar'
-
-W_.html do
-  _head_ do
-    _title 'CGI Environment'
-    _style %{
-      table {border-spacing: 0}
-      th, td {padding: 0.2em 0.5em}
-      thead th {border-bottom: solid 1px #000}
-      tbody tr:nth-child(5n) td {border-bottom: solid 1px #888}
-      th:last-child, td:last-child {border-left: solid 1px #000}
-      tr:hover {background-color: #FF8}
-    }
-  end
-
-  _body? do
-    _h1 'Environment Variables'
-    _table do
-      _thead_ do
-        _tr do
-          _th 'Name'
-          _th 'Value'
-        end
-      end
-
-      _tbody do
-        ENV.sort.each do |name, value|
-          _tr_ do
-            _td name
-            _td value
-          end
-        end
-      end
-    end
-  end
-end

data/demo/helloworld.rb

@@ -1,22 +0,0 @@
-require 'wunderbar'
-
-W_.html do
-  _head_ do
-    _title 'Greeter'
-    _style %{
-      input {display: block; margin: 2em}
-    }
-  end
-
-  _body? do
-    if @name
-      _p "Hello #{@name}!"
-    else
-      _form method: 'post' do
-        _p 'Please enter your name:'
-        _input name: 'name'
-        _input type: 'submit'
-      end
-    end
-  end
-end