wunderbar 0.12.1 → 0.12.3

data/README.md

@@ -266,6 +266,7 @@ the block
    * Example: `_([1,2,3]) {|n| n*n}`
 
 * arrays can be also be built using the `_` method:
+
         _ 1
         _ 2
 

data/lib/wunderbar/html-methods.rb

@@ -37,39 +37,7 @@ class HtmlMarkup < Wunderbar::BuilderBase
     end
 
     if @_width
-      # reflow long lines
-      source = @x.target!.slice!(0..-1)
-      indent = col = 0
-      breakable = true
-      pre = false
-      while not source.empty?
-        token = source.shift
-        indent = token[/^ */].length if col == 0
-
-        if token.start_with? '<'
-          breakable = false
-          pre = true if token == '<pre'
-        end
-
-        while token.length + col > @_width and breakable and not pre
-          break if token[0...-1].include? "\n"
-          split = token.rindex(' ', [@_width-col,0].max) || token.index(' ')
-          break unless split
-          break if col+split < indent+@_width/2
-          @x.target! << token[0...split] << "\n" << (' '*indent)
-          col = indent
-          token = token[split+1..-1]
-        end
-
-        if token.end_with? '>'
-          breakable = true
-          pre = false if token == '</pre>'
-        end
-
-        @x.target! << token
-        col += token.length
-        col = 0 if token.end_with? "\n"
-      end
+      self.class.reflow(@x.target!, @_width)
     end
 
     @x.target!.join
@@ -131,8 +99,12 @@ class HtmlMarkup < Wunderbar::BuilderBase
       end
 
       # ensure that non-void elements are explicitly closed
-      if args.length == 0 or (args.length == 1 and Hash === args.first)
-        args.unshift '' if not VOID.include?(name) and not block
+      if not block and not VOID.include?(name)
+        symbol = (args.shift if args.length > 0 and Symbol === args.first)
+        if args.length == 0 or (args.length == 1 and Hash === args.first)
+          args.unshift ''
+        end
+        args.unshift(symbol) if symbol
       end
 
       if String === args.first and args.first.respond_to? :html_safe?
@@ -236,35 +208,6 @@ class HtmlMarkup < Wunderbar::BuilderBase
     @x.text! text.to_s
   end
 
-  def _coffeescript(text)
-    require 'coffee-script'
-    _script CoffeeScript.compile(text)
-  rescue LoadError
-    _script text, :lang => 'text/coffeescript'
-  end
-
-  def clear!
-    @x.target!.clear
-  end
-
-  def self.flatten?(children)
-    # do any of the text nodes need special processing to preserve spacing?
-    flatten = false
-    space = true
-    if children.any? {|child| child.text? and !child.text.strip.empty?}
-      children.each do |child|
-        if child.text? or child.element?
-          unless child.text == ''
-            flatten = true if not space and not child.text =~ /\A\s/
-            space = (child.text =~ /\s\Z/)
-          end
-          space = true if child.element? and HTML5_BLOCK.include? child.name
-        end
-      end
-    end
-    flatten
-  end
-
   def _(children=nil)
     return @x if children == nil
 
@@ -338,4 +281,93 @@ class HtmlMarkup < Wunderbar::BuilderBase
       end
     end
   end
+
+  def _coffeescript(text)
+    require 'coffee-script'
+    _script CoffeeScript.compile(text)
+  rescue LoadError
+    _script text, :lang => 'text/coffeescript'
+  end
+
+  def clear!
+    @x.target!.clear
+  end
+
+  def self.flatten?(children)
+    # do any of the text nodes need special processing to preserve spacing?
+    flatten = false
+    space = true
+    if children.any? {|child| child.text? and !child.text.strip.empty?}
+      children.each do |child|
+        if child.text? or child.element?
+          unless child.text == ''
+            flatten = true if not space and not child.text =~ /\A\s/
+            space = (child.text =~ /\s\Z/)
+          end
+          space = true if child.element? and HTML5_BLOCK.include? child.name
+        end
+      end
+    end
+    flatten
+  end
+
+  # reflow long lines
+  def self.reflow(stream, width)
+    source = stream.slice!(0..-1)
+    indent = col = 0
+    breakable = true
+    pre = false
+    while not source.empty?
+      token = source.shift
+      indent = token[/^ */].length if col == 0
+
+      if token.start_with? '<'
+        breakable = false
+        pre = true if token == '<pre'
+      end
+
+      # flow text
+      while token.length + col > width and breakable and not pre
+        break if token[0...-1].include? "\n"
+        split = token.rindex(' ', [width-col,0].max) || token.index(' ')
+        break unless split
+        break if col+split < indent+width/2
+        stream << token[0...split] << "\n" << (' '*indent)
+        col = indent
+        token = token[split+1..-1]
+      end
+
+      # break around tags
+      if token.end_with? '>'
+        if col > indent + 4 and stream[-2..-1] == ['<br', '/']
+          stream << token << "\n"
+          col = 0
+          token = ' '*indent
+          source[0] = source.first.lstrip unless source.empty?
+        elsif col > width and not pre
+          # break on previous space within text
+          pcol = col
+          stream.reverse_each do |xtoken|
+            break if xtoken.include? "\n"
+            split = xtoken.rindex(' ')
+            breakable = false if xtoken.end_with? '>'
+            if breakable and split
+              col = col - pcol + xtoken.length - split + indent
+              xtoken[split] = "\n#{' '*indent}" 
+              break
+            end
+            breakable = true if xtoken.start_with? '<'
+            pcol -= xtoken.length
+            break if pcol < (width + indent)/2
+          end
+        end
+        breakable = true
+        pre = false if token == '</pre>'
+      end
+
+      stream << token
+      col += token.length
+      col = 0 if token.end_with? "\n"
+    end
+  end
 end

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.12.1"
+  s.version = "0.12.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-04-24"
+  s.date = "2012-04-25"
   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.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/version.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/server.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/cgi-methods.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder