wunderbar 0.8.10 → 0.8.11

data/Manifest

@@ -8,6 +8,7 @@ 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

data/README.md

@@ -9,7 +9,10 @@ the emerging results from the [XML Error Recovery Community
 Group](http://www.w3.org/community/xml-er/wiki/Main_Page).
 
 Wunderbar is both inspired by, and builds upon Jim Weirich's 
-[Builder](https://github.com/jimweirich/builder#readme).
+[Builder](https://github.com/jimweirich/builder#readme), and provides 
+the element id and class id syntax and based on the implementation from
+[Markaby](http://markaby.rubyforge.org/).
+.
 
 Quick Start
 ---
@@ -36,6 +39,14 @@ Element with both text and attributes:
 
     _a 'search', href: 'http://google.com'
 
+Element with boolean attributes:
+
+    _input 'Cheese', type: 'checkbox', name: 'cheese', checked: true
+
+Element with optional (omitted) attributes:
+
+    _tr class: nil
+
 Text:
 
     _ "hello"
@@ -76,6 +87,15 @@ Capture exceptions:
       raise NotImplementedError.new('page')
     end
 
+Class attribute shortcut (equivalent to class="front"):
+
+    div.front do
+    end
+
+Id attributes shortcut (equivalent to id="search"):
+
+    div.search! do
+    end
 
 Basic interface
 ---

data/demo/wiki.rb

@@ -21,7 +21,7 @@ W_.html do
       .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}
+      #message {position: fixed; left: 2%; color: #9400d3}
       h1 {text-align: center; margin: 0}
       form {clear: both}
       .buttons form {display: inline}
@@ -38,7 +38,7 @@ W_.html do
 
     # determine markup
     if _.post? and @markup
-      _header class: 'status' do
+      _header.status do
         _h1 'Status'
         if File.exist?(file) and Digest::MD5.hexdigest(File.read(file)) != @hash
           _p 'Write conflict'
@@ -96,15 +96,15 @@ W_.html do
       end
 
       _form_ action: file, method: 'post' do
-        _textarea @markup, name: 'markup', class: 'input'
+        _textarea.input @markup, name: 'markup'
         _input type: 'hidden', name: 'hash', 
           value: Digest::MD5.hexdigest(@markup)
-        _div class: 'output' do
+        _div.output do
           _ << RDiscount.new(@markup).to_html
         end
 
-        _div class: 'buttons' do
-          _span class: 'message'
+        _div.buttons do
+          _span.message!
           _input name: 'comment', placeholder: 'commit message'
           _input type: 'submit', value: 'save'
         end
@@ -125,7 +125,7 @@ W_.html do
 
       #display
       _ << RDiscount.new(@markup).to_html
-      _div_ class: 'buttons' do
+      _div_.buttons do
         if !rev or rev.empty?
           _form action: "#{file}?", method: 'post' do
             _input type: 'submit', value: 'edit'
@@ -153,10 +153,10 @@ W_.html do
           $('input[name=hash]').val(_.hash);
           if (_.time) {
             var time = new Date(_.time).toLocaleTimeString();
-            $('.message').text("Autosaved at " + time).show().fadeOut(5000);
+            $('#message').text("Autosaved at " + time).show().fadeOut(5000);
           } else {
             $('.input').val(_.markup).attr('readonly', 'readonly');
-            $('.message').css({'font-weight': 'bold'}).text(_.error).show();
+            $('#message').css({'font-weight': 'bold'}).text(_.error).show();
           }
         });
       }, 10000);

data/lib/wunderbar/builder.rb

@@ -34,13 +34,21 @@ module Wunderbar
     end
 
     def disable_indendation!(&block)
-      indent, level = @indent, @level
-      @indent = @level = 0
+      indent, level, pending_newline, pending_margin = 
+        indentation_state! [0, 0, @pending_newline, @pending_margin]
       text! " "*indent*level
       block.call
     ensure
-      text! "\n"
-      @indent, @level = indent, level
+      indentation_state! [indent, level, pending_newline, pending_margin]
+    end
+
+    def indentation_state! new_state=nil
+      result = [@indent, @level, @pending_newline, @pending_margin]
+      if new_state
+        text! "\n" if @indent == 0 and new_state.first > 0
+        @indent, @level, @pending_newline, @pending_margin = new_state
+      end
+      result
     end
 
     def margin!
@@ -58,7 +66,7 @@ module Wunderbar
       @pending_newline = pending_newline
     end
 
-    def tag!(*args)
+    def tag!(sym, *args, &block)
       _newline if @pending_newline
       @pending_newline = @pending_margin
       @first_tag = @pending_margin = false
@@ -85,8 +93,12 @@ module Wunderbar
     end
 
     # avoid method_missing overhead for the most common case
-    def tag!(*args, &block)
-      @x.tag! *args, &block
+    def tag!(sym, *args, &block)
+      if !block and (args.empty? or args == [''])
+        CssProxy.new(@x, @x.target!, sym, args)
+      else
+        @x.tag! sym, *args, &block
+      end
     end
 
     # execute a system command, echoing stdin, stdout, and stderr

data/lib/wunderbar/cgi-methods.rb

@@ -69,7 +69,7 @@ end
 
 # Conditionally provide output, based on ETAG
 def $cgi.out?(headers, &block)
-  content = block.call
+  content = block.call.join
   require 'digest/md5'
   etag = Digest::MD5.hexdigest(content)
 

