wunderbar 0.22.0 → 0.22.1

data/lib/wunderbar/builder.rb

@@ -99,9 +99,29 @@ module Wunderbar
   end
 
   class XmlMarkup < BuilderClass
-    def initialize(args)
+    # convenience method for taking an XML node or string and formatting it
+    def self.dump(content, args={})
+      markup = self.new(args)
+
+      if Nokogiri::XML::Document === content and content.root.name == 'html'
+        markup.declare! :DOCTYPE, :html
+      end
+
+      unless Nokogiri::XML::Node === content
+        if defined? Nokogiri::HTML5.fragment
+          content = Nokogiri::HTML5.fragment(content.to_s)
+        else
+          content = Nokogiri::HTML.fragment(content.to_s)
+        end
+      end
+
+      markup[content]
+      markup.target!
+    end
+
+    def initialize(args={})
       @_scope = args.delete(:scope)
-      @_indent = args.delete(:indent) or 2
+      @_indent = args.delete(:indent) || 2
       @_pdf = false
       @doc = Node.new(nil)
       @node = @doc
@@ -259,6 +279,7 @@ module Wunderbar
     def <<(data)
       if defined? Nokogiri
         if not String === data or data.include? '<' or data.include? '&'
+          # https://github.com/google/gumbo-parser/issues/266
           data = Nokogiri::HTML::fragment(data.to_s).to_xml
 
           # fix CDATA in most cases (notably scripts)
@@ -289,8 +310,14 @@ module Wunderbar
     end
 
     def [](*children)
-      if children.length == 1 and children.first.respond_to? :root
-        children = [children.first.root]
+      if children.length == 1
+        if children.first.respond_to? :root
+          children = [children.first.root]
+        elsif defined? Nokogiri::XML::DocumentFragment and
+          Nokogiri::XML::DocumentFragment === children.first
+        then
+          children = children.first.children
+        end
       end
 
       # remove leading and trailing space

data/lib/wunderbar/html-methods.rb

@@ -341,7 +341,7 @@ module Wunderbar
         return @_x
       end
 
-      children = block.call
+      children = instance_eval &block
 
       if String === children
         safe = !children.tainted?
@@ -382,6 +382,8 @@ module Wunderbar
         else
           return @_x.indented_text! children
         end
+      elsif children.nil? or Wunderbar::Node === children
+        return children
       end
 
       @_x[*children]

data/lib/wunderbar/version.rb

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

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.22.0"
+  s.version = "0.22.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2014-12-23"
+  s.date = "2015-01-02"
   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/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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json