wunderbar 0.21.4 → 0.22.0

data/README.md

@@ -442,6 +442,8 @@ The following gems are required by extensions of the same name:
 The following gems, if installed, will produce cleaner and prettier output:
 
 * `nokogiri` cleans up HTML fragments inserted via `<<`
+* `nokogumbo` also cleans up HTML fragments inserted via `<<`.  If this is
+  available, it will be preferred over direct usage of `nokogiri`.
 * `escape` prettier quoting of `system` commands
 * `sanitize` will remove unsafe markup from tainted input
 

data/lib/wunderbar/builder.rb

@@ -166,10 +166,10 @@ module Wunderbar
 
     def compact!(&block)
       begin
-        @indentation_enabled = false
+        indentation_enabled, @indentation_enabled = @indentation_enabled, false
         block.call
       ensure
-        @indentation_enabled = true
+        @indentation_enabled = indentation_enabled
       end
     end
 
@@ -191,6 +191,7 @@ module Wunderbar
             [name, attr.value]
           }]
         end
+
         attributes.merge!(node.namespaces) if node.namespaces
         args.push attributes
         if node.namespace and node.namespace.prefix
@@ -198,6 +199,12 @@ module Wunderbar
         else
           sym = node.name
         end
+
+        unless Class === args.first
+          args.unshift PreformattedNode if sym == 'pre'
+          args.unshift ScriptNode if sym == 'script'
+          args.unshift StyleNode if sym == 'style'
+        end
       end
 
       if Class === args.first and args.first < Node
@@ -308,33 +315,8 @@ module Wunderbar
         elsif child.comment?
           comment! child.text.sub(/\A /,'').sub(/ \Z/, '')
         elsif HtmlMarkup.flatten? child.children
-          block_element = Proc.new do |node| 
-            node.element? and HtmlMarkup::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.
-            tag!(child) do
-              children = child.children.to_a
-              while not children.empty?
-                stop = children.index(&block_element)
-                if stop == 0
-                  self[children.shift]
-                else
-                  compact!(nil) do
-                    self[*children.shift(stop || children.length)]
-                  end
-                end
-              end
-            end
-          else
-            # disable indentation on the entire element
-            compact! do
-              tag!(child) {self[*child.children]}
-            end
-          end
+          # disable indentation on the entire element
+          compact! { tag!(child) {self[*child.children]} }
         elsif child.children.empty? and HtmlMarkup::VOID.include? child.name
           tag!(child)
         elsif child.children.all?(&:text?)

data/lib/wunderbar/html-methods.rb

@@ -5,8 +5,7 @@ module Wunderbar
     def _script(*args, &block)
       args << {} unless Hash === args.last
       args.last[:lang] ||= 'text/javascript'
-      args.unshift ScriptNode
-      proxiable_tag! 'script', *args, &block
+      proxiable_tag! 'script', ScriptNode, *args, &block
     end
 
     def _style(*args, &block)
@@ -19,8 +18,7 @@ module Wunderbar
       end
       args << {} unless Hash === args.last
       args.last[:type] ||= 'text/css'
-      args.unshift StyleNode
-      proxiable_tag! 'style', *args, &block
+      proxiable_tag! 'style', StyleNode, *args, &block
     end
   end
 
@@ -124,7 +122,7 @@ module Wunderbar
         require 'pathname'
         base = @_scope.env['DOCUMENT_ROOT'] if @_scope.env.respond_to? :[]
         base ||= Dir.pwd
-        base += head.children[1].attrs[:href]
+        base += (head.children[1].attrs[:href] || '')
         base += 'index.html' if base.end_with? '/'
         base = Pathname.new(base).parent
         prefix = Pathname.new(Dir.pwd).relative_path_from(base).to_s + '/'
@@ -292,7 +290,9 @@ module Wunderbar
     
     def _pre(*args, &block)
       args.first.chomp! if String === args.first and args.first.end_with? "\n"
-      @_x.compact! { tag! :pre, *args, &block }
+      @_x.compact! do
+        proxiable_tag! :pre, PreformattedNode, *args, &block
+      end
     end
 
     def _ul(*args, &block)
@@ -351,7 +351,12 @@ module Wunderbar
         safe = true
 
         if ok and (children.include? '<' or children.include? '&')
-          doc = Nokogiri::HTML::fragment(children.to_s)
+          if defined? Nokogiri::HTML5.fragment
+            doc = Nokogiri::HTML5.fragment(children.to_s)
+          else
+            doc = Nokogiri::HTML.fragment(children.to_s)
+          end
+
           Sanitize.new.clean_node! doc.dup.untaint if not safe
           children = doc.children.to_a
 
