wunderbar 1.2.10 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25300e523256c215058ba7101daf53cedac48945284e5d0e1fa9edfebe1eb284
-  data.tar.gz: e363a0d5ded5ea339136b8177b86908d3c206469250ecede8167a299b8070695
+  metadata.gz: faf3ed56159ea9aae14376907dd0c17efabb7560f08b886b1f4f781be5b630af
+  data.tar.gz: f0a40ec22da2f77faf6b97c6a156198430a4afe12d96baacd37c8c489bcc037b
 SHA512:
-  metadata.gz: 357d98b67e760a7edb05952363eb00793b8d60a4242e366b60eb265af1690520c4fa48c2f16a44a1a53e5d3646338308b870a2aef236a0636ebb53ad4b0ff32d
-  data.tar.gz: 3ca9b2345ac95e0d3c34561b549276c705be04d4ae2916812a286151a94ddd30258c02b86451b608e0aa684fe6f35d0adf4c045182e85c8f256c1d5b38c7344b
+  metadata.gz: fba3b4c3676b35938fc132792a5fb8d73ea949fe3d76b9a4a05a2b83a2d24e3b933ce993b45e36717dc9877c8a2a429af80dceab4313dfaa3ef8eb63cdba4380
+  data.tar.gz: f9d3f47d1f81627649f98ebfeda570f84dadb9f33e9839a06584f31c52da587b98ca9be027f411a805f82c09979bb96e92882be0a8907dd743193fbf4c51f8ee

data/README.md

@@ -371,13 +371,15 @@ 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
-[`$SAFE=1`](http://www.ruby-doc.org/docs/ProgrammingRuby/html/taint.html)
-before processing requests.  This means that you will need to
-[`untaint`](ruby-doc.org/core/Object.html#method-i-untaint) all inputs
-received from external sources before you make system calls or access the file
-system.
+For Ruby version < 2.6.0:
+
+> For all environments other than Rails, unless you call `Wunderbar.unsafe!` at
+> the top of your script, Wunderbar will also set
+> [`$SAFE=1`](http://www.ruby-doc.org/docs/ProgrammingRuby/html/taint.html)
+> before processing requests.  This means that you will need to
+> [`untaint`](ruby-doc.org/core/Object.html#method-i-untaint) all inputs
+> received from external sources before you make system calls or access the file
+> system.
 
 A special feature that effectively is only available in the Rails environment:
 if the first argument to call that creates an element is `html_safe?`, then

data/lib/wunderbar/builder.rb

@@ -461,8 +461,14 @@ module Wunderbar
       output_prefix = opts[:prefix] || {}
       output_prefix[:stdin]  ||= '$ '
 
-      super do |kind, line|
-        @_target.puts "#{output_prefix[kind]}#{line}"
+      if Hash === args.last # support original code which needed two hashes
+        super do |kind, line|
+          @_target.puts "#{output_prefix[kind]}#{line}"
+        end
+      else
+        super(*args, opts) do |kind, line|
+          @_target.puts "#{output_prefix[kind]}#{line}"
+        end
       end
     end
 
@@ -587,8 +593,14 @@ module Wunderbar
         @_target[transcript] = []
       end
 
-      super do |kind, line|
-        @_target[transcript] << "#{output_prefix[kind]}#{line}"
+      if Hash === args.last # support original code which needed two hashes
+        super do |kind, line|
+          @_target[transcript] << "#{output_prefix[kind]}#{line}"
+        end
+      else
+        super(*args, opts) do |kind, line|
+          @_target[transcript] << "#{output_prefix[kind]}#{line}"
+        end
       end
     end
 

data/lib/wunderbar/environment.rb

@@ -5,14 +5,17 @@ module Wunderbar
     TEXT      = ARGV.delete('--text')
   end
 
-  @@unsafe = false
+  # Ruby 2.6.0 gets rid of $SAFE > 1; unfortunately in the process it
+  # treats $SAFE = 1 as a higher level; @FAFE = 1 no longer is limited
+  # to taintness checks, it not treats all File operations as unsafe
+  @@unsafe = (RUBY_VERSION.split('.').map(&:to_i) <=> [2, 6, 0]) == 1
 
   def self.unsafe!(mode=true)
     @@unsafe=mode
   end
 
   def self.safe?
-    if $SAFE == 0 and not @@unsafe
+    if not @@unsafe and $SAFE == 0
       # some gems (e.g. em-websocket-0.3.6) insert unsafe entries into the
       # path, and that prevents requires from succeeding.  If it looks like
       # we are about to make a transition to $SAFE=1, clean up that mess
@@ -44,11 +47,16 @@ module Wunderbar
   end
 
   @@templates = {}
+  @@files = {}
 
   def self.templates
     @@templates
   end
 
+  def self.files
+    @@files
+  end
+
   module API
     def _html(*args, &block)
       Wunderbar.html(*args, &block)
@@ -74,6 +82,11 @@ module Wunderbar
     def _template(name, &block)
       Wunderbar.templates[name.to_s.gsub('_','-')] = block
     end
+
+    def _file(name, options={}, &block)
+      options[:source] = block if block
+      Wunderbar.files[name] = options
+    end
   end
 
   #

data/lib/wunderbar/rack.rb

@@ -1,5 +1,6 @@
 require 'wunderbar'
 require 'rack'
+require 'rack/media_type'
 
 module Wunderbar
   class RackApp
@@ -9,7 +10,14 @@ module Wunderbar
       @_request = Rack::Request.new(env)
       @_response = Rack::Response.new
       Wunderbar.logger = @_request.logger
-      if Wunderbar.safe? and $SAFE==0
+      file = Wunderbar.files[env['PATH_INFO']]
+
+      if file
+        mime = file[:mime] ||
+          Rack::Mime::MIME_TYPES[File.extname(env['PATH_INFO'])]
+        @_response.set_header('Content-Type', mime) if mime
+        @_response.write(file[:content] || file[:source].call)
+      elsif Wunderbar.safe? and $SAFE==0
         Proc.new { $SAFE=1; Wunderbar::CGI.call(self) }.call
       else
         Wunderbar::CGI.call(self)
@@ -43,6 +51,12 @@ module Wunderbar
     def response
       @_response
     end
+
+    %w(delete get head options post put trace).each do |http_method|
+      define_method "#{http_method}?" do
+        @_env['REQUEST_METHOD'].to_s.downcase == http_method
+      end
+    end
   end
 end
 

data/lib/wunderbar/rails.rb

@@ -7,7 +7,7 @@ module Wunderbar
       cattr_accessor :default_format
       self.default_format = Mime[:html]
 
-      def self.call(template)
+      def self.call(template, source=nil)
         %{
           compiled = Proc.new {#{template.source}}
           x = Wunderbar::HtmlMarkup.new(self);
@@ -24,7 +24,7 @@ module Wunderbar
       cattr_accessor :default_format
       self.default_format = Mime[:json]
 
-      def self.call(template)
+      def self.call(template, source=nil)
         %{
           compiled = Proc.new {#{template.source}}
           x = Wunderbar::JsonBuilder.new(self);

data/lib/wunderbar/react.rb

@@ -16,6 +16,12 @@ class Wunderbar::Render
     "ReactDOMServer.renderToString(#{common})"
   end
 
+  # return all nodes on server rendering, as there is no wrapper element
+  # like there is for vue
+  def self.extract(nodes)
+    nodes
+  end
+
   def self.client(common, element, target)
     "ReactDOM.render(#{common}, #{element})"
   end

data/lib/wunderbar/render.rb

@@ -131,7 +131,7 @@ class Wunderbar::XmlMarkup
     html = Wunderbar::Render.eval(scripts, server)
 
     # insert results into target
-    nodes = builder._ { html }
+    nodes = Wunderbar::Render.extract(builder._ { html })
 
     begin
       if nodes.length == 1

data/lib/wunderbar/version.rb

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

data/lib/wunderbar/vue.rb

@@ -18,13 +18,26 @@ class Wunderbar::Render
   end
 
   def self.server(common)
-    "VueServer.renderToString(new Vue({render: function($h) {return #{common}}}))"
+    "VueServer.renderToString(new Vue({render: function($h) {
+      return $h('div', #{common})}}))"
+  end
+
+  # unwrap children from div wrapper inserted by self.server
+  def self.extract(nodes)
+    if 
+      nodes.length == 1 and nodes.first.name == 'div' and
+      nodes.first.attrs['data-server-rendered'].to_s == 'true'
+    then
+      nodes.first.children
+    else
+      nodes
+    end
   end
 
   def self.client(common, element, target)
     wrap = "$h(#{target.name.inspect}, " +
       "{attrs: {#{target.attrs.map {|name, value|
-      "#{name}: #{value.inspect}"}.join(', ')}}}, [#{common}])"
+      "#{name}: #{value.inspect}"}.join(', ')}}}, #{common})"
     "new Vue({el: #{element}, render: function($h) {return #{wrap}}})"
   end
 

data/wunderbar.gemspec

@@ -1,21 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: wunderbar 1.2.10 ruby lib
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+require 'wunderbar/version'
 
 Gem::Specification.new do |s|
   s.name = "wunderbar".freeze
-  s.version = "1.2.10"
+  s.version = Wunderbar::VERSION::STRING
 
   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 = "2018-01-27"
+  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.homepage = "http://github.com/rubys/wunderbar".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
-  s.rubygems_version = "2.7.4".freeze
+  s.rubygems_version = "3.0.6".freeze
   s.summary = "HTML Generator and CGI application support".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.3.4
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-27 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -105,8 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: HTML Generator and CGI application support