wunderbar 1.4.2 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2370b47ae71304e7ff9d1628fd1d4803b86aa5cc880d452a5e4d03676ef438f6
-  data.tar.gz: cff0057eaf71bb632ebeee1acc8f2d0f2a71b7eef75523f736908b6db5e78719
+  metadata.gz: 1753c6f65653020143af9ed4f73f15e11c7443e8fec1d26a3ae645be0f785191
+  data.tar.gz: 3257c0840a2d8d9aaf5f7368623dc8f487e449d6e8d8046632c1a264bb373e18
 SHA512:
-  metadata.gz: e6f3608e3b63f5e4014dafe64cbce41b57b42b4bb32f2ee7ce3d2ac8921ebd073cce6c27246195b13629abdbd29a2b353b3dbb854545437bf45dea1d14e5da27
-  data.tar.gz: c203ed7ab21bcdc757e612938f0d1f4953896ab20e05d4d2fa165b13290349d45b61a40c4c3e5dd1100e4e7617dc4051272ac7d330b8d20551d0e9796a276936
+  metadata.gz: 364ab25aeab2b20e7b98d98ac0dbf537b68fb11c82046b6206039661b2d0694521d09229cc4c5832aff48eab5fbb8b4fad34cabe65d9c534921b6f015b2c6fab
+  data.tar.gz: '0885f9681bd7955e81de1a2920a77c736b1283c152eab4f20425ec7cebbd75c956da6efd348c388541229822c65644ad20f78f8a6911066fdfcf59616e133840'

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/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

@@ -2,7 +2,7 @@ module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 4
-    TINY  = 2
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   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,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.5
 platform: ruby
 authors:
 - Sam Ruby
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-06-07 00:00:00.000000000 Z
@@ -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
@@ -90,7 +89,7 @@ homepage: http://github.com/rubys/wunderbar
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: HTML Generator and CGI application support
 test_files: []

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