wunderbar 0.10.5 → 0.10.6

data/README.md

@@ -282,6 +282,7 @@ HTML methods
 * `_svg`: insert svg namespace
 * `_math`: insert math namespace
 * `_coffeescript`: convert [coffeescript](http://coffeescript.org/) to JS and insert script tag
+* `_import!`: insert markup with indentation matching the current output
 * `xhtml?`: output as XHTML?
 
 Note that adding an exclamation mark to the end of the tag name disables this
@@ -291,7 +292,7 @@ Builder extensions
 ---
 * `indented_text!`: matches text indentation to markup
 * `indented_data!`: useful for script and styles in HTML syntax
-* `disable_indendation!`: temporarily disable insertion of whitespace
+* `disable_indentation!`: temporarily disable insertion of whitespace
 * `margin!`: insert blank lines between tags
 
 Logging:

data/lib/wunderbar/builder.rb

@@ -37,7 +37,7 @@ module Wunderbar
       self << post if post
     end
 
-    def disable_indendation!(&block)
+    def disable_indentation!(&block)
       indent, level, pending_newline, pending_margin = 
         indentation_state! [0, 0, @pending_newline, @pending_margin]
       text! " "*indent*level

data/lib/wunderbar/html-methods.rb

@@ -5,6 +5,13 @@ class HtmlMarkup < Wunderbar::BuilderBase
     link meta param source track wbr
   )
 
+  HTML5_BLOCK = %w(
+    # https://developer.mozilla.org/en/HTML/Block-level_elements
+    address article aside audio blockquote br canvas dd div dl fieldset
+    figcaption figcaption figure footer form h1 h2 h3 h4 h5 h6 header hgroup hr
+    noscript ol output p pre section table tfoot ul video
+  )
+
   def initialize(scope)
     @_scope = scope
     @x = Wunderbar::XmlMarkup.new :scope => scope, :indent => 2, :target => []
@@ -99,7 +106,7 @@ class HtmlMarkup < Wunderbar::BuilderBase
     end
 
     if flag == '!'
-      @x.disable_indendation! do
+      @x.disable_indentation! do
         @x.tag! name, *args, &block
       end
     elsif flag == '?'
@@ -193,4 +200,58 @@ class HtmlMarkup < Wunderbar::BuilderBase
   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 _import!(children)
+    if String === children
+      require 'nokogiri'
+      children = Nokogiri::HTML::fragment(children.to_s).children
+    end
+
+    # remove leading and trailing space
+    children.shift if children.first.text.strip.empty?
+    children.pop if children.last.text.strip.empty?
+
+    children.each do |child|
+      if child.text?
+        text = child.text
+        if text.strip.empty?
+          @x.text! "\n" if text.count("\n")>1
+        elsif @x.indentation_state!.first == 0
+          @x.indented_text! text.gsub(/\s+/, ' ')
+        else
+          @x.indented_text! text.strip
+        end
+      else
+        if self.class.flatten? child.children
+          @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
+      end
+    end
+  end
 end

data/lib/wunderbar/version.rb

@@ -2,7 +2,7 @@ module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 10
-    TINY  = 5
+    TINY  = 6
 
     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.5"
+  s.version = "0.10.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-04-15"
+  s.date = "2012-04-16"
   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: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 10
-  - 5
-  version: 0.10.5
+  - 6
+  version: 0.10.6
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-15 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder