wunderbar 1.4.1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1781f56d68599526c5094eaba70dd8193e8f973b6c63f8d2e005a0b21e76e86e
-  data.tar.gz: 45211ba6f05a8df925bf3ffefb6c8f41df7f37978f4465b15edb8f0bcdf6b607
+  metadata.gz: 2633787e3fe5370fb9c661d09f7774f01e0bd8343d6f67e03ff0798827c7b19f
+  data.tar.gz: 39ca7d33dae070f59192b525c318c485f2e931a21c0b375be21ae350be65169a
 SHA512:
-  metadata.gz: ad3dbe900b2e2f1cc42b6bd095d73cec26454cccc60c424bb2e58eea96d843dd7254aa5ff3e2b3a1d9d224ce4924c9069e966614a61e5663316f2b55a701fbef
-  data.tar.gz: 61167b0ce4901bda14e5435a03283f33ee64bf593ef65d51337a4309557750ca6ab0a983d0bb0b1fd0f0207481655e8ee40dde185a99d05d3469ebd5862b3e4d
+  metadata.gz: b44d6101629179c0ec3048b118a2bd2246bc3faf439452202b44dfa22ec09be3457db421b98a8713be47c4c0c68a5b21dfed86d092b0f90a50476172c267f542
+  data.tar.gz: cad6637488679332c98a498f6ef60a0fb288faa735bd3b0851c495b386534b2add7dd9eb38dab1457c4174c6e7576e5a3538261c7cedcddcfe812c28bdf71721

data/README.md

@@ -226,7 +226,12 @@ convenience methods are defined:
 * `_.submit` -- runs command (or block) as a deamon process
 * `_.xhtml?` -- output as XHTML?
 
