wunderbar 0.10.6 → 0.10.7

data/lib/wunderbar/html-methods.rb

@@ -239,18 +239,40 @@ class HtmlMarkup < Wunderbar::BuilderBase
         else
           @x.indented_text! text.strip
         end
-      else
-        if self.class.flatten? child.children
+      elsif self.class.flatten? child.children
+        block_element = Proc.new do |node| 
+          node.element? and HTML5_BLOCK.include?(node.name)
+        end
+
+        if child.children.any?(&block_element)
+          # indent children, but disable indentation on consecutive
+          # sequences of non-block-elements.  Put another way: break
+          # out block elements to a new line.
+          @x.tag!(child.name, child.attributes) do
+            children = child.children.to_a
+            while not children.empty?
+              stop = children.index(&block_element)
+              if stop == 0
+                _import! [children.shift]
+              else
+                @x.disable_indentation! do
+                  _import! children.shift(stop || children.length)
+                end
+              end
+            end
+          end
+        else
+          # disable indentation on the entire element
           @x.disable_indentation! do
             @x.tag!(child.name, child.attributes) {_import! child.children}
           end
-        elsif child.children.empty?
-          @x.tag!(child.name, child.attributes)
-        elsif child.children.all? {|gchild| gchild.text?}
-          @x.tag!(child.name, child.text.strip, child.attributes)
-        else
-          @x.tag!(child.name, child.attributes) {_import! child.children}
         end
+      elsif child.children.empty?
+        @x.tag!(child.name, child.attributes)
+      elsif child.children.all? {|gchild| gchild.text?}
+        @x.tag!(child.name, child.text.strip, child.attributes)
+      else
+        @x.tag!(child.name, child.attributes) {_import! child.children}
       end
     end
   end

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wunderbar
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 10
-  - 6
-  version: 0.10.6
+  - 7
+  version: 0.10.7
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 Z
+date: 2012-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder