RubyGems - wunderbar - Versions diffs - 0.8.5 → 0.8.6 - Mend

wunderbar 0.8.5 → 0.8.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

data/Manifest +3 -1
data/README +0 -1
data/demo/wiki.html +69 -0
data/demo/wiki.rb +200 -0
data/lib/wunderbar/builder.rb +129 -87
data/lib/wunderbar/cgi-methods.rb +10 -15
data/lib/wunderbar/environment.rb +0 -1
data/lib/wunderbar/html-methods.rb +24 -66
data/lib/wunderbar/version.rb +1 -1
data/test/test_builder.rb +18 -6
data/test/test_html_markup.rb +33 -2
data/tools/web2script.rb +213 -0
data/wunderbar.gemspec +3 -3
metadata +8 -5

data/Manifest CHANGED Viewed

@@ -1,6 +1,8 @@
 COPYING
 README
 Rakefile
+demo/wiki.html
+demo/wiki.rb
 lib/wunderbar.rb
 lib/wunderbar/builder.rb
 lib/wunderbar/cgi-methods.rb
@@ -13,5 +15,5 @@ lib/wunderbar/version.rb
 test/test_builder.rb
 test/test_html_markup.rb
 test/test_logger.rb
-wunderbar.gemspec
+tools/web2script.rb
 Manifest

data/README CHANGED Viewed

@@ -47,7 +47,6 @@ number of other convenience methods are defined:
 * $cgi   - Common Gateway Interface
 * $param - Access to parameters (read-only OpenStruct like interface)
 * $env   - Access to environment variables (read-only OpenStruct like interface)
-* $x     - XmlBuilder instance
 * $USER  - Host user id
 * $HOME  - Home directory
 * $SERVER- Server name

data/demo/wiki.html ADDED Viewed

@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="utf-8"/>
+    <title>Wunderbar Wiki</title>
+  </head>
+  <body>
+<h2>Wunderbar Wiki</h2>
+<p>Note: demo code requires Ruby 1.9.2 or later.  Wunderbar itself works with
+Ruby 1.8.7 or later.</p>
+<p>Prereqs:</p>
+<ul>
+<li><code>gem install wunderbar rdiscount</code></li>
+<li><code>apt-get install git</code></li>
+<li><a href="http://jquery.com/">jQuery</a></li>
+<li><a href="http://www.showdown.im/">Showdown</a></li>
+</ul>
+<p>Create a data directory (one per wiki):</p>
+<ul>
+<li>Must be writeable by your web server</li>
+<li>Should not be in the Document Root</li>
+</ul>
+<p>Configure git:</p>
+<ul>
+<li>Follow <a
+href="http://help.github.com/set-your-user-name-email-and-github-token/]">Step
+1</a>.</li>
+<li>Note that this needs to be done for the user that the webserver runs the
+script under.  If you are not running <a
+href="http://httpd.apache.org/docs/2.0/suexec.html">suexec</a>, this is
+typically <code>www-data</code> on Unix or <code>www</code> on Mac OS/X.</li>
+</ul>
+<p>Configure Apache:</p>
+<pre><code>    Options +ExecCGI +MultiViews
+    MultiViewsMatch Any
+    AddHandler cgi-script .cgi
+</code></pre>
+<p>Install scripts:</p>
+<ul>
+<li>Copy <code>jquery-min.js</code> and <code>showdown.js</code> into your
+document root</li>
+</ul>
+<p>Install wiki (one per wiki):</p>
+<pre><code>    ruby wiki.rb --install=/var/www/wikiname.cgi --WIKIDATA="/full/path/to/data/directory"
+</code></pre>
+<p>Access your wiki:</p>
+<pre><code>    http://localhost/wikiname/
+</code>
+</body>
+</html>

data/demo/wiki.rb ADDED Viewed

@@ -0,0 +1,200 @@
+#!/usr/bin/ruby
+require 'wunderbar'
+require 'rdiscount'
+require 'shellwords'
+require 'digest/md5'
+Dir.chdir WIKIDATA
+# parse request
+%r{/(?<file>.\w+)((?<flag>/)(?<rev>\w*))?$} =~ $env.PATH_INFO
+flag ||= '?' if $env.REQUEST_URI.include? '?'
+file ||= 'index'
+Wunderbar.html do
+  _head do
+    _title file
+    _style %{
+      body {background-color: #{(flag=='?') ? '#E0D8D8' : '#FFF'}}
+      .status {border: 2px solid #000; border-radius: 1em; background: #FAFAD2; padding: 0.5em}
+      .input, .output {border: 1px solid #888; position: relative; width: 47.5%; height: 400px; overflow: auto}
+      .input {float: left; left: 1.5%}
+      .output {float: right; right: 1.5%; background-color: #6C6666; color: #FFF}
+      .buttons {clear: both; text-align: center; padding-top: 0.5em}
+      .message {position: fixed; left: 2%; color: #9400d3}
+      h1 {text-align: center; margin: 0}
+      form {clear: both}
+      .buttons form {display: inline}
+      ._stdin:before {content: '$ '}
+      ._stdin {color: #9400D3; margin-bottom: 0}
+      ._stdout {margin: 0}
+      ._stderr {margin: 0; color: red}
+    }
+    _script src: '/showdown.js'
+    _script src: '/jquery.min.js'
+  end
+  _body? do
+    # determine markup
+    if _.post? and @markup
+      _header class: 'status' do
+        _h1 'Status'
+        if File.exist?(file) and Digest::MD5.hexdigest(File.read(file)) != @hash
+          _p 'Write conflict'
+        else
+          File.open(file, 'w') {|fh| fh.write @markup}
+          _.system 'git init' unless Dir.exist? '.git'
+          if `git status --porcelain #{file}`.empty?
+            _p 'Nothing changed'
+          else
+            _.system "git add #{file}"
+            _.system "git commit -m #{@comment.shellescape} #{file}"
+          end
+        end
+      end
+    elsif File.exist? file
+      # existing file
+      if !rev or rev.empty?
+        @markup = File.read(file)
+      else
+        @markup = `git show #{rev}:#{file}`
+        flag = nil
+      end
+    else
+      # new file: go directly into edit mode
+      @markup = "#{file}\n#{'-'*file.length}\n\nEnter your text here..."
+      flag = '?'
+    end
+    # produce HTML
+    if file == '_index'
+      # index
+      index = Hash[`git ls-tree HEAD --name-only`.scan(/(\w+)()/)].
+        merge Hash[*`git status --porcelain`.scan(/(..) (\w+)/).flatten.reverse]
+      _table do
+        _tbody do
+          index.sort.each do |name, status|
+            _tr do
+              _td status
+              _td {_a name, href: name}
+            end
+          end
+        end
+      end
+    elsif flag == '?'
+      # edit mode
+      _header do
+        _h1 "~~~ #{file} ~~~"
+        _span 'Input', style: 'float: left; margin-left: 2em'
+        _span 'Output', style: 'float: right; margin-right: 2em'
+      end
+      _form action: file, method: 'post' do
+        _textarea @markup, name: 'markup', class: 'input'
+        _input type: 'hidden', name: 'hash',
+          value: Digest::MD5.hexdigest(@markup)
+        _div class: 'output' do
+          _ << RDiscount.new(@markup).to_html
+        end
+        _div class: 'buttons' do
+          _span class: 'message'
+          _input name: 'comment', placeholder: 'commit message'
+          _input type: 'submit', value: 'save'
+        end
+      end
+    elsif flag == '/'
+      # revision history
+      _h2 "Revision history for #{file}"
+      _ul do
+        `git log --format="%H|%ai|%an|%s" #{file}`.lines.each do |line|
+          hash, date, author, subject = line.split('|')
+          _li! {_a date, href: hash; _ " #{subject} by #{author}"}
+        end
+      end
+    else
+      #display
+      _ << RDiscount.new(@markup).to_html
+      _div class: 'buttons' do
+        if !rev or rev.empty?
+          _form action: "#{file}?", method: 'post' do
+            _input type: 'submit', value: 'edit'
+          end
+        end
+        _form action: "#{file}/" do
+          _input type: 'submit', value: 'history'
+        end
+      end
+    end
+    _script %{
+      // autosave every 10 seconds
+      var dirty = false;
+      setInterval(function() {
+        if (!dirty) return;
+        dirty = false;
+        var params = {
+          markup: $('textarea[name=markup]').val(),
+          hash:   $('input[name=hash]').val()
+        };
+        $.getJSON("#{SELF}", params, function(_) {
+          $('input[name=hash]').val(_.hash);
+          if (_.time) {
+            var time = new Date(_.time).toLocaleTimeString();
+            $('.message').text("Autosaved at " + time).show().fadeOut(5000);
+          } else {
+            $('.input').val(_.markup).attr('readonly', 'readonly');
+            $('.message').css({'font-weight': 'bold'}).text(_.error).show();
+          }
+        });
+      }, 10000);
+      // regenerate output every 0.5 seconds
+      var updated = false;
+      setInterval(function() {
+        if (!updated) return;
+        updated = false;
+        $('.output').html(converter.makeHtml($('.input').val()));
+      }, 500);
+      // update output pane and mark dirty whenever input changes
+      var converter = new Showdown.converter();
+      $('.input').bind('input', function() {
+        updated = dirty = true;
+      }).trigger('input');
+      // resize based on window size
+      var reserve = $('header').height() * 3 + $('.buttons').height();
+      $(window).resize(function() {
+        $('.input,.output').height($(window).height()-reserve);
+      }).trigger('resize');
+    }
+  end
+end
+# process autosave requests
+Wunderbar.json do
+  hash = Digest::MD5.hexdigest(@markup)
+  if File.exist?(file) and Digest::MD5.hexdigest(File.read(file)) != @hash
+    {error: "Write conflict", markup: File.read(file), hash: hash}
+  else
+    File.open(file, 'w') {|fh| fh.write @markup} unless @hash == hash
+    {time: Time.now.to_i*1000, hash: hash}
+  end
+end
+__END__
+# Customize where the wiki data is stored
+WIKIDATA = '/full/path/to/data/directory'

data/lib/wunderbar/builder.rb CHANGED Viewed

@@ -1,107 +1,149 @@
-# add indented_text!, indented_data! and traceback! methods to builder
-module Builder
-  class XmlMarkup
-    unless method_defined? :indented_text!
-      def indented_text!(text)
-        indented_data!(text) {|data| text! data}
-      end
+module Wunderbar
+  # XmlMarkup handles indentation of elements beautifully, this class extends
+  # that support to text, data, and spacing between elements
+  class SpacedMarkup < Builder::XmlMarkup
+    def indented_text!(text)
+      indented_data!(text) {|data| text! data}
     end
-    unless method_defined? :indented_data!
-      def indented_data!(data, &block)
-        return if data.strip.length == 0
+    def indented_data!(data, &block)
+      return if data.strip.length == 0
-        if @indent > 0
-          data.sub! /\n\s*\Z/, ''
-          data.sub! /\A\s*\n/, ''
+      if @indent > 0
+        data.sub! /\n\s*\Z/, ''
+        data.sub! /\A\s*\n/, ''
-          unindent = data.sub(/s+\Z/,'').scan(/^ *\S/).map(&:length).min || 1
+        unindent = data.sub(/s+\Z/,'').scan(/^ *\S/).map(&:length).min || 1
-          before  = ::Regexp.new('^'.ljust(unindent))
-          after   =  " " * (@level * @indent)
-          data.gsub! before, after
-        end
+        before  = ::Regexp.new('^'.ljust(unindent))
+        after   =  " " * (@level * @indent)
+        data.gsub! before, after
-        if block
-          block.call(data)
-        else
-          self << data
-        end
+        _newline if @pending_newline and not @first_tag
+        @pending_newline = @pending_margin
+        @first_tag = @pending_margin = false
+      end
-        _newline unless data =~ /\n\Z/
+      if block
+        block.call(data)
+      else
+        self << data
       end
+      _newline unless data =~ /\n\Z/
     end
-    unless method_defined? :traceback!
-      def traceback!(exception=$!, klass='traceback')
-        pre :class=>klass do
-          text! exception.inspect
-          _newline
-          exception.backtrace.each {|frame| text!((' '*@indent)+frame + "\n")}
-        end
-      end
+    def disable_indendation!(&block)
+      indent, level = @indent, @level
+      @indent = @level = 0
+      text! " "*indent*level
+      block.call
+    ensure
+      text! "\n"
+      @indent, @level = indent, level
     end
-  end
-end
-# monkey patch to ensure that tags are closed
-test =
-  Builder::XmlMarkup.new.html do |x|
-    x.body do
-     begin
-       x.p do
-         raise Exception.new('boom')
-       end
-     rescue Exception => e
-       x.pre e
-     end
+    def _margin
+      _newline unless @first_tag
+      @pending_newline = false
+      @pending_margin = true
+    end
+    def _nested_structures(*args)
+      pending_newline = @pending_newline
+      @pending_newline = false
+      @first_tag = true
+      super
+      @first_tag = @pending_margin = false
+      @pending_newline = pending_newline
+    end
+    def tag!(*args)
+      _newline if @pending_newline
+      @pending_newline = @pending_margin
+      @first_tag = @pending_margin = false
+      super
     end
   end
-if test.index('<p>') and !test.index('</p>')
-  module Builder
-    class XmlMarkup
-      def method_missing(sym, *args, &block)
-          text = nil
-        attrs = nil
-        sym = "#{sym}:#{args.shift}" if args.first.kind_of?(Symbol)
-        args.each do |arg|
-          case arg
-          when Hash
-            attrs ||= {}
-            attrs.merge!(arg)
-          else
-            text ||= ''
-            text << arg.to_s
-          end
-        end
-        if block
-          unless text.nil?
-            raise ArgumentError, "XmlMarkup cannot mix a text argument with a block"
+  class XmlMarkup
+    def initialize(*args)
+      @x = SpacedMarkup.new(*args)
+    end
+    # forward to either Wunderbar or XmlMarkup
+    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
+      elsif SpacedMarkup.public_instance_methods.include? method.to_s
+        @x.__send__ method, *args, &block
+      else
+        super
+      end
+    end
+    # avoid method_missing overhead for the most common case
+    def tag!(*args, &block)
+      @x.tag! *args, &block
+    end
+    # execute a system command, echoing stdin, stdout, and stderr
+    def system(command, opts={})
+      require 'open3'
+      tag  = opts[:tag]  || 'pre'
+      output_class = opts[:class] || {}
+      stdin  = output_class[:stdin]  || '_stdin'
+      stdout = output_class[:stdout] || '_stdout'
+      stderr = output_class[:stderr] || '_stderr'
+      @x.tag! tag, command, :class=>stdin unless opts[:echo] == false
+      require 'thread'
+      semaphore = Mutex.new
+      Open3.popen3(command) do |pin, pout, perr|
+        [
+          Thread.new do
+            until pout.eof?
+              out_line = pout.readline.chomp
+              semaphore.synchronize { @x.tag! tag, out_line, :class=>stdout }
+            end
+          end,
+          Thread.new do
+            until perr.eof?
+              err_line = perr.readline.chomp
+              semaphore.synchronize { @x.tag! tag, err_line, :class=>stderr }
+            end
+          end,
+          Thread.new do
+            if opts[:stdin].respond_to? :read
+              require 'fileutils'
+              FileUtils.copy_stream opts[:stdin], pin
+            elsif opts[:stdin]
+              pin.write opts[:stdin].to_s
+            end
+            pin.close
           end
-          _indent
-          _start_tag(sym, attrs)
-          _newline
-          begin ### Added
-            _nested_structures(block)
-          ensure ### Added
-            _indent
-            _end_tag(sym)
-            _newline
-          end ### Added
-        elsif text.nil?
-          _indent
-          _start_tag(sym, attrs, true)
-          _newline
-        else
-          _indent
-          _start_tag(sym, attrs)
-          text! text
-          _end_tag(sym)
-          _newline
-        end
-        @target
+        ].each {|thread| thread.join}
       end
     end
+    # declaration (DOCTYPE, etc)
+    def declare(*args)
+      @x.declare!(*args)
+    end
+    # comment
+    def comment(*args)
+      @x.comment! *args
+    end
+    # was this invoked via HTTP POST?
+    def post?
+      $HTTP_POST
+    end
   end
 end

data/lib/wunderbar/cgi-methods.rb CHANGED Viewed

@@ -83,28 +83,23 @@ def $cgi.out?(headers, &block)
 end
 # produce html/xhtml
-def $cgi.html(&block)
+def $cgi.html(*args, &block)
   return if $XHR_JSON or $TEXT
+  args.push {} 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
-  if $XHTML
-    $cgi.out? 'type' => 'application/xhtml+xml', 'charset' => 'UTF-8' do
-      x._! "\xEF\xBB\xBF"
-      x.declare! :DOCTYPE, :html
-      x.html :xmlns => 'http://www.w3.org/1999/xhtml', &block
-    end
-  else
-    $cgi.out? 'type' => 'text/html', 'charset' => 'UTF-8' do
-      x._! "\xEF\xBB\xBF"
-      x.declare! :DOCTYPE, :html
-      x.html &block
-    end
+  $cgi.out? 'type' => mimetype, 'charset' => 'UTF-8' do
+    x._! "\xEF\xBB\xBF"
+    x._.declare :DOCTYPE, :html
+    x.html *args, &block
   end
 end
 # produce html and quit
-def $cgi.html! &block
+def $cgi.html! *args, &block
   return if $XHR_JSON or $TEXT
-  html(&block)
+  html(*args, &block)
   Process.exit
 end

data/lib/wunderbar/environment.rb CHANGED Viewed

@@ -12,7 +12,6 @@ ARGV.delete('--prompt') or ARGV.delete('--offline')
 # standard objects
 $cgi = CGI.new
 $param = $cgi.params
-$x = Builder::XmlMarkup.new :indent => 2
 # implied request types
 $HTTP_GET  ||= ($cgi.request_method == 'GET')

data/lib/wunderbar/html-methods.rb CHANGED Viewed

@@ -1,49 +1,3 @@
-# execute a system command, echoing stdin, stdout, and stderr
-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'
-  $x.pre command, :class=>stdin unless opts[:echo] == false
-  ::Kernel.require 'thread'
-  semaphore = ::Mutex.new
-  ::Open3.popen3(command) do |pin, pout, perr|
-    [
-      ::Thread.new do
-        until pout.eof?
-          out_line = pout.readline.chomp
-          semaphore.synchronize { $x.pre out_line, :class=>stdout }
-        end
-      end,
-      ::Thread.new do
-        until perr.eof?
-          err_line = perr.readline.chomp
-          semaphore.synchronize { $x.pre err_line, :class=>stderr }
-        end
-      end,
-      ::Thread.new do
-        if opts[:stdin].respond_to? :read
-          require 'fileutils'
-          FileUtils.copy_stream opts[:stdin], pin
-        elsif opts[:stdin]
-          pin.write opts[:stdin].to_s
-        end
-        pin.close
-      end
-    ].each {|thread| thread.join}
-  end
-end
-# was this invoked via HTTP POST?
-def $x.post?
-  $HTTP_POST
-end
 # Wrapper class that understands HTML
 class HtmlMarkup
   VOID = %w(
@@ -52,14 +6,11 @@ class HtmlMarkup
   )
   def initialize(*args, &block)
-    # as a migration aide, use the global variable, but consider that
-    # to be deprecated.
-    $x ||= Builder::XmlMarkup.new :indent => 2
-    @x = $x
+    @x = Wunderbar::XmlMarkup.new :indent => 2
   end
   def html(*args, &block)
-    @x.html(*args) do
+    @x.tag! :html, *args do
       $param.each do |key,value|
         instance_variable_set "@#{key}", value.first if key =~ /^\w+$/
       end
@@ -76,6 +27,10 @@ class HtmlMarkup
       raise error
     end
+    if name.sub!(/_$/,'')
+      @x._margin
+    end
     if flag != '!'
       if %w(script style).include?(name)
         if String === args.first and not block
@@ -104,15 +59,8 @@ class HtmlMarkup
     end
     if flag == '!'
-      # turn off indentation
-      indent, level = @x.instance_eval { [@indent, @level] }
-      begin
-        @x.instance_eval { [@indent=0, @level=0] }
-        @x.text! " "*indent*level
+      @x.disable_indendation! do
         @x.tag! name, *args, &block
-      ensure
-        @x.text! "\n"
-        @x.instance_eval { [@indent=indent, @level=level] }
       end
     elsif flag == '?'
       # capture exceptions, produce filtered tracebacks
@@ -135,9 +83,9 @@ class HtmlMarkup
           end
           if traceback_class
-            $x.pre text, :class=>traceback_class
+            @x.tag! :pre, text, :class=>traceback_class
           else
-            $x.pre text, :style=>traceback_style
+            @x.tag! :pre, text, :style=>traceback_style
           end
         end
       end
@@ -148,11 +96,25 @@ class HtmlMarkup
   def _head(*args, &block)
     @x.tag!('head', *args) do
-      @x.meta :charset => 'utf-8' unless $XHTML
+      @x.tag! :meta, :charset => 'utf-8' unless $XHTML
       block.call if block
     end
   end
+  def _svg(*args, &block)
+    args << {} if args.empty?
+    args.first['xmlns'] = 'http://www.w3.org/2000/svg' if Hash === args.first
+    @x.tag! :svg, *args, &block
+  end
+  def _math(*args, &block)
+    args << {} if args.empty?
+    if Hash === args.first
+      args.first['xmlns'] = 'http://www.w3.org/1998/Math/MathML'
+    end
+    @x.tag! :math, *args, &block
+  end
   def _(text=nil)
     @x.indented_text! text if text
     @x
@@ -163,10 +125,6 @@ class HtmlMarkup
     @x
   end
-  def declare!(*args)
-    @x.declare!(*args)
-  end
   def _coffeescript(text)
     require 'coffee-script'
     _script CoffeeScript.compile(text)

data/lib/wunderbar/version.rb CHANGED Viewed

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

data/test/test_builder.rb CHANGED Viewed

@@ -4,20 +4,32 @@ require 'wunderbar'
 class BuilderTest < Test::Unit::TestCase
   def test_empty
-    x = Builder::XmlMarkup.new :indent => 2
-    x.script { x.indented_text! '' }
+    x = Wunderbar::XmlMarkup.new :indent => 2
+    x.tag!(:script) { x.indented_text! '' }
     assert_equal %{<script>\n</script>\n}, x.target!
   end
   def test_unindented_input
-    x = Builder::XmlMarkup.new :indent => 2
-    x.script { x.indented_text! "{\n  x: 1\n}" }
+    x = Wunderbar::XmlMarkup.new :indent => 2
+    x.tag!(:script) { x.indented_text! "{\n  x: 1\n}" }
     assert_equal %{<script>\n  {\n    x: 1\n  }\n</script>\n}, x.target!
   end
   def test_indented_input
-    x = Builder::XmlMarkup.new :indent => 2
-    x.script { x.indented_text! "      alert('danger');" }
+    x = Wunderbar::XmlMarkup.new :indent => 2
+    x.tag!(:script) { x.indented_text! "      alert('danger');" }
     assert_equal %{<script>\n  alert('danger');\n</script>\n}, x.target!
   end
+  def test_exception
+    x = Wunderbar::XmlMarkup.new :indent => 2
+    x.tag!(:body) do
+      begin
+        x.tag!(:p) { raise Exception.new('boom') }
+      rescue Exception => e
+        x.tag!(:pre, e)
+      end
+    end
+    assert x.target!.include? '<p>' and x.target!.include? '</p>'
+  end
 end

data/test/test_html_markup.rb CHANGED Viewed

@@ -4,7 +4,6 @@ require 'wunderbar'
 class HtmlMarkupTest < Test::Unit::TestCase
   def setup
-    $x = nil # until this hack is removed html-methods.rb
     @original_log_level = Wunderbar.logger.level
     Wunderbar.log_level = :fatal
   end
@@ -75,6 +74,20 @@ class HtmlMarkupTest < Test::Unit::TestCase
     assert_match %r[<div>one <strong>two</strong> three</div>], x.target!
   end
+  def test_spaced_embedded
+    x = HtmlMarkup.new
+    x.html {_div {_p 'one'; _hr_; _p 'two'}}
+    assert_match %r[<div>\n +<p>one</p>\n\n +<hr/>\n\n +<p>two</p>\n +</div>],
+      x.target!
+  end
+  def test_spaced_collapsed
+    x = HtmlMarkup.new
+    x.html {_div {_p_ 'one'; _hr_; _p_ 'two'}}
+    assert_match %r[<div>\n +<p>one</p>\n\n +<hr/>\n\n +<p>two</p>\n +</div>],
+      x.target!
+  end
   def test_traceback
     x = HtmlMarkup.new
     x.html {_body? {boom}}
@@ -120,10 +133,28 @@ class HtmlMarkupTest < Test::Unit::TestCase
   def test_declare
     x = HtmlMarkup.new
-    x.declare! :DOCTYPE, 'html'
+    x._.declare :DOCTYPE, 'html'
     assert_equal %{<!DOCTYPE "html">\n}, x.target!
   end
+  def test_comment
+    x = HtmlMarkup.new
+    x._.comment 'foo'
+    assert_equal %{<!-- foo -->\n}, x.target!
+  end
+  def test_svg
+    x = HtmlMarkup.new
+    x.html {_svg}
+    assert_match %r[^  <svg xmlns="http://www.w3.org/2000/svg"/>], x.target!
+  end
+  def test_math
+    x = HtmlMarkup.new
+    x.html {_math}
+    assert_match %r[^  <math xmlns="http://www.w3.org/1998/Math/MathML"/>], x.target!
+  end
   begin
     require 'coffee-script'

data/tools/web2script.rb ADDED Viewed

@@ -0,0 +1,213 @@
+require 'net/http'
+require 'rubygems'
+require 'nokogiri'
+require 'optparse'
+# Convert a webpage to a Wunderbar script
+OptionParser.new { |opts|
+  opts.banner = "#{File.basename(__FILE__)} [-o output] [-w width] URLs..."
+  opts.on '-o', '--output FILE', 'Send Output to FILE' do |file|
+    $stdout = File.open(file, 'w')
+  end
+  opts.on '-w', '--width WIDTH', Integer, 'Set line width' do |width|
+    $width = width
+  end
+  opts.on '-g', '--group lines', Integer,
+    'Insert blanks lines around blocks larger than this value' do |group|
+    $group = group
+  end
+  if ''.respond_to? 'encoding'
+    opts.on '-a', '--ascii', Integer, 'Escape non-ASCII characters' do
+      $ascii = true
+    end
+  end
+}.parse!
+# Method to "enquote" a string
+class String
+  def enquote
+    if $ascii
+      inspect.gsub(/[^\x20-\x7f]/) { |c| '\u' + c.ord.to_s(16).rjust(4,'0') }
+    else
+      inspect
+    end
+  end
+end
+# queue of lines to be output
+$q = []
+def q line
+  $q << line
+end
+def flow_text(line, join)
+  while $width and line.length>$width
+    line.sub! /(.{1,#{$width-4}})(\s+|\Z)/, "\\1 #{join}"
+    break unless line.include? "\n"
+    q line.split("\n").first
+    line = line[/\n(.*)/,1]
+  end
+  q line
+end
+def flow_attrs(line, attributes, indent)
+  attributes.each do |attribute|
+    line += ','
+    if $width and (line+attribute).length > $width-1
+      q line
+      line = "#{indent} "
+    end
+    line += attribute
+  end
+  q line
+end
+def code(element, indent='')
+  attributes = []
+  element.attributes.keys.each do |key|
+    value = element[key]
+    # resolve relative links
+    if %w(a img link).include? element.name and %w(href src).include? key
+      value = ($uri + value).to_s rescue nil
+    end
+    if key =~ /^\w+$/
+      if key == 'xmlns' and %w(html svg mathml).include? element.name
+        # drop xmlns attributes from these elements
+      elsif key == 'type' and element.name == 'style' and value == 'text/css'
+        # drop type attributes from script elements
+      elsif key == 'type' and element.name == 'script' and value == 'text/javascript'
+        # drop type attributes from script elements
+      elsif RUBY_VERSION =~ /^1\.8/
+        attributes << " :#{key} => #{value.enquote}"
+      else
+        attributes << " #{key}: #{value.enquote}"
+      end
+    else
+      attributes << " #{key.enquote} => #{value.enquote}"
+    end
+  end
+  # restore namespaces that Nokogiri::HTML dropped
+  element_name = element.name
+  if $namespaced[element.name]
+    element_name = $namespaced[element.name]
+    element_name += ',' unless attributes.empty?
+  end
+  line = "#{indent}_#{element_name}#{attributes.join(',')}"
+  line.sub! /^_/, 'Wunderbar.' if element_name == 'html' and indent.empty?
+  if element.children.empty?
+    flow_attrs "#{indent}_#{element_name}#{attributes.pop}", attributes, indent
+  # element has children
+  elsif element.children.any? {|child| child.element?}
+    # do any of the text nodes need special processing to preserve spacing?
+    flatten = false
+    space = true
+    if element.children.any? {|child| child.text? and !child.text.strip.empty?}
+      element.children.each do |child|
+        if child.text? or child.element?
+          next if child.text == ''
+          flatten = true if not space and not child.text =~ /\A\s/
+          space = (child.text =~ /\s\Z/)
+        end
+      end
+    end
+    line.sub!(/(\w)( |$)/, '\1!\2') if flatten
+    q "#{line} do"
+    start = $q.length
+    blank = false
+    first = true
+    # recursively process children
+    element.children.each do |child|
+      if child.text?
+        text = child.text.gsub(/\s+/, ' ')
+        text = text.strip unless flatten
+        next if text.empty?
+        flow_text "#{indent}  _ #{text.enquote}", "\" +\n    #{indent}\""
+      elsif child.comment?
+        flow_text "#{indent}  _.comment #{child.text.strip.enquote}",
+          "\" +\n    #{indent}\""
+      else
+        code(child, indent + '  ')
+      end
+      # insert a blank line if either this or the previous block was large
+      if $group and start + $group < $q.length
+        $q[start].sub! /^(\s+_\w+) /, '\1_ \2'
+        $q.insert(start,'')  if not first
+        blank = true
+      else
+        $q.insert(start,'') if blank
+        blank = false
+      end
+      start = $q.length
+      first = false
+    end
+    q indent + "end"
+  elsif element.name == 'pre' and element.text.include? "\n"
+    data = element.text.sub(/\A\n/,'').sub(/\s+\Z/,'')
+    unindent = data.sub(/s+\Z/,'').scan(/^ *\S/).map(&:length).min || 1
+    before  = Regexp.new('^'.ljust(unindent))
+    after   =  "#{indent}  "
+    data.gsub! before, after
+    flow_attrs "#{indent}_pre <<-EOD.gsub(/^\\s{#{after.length}}/,'')",
+      attributes, indent
+    data.split("\n").each { |line| q line }
+    q "#{indent}EOD"
+  # element has text but no attributes or children
+  elsif attributes.empty?
+    if %w(script style).include? element.name and element.text.include? "\n"
+      script = element.text.sub(/\A\n/,'').sub(/\s+\Z/,'')
+      unindent = script.sub(/s+\Z/,'').scan(/^ *\S/).map(&:length).min || 1
+      before  = Regexp.new('^'.ljust(unindent))
+      after   =  "#{indent}  "
+      script.gsub! before, after
+      q "#{line} %{"
+      script.split("\n").each { |line| q line }
+      q "#{indent}}"
+    else
+      flow_text "#{line} #{element.text.enquote}", "\" +\n  #{indent}\""
+    end
+  # element has text and attributes but no children
+  else
+    flow_attrs "#{indent}_#{element_name} #{element.text.enquote}",
+      attributes, indent
+  end
+end
+# fetch and convert each web page
+ARGV.each do |arg|
+  $uri = URI.parse arg
+  doc = Net::HTTP.get($uri)
+  $namespaced = Hash[doc.scan(/<\/(\w+):(\w+)>/).uniq.
+    map {|p,n| [n, "#{p} :#{n}"]}]
+  $namespaced.delete_if {|name, value| doc =~ /<#{name}[ >]/}
+  code Nokogiri::HTML(doc).root
+end
+# headers
+if ''.respond_to? 'encoding'
+  puts '# encoding: utf-8' if $q.any? {|line| line.match /[^\x20-\x7f]/}
+else
+  puts "require 'rubygems'"
+end
+puts "require 'wunderbar'\n\n"
+# main output
+puts $q.join("\n")

data/wunderbar.gemspec CHANGED Viewed

@@ -2,15 +2,15 @@
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.8.5"
+  s.version = "0.8.6"
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-02-18"
+  s.date = "2012-03-17"
   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"]
-  s.files = ["COPYING", "README", "Rakefile", "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", "test/test_builder.rb", "test/test_html_markup.rb", "test/test_logger.rb", "wunderbar.gemspec", "Manifest"]
+  s.files = ["COPYING", "README", "Rakefile", "demo/wiki.html", "demo/wiki.rb", "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", "test/test_builder.rb", "test/test_html_markup.rb", "test/test_logger.rb", "tools/web2script.rb", "Manifest", "wunderbar.gemspec"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Wunderbar", "--main", "README"]
   s.require_paths = ["lib"]

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  hash: 53
+  hash: 51
   prerelease:
   segments:
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors:
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00 Z
+date: 2012-03-17 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -67,6 +67,8 @@ files:
 - COPYING
 - README
 - Rakefile
+- demo/wiki.html
+- demo/wiki.rb
 - lib/wunderbar.rb
 - lib/wunderbar/builder.rb
 - lib/wunderbar/cgi-methods.rb
@@ -79,8 +81,9 @@ files:
 - test/test_builder.rb
 - test/test_html_markup.rb
 - test/test_logger.rb
-- wunderbar.gemspec
+- tools/web2script.rb
 - Manifest
+- wunderbar.gemspec
 homepage: http://github.com/rubys/wunderbar
 licenses: []