@@ -382,10 +387,13 @@ module Wunderbar
       @_x[*children]
     end
 
-    def __(text=nil)
+    def __(text=nil, &block)
       if text
         @_x.spaced!
         @_x.indented_text! text
+      elsif block
+        @_x.spaced!
+        _ &block
       else
         @_x.text! ""
       end

data/lib/wunderbar/node.rb

@@ -46,10 +46,17 @@ module Wunderbar
       indent += options[:indent] if indent and parent
       first = true
       spaced = false
+
+      if preserve_spaces?
+        options = options.dup
+        options[:space] = :preserve
+      end
+
       children.each do |child| 
         next unless child
         result << '' if (spaced or SpacedNode === child) and not first
         if String === child
+          child = child.gsub(/\s+/, ' ') unless options[:space] == :preserve
           result << child
         else
           child.serialize(options, result, indent)
@@ -70,22 +77,24 @@ module Wunderbar
       end
 
       if children.empty? 
-        if text
-          if options[:pre]
-            line += ">#{options[:pre]}#{text}#{options[:post]}</#{name}>"
-          else
-            width = options[:width] if name != :pre
+        if options[:pre]
+          line += ">#{options[:pre]}#{text}#{options[:post]}</#{name}>"
+        else
+          width = options[:width] unless preserve_spaces?
+
+          if text
             line += ">#{text.to_s.gsub(/[&<>]/,ESCAPE)}</#{name}>"
-            if indent and width and line.length > width
-              reflowed = IndentedTextNode.reflow(indent, line, width)
-              line = reflowed.pop
-              result.push *reflowed
-            end
+          elsif VOID.include? name.to_s
+            line += "/>"
+          else
+            line += "></#{name}>"
+          end
+
+          if indent and width and line.length > width
+            reflowed = IndentedTextNode.reflow(indent, line, width)
+            line = reflowed.pop
+            result.push *reflowed
           end
-        elsif VOID.include? name.to_s
-          line += "/>"
-        else
-          line += "></#{name}>"
         end
       elsif CompactNode === self and not CompactNode === parent
         work = []
@@ -113,7 +122,7 @@ module Wunderbar
                 line += ' ' + token
               else
                 result << line
-                line = indent.to_s + token
+                line = indent.to_s + options[:indent] + token
               end
             end
           end
@@ -131,6 +140,10 @@ module Wunderbar
       result << line if parent
       result
     end
+
+    def preserve_spaces?
+      false
+    end
   end
 
   class CommentNode
@@ -156,7 +169,13 @@ module Wunderbar
     end
   end
 
-  class CDATANode < Node
+  class PreformattedNode < Node
+    def preserve_spaces?
+      true
+    end
+  end
+
+  class CDATANode < PreformattedNode
     def self.normalize(data, indent='')
       data = data.sub(/\n\s*\Z/, '').sub(/\A\s*\n/, '')
 
@@ -177,7 +196,7 @@ module Wunderbar
       end
 
       if @text and @text =~ /[<^>]/
-        indent += '  ' if indent
+        indent += options[:indent] if indent
         children.unshift @text.gsub(/^/, indent).gsub(/^ +$/,'').rstrip
         @text = nil
         super(options.merge(pre: pre, post: post), result, indent)
@@ -195,13 +214,19 @@ module Wunderbar
     end
 
     def serialize(options, result, indent)
-      result << @text.to_s.gsub(/[&<>]/,ESCAPE)
+      if options[:space] == :preserve
+        result << @text.to_s.gsub(/[&<>]/,ESCAPE)
+      else
+        result << @text.to_s.gsub(/[&<>]/,ESCAPE).gsub(/\s+/, ' ')
+      end
     end
   end
 
   class IndentedTextNode < TextNode
     def self.reflow(indent, line, width)
-      return [line] if line.include? "\n" or not width
+      return [line] unless width and indent
+      line = indent + line.gsub!(/\s+/, ' ').strip
+      indent += '  '
 
       result = []
       while line.length > width

data/lib/wunderbar/script.rb

@@ -9,7 +9,7 @@ module Wunderbar
   class ScriptNode
     attr_accessor :block, :binding
     def serialize(options, result, indent)
-      if @block
+      if @block and @children.empty? and not @text
         width = options[:width]
         width -= indent.to_s.length if width
         @text = Ruby2JS.convert(@block, binding: @binding, width: width)

data/lib/wunderbar/version.rb

@@ -1,8 +1,8 @@
 module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 21
-    TINY  = 4
+    MINOR = 22
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/wunderbar.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.21.4"
+  s.version = "0.22.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2014-06-24"
+  s.date = "2014-12-23"
   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", "lib/wunderbar/angularjs", "lib/wunderbar/angularjs/resource.rb", "lib/wunderbar/angularjs/route.rb", "lib/wunderbar/angularjs.rb", "lib/wunderbar/asset.rb", "lib/wunderbar/backtick.rb", "lib/wunderbar/bootstrap", "lib/wunderbar/bootstrap/theme.rb", "lib/wunderbar/bootstrap.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/coderay.rb", "lib/wunderbar/coffeescript.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/jquery", "lib/wunderbar/jquery/filter.rb", "lib/wunderbar/jquery/stupidtable.rb", "lib/wunderbar/jquery.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/markdown.rb", "lib/wunderbar/node.rb", "lib/wunderbar/opal", "lib/wunderbar/opal/browser.rb", "lib/wunderbar/opal/jquery.rb", "lib/wunderbar/opal.rb", "lib/wunderbar/pagedown.rb", "lib/wunderbar/polymer.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/script.rb", "lib/wunderbar/server.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/underscore.rb", "lib/wunderbar/vendor", "lib/wunderbar/vendor/angular-resource.min.js", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/bootstrap-theme.min.css", "lib/wunderbar/vendor/bootstrap.min.css", "lib/wunderbar/vendor/bootstrap.min.js", "lib/wunderbar/vendor/jquery-1.11.0.min.js", "lib/wunderbar/vendor/Markdown.Converter.js", "lib/wunderbar/vendor/polymer-v0.0.20131003.min.js", "lib/wunderbar/vendor/stupidtable.min.js", "lib/wunderbar/vendor/underscore-min.js", "lib/wunderbar/version.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar.rb"]
+  s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/script.rb", "lib/wunderbar/jquery.rb", "lib/wunderbar/underscore.rb", "lib/wunderbar/polymer.rb", "lib/wunderbar/jquery", "lib/wunderbar/jquery/filter.rb", "lib/wunderbar/jquery/stupidtable.rb", "lib/wunderbar/vendor", "lib/wunderbar/vendor/polymer-v0.0.20131003.min.js", "lib/wunderbar/vendor/stupidtable.min.js", "lib/wunderbar/vendor/bootstrap.min.js", "lib/wunderbar/vendor/Markdown.Converter.js", "lib/wunderbar/vendor/angular.min.js", "lib/wunderbar/vendor/bootstrap-theme.min.css", "lib/wunderbar/vendor/jquery-1.11.0.min.js", "lib/wunderbar/vendor/angular-resource.min.js", "lib/wunderbar/vendor/bootstrap.min.css", "lib/wunderbar/vendor/underscore-min.js", "lib/wunderbar/vendor/angular-route.min.js", "lib/wunderbar/websocket.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/pagedown.rb", "lib/wunderbar/version.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/server.rb", "lib/wunderbar/angularjs.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/asset.rb", "lib/wunderbar/backtick.rb", "lib/wunderbar/opal", "lib/wunderbar/opal/browser.rb", "lib/wunderbar/opal/jquery.rb", "lib/wunderbar/coffeescript.rb", "lib/wunderbar/markdown.rb", "lib/wunderbar/opal.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/bootstrap.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/angularjs", "lib/wunderbar/angularjs/resource.rb", "lib/wunderbar/angularjs/route.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/coderay.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/bootstrap", "lib/wunderbar/bootstrap/theme.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/node.rb"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.14"
+  s.rubygems_version = "1.8.23"
   s.summary = "HTML Generator and CGI application support"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])

metadata

@@ -1,34 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.21.4
+  version: 0.22.0
+  prerelease: 
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode
-      (utf-8), consistently indented, readable applications.  This includes
-      output that conforms to the Polyglot specification and the emerging
-      results from the XML Error Recovery Community Group.
+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"
 email: rubys@intertwingly.net
 executables: []
 extensions: []
@@ -37,75 +39,76 @@ files:
 - wunderbar.gemspec
 - README.md
 - COPYING
-- lib/wunderbar/angularjs/resource.rb
-- lib/wunderbar/angularjs/route.rb
+- lib/wunderbar.rb
+- lib/wunderbar/script.rb
+- lib/wunderbar/jquery.rb
+- lib/wunderbar/underscore.rb
+- lib/wunderbar/polymer.rb
+- lib/wunderbar/jquery/filter.rb
+- lib/wunderbar/jquery/stupidtable.rb
+- lib/wunderbar/vendor/polymer-v0.0.20131003.min.js
+- lib/wunderbar/vendor/stupidtable.min.js
+- lib/wunderbar/vendor/bootstrap.min.js
+- lib/wunderbar/vendor/Markdown.Converter.js
+- lib/wunderbar/vendor/angular.min.js
+- lib/wunderbar/vendor/bootstrap-theme.min.css
+- lib/wunderbar/vendor/jquery-1.11.0.min.js
+- lib/wunderbar/vendor/angular-resource.min.js
+- lib/wunderbar/vendor/bootstrap.min.css
+- lib/wunderbar/vendor/underscore-min.js
+- lib/wunderbar/vendor/angular-route.min.js
+- lib/wunderbar/websocket.rb
+- lib/wunderbar/environment.rb
+- lib/wunderbar/pagedown.rb
+- lib/wunderbar/version.rb
+- lib/wunderbar/cgi-methods.rb
+- lib/wunderbar/server.rb
 - lib/wunderbar/angularjs.rb
+- lib/wunderbar/logger.rb
 - lib/wunderbar/asset.rb
 - lib/wunderbar/backtick.rb
-- lib/wunderbar/bootstrap/theme.rb
+- lib/wunderbar/opal/browser.rb
+- lib/wunderbar/opal/jquery.rb
+- lib/wunderbar/coffeescript.rb
+- lib/wunderbar/markdown.rb
+- lib/wunderbar/opal.rb
+- lib/wunderbar/installation.rb
 - lib/wunderbar/bootstrap.rb
-- lib/wunderbar/builder.rb
-- lib/wunderbar/cgi-methods.rb
+- lib/wunderbar/job-control.rb
+- lib/wunderbar/sinatra.rb
+- lib/wunderbar/rails.rb
+- lib/wunderbar/angularjs/resource.rb
+- lib/wunderbar/angularjs/route.rb
+- lib/wunderbar/rack.rb
 - lib/wunderbar/coderay.rb
-- lib/wunderbar/coffeescript.rb
+- lib/wunderbar/builder.rb
+- lib/wunderbar/bootstrap/theme.rb
 - lib/wunderbar/cssproxy.rb
-- lib/wunderbar/environment.rb
 - lib/wunderbar/html-methods.rb
-- lib/wunderbar/installation.rb
-- lib/wunderbar/job-control.rb
-- lib/wunderbar/jquery/filter.rb
-- lib/wunderbar/jquery/stupidtable.rb
-- lib/wunderbar/jquery.rb
-- lib/wunderbar/logger.rb
-- lib/wunderbar/markdown.rb
 - lib/wunderbar/node.rb
-- lib/wunderbar/opal/browser.rb
-- lib/wunderbar/opal/jquery.rb
-- lib/wunderbar/opal.rb
-- lib/wunderbar/pagedown.rb
-- lib/wunderbar/polymer.rb
-- lib/wunderbar/rack.rb
-- lib/wunderbar/rails.rb
-- lib/wunderbar/script.rb
-- lib/wunderbar/server.rb
-- lib/wunderbar/sinatra.rb
-- lib/wunderbar/underscore.rb
-- lib/wunderbar/vendor/angular-resource.min.js
-- lib/wunderbar/vendor/angular-route.min.js
-- lib/wunderbar/vendor/angular.min.js
-- lib/wunderbar/vendor/bootstrap-theme.min.css
-- lib/wunderbar/vendor/bootstrap.min.css
-- lib/wunderbar/vendor/bootstrap.min.js
-- lib/wunderbar/vendor/jquery-1.11.0.min.js
-- lib/wunderbar/vendor/Markdown.Converter.js
-- lib/wunderbar/vendor/polymer-v0.0.20131003.min.js
-- lib/wunderbar/vendor/stupidtable.min.js
-- lib/wunderbar/vendor/underscore-min.js
-- lib/wunderbar/version.rb
-- lib/wunderbar/websocket.rb
-- lib/wunderbar.rb
 homepage: http://github.com/rubys/wunderbar
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: HTML Generator and CGI application support
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8badf15d87c160ff80047cf11daa11c075f52cd1
-  data.tar.gz: 49055a8e408472bfa4b868ea45dfbf3133aa09d4
-SHA512:
-  metadata.gz: b325a928ba13e21146b98ecaea45a1eb53e7cece7e37c076f07b278373d9674798420370e295c798be7b20739106a189bba9095373ad45d22d3b0a8e3655eaa2
-  data.tar.gz: 76b378725828ff67d819119459e7aa480b9bd33d0284bd8dae28e37728e7fdcbdeb98f62933ee9f08b23d5993ea1024da7346d792f1e92a7fa3e0d6d2d2a8fd4