opal-virtual-dom 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4af4fe73f545fc7348b1d934787ed5e0e5b9a89
-  data.tar.gz: 589de3ba4f5452c06c291990d01be9a2b5d2e9b0
+  metadata.gz: 5d1742e56e1a41c661d1e5187dfb2039b7659cb4
+  data.tar.gz: ae392be98fcf7b952ffb88199ae557589905fac8
 SHA512:
-  metadata.gz: 9c1e0d821df239bec6bf705c0058f05efa704f3d5e44d99dc789f15f6dc17b015af4aa387e7885a8adf87c3d0343fbfb32900adcacd9dc396a54e6463a33ec04
-  data.tar.gz: c38ad25dbe2d01109aee4108c3114f9adf49859f6ae45ccf10c4be666524d752e4983dec715b0401c59b1ba13ea71b6c16e3942827b8b519a5a0fa93288aa1a8
+  metadata.gz: e498df234779e09b5dff8bd0f86eb5f45c5833a82c3b19dbed4b74c97b1f879536127193418dd2861409a394eb4b5eb9094247bfd44b56fef7bfdfa98cef3e61
+  data.tar.gz: e81c93af95ca6f2d3602b83e5d410a14465e05cdf426ae007d2cf2ef8633e1259b39a1a89100e90ab5323824b42997bbe302920408a1da0cfbd32f81efbbbe8a

data/opal-virtual-dom.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'opal-virtual-dom'
-  s.version     = '0.5.0'
+  s.version     = '0.5.1'
   s.authors     = ['Michał Kalbarczyk']
   s.email       = 'fazibear@gmail.com'
   s.homepage    = 'http://github.com/fazibear/opal-virtual-dom'

data/opal/virtual_dom/dom.rb

@@ -11,22 +11,24 @@ module VirtualDOM
 
     HTML_TAGS.each do |tag|
       define_method tag do |params = {}, &block|
-        process_tag(tag, params, block)
+        if params.is_a?(String)
+          process_tag(tag, {}, block, params)
+        elsif params.is_a?(Hash)
+          process_tag(tag, params, block)
+        end
       end
     end
 
-    def process_tag(tag, params, block)
+    def process_tag(tag, params, block, children = [])
       @__virtual_nodes__ ||= []
       if block
         current = @__virtual_nodes__
         @__virtual_nodes__ = []
-        result = block.call || ''
+        result = block.call || children
         vnode = VirtualNode.new(tag, process_params(params), @__virtual_nodes__.count.zero? ? result : @__virtual_nodes__)
         @__virtual_nodes__ = current
-      elsif params.is_a?(String)
-        vnode = VirtualNode.new(tag, {}, [params])
       else
-        vnode = VirtualNode.new(tag, process_params(params), [])
+        vnode = VirtualNode.new(tag, process_params(params), children)
       end
       @__last_virtual_node__ = vnode
       @__virtual_nodes__ << @__last_virtual_node__.to_n
@@ -37,6 +39,13 @@ module VirtualDOM
       return unless @__last_virtual_node__
       return unless @__virtual_nodes__
       @__virtual_nodes__.pop
+      children = []
+
+      if params.is_a?(String)
+        children = [params]
+        params = {}
+      end
+
       class_params = @__last_virtual_node__.params.delete(:className)
       method_params = if clazz.end_with?('!')
                         { id: clazz[0..-2],
@@ -45,7 +54,7 @@ module VirtualDOM
                         { class: merge_string(class_params, params[:class], clazz) }
                       end
       params = @__last_virtual_node__.params.merge(params).merge(method_params)
-      process_tag(@__last_virtual_node__.name, params, block)
+      process_tag(@__last_virtual_node__.name, params, block, children)
     end
 
     def merge_string(*params)
@@ -58,7 +67,6 @@ module VirtualDOM
     end
 
     def process_params(params)
-      return {} unless params.is_a?(Hash)
       params.dup.each do |k, v|
         case k
         when 'class'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-virtual-dom
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Michał Kalbarczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2017-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: virtual-dom wrapper for opal