wunderbar 1.0.21 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2e1e449f96b62b3cc9251367f7d25efcb45e1c7
-  data.tar.gz: 5f01bf5862c3956c07ca5a7247596a1495a70ef7
+  metadata.gz: d584cea1e10ef64f349221f0c7166b273e87065e
+  data.tar.gz: ceb134f97e82c9dd9298a83c30d5add9ffd0d4a7
 SHA512:
-  metadata.gz: 32e20118eeaa68e3e374812d8b75fdab54b05f3bdcceeffbe67accc0dd035d0408737682abb786dbc2468f3d942771f5d4319b2a1f038c76b5de8b4409d884eb
-  data.tar.gz: caac555ac66f5c5d688e10c7cc34d062babbd3cbc286183533fc9ad070b9e975f08c0c6313b6c48b9d7ac1592c8ce47d1abbce0458ce0a2dd7ef6d95114f30e0
+  metadata.gz: 0bc7bd9fa1c2ed6b6c555736bf534a1b00c9cfe0aac2156f05c7b99ece51f5253d95c0b6ed121f6dde9fdd5aa3fd655252e0cf83e012b0086a48534329aa0294
+  data.tar.gz: e69d846acbe52f2d4fe64b5433a1cde82a8a39c98bcc75e52364494707259d34e984893364585b676236725068093623f65413e60c9fb24e230d1d09575fc1dc

data/README.md

@@ -228,6 +228,7 @@ convenience methods are defined:
 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:
 
 * `_.tag! :foo`: insert elements where the name can be dynamic
+* `_.comment! "text"`: add a comment
 * `_.error 'Log message'`: write a message to the server log
 
 Underscores in element and attribute names are converted to dashes.  To
