wunderbar 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e0a24f478dfe451da0e17380445b31050ef2dad
-  data.tar.gz: 29938d3706c0485fa2503d6e66a8683e541349a3
+  metadata.gz: 5302769e2b4cec4245c002657e30a67ab3e3bd58
+  data.tar.gz: 55cacd2f87846550186a39e5335b81ad9fa787ae
 SHA512:
-  metadata.gz: 9f34f142c8fe501d276da28c6bb422f99a8fb13a964b52dece6a9254a916b9727a29058ac8a87b24f7b477ebc7284613d8c4600daf59efa1e1231a9dc2554db6
-  data.tar.gz: 3f9ac9651b0ddf90b1e7fda0a8e0b3df33cd3010813e0d9ddc9f798ed1d1a453844274288c461f4385afee2f43f3a56f971229e29ccffc658f552efc9f1a4b59
+  metadata.gz: 1621333ee1eed24865a709f9c78c96df0cf2d7c259c32b77def3e58204e521304b3f07fba7dd781f21c083a00e4ac2749817a1a056ed3e147548fea3473ba4d6
+  data.tar.gz: 51d0b2b248508e0004924206a5b74a2b0a1eac3559f0e0e5f53eaffd4c13c4d12864aa15992c446ca47551c09294883335810f52a184275de14d868fedc1f101

data/lib/wunderbar/render.rb

@@ -119,14 +119,17 @@ class Wunderbar::XmlMarkup
 
     # concatenate and execute scripts on server
     if browserify
-      setup << requires.map {|key, value| "#{key}=require(#{value.inspect})"}.
-        join(';')
+      setup += requires.map {|key, value| 
+        "const #{key}=module.exports.#{key} || require(#{value.inspect})"
+        "const #{key}=require(#{value.inspect})"
+      }
     end
     scripts.unshift *setup.uniq
     html = Wunderbar::Render.eval(scripts, server)
 
     # insert results into target
     nodes = builder._ { html }
+
     begin
       nodes.each {|node| node.parent = target}
       target.children += nodes
@@ -135,7 +138,7 @@ class Wunderbar::XmlMarkup
         style: 'background-color:#ff0; margin: 1em 0; padding: 1em; ' +
                'border: 4px solid red; border-radius: 1em')
       div.children << Wunderbar::Node.new('pre', e.to_s)
-      div.children << Wunderbar::Node.new('pre', e.backtrace)
+      div.children << Wunderbar::Node.new('pre', e.backtrace.join("\n"))
       div.children << Wunderbar::Node.new('pre', html)
       div.children << Wunderbar::Node.new('pre', nodes.inspect)
       div.children.each {|node| node.parent = div}

data/lib/wunderbar/version.rb

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

data/lib/wunderbar/vue.rb

@@ -29,12 +29,17 @@ class Wunderbar::Render
   end
 
   def self.eval(scripts, server)
-    output, status = Open3.capture3 self.nodejs,
+    stdout, stderr, status = Open3.capture3 self.nodejs,
       stdin_data: scripts.compact.join(";\n") + ";\n" + server
-    output.untaint
+
+    unless stderr.empty?
+      Wunderbar.err stderr
+      stdout += "\n<pre>#{CGI.escapeHTML(stderr)}</pre>"
+    end
+
+    stdout.untaint
   rescue => e
     Wunderbar.error e
-    "<pre>" + e.message.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;') +
-      "</pre>"
+    "<pre>#{CGI.escapeHTML(e.message)}</pre>"
   end
 end

data/wunderbar.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: wunderbar 1.2.1 ruby lib
+# stub: wunderbar 1.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "wunderbar".freeze
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sam Ruby".freeze]
-  s.date = "2017-09-04"
+  s.date = "2017-09-05"
   s.description = "    Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode\n    (utf-8), consistently indented, readable applications.'\n".freeze
   s.email = "rubys@intertwingly.net".freeze
   s.files = ["COPYING".freeze, "README.md".freeze, "lib/wunderbar".freeze, "lib/wunderbar.rb".freeze, "lib/wunderbar/angularjs".freeze, "lib/wunderbar/angularjs.rb".freeze, "lib/wunderbar/angularjs/resource.rb".freeze, "lib/wunderbar/angularjs/route.rb".freeze, "lib/wunderbar/asset.rb".freeze, "lib/wunderbar/backtick.rb".freeze, "lib/wunderbar/bootstrap".freeze, "lib/wunderbar/bootstrap.rb".freeze, "lib/wunderbar/bootstrap/theme.rb".freeze, "lib/wunderbar/builder.rb".freeze, "lib/wunderbar/cgi-methods.rb".freeze, "lib/wunderbar/coderay.rb".freeze, "lib/wunderbar/coffeescript.rb".freeze, "lib/wunderbar/cssproxy.rb".freeze, "lib/wunderbar/environment.rb".freeze, "lib/wunderbar/eventsource.rb".freeze, "lib/wunderbar/html-methods.rb".freeze, "lib/wunderbar/installation.rb".freeze, "lib/wunderbar/job-control.rb".freeze, "lib/wunderbar/jquery".freeze, "lib/wunderbar/jquery.rb".freeze, "lib/wunderbar/jquery/filter.rb".freeze, "lib/wunderbar/jquery/stupidtable.rb".freeze, "lib/wunderbar/listen.rb".freeze, "lib/wunderbar/logger.rb".freeze, "lib/wunderbar/markdown.rb".freeze, "lib/wunderbar/marked.rb".freeze, "lib/wunderbar/node.rb".freeze, "lib/wunderbar/pagedown.rb".freeze, "lib/wunderbar/polymer.rb".freeze, "lib/wunderbar/rack.rb".freeze, "lib/wunderbar/rails.rb".freeze, "lib/wunderbar/react.rb".freeze, "lib/wunderbar/render.rb".freeze, "lib/wunderbar/script.rb".freeze, "lib/wunderbar/server.rb".freeze, "lib/wunderbar/sinatra.rb".freeze, "lib/wunderbar/underscore.rb".freeze, "lib/wunderbar/vendor".freeze, "lib/wunderbar/vendor/Markdown.Converter.js".freeze, "lib/wunderbar/vendor/angular-resource.min.js".freeze, "lib/wunderbar/vendor/angular-route.min.js".freeze, "lib/wunderbar/vendor/angular.min.js".freeze, "lib/wunderbar/vendor/bootstrap-theme.min.css".freeze, "lib/wunderbar/vendor/bootstrap.min.css".freeze, "lib/wunderbar/vendor/bootstrap.min.js".freeze, "lib/wunderbar/vendor/eventsource.min.js".freeze, "lib/wunderbar/vendor/jquery-3.2.1.min.js".freeze, "lib/wunderbar/vendor/marked.min.js".freeze, "lib/wunderbar/vendor/polymer-v0.0.20131003.min.js".freeze, "lib/wunderbar/vendor/react-dom-server.min.js".freeze, "lib/wunderbar/vendor/react-dom.min.js".freeze, "lib/wunderbar/vendor/react-with-addons.min.js".freeze, "lib/wunderbar/vendor/stupidtable.min.js".freeze, "lib/wunderbar/vendor/underscore-min.js".freeze, "lib/wunderbar/vendor/vue-server.min.js".freeze, "lib/wunderbar/vendor/vue.min.js".freeze, "lib/wunderbar/version.rb".freeze, "lib/wunderbar/vue.rb".freeze, "lib/wunderbar/websocket.rb".freeze, "wunderbar.gemspec".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json