wunderbar 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2dfe16b13a2f629c45680c78f47f43767405965
-  data.tar.gz: 18a1e83ff86efe5020049b63a0d3c9262f8a92e0
+  metadata.gz: 5d0bf66bfd444cace4acde0057ba3bf0ac53f02f
+  data.tar.gz: 223ff899aa06573c0b4d53b6f79a2c23755a64de
 SHA512:
-  metadata.gz: 3290901783f5f6ae6537878a5a1ae2f321046b419e5687e8d274a9634853dfba02d81e7fa1ee401da48ce8bbd3a68edf7db289d8d55ffaa16de46da2cdfb1bff
-  data.tar.gz: 5234d352fe6213551c4e68f2f9a8a3dcc252d4c22f73ce24d73613f7fa05212b491133acd27af844a55937535071fd3afd7f1006167903aba9ab0fac25dd6a95
+  metadata.gz: 6025587bdcf0cf572312da1006565ac289f4a0ec2615ace9f8fdea71c891544c461b13efef0a5ca1f30fb7a1c3d10bc154426beb539e9adfd1f2a66bcfe8df2c
+  data.tar.gz: 0d237270a67cbc952272be4b54b21af56646b447f8a91e1ff415fb5b9be5a26bd30191ffe9056e2f7c973b85b1376bf2b83f48a6cb0f327e54411fae45f3ae34

data/lib/wunderbar/builder.rb

@@ -171,15 +171,21 @@ module Wunderbar
     end
 
     def text! text
-      @node.children << TextNode.new(text)
+      text = TextNode.new(text)
+      @node.children << text
+      text
     end
 
     def declare! *args
-      @node.children << DocTypeNode.new(*args)
+      doctype = DocTypeNode.new(*args)
+      @node.children << doctype
+      doctype
     end
 
     def comment! text
-      @node.children << CommentNode.new(text)
+      comment = CommentNode.new(text)
+      @node.children << comment
+      comment
     end
 
     def indented_text!(text)
@@ -188,6 +194,7 @@ module Wunderbar
       text.extend SpacedNode if @spaced
       @node.children << text
       @spaced = false
+      text
     end
 
     def target!

data/lib/wunderbar/react.rb

@@ -1,196 +1,35 @@
-unless defined? Sinatra
-  raise RuntimeError.new('Sinatra is a prereq for wunderbar/react')
-  # a parallel solution is possible for Rails, but that work hasn't
-  # been done yet
-end
-
-require 'wunderbar/sinatra'
-require 'wunderbar/script'
+require 'wunderbar/render'
 require 'ruby2js/filter/react'
 require 'execjs'
-require 'nokogumbo'
 
 react = File.expand_path('../vendor/react-with-addons.min.js', __FILE__)
-Wunderbar::Asset.script name: 'react-min.js', file: react, react: true
+Wunderbar::Asset.script name: 'react-min.js', file: react, render: true
 
 reactdom = File.expand_path('../vendor/react-dom.min.js', __FILE__)
-Wunderbar::Asset.script name: 'react-dom.min.js', file: reactdom, react: true,
+Wunderbar::Asset.script name: 'react-dom.min.js', file: reactdom, render: true,
   server: File.expand_path('../vendor/react-dom-server.min.js', __FILE__)
 
-class Wunderbar::Asset
-  @@cached_scripts = {}
-  def self.convert(file)
-    cached = @@cached_scripts[file]
-    return cached if cached and cached.uptodate?
-    return nil unless File.exist? file
-    @@cached_scripts[file] = Ruby2JS.convert(File.read(file), file: file)
-  end
-end
-
-class Wunderbar::ClientScriptNode < Wunderbar::ScriptNode
-end
-
-class Wunderbar::XmlMarkup
-  def render(container, &block)
-    csspath = Wunderbar::Node.parse_css_selector(container)
-    root = @node.root
-
-    # find the scripts and target on the page
-    scripts = root.search('script')
-    target = root.at(container)
-
-    # compute base
-    base = root.at('base')
-    base = base && base.attrs[:href]
-    base ||= @_scope.env['REQUEST_URI'][/.*\//]
-
-    _base = @_scope.env['HTTP_X_WUNDERBAR_BASE']
-    base = base[_base.length..-1] if _base and base.start_with? _base
-
-    if base == '..' or base.end_with? '/..'
-      base = (Pathname.new(@_scope.env['REQUEST_URI']) + '../' + base).to_s
-    end
-
-    script = @_scope.env['SCRIPT_NAME']
-    base = base[script.length..-1] if script and base.start_with? script
-
-    base = base[1..-1] if base.start_with? '/'
-
-    # compute client side container
-    element = "document.querySelector(#{container.inspect})"
-    if csspath.length == 1 and csspath[0].length == 1
-      value = csspath[0].values.first
-      case csspath[0].keys.first
-      when :id
-        element = "document.getElementById(#{value.inspect})"
-      when :class
-        value = value.join(' ')
-        element = "document.getElementsByClassName(#{value.inspect})[0]"
-      when :name
-        element = "document.getElementsByTagName(#{value.inspect})[0]"
-      end
-    end
-
-    # build client and server scripts
-    common = Ruby2JS.convert(block, scope: @_scope, react: true)
-    server = "ReactDOMServer.renderToString(#{common})"
-    client = "ReactDOM.render(#{common}, #{element})"
+class Wunderbar::Render
+  RUBY2JS_OPTIONS = {react: true}
 
-    # extract content of scripts
-    scripts.map! do |script|
-      result = nil
-      next if Wunderbar::ClientScriptNode === script
-
-      if script.attrs[:src]
-        src = script.attrs[:src]
-
-        src = File.join(base, src) if not base.empty?
-        src.sub!(/\?.*$/, '') # strip queries (typically mtimes)
-        src.untaint
-
-        name = File.expand_path(src, @_scope.settings.public_folder.untaint)
-        name.untaint unless src.tainted?
-        if File.exist? name
-          result = File.read(name)
-        else
-          file = File.expand_path(src+'.rb', @_scope.settings.views.untaint)
-          result = Wunderbar::Asset.convert(file)
-        end
-      else
-        result = Ruby2JS.convert(script.block, binding: script.binding)
-      end
-
-      result
-    end
-
-    builder = Wunderbar::HtmlMarkup.new({})
-    begin
-      setup = []
-      Wunderbar::Asset.scripts.each do |script|
-        next unless script.options[:react]
-        setup += script.options[:react] if Array === script.options[:react]
-
-        if script.contents
-          scripts.unshift script.contents
-        elsif script.path
-          if script.path.start_with? '/'
-            path = (ENV['DOCUMENT_ROOT'] + script.path).untaint
-          else
-            path = File.expand_path(script.path, Wunderbar::Asset.root)
-          end
-          setup << File.read(script.options[:server] || path)
-        end
-      end
-
-      # concatenate and execute scripts on server
-      scripts.unshift *setup.uniq
-      context = ExecJS.compile(scripts.compact.join(";\n"))
-
-      # insert results into target
-      nodes = builder._ { context.eval(server) }
-      nodes.each {|node| node.parent = target}
-      target.children += nodes
-    rescue ExecJS::ProgramError => e
-      Wunderbar.error e
-      target.children << builder._pre(e.message).node?
-    end
-
-    # add client side script
-    tag! 'script', Wunderbar::ClientScriptNode, client
+  def self.server(common)
+    "ReactDOMServer.renderToString(#{common})"
   end
-end
 
-class Ruby2JS::Serializer
-  def etag
-    @etag ||= Digest::MD5.hexdigest(to_str)
+  def self.client(common, element, target)
+    "ReactDOM.render(#{common}, #{element})"
   end
 
-  def sourcemap_etag
-    @sourcemap_etag ||= Digest::MD5.hexdigest(sourcemap.inspect)
+  def self.eval(scripts, server)
+    context = ExecJS.compile(scripts.compact.join(";\n"))
+    context.eval(server)
+  rescue ExecJS::ProgramError => e
+    Wunderbar.error e
+    "<pre>" + e.message.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;') +
+      "</pre>"
   end
 end
 
-get %r{/([-\w]+)\.js} do |script|
-  file = File.join(settings.views, "#{script}.js.rb")
-  begin
-    js = Wunderbar::Asset.convert(file)
-    pass unless js
-  rescue Exception => e
-    Wunderbar.error e.to_s
-    return [500, {'Content-type' => 'text/plain'}, "*** ERROR ***\n\n#{e}"]
-  end
-
-  response.headers['SourceMap'] = "#{script}.js.map"
-
-  etag js.etag
-
-  content_type 'application/javascript; charset=utf-8'
-
-  js.to_s
-end
-
-get %r{/((?:\w+\/)*[-\w]+)\.js.rb} do |script|
-  file = File.join(settings.views, "#{script}.js.rb")
-  pass unless File.exist? file
-  send_file file
-end
-
-get %r{/([-\w]+)\.js.map} do |script|
-  file = File.join(settings.views, "#{script}.js.rb")
-  js = Wunderbar::Asset.convert(file)
-  pass unless js
-
-  etag js.sourcemap_etag
-
-  sourcemap = js.sourcemap
-
-  content_type 'application/json;charset:utf8'
-  base = settings.views + '/'
-  sourcemap[:file] = sourcemap[:file].sub base, ''
-  sourcemap[:sources].map! {|source| source.sub base, ''}
-  JSON.pretty_generate sourcemap
-end
-
 # Monkeypatch to address https://github.com/sstephenson/execjs/pull/180
 require 'execjs'
 class ExecJS::ExternalRuntime::Context

data/lib/wunderbar/render.rb

@@ -0,0 +1,200 @@
+unless defined? Sinatra
+  raise RuntimeError.new('Sinatra is a prereq for wunderbar/render')
+  # a parallel solution is possible for Rails, but that work hasn't
+  # been done yet
+end
+
+require 'wunderbar/sinatra'
+require 'wunderbar/script'
+require 'nokogumbo'
+
+class Wunderbar::Asset
+  @@cached_scripts = {}
+  def self.convert(file)
+    cached = @@cached_scripts[file]
+    return cached if cached and cached.uptodate?
+    return nil unless File.exist? file
+    @@cached_scripts[file] = Ruby2JS.convert(File.read(file), file: file)
+  end
+end
+
+class Wunderbar::ClientScriptNode < Wunderbar::ScriptNode
+end
+
+class Wunderbar::XmlMarkup
+  def render(container, &block)
+    csspath = Wunderbar::Node.parse_css_selector(container)
+    root = @node.root
+
+    # find the scripts and target on the page
+    scripts = root.search('script')
+    target = root.at(container)
+
+    # compute base
+    base = root.at('base')
+    base = base && base.attrs[:href]
+    base ||= @_scope.env['REQUEST_URI'][/.*\//]
+
+    _base = @_scope.env['HTTP_X_WUNDERBAR_BASE']
+    base = base[_base.length..-1] if _base and base.start_with? _base
+
+    if base == '..' or base.end_with? '/..'
+      base = (Pathname.new(@_scope.env['REQUEST_URI']) + '../' + base).to_s
+    end
+
+    script = @_scope.env['SCRIPT_NAME']
+    base = base[script.length..-1] if script and base.start_with? script
+
+    base = base[1..-1] if base.start_with? '/'
+
+    # compute client side container
+    element = "document.querySelector(#{container.inspect})"
+    if csspath.length == 1 and csspath[0].length == 1
+      value = csspath[0].values.first
+      case csspath[0].keys.first
+      when :id
+        element = "document.getElementById(#{value.inspect})"
+      when :class
+        value = value.join(' ')
+        element = "document.getElementsByClassName(#{value.inspect})[0]"
+      when :name
+        element = "document.getElementsByTagName(#{value.inspect})[0]"
+      end
+    end
+
+    # build client and server scripts
+    options = Wunderbar::Render::RUBY2JS_OPTIONS.merge(scope: @_scope)
+    common = Ruby2JS.convert(block, options)
+    server = Wunderbar::Render.server(common)
+    client = Wunderbar::Render.client(common, element, target)
+
+    # extract content of scripts
+    scripts.map! do |script|
+      result = nil
+      next if Wunderbar::ClientScriptNode === script
+
+      if script.attrs[:src]
+        src = script.attrs[:src]
+
+        src = File.join(base, src) if not base.empty?
+        src.sub!(/\?.*$/, '') # strip queries (typically mtimes)
+        src.untaint
+
+        name = File.expand_path(src, @_scope.settings.public_folder.untaint)
+        name.untaint unless src.tainted?
+        if File.exist? name
+          result = File.read(name)
+        else
+          file = File.expand_path(src+'.rb', @_scope.settings.views.untaint)
+          result = Wunderbar::Asset.convert(file)
+        end
+      else
+        result = Ruby2JS.convert(script.block, binding: script.binding)
+      end
+
+      result
+    end
+
+    builder = Wunderbar::HtmlMarkup.new({})
+    setup = []
+    requires = {}
+    browserify = false
+    Wunderbar::Asset.scripts.each do |script|
+      next unless script.options[:render]
+      setup += script.options[:render] if Array === script.options[:render]
+      requires.merge! script.options[:require] if script.options[:require]
+      browserify = true if script.options[:browserify]
+
+      if script.contents
+        scripts.unshift script.contents
+      elsif script.path
+        if script.path.start_with? '/'
+          path = (ENV['DOCUMENT_ROOT'] + script.path).untaint
+        else
+          path = File.expand_path(script.path, Wunderbar::Asset.root)
+        end
+        setup << File.read(script.options[:server] || path)
+      end
+    end
+
+    # concatenate and execute scripts on server
+    if browserify
+      setup << requires.map {|key, value| "#{key}=require(#{value.inspect})"}.
+        join(';')
+    end
+    scripts.unshift *setup.uniq
+    File.write('/home/rubys/tmp/scripts', scripts.join(";\n") + ";\n" + server)
+    html = Wunderbar::Render.eval(scripts, server)
+
+    # insert results into target
+    nodes = builder._ { html }
+    begin
+      nodes.each {|node| node.parent = target}
+      target.children += nodes
+    rescue => e
+      div = Wunderbar::Node.new('span',
+        style: 'background-color:#ff0; margin: 1em 0; padding: 1em; ' +
+               'border: 4px solid red; border-radius: 1em')
+      div.children << Wunderbar::Node.new('pre', e.to_s)
+      div.children << Wunderbar::Node.new('pre', e.backtrace)
+      div.children << Wunderbar::Node.new('pre', html)
+      div.children << Wunderbar::Node.new('pre', nodes.inspect)
+      div.children.each {|node| node.parent = div}
+      target.children << div
+    end
+
+    # add client side script
+    tag! 'script', Wunderbar::ClientScriptNode, client
+  end
+end
+
+class Ruby2JS::Serializer
+  def etag
+    @etag ||= Digest::MD5.hexdigest(to_str)
+  end
+
+  def sourcemap_etag
+    @sourcemap_etag ||= Digest::MD5.hexdigest(sourcemap.inspect)
+  end
+end
+
+get %r{/([-\w]+)\.js} do |script|
+  file = File.join(settings.views, "#{script}.js.rb")
+  begin
+    js = Wunderbar::Asset.convert(file)
+    pass unless js
+  rescue Exception => e
+    Wunderbar.error e.to_s
+    return [500, {'Content-type' => 'text/plain'}, "*** ERROR ***\n\n#{e}"]
+  end
+
+  response.headers['SourceMap'] = "#{script}.js.map"
+
+  etag js.etag
+
+  content_type 'application/javascript; charset=utf-8'
+
+  js.to_s
+end
+
+get %r{/((?:\w+\/)*[-\w]+)\.js.rb} do |script|
+  file = File.join(settings.views, "#{script}.js.rb")
+  pass unless File.exist? file
+  send_file file
+end
+
+get %r{/([-\w]+)\.js.map} do |script|
+  file = File.join(settings.views, "#{script}.js.rb")
+  js = Wunderbar::Asset.convert(file)
+  pass unless js
+
+  etag js.sourcemap_etag
+
+  sourcemap = js.sourcemap
+
+  content_type 'application/json;charset:utf8'
+  base = settings.views + '/'
+  sourcemap[:file] = sourcemap[:file].sub base, ''
+  sourcemap[:sources].map! {|source| source.sub base, ''}
+  JSON.pretty_generate sourcemap
+end