@@ -364,9 +365,10 @@ 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.  Even calls to insert markup (`_{...}`) will escape the markup if
-the input is `tainted` and not explicitly marked as `html-safe?`
-(when using Rails).
+directly.  Unless `nokogiri` was previously required (see [optional
+dependencies](#optional-dependencies) below), calls to insert markup
+(`_{...}`) will escape the markup if the input is `tainted` and not explicitly
+marked as `html-safe?` (when using Rails).
 
 For all environments other than Rails, unless you call `Wunderbar.unsafe!` at
 the top of your script, Wunderbar will also set
@@ -407,6 +409,7 @@ Logging:
 * `_.error`: error messages
 * `_.fatal`: fatal error messages
 * `_.log_level`=: set logging level (default: `:warn`)
+* `_.default_log_level`=: set, but don't override, log level
 * `_.logger`: return [Logger](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/logger/rdoc/Logger.html) instance
 
 Command line options
@@ -443,9 +446,9 @@ The following gems are required by extensions of the same name:
 
 The following gems, if installed, will produce cleaner and prettier output:
 
-* `nokogiri` cleans up HTML fragments inserted via `<<`
-* `nokogumbo` also cleans up HTML fragments inserted via `<<`.  If this is
-  available, it will be preferred over direct usage of `nokogiri`.
+* `nokogiri` cleans up HTML fragments inserted via `<<` and `_{}`.
+* `nokogumbo` also cleans up HTML fragments inserted via `<<` and `_{}`.  If
+  this gem is available, it will be preferred over direct usage of `nokogiri`.
 * `escape` prettier quoting of `system` commands
 * `sanitize` will remove unsafe markup from tainted input
 

data/lib/wunderbar/asset.rb

@@ -62,6 +62,7 @@ module Wunderbar
     env = Thread.current[:env] || ENV
 
     @path = '../' * env['PATH_INFO'].to_s.count('/') + 'assets'
+    @root ||= nil
     @root = File.dirname(env['SCRIPT_FILENAME']) if env['SCRIPT_FILENAME']
     @root = File.expand_path((@root || Dir.pwd) + "/assets").untaint
 
@@ -123,7 +124,8 @@ module Wunderbar
         nodes = []
         @@scripts.each do |script|
           if script.path
-            nodes << Node.new(:script, src: "#{path}/#{script.path}")
+            nodes << Node.new(:script, src:
+              "#{path}/#{script.path}?#{script.mtime.to_i}")
           elsif script.contents
             nodes << ScriptNode.new(:script, script.contents)
           end
@@ -146,7 +148,7 @@ module Wunderbar
         @@stylesheets.each do |stylesheet|
           if stylesheet.path
             nodes << Node.new(:link, rel: "stylesheet", type: "text/css",
-              href: "#{path}/#{stylesheet.path}")
+              href: "#{path}/#{stylesheet.path}?#{stylesheet.mtime.to_i}")
           elsif stylesheet.contents
             nodes << StyleNode.new(:style, stylesheet.contents)
           end

data/lib/wunderbar/builder.rb

@@ -11,10 +11,11 @@ module Wunderbar
 
   class BuilderBase
     def set_variables_from_params(locals={})
-      params = @_scope.params.map do |key, value|
+      params = []
+      @_scope.params.each_pair do |key, value|
         value = value.first if Array === value
         value.gsub! "\r\n", "\n" if String === value
-        ["@#{key}", value]
+        params << ["@#{key}", value]
       end
 
       Hash[params].merge(locals).each do |key,value|
@@ -403,7 +404,7 @@ module Wunderbar
     end
 
     def _(*args)
-      @_target.puts *args if args.length > 0 
+      @_target.puts(*args) if args.length > 0 
       self
     end
 

data/lib/wunderbar/cgi-methods.rb

@@ -96,9 +96,9 @@ module Wunderbar
         if @pdf
           x._.pdf = true if @pdf
           headers = { 'type' => 'application/pdf' }
-          output = html2pdf {x.html *args, &block}
+          output = html2pdf {x.html(*args, &block)}
         else
-          output = x.html *args, &block
+          output = x.html(*args, &block)
         end
       rescue ::Exception => exception
         headers['status'] = Wunderbar::ServerError.text
@@ -159,9 +159,9 @@ module Wunderbar
 
       # disable conneg if only one handler is provided
       if Wunderbar.queue.length == 1
-        type = Wunderbar.queue.first.first
-        xhr_json = (type == :json)
-        text     = (type == :text)
+        htype = Wunderbar.queue.first.first
+        xhr_json = (htype == :json)
+        text     = (htype == :text)
       end
 
       Wunderbar.queue.each do |type, args, block|

data/lib/wunderbar/coderay.rb

@@ -7,7 +7,7 @@ module CodeRay::PluginHost
   alias_method :old_plugin_path, :plugin_path
   def plugin_path *args
     args.first.untaint if args.first == CodeRay::CODERAY_PATH
-    old_plugin_path *args
+    old_plugin_path(*args)
   end
 end
 

data/lib/wunderbar/cssproxy.rb

@@ -35,7 +35,7 @@ module Wunderbar
         hash = args.pop.to_hash 
         if attrs[:class] and hash[:class]
           hash[:class] = "#{attrs[:class]} #{hash[:class]}"
-       end
+        end
         attrs.merge! hash
       end
       args.push(attrs)

data/lib/wunderbar/environment.rb

@@ -109,8 +109,14 @@ $SERVER = ENV['HTTP_HOST'] || Socket::gethostname
 
 # set encoding to UTF-8
 ENV['LANG'] ||= "en_US.UTF-8"
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
+begin
+  verbose = $VERBOSE
+  $VERBOSE = nil
+  Encoding.default_external = Encoding::UTF_8 
+  Encoding.default_internal = Encoding::UTF_8
+ensure
+  $VERBOSE = verbose
+end
 
 # Add methods to the 'main' object
 if self.to_s == 'main'

data/lib/wunderbar/html-methods.rb

@@ -216,14 +216,14 @@ module Wunderbar
           x.instance_variable_set ivar, instance_variable_get(ivar)
         end
         if Hash === args.last
-          args.last.each do |name, value|
-            x.instance_variable_set "@#{name}", value
+          args.last.each do |attrname, value|
+            x.instance_variable_set "@#{attrname}", value
           end
         end
         save_yield = Wunderbar.templates['yield']
         begin
           Wunderbar.templates['yield'] = block if block
-          x.instance_eval &Wunderbar.templates[name]
+          x.instance_eval(&Wunderbar.templates[name])
         ensure
           Wunderbar.templates['yield'] = save_yield
           Wunderbar.templates.delete 'yield' unless save_yield
@@ -371,7 +371,7 @@ module Wunderbar
         return @_x
       end
 
-      children = instance_eval &block
+      children = instance_eval(&block)
 
       if String === children
         safe = !children.tainted?
@@ -425,7 +425,7 @@ module Wunderbar
         @_x.indented_text! text
       elsif block
         @_x.spaced!
-        _ &block
+        _(&block)
       else
         @_x.text! ""
       end

data/lib/wunderbar/jquery/filter.rb

@@ -8,6 +8,11 @@ module Wunderbar
     module JQuery
       include Ruby2JS::Filter::SEXP
 
+      def initialize(*args)
+        @_jqchild = nil
+        super
+      end
+
       def on_send(node)
         return super if @react
 
@@ -94,7 +99,7 @@ module Wunderbar
                   s(:str, node.children[1].to_s[0..-2].gsub('_','-')))
 
                 # if a hash argument is already passed, merge in id value
