wunderbar 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 94fc2b82b048fcdf5561c4764554cabe6a28df63
-  data.tar.gz: 6a16efca47491680cd4330afc8fd0a1e5d8c5da5
+SHA256:
+  metadata.gz: efc6697133eb061d2cfa7a864669dada66b69340af39bb64ff120e3f9678c8ed
+  data.tar.gz: 483ef47514305d740b55016fe43887c680369c0d9b446fa00481de54e2ca7959
 SHA512:
-  metadata.gz: 52321292277def7fb17d371bad3d593d318a9c61a9880d379fd63c2e8301bc7def79e12c30af35250bad2885aff879ee09510cd9f49089f1910e1cbdc583465f
-  data.tar.gz: 07b8be504eeb533235440be6871d18d438bdb6e79d535ffd0883f98cb12e0df4210760ff62e3a53b25a89fa276f93b7d9464b2aff788c74b9923d77cd5495a5c
+  metadata.gz: c9861d04f5c6b1104999c297a4248b668c8dfa3ba8139b8bb256a7dd74d2e0e394ad82ff93921b846a231da78c6359d6d5edc789a92825885c1ba4a364860343
+  data.tar.gz: 5c24836c64c00712a6d267f88d28c8addedcfe296fedea031ec8aa09fe40df696402f17013c86ebae5bef3189bee7893ca222bc599b52b23c3be7b4c1566d8f2

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

@@ -2,7 +2,7 @@ module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 3
-    TINY  = 1
+    TINY  = 2
 
     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,21 @@
 # -*- encoding: utf-8 -*-
-# stub: wunderbar 1.3.1 ruby lib
+# stub: wunderbar 1.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "wunderbar".freeze
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   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 = "2019-03-06"
+  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.5.2.3".freeze
+  s.rubygems_version = "2.7.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.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: HTML Generator and CGI application support