-Access to all of the builder _defined_ methods (typically these end in an esclamation mark) and all of the Wunderbar module methods can be accessed in this way.  Examples:
+The `_.system` method takes an optional hash as its last parameter. This can be used to provide settings for the underlying 
+[Process.spawn](https://www.rubydoc.info/stdlib/core/Process.spawn) method.
+For example: `._system('pwd',{ system_opts: { chdir: dir } , system_env: { 'FOO' => 'BAR' } })`
+Note that environment variable names must be provided as strings, not symbols.
+
+Access to all of the builder _defined_ methods (typically these end in an exclamation mark) and all of the Wunderbar module methods can be accessed in this way.  Examples:
 
 * `_.tag! :foo`: insert elements where the name can be dynamic
 * `_.comment! "text"`: add a comment
@@ -366,7 +371,9 @@ Secure by default
 
 Wunderbar will properly escape all HTML and JSON output, eliminating problems
 of HTML or JavaScript injection.  This includes calls to `_` to insert text
-directly. 
+directly.  Unless `nokogiri` was previously required (see [optional
+dependencies](#optional-dependencies) below), calls to insert markup
+(`_{...}`) will escape the markup.
 
 Globals provided
 ---
@@ -426,7 +433,6 @@ The following gems are required by extensions of the same name:
 * `coderay` - syntax highlighting
 * `opal` - ruby to javascript compiler
 * `rack` - webserver interface
-* `rails` - web application framework
 * `sinatra` - DSL for creating web applications
 
 The following gems, if installed, will produce cleaner and prettier output:

data/lib/wunderbar/builder.rb

@@ -1,6 +1,5 @@
 require 'shellwords'
 require 'open3'
-require 'thread'
 
 module Wunderbar
   @@options = {indent: 2}
@@ -74,7 +73,10 @@ module Wunderbar
 
       semaphore = Mutex.new
       env = {'LC_CTYPE' => 'en_US.UTF-8'}
-      Open3.popen3(env, *command) do |pin, pout, perr, wait|
+      sys_env = opts[:system_env] || {}
+      env.merge! sys_env unless sys_env.empty?
+      sys_opts = opts[:system_opts] || {}
+      Open3.popen3(env, *command, sys_opts) do |pin, pout, perr, wait|
         [
           Thread.new do
             until pout.eof?
@@ -357,8 +359,8 @@ module Wunderbar
       end
 
       # remove leading and trailing space
-      if children.first.text? and children.first.text.strip.empty?
-        children.shift
+      if not children.empty? 
+        children.shift if children.first.text? and children.first.text.strip.empty?
       end
 
       if not children.empty?

data/lib/wunderbar/html-methods.rb

@@ -188,15 +188,6 @@ module Wunderbar
 
       name = name.to_s.gsub('_', '-')
 
-      if flag != '!'
-        if String === args.first
-          if not block and args.first =~ /[>&]/
-            markup = args.shift
-            block = Proc.new {_ {markup}}
-          end
-        end
-      end
-
       if flag == '!'
         @_x.compact! { tag! name, *args, &block }
       elsif flag == '?'
@@ -362,7 +353,7 @@ module Wunderbar
     def _(text=nil, &block)
       unless block
         if text
-          _ {text}
+          @_x.indented_text! text.to_s
         end
         return @_x
       end
@@ -370,7 +361,9 @@ module Wunderbar
       children = instance_eval(&block)
 
       if String === children
-        if children.include? '<' or children.include? '&'
+        ok = defined? Nokogiri
+
+        if ok and (children.include? '<' or children.include? '&')
           if defined? Nokogiri::HTML5.fragment
             doc = Nokogiri::HTML5.fragment(children.to_s)
           else

data/lib/wunderbar/markdown.rb

@@ -1,7 +1,6 @@
 require 'wunderbar'
 require 'kramdown'
 require 'nokogiri'
-require 'sanitize'
 
 module Wunderbar
   class HtmlMarkup

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 = {}

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/server.rb

@@ -60,10 +60,6 @@ elsif defined? Sinatra
 
   require 'wunderbar/sinatra'
 
-elsif defined? ActionView::Template
-
-  require 'wunderbar/rails'
-
 elsif defined? Rack
 
   require 'wunderbar/rack'

data/lib/wunderbar/vendor/Markdown.Converter.js

@@ -695,7 +695,7 @@ else
         
         function attributeEncode(text) {
             // unconditionally replace angle brackets here -- what ends up in an attribute (e.g. alt or title)
-            // never makes sense to have verbatim HTML in it (and the sanitizer would totally break it)
+            // never makes sense to have verbatim HTML in it
             return text.replace(/>/g, "&gt;").replace(/</g, "&lt;").replace(/"/g, "&quot;");
         }
 

data/lib/wunderbar/version.rb

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

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
 

data/wunderbar.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.date = "2019-06-07"
   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/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/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]
+  s.files = ["COPYING".freeze, "README.md".freeze, "lib/wunderbar".freeze, "lib/wunderbar.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/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/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]
   s.homepage = "http://github.com/rubys/wunderbar".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Sam Ruby
@@ -60,7 +60,6 @@ files:
 - lib/wunderbar/pagedown.rb
 - lib/wunderbar/polymer.rb
 - lib/wunderbar/rack.rb
-- lib/wunderbar/rails.rb
 - lib/wunderbar/react.rb
 - lib/wunderbar/render.rb
 - lib/wunderbar/script.rb

data/lib/wunderbar/rails.rb

@@ -1,43 +0,0 @@
-require 'active_support/core_ext'
-require 'action_view'
-
-module Wunderbar
-  module Rails
-    class HtmlHandler
-      cattr_accessor :default_format
-      self.default_format = Mime[:html]
-
-      def self.call(template, source=nil)
-        %{
-          compiled = Proc.new {#{template.source}}
-          x = Wunderbar::HtmlMarkup.new(self);
-          instance_variables.each do |var|
-            x.instance_variable_set var, instance_variable_get(var)
-          end
-          x.instance_eval(&compiled)
-          x._.target!
-        }.strip # take care to preserve line numbers in original source
-      end
-    end
-
-    class JsonHandler
-      cattr_accessor :default_format
-      self.default_format = Mime[:json]
-
-      def self.call(template, source=nil)
-        %{
-          compiled = Proc.new {#{template.source}}
-          x = Wunderbar::JsonBuilder.new(self);
-          instance_variables.each do |var|
-            x.instance_variable_set var, instance_variable_get(var)
-          end
-          x.instance_eval(&compiled)
-          x.target!
-        }.strip # take care to preserve line numbers in original source
-      end
-    end
-
-    ActionView::Template.register_template_handler :_html, HtmlHandler
-    ActionView::Template.register_template_handler :_json, JsonHandler
-  end
-end