-                hash = children.find_index {|node| node.type == :hash}
+                hash = children.find_index {|cnode| cnode.type == :hash}
                 if hash
                   children[hash] = s(:hash, pair, *children[hash].children)
                 else

data/lib/wunderbar/logger.rb

@@ -2,6 +2,7 @@ require 'logger'
 
 module Wunderbar
   def self.logger
+    @logger ||= nil
     return @logger if @logger
     @logger = Logger.new($stderr)
     @logger.level = Logger::WARN
@@ -29,6 +30,10 @@ module Wunderbar
     end
   end
 
+  def self.default_log_level=(level)
+    self.log_level = level unless @logger
+  end
+
   def self.log_level
     return 'debug' if logger.level == Logger::DEBUG
     return 'info'  if logger.level == Logger::INFO
@@ -39,23 +44,23 @@ module Wunderbar
 
   # convenience methods
   def self.debug(*args, &block)
-    logger.debug *args, &block
+    logger.debug(*args, &block)
   end
 
   def self.info(*args, &block)
-    logger.info *args, &block
+    logger.info(*args, &block)
   end
 
   def self.warn(*args, &block)
-    logger.warn *args, &block
+    logger.warn(*args, &block)
   end
 
   def self.error(*args, &block)
-    logger.error *args, &block
+    logger.error(*args, &block)
   end
 
   def self.fatal(*args, &block)
-    logger.fatal *args, &block
+    logger.fatal(*args, &block)
   end
 end
 

data/lib/wunderbar/node.rb

@@ -95,7 +95,7 @@ module Wunderbar
             reflowed = IndentedTextNode.reflow(indent, line, width,
               options[:indent])
             line = reflowed.pop
-            result.push *reflowed
+            result.push(*reflowed)
           end
         end
       elsif CompactNode === self and not CompactNode === parent
@@ -278,9 +278,8 @@ module Wunderbar
       unindent = data.sub(/s+\Z/,'').scan(/^ *\S/).map(&:length).min || 0
 
       before  = ::Regexp.new('^'.ljust(unindent))
-      node = @node
       data.gsub! before, indent
-      data.gsub! /^#{indent}$/, '' if unindent == 0
+      data.gsub!(/^#{indent}$/, '') if unindent == 0
       data
     end
 
@@ -342,8 +341,8 @@ module Wunderbar
         text = @text
       end
 
-      result.push *IndentedTextNode.reflow(indent, 
-        text.to_s.gsub(/[&<>\u00A0]/,ESCAPE), options[:width], '')
+      result.push(*IndentedTextNode.reflow(indent,
+        text.to_s.gsub(/[&<>\u00A0]/,ESCAPE), options[:width], ''))
     end
   end
 

data/lib/wunderbar/polymer.rb

@@ -27,7 +27,7 @@ if self.to_s == 'main'
 
         begin
            element = x._polymer_element *args do
-            x.instance_eval &block
+            x.instance_eval(&block)
           end
           output = element.serialize.join("\n") + "\n"
         rescue ::Exception => exception
@@ -49,7 +49,7 @@ module Wunderbar
   module SinatraHelpers
     def _polymer_element(*args, &block)
       Wunderbar::Template::Html.evaluate('_polymer_element', self) do
-        _polymer_element(*args) { instance_eval &block }
+        _polymer_element(*args) { instance_eval(&block) }
       end
     end
   end

data/lib/wunderbar/rails.rb

@@ -5,7 +5,7 @@ module Wunderbar
   module Rails
     class HtmlHandler
       cattr_accessor :default_format
-      self.default_format = Mime::HTML
+      self.default_format = Mime[:html]
 
       def self.call(template)
         %{
@@ -14,7 +14,7 @@ module Wunderbar
           instance_variables.each do |var|
             x.instance_variable_set var, instance_variable_get(var)
           end
-          x.instance_eval &compiled
+          x.instance_eval(&compiled)
           x._.target!
         }.strip # take care to preserve line numbers in original source
       end
@@ -22,7 +22,7 @@ module Wunderbar
 
     class JsonHandler
       cattr_accessor :default_format
-      self.default_format = Mime::JSON
+      self.default_format = Mime[:json]
 
       def self.call(template)
         %{
@@ -31,7 +31,7 @@ module Wunderbar
           instance_variables.each do |var|
             x.instance_variable_set var, instance_variable_get(var)
           end
-          x.instance_eval &compiled
+          x.instance_eval(&compiled)
           x.target!
         }.strip # take care to preserve line numbers in original source
       end

data/lib/wunderbar/script.rb

@@ -9,6 +9,7 @@ module Wunderbar
   class ScriptNode
     attr_accessor :block, :binding
     def serialize(options, result, indent)
+      @block ||= nil
       if @block and @children.empty? and not @text
         width = options[:width]
         width -= indent.to_s.length if width
@@ -45,8 +46,8 @@ module Wunderbar
   end
 
   def self.ruby2js(*args, &block)
-    callback = Proc.new do |scope, args, block| 
-      ruby2js(scope, *args, &block)
+    callback = Proc.new do |scope, callback_args, callback_block| 
+      ruby2js(scope, *callback_args, &callback_block)
     end
     @queue << [callback, args, block]
   end

data/lib/wunderbar/sinatra.rb

@@ -15,7 +15,7 @@ module Wunderbar
 
       if block
         Wunderbar::Template::Html.evaluate('html.rb', self) do
-          _html(*args) { instance_eval &block }
+          _html(*args) { instance_eval(&block) }
         end
       else
         Wunderbar::Template::Html.evaluate('html.rb', self, *args)
@@ -31,7 +31,7 @@ module Wunderbar
 
       if block
         Wunderbar::Template::Xhtml.evaluate('xhtml.rb', self) do
-          _xhtml(*args) { instance_eval &block }
+          _xhtml(*args) { instance_eval(&block) }
         end
       else
         Wunderbar::Template::Xhtml.evaluate('xhtml.rb', self, *args)
@@ -277,9 +277,9 @@ unless Wunderbar.queue.empty?
     pass unless task
 
     if xhr_json
-      _json *task[1], &task[2]
+      _json(*task[1], &task[2])
     else
-      _html *task[1], &task[2]
+      _html(*task[1], &task[2])
     end
   end
 

data/lib/wunderbar/version.rb

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

data/lib/wunderbar/websocket.rb

@@ -188,7 +188,7 @@ module Wunderbar
 	  sock1.send('x',0)
 	  sock1.close
 	end
-	channel.instance_eval &block
+	channel.instance_eval(&block)
       rescue Exception => exception
 	channel._ :type=>:stderr, :line=>exception.inspect
 	exception.backtrace.each do |frame| 
@@ -209,7 +209,7 @@ module Wunderbar
       instance_eval &proc
     else
       sock1, sock2 = UNIXSocket.pair
-      submit &proc
+      submit(&proc)
       sleep 0.3 while sock2.recv(1) != 'x'
       sock2.close
     end

data/wunderbar.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.23
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json