data/lib/wunderbar/html-methods.rb

@@ -6,7 +6,7 @@ class HtmlMarkup
   )
 
   def initialize(*args, &block)
-    @x = Wunderbar::XmlMarkup.new :indent => 2
+    @x = Wunderbar::XmlMarkup.new :indent => 2, :target => []
   end
 
   def html(*args, &block)
@@ -54,8 +54,13 @@ class HtmlMarkup
         args.unshift '' if not VOID.include?(name) and not block
       end
 
-      # remove attributes with nil values
-      args.last.delete_if {|key, value| value == nil} if Hash === args.last
+      if Hash === args.last
+        # remove attributes with nil, false values
+        args.last.delete_if {|key, value| !value}
+
+        # replace boolean 'true' attributes with the name of the attribute
+        args.last.each {|key, value| args.last[key]=key if value == true}
+      end
     end
 
     if flag == '!'
@@ -133,6 +138,6 @@ class HtmlMarkup
   end
 
   def target!
-    @x.target!
+    @x.target!.join
   end
 end

data/lib/wunderbar/version.rb

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

data/lib/wunderbar.rb

@@ -4,6 +4,7 @@ require 'json'
 
 require 'wunderbar/environment'
 require 'wunderbar/cgi-methods'
+require 'wunderbar/cssproxy'
 require 'wunderbar/html-methods'
 require 'wunderbar/job-control'
 require 'wunderbar/installation'

data/test/test_html_markup.rb

@@ -119,6 +119,36 @@ class HtmlMarkupTest < Test::Unit::TestCase
     assert_match %r[<head>\s*<meta charset="utf-8"/>\s*</head>], x.target!
   end
 
+  def test_nil_attribute
+    x = HtmlMarkup.new
+    x.html {_div :class => nil}
+    assert_match %r[^  <div></div>], x.target!
+  end
+
+  def test_class_attribute
+    x = HtmlMarkup.new
+    x.html {_div.header {_span.text 'foo'}}
+    assert_match %r[<div class="header">.*</div>]m, x.target!
+  end
+
+  def test_id_attribute
+    x = HtmlMarkup.new
+    x.html {_h1.content! 'Content'}
+    assert_match %r[^  <h1 id="content">Content</h1>], x.target!
+  end
+
+  def test_boolean_attribute_false
+    x = HtmlMarkup.new
+    x.html {_option :selected => false}
+    assert_match %r[^  <option></option>], x.target!
+  end
+
+  def test_boolean_attribute_true
+    x = HtmlMarkup.new
+    x.html {_option :selected => true}
+    assert_match %r[^  <option selected="selected"></option>], x.target!
+  end
+
   def test_indented_text
     x = HtmlMarkup.new
     x.html {_div {_ 'text'}}

data/tools/web2script.rb

@@ -64,6 +64,13 @@ def flow_attrs(line, attributes, indent)
 end
 
 def code(element, indent='')
+  # restore namespaces that Nokogiri::HTML dropped
+  element_name = element.name
+  if $namespaced[element.name]
+    element_name = $namespaced[element.name]
+    element_name += ',' unless element.attributes.empty?
+  end
+
   attributes = []
   element.attributes.keys.each do |key|
     value = element[key]
@@ -74,7 +81,11 @@ def code(element, indent='')
     end
 
     if key =~ /^\w+$/
-      if key == 'xmlns' and %w(html svg mathml).include? element.name
+      if key == 'id' and value =~ /^\w+$/
+        element_name += ".#{value}!"
+      elsif key == 'class' and value =~ /^\w+$/
+        element_name += ".#{value}"
+      elsif 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
@@ -90,13 +101,6 @@ def code(element, indent='')
     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! /^_/, 'W_.' if element_name == 'html' and indent.empty?
 
@@ -117,7 +121,7 @@ def code(element, indent='')
         end
       end
     end
-    line.sub!(/(\w)( |$)/, '\1!\2') if flatten
+    line.sub!(/(\w)( |\.|$)/, '\1!\2') if flatten
 
     q "#{line} do"
 
@@ -141,7 +145,7 @@ def code(element, indent='')
 
       # 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[start].sub! /^(\s+_\w+)([ .])/, '\1_\2'
         $q.insert(start,'')  if not first
         blank = true
       else

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.8.10"
+  s.version = "0.8.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-03-20"
+  s.date = "2012-03-23"
   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,57 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wunderbar
-version: !ruby/object:Gem::Version 
-  hash: 43
+version: !ruby/object:Gem::Version
+  version: 0.8.11
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 10
-  version: 0.8.10
 platform: ruby
-authors: 
+authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &10419980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *10419980
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &10418220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-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"
+  prerelease: false
+  version_requirements: *10418220
+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"
 email: rubys@intertwingly.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - COPYING
 - README.md
 - lib/wunderbar.rb
@@ -63,7 +50,7 @@ extra_rdoc_files:
 - lib/wunderbar/job-control.rb
 - lib/wunderbar/logger.rb
 - lib/wunderbar/version.rb
-files: 
+files:
 - COPYING
 - README.md
 - Rakefile
@@ -88,44 +75,35 @@ files:
 - Manifest
 homepage: http://github.com/rubys/wunderbar
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Wunderbar
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: wunderbar
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: HTML Generator and CGI application support
-test_files: 
+test_files:
 - test/test_logger.rb
 - test/test_html_markup.rb
 - test/test_builder.rb