wunderbar 0.8.4 → 0.8.5

data/README

@@ -4,6 +4,45 @@ Wunder provides a number of globals, helper methods, and monkey patches which
 simplify the development of single page applications in the form of CGI
 scripts.
 
+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
+ 
+Arbitrary Ruby code can be placed in each.  
+
+== 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.
+
+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
+arguments and text.
+
+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
+
 == Globals provided
 * $cgi   - Common Gateway Interface
 * $param - Access to parameters (read-only OpenStruct like interface)

data/lib/wunderbar/cgi-methods.rb

@@ -1,7 +1,8 @@
 # produce json
-def $cgi.json
+def $cgi.json(&block)
   return unless $XHR_JSON
-  output = yield
+  $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 = {
@@ -38,6 +39,7 @@ def $cgi.text &block
   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"

data/lib/wunderbar/environment.rb

@@ -72,7 +72,7 @@ $USER = ENV['REMOTE_USER'] || ENV['USER'] ||
 
 ENV['REMOTE_USER'] ||= $USER
 
-$HOME   = ENV['HOME'] || File.expand_path('~' + $USER)
+$HOME = ENV['HOME'] ||= File.expand_path('~' + $USER)
 $SERVER = ENV['HTTP_HOST'] || `hostname`.chomp
 
 # more implied request types

data/lib/wunderbar/html-methods.rb

@@ -1,58 +1,32 @@
-# smart style, knows that the content is indented text/data
-def $x.style!(text)
-  text.slice! /^\n/
-  text.slice! /[ ]+\z/
-  $x.style :type => "text/css" do
-    if $XHTML
-      indented_text! text
-    else
-      indented_data! text
-    end
-  end
-end
-
-# smart script, knows that the content is indented text/data
-def $x.script!(text)
-  text.slice! /^\n/
-  text.slice! /[ ]+\z/
-  $x.script :lang => "text/javascript" do
-    if $XHTML
-      indented_text! text
-    else
-      indented_data! text
-    end
-  end
-end
-
 # execute a system command, echoing stdin, stdout, and stderr
-def $x.system!(command, opts={})
-  require 'open3'
+def $x.system(command, opts={})
+  ::Kernel.require 'open3'
   output_class = opts[:class] || {}
-  stdin  = output_class[:stdin]  || 'stdin'
-  stdout = output_class[:stdout] || 'stdout'
-  stderr = output_class[:stderr] || 'stderr'
+  stdin  = output_class[:stdin]  || '_stdin'
+  stdout = output_class[:stdout] || '_stdout'
+  stderr = output_class[:stderr] || '_stderr'
 
   $x.pre command, :class=>stdin unless opts[:echo] == false
 
-  require 'thread'
-  semaphore = Mutex.new
-  Open3.popen3(command) do |pin, pout, perr|
+  ::Kernel.require 'thread'
+  semaphore = ::Mutex.new
+  ::Open3.popen3(command) do |pin, pout, perr|
     [
-      Thread.new do
+      ::Thread.new do
         until pout.eof?
           out_line = pout.readline.chomp
           semaphore.synchronize { $x.pre out_line, :class=>stdout }
         end
       end,
 
-      Thread.new do
+      ::Thread.new do
         until perr.eof?
           err_line = perr.readline.chomp
           semaphore.synchronize { $x.pre err_line, :class=>stderr }
         end
       end,
 
-      Thread.new do
+      ::Thread.new do
         if opts[:stdin].respond_to? :read
           require 'fileutils'
           FileUtils.copy_stream opts[:stdin], pin
@@ -65,25 +39,9 @@ def $x.system!(command, opts={})
   end
 end
 
-def $x.body? args={}
-  traceback_class = args.delete('traceback_class')
-  traceback_style = args.delete('traceback_style')
-  traceback_style ||= 'background-color:#ff0; margin: 1em 0; padding: 1em; ' +
-    'border: 4px solid red; border-radius: 1em'
-  $x.body(args) do
-    begin
-      yield
-    rescue ::Exception => exception
-      text = exception.inspect
-      exception.backtrace.each {|frame| text += "\n  #{frame}"}
-
-      if traceback_class
-        $x.pre text, :class=>traceback_class
-      else
-        $x.pre text, :style=>traceback_style
-      end
-    end
-  end
+# was this invoked via HTTP POST?
+def $x.post?
+  $HTTP_POST
 end
 
 # Wrapper class that understands HTML
@@ -101,7 +59,12 @@ class HtmlMarkup
   end
 
   def html(*args, &block)
-    @x.html(*args) { instance_exec(@x, &block) }
+    @x.html(*args) do 
+      $param.each do |key,value| 
+        instance_variable_set "@#{key}", value.first if key =~ /^\w+$/
+      end
+      instance_exec(@x, &block)
+    end
   end
 
   def method_missing(name, *args, &block)

data/lib/wunderbar/installation.rb

@@ -40,10 +40,35 @@ if install and ARGV.delete(install)
     file.puts "Dir.chdir #{File.dirname(main).inspect}"
 
     # Optional data from the script (after __END__)
-    file.puts DATA.read if Object.const_defined? :DATA
+    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
 
     # Load script
-    file.puts "require #{File.basename(main).sub(/\.rb$/,'').inspect}"
+    require = "require #{"./#{File.basename(main).sub(/\.rb$/,'')}".inspect}"
+    if ARGV.delete('--rescue') or ARGV.delete('--backtrace')
+      file.puts <<-EOF.gsub(/^ {8}/,'')
+        begin
+          #{require}
+        rescue ::Exception => exception
+          print "Content-Type: text/plain\\r\\n\\r\\n"
+          puts exception.inspect
+          exception.backtrace.each do |frame|
+            puts "  \#{frame}"
+          end
+        end
+      EOF
+    else
+      file.puts require
+    end
   end
 
   # Mark wrapper as executable

data/lib/wunderbar/version.rb

@@ -2,7 +2,7 @@ module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 8
-    TINY  = 4
+    TINY  = 5
 
     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.4"
+  s.version = "0.8.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-02-12"
+  s.date = "2012-02-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", "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: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-12 00:00:00 Z
+date: 2012-02-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder