wunderbar 1.4.5 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1753c6f65653020143af9ed4f73f15e11c7443e8fec1d26a3ae645be0f785191
-  data.tar.gz: 3257c0840a2d8d9aaf5f7368623dc8f487e449d6e8d8046632c1a264bb373e18
+  metadata.gz: 5b41fc0cdf18f4493457caaf8ea0be99429a7ef2b93f3725dc255c0be969c49c
+  data.tar.gz: 6f3c9aba7491dcf8c7a2a3e6f344b063b5a0901b54f17e736c6e96f1f410d83d
 SHA512:
-  metadata.gz: 364ab25aeab2b20e7b98d98ac0dbf537b68fb11c82046b6206039661b2d0694521d09229cc4c5832aff48eab5fbb8b4fad34cabe65d9c534921b6f015b2c6fab
-  data.tar.gz: '0885f9681bd7955e81de1a2920a77c736b1283c152eab4f20425ec7cebbd75c956da6efd348c388541229822c65644ad20f78f8a6911066fdfcf59616e133840'
+  metadata.gz: ab2ffb039d0bbf017f27b280724ac84b13f3887c7e1eb9c903bb9870cd598da31b9df369a20bc6fb7881177ecc75e29fb5c93a4433e2ccfdcd5fea2fdd3bd728
+  data.tar.gz: 4035385caae931b83278a621855d98ceb60be387ecff963fb621712daeec443313f4a6671642388ed72f261b5be8ec420194a57bddb10253154c2a03bb43a3fd

data/lib/wunderbar/render.rb

@@ -6,7 +6,12 @@ end
 
 require 'wunderbar/sinatra'
 require 'wunderbar/script'
-require 'nokogumbo'
+
+if RUBY_VERSION =~ /^1|^2\.[0-4]/
+  require 'nokogumbo'
+else
+  require 'nokogiri'
+end
 
 class Wunderbar::Asset
   @@cached_scripts = {}
@@ -25,7 +30,7 @@ class Wunderbar::ClientScriptNode < Wunderbar::ScriptNode
 end
 
 class Wunderbar::XmlMarkup
-  def render(container, &block)
+  def render(container, timeout: nil, &block)
     csspath = Wunderbar::Node.parse_css_selector(container)
     root = @node.root
 
@@ -119,6 +124,15 @@ class Wunderbar::XmlMarkup
       end
     end
 
+    # add timeout, if requested
+    # 
+    # useful if the rendering itself is inherently synchronous, but may make
+    # use of a library routines that set up event handlers that will never fire.
+    #
+    if timeout
+      server +=  ";\nsetTimeout(() => {process.exit()}, #{timeout})"
+    end
+
     # concatenate and execute scripts on server
     if browserify
       setup += requires.map {|key, value| 

data/lib/wunderbar/script.rb

@@ -13,7 +13,9 @@ module Wunderbar
       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).to_s
+        opts = {binding: @binding, width: width}
+        opts = {**@attrs.delete(:options), **opts} if @attrs[:options]
+        @text = Ruby2JS.convert(@block, opts).to_s
       end
       super
     end

data/lib/wunderbar/version.rb

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

data/lib/wunderbar/websocket.rb

@@ -183,25 +183,25 @@ module Wunderbar
 
     proc = Proc.new do
       begin
-	channel = Wunderbar::Channel.new(port, buffer, opts[:locals])
-	if sock1
-	  sock1.send('x',0)
-	  sock1.close
-	end
-	channel.instance_eval(&block)
+        channel = Wunderbar::Channel.new(port, buffer, opts[:locals])
+        if sock1
+          sock1.send('x',0)
+          sock1.close
+        end
+        channel.instance_eval(&block)
       rescue Exception => exception
-	channel._ :type=>:stderr, :line=>exception.inspect
-	exception.backtrace.each do |frame| 
-	  next if Wunderbar::CALLERS_TO_IGNORE.any? {|re| frame =~ re}
-	  channel._ :type=>:stderr, :line=>"  #{frame}"
-	end
+        channel._ :type=>:stderr, :line=>exception.inspect
+        exception.backtrace.each do |frame| 
+          next if Wunderbar::CALLERS_TO_IGNORE.any? {|re| frame =~ re}
+          channel._ :type=>:stderr, :line=>"  #{frame}"
+        end
       ensure
-	if channel
-	  channel.complete = true
-	  sleep 5
-	  sleep 60 unless channel.connected or opts[:sync]
-	  channel.close
-	end
+        if channel
+          channel.complete = true
+          sleep 5
+          sleep 60 unless channel.connected or opts[:sync]
+          channel.close
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.6.0
 platform: ruby
 authors:
 - Sam Ruby
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: HTML Generator and CGI application support