wunderbar 0.8.7 → 0.8.8

data/README.md

@@ -16,59 +16,59 @@ Quick Start
 
 Simple element:
 
-        _br
+    _br
 
 Nested elements:
 
-        _div do
-          _hr
-        end
+    _div do
+      _hr
+    end
 
 Element with text:
 
-        _h1 "My weblog"
+    _h1 "My weblog"
 
 Element with attributes:
 
-        _img src: '/img/logo.jpg', alt: 'site logo'
+    _img src: '/img/logo.jpg', alt: 'site logo'
 
 Element with both text and attributes:
 
-        _a 'search', href: 'http://google.com'
+    _a 'search', href: 'http://google.com'
 
 Text:
 
-        _ "hello"
+    _ "hello"
 
 Mixed content (autospaced):
 
-        _p do
-          _ 'It is a'
-          _em 'very'
-          _ 'nice day.'
-        end
+    _p do
+      _ 'It is a'
+      _em 'very'
+      _ 'nice day.'
+    end
 
 Mixed content (space controlled):
 
-        _p! do
-          _ 'Source is on '
-          _a 'github', href: 'https://github.com/'
-          _ '.'
-        end
+    _p! do
+      _ 'Source is on '
+      _a 'github', href: 'https://github.com/'
+      _ '.'
+    end
 
 Insert blank lines between rows in the HTML produced:
 
-        _tbody do
-          _tr_ do
-            _td 1
-          end
-          _tr_ do
-            _td 2
-          end
-          _tr_ do
-            _td 3
-          end
-        end
+    _tbody do
+      _tr_ do
+        _td 1
+      end
+      _tr_ do
+        _td 2
+      end
+      _tr_ do
+        _td 3
+      end
+    end
 
 Capture exceptions:
 
@@ -83,31 +83,36 @@ Basic interface
 A typical main program produces one or more of HTML, JSON, or plain text
 output.  This is accomplished by providing one or more of the following:
 
-        Wunderbar.html do
-         code
-        end
-  
-        Wunderbar.json do
-          expression
-        end
-
-        Wunderbar.text do
-          code
-        end
+    Wunderbar.html do
+      code
+    end
+ 
+    Wunderbar.xhtml do
+      code
+    end
+ 
+    Wunderbar.json do
+      expression
+    end
+
+    Wunderbar.text do
+      code
+    end
  
 Arbitrary Ruby code can be placed in each.  For html, use the `_` methods described here.  For json, the results (typically a hash or array) are converted to JSON.  For text, use `puts` and `print` statements to produce the desired results.
 
 Methods provided to Wunderbar.html
 ---
 
-Invoking methods that start with a Unicode "low line" character ("_") will
-generate a HTML tag.  As with builder on which this library is based, these
-tags can have text content and attributes.  Tags can also be nested.  Logic
-can be freely intermixed.
+Invoking methods that start with a Unicode 
+[low line](http://www.fileformat.info/info/unicode/char/5f/index.htm) 
+character ("_") will generate a HTML tag.  As with builder on which this
+library is based, these tags can have text content and attributes.  Tags can
+also be nested.  Logic can be freely intermixed.
 
 Wunderbar knows which HTML tags need to be explicitly closed with separate end
-tags (example: textarea), and which should never be closed with separate end
-tags (example: br).  It also takes care of HTML quoting and escaping of
+tags (example: `textarea`), and which should never be closed with separate end
+tags (example: `br`).  It also takes care of HTML quoting and escaping of
 arguments and text.
 
 Suffixes after the tag name will modify the processing.
@@ -120,9 +125,9 @@ The "`_`" method serves a number of purposes.  Calling it with a single argument
 produces text nodes.  Inserting markup verbatim is done by "`_ << text`".  A
 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
+* `_.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
 
 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:
 
@@ -189,24 +194,24 @@ Builder extensions
 
 Logging:
 ---
-* _.`debug`: debug messages
-* _.`info`: informational messages
-* _.`warn`: warning messages
-* _.`error`: error messages
-* _.`fatal`: fatal error messages
-* _.`log_level`=: set logging level (default: `:warn`)
-* _.`logger`: return [Logger](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/logger/rdoc/Logger.html) instance
+* `_.debug`: debug messages
+* `_.info`: informational messages
+* `_.warn`: warning messages
+* `_.error`: error messages
+* `_.fatal`: fatal error messages
+* `_.log_level`=: set logging level (default: `:warn`)
+* `_.logger`: return [Logger](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/logger/rdoc/Logger.html) instance
 
 Command line options
 ---
 When run from the command line, CGI name=value pairs can be specified.
 Additionally, the following options are supported:
 
-* --`html`: HTML (HTTP GET) output is expected
-* --`post`: HTML (HTTP POST) output is expected
-* --`json`: JSON (XML HTTP Request) output is expected
-* --`xhtml`: XHTML output is expected
-* --`prompt` or --`offline`: prompt for key/value pairs using stdin
-* --`debug`, --`info`,--`warn`, --`error`, --`fatal`: set log level
-* --`install`=path: produce an suexec-callable wrapper script
-* --`rescue` or --`backtrace` cause wrapper script to capture errors
+* `--get`:  HTML (HTTP GET) output is expected
+* `--post`: HTML (HTTP POST) output is expected
+* `--json`: JSON (XML HTTP Request) output is expected
+* `--html`: force HTML output
+* `--prompt` or `--offline`: prompt for key/value pairs using stdin
+* `--debug`, `--info`, `--warn`, `--error`, `--fatal`: set log level
+* `--install=`path: produce an suexec-callable wrapper script
+* `--rescue` or `--backtrace` cause wrapper script to capture errors

data/lib/wunderbar/cgi-methods.rb

@@ -116,6 +116,12 @@ end
 # canonical interface
 module Wunderbar
   def self.html(*args, &block)
+    $XHTML = false unless ARGV.delete('--xhtml')
+    $cgi.html!(*args, &block)
+  end
+
+  def self.xhtml(*args, &block)
+    $XHTML = false if ARGV.delete('--html')
     $cgi.html!(*args, &block)
   end
 
@@ -127,4 +133,3 @@ module Wunderbar
     $cgi.text!(*args, &block)
   end
 end
-

data/lib/wunderbar/environment.rb

@@ -1,8 +1,7 @@
 # explicit request types
-$HTTP_GET  = ARGV.delete('--html')
+$HTTP_GET  = ARGV.delete('--get')
 $HTTP_POST = ARGV.delete('--post')
 $XHR_JSON  = ARGV.delete('--json')
-$XHTML     = ARGV.delete('--xhtml')
 $TEXT      = ARGV.delete('--text')
 
 # Only prompt if explicitly asked for
@@ -17,8 +16,8 @@ $param = $cgi.params
 $HTTP_GET  ||= ($cgi.request_method == 'GET')
 $HTTP_POST ||= ($cgi.request_method == 'POST')
 $XHR_JSON  ||= ($cgi.accept.to_s =~ /json/)
-$XHTML     ||= ($cgi.accept.to_s =~ /xhtml/)
 $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?

data/lib/wunderbar/html-methods.rb

@@ -96,7 +96,7 @@ class HtmlMarkup
 
   def _head(*args, &block)
     @x.tag!('head', *args) do
-      @x.tag! :meta, :charset => 'utf-8' unless $XHTML
+      @x.tag! :meta, :charset => 'utf-8'
       block.call if block
     end
   end

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.8.7"
+  s.version = "0.8.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-03-17"
+  s.date = "2012-03-18"
   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.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/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/version.rb"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wunderbar
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 8
-  - 7
-  version: 0.8.7
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-17 00:00:00 Z
+date: 2012-03-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder