opal-virtual-dom 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 634c72e5f68dc1798887cb2c73b41ea57d2367d4
-  data.tar.gz: 2862cd38499e3cbd1a96e23fb5c2b0bb2ab998f5
+  metadata.gz: e4af4fe73f545fc7348b1d934787ed5e0e5b9a89
+  data.tar.gz: 589de3ba4f5452c06c291990d01be9a2b5d2e9b0
 SHA512:
-  metadata.gz: aac7e8efb0a5d7a38919d683e09dcaae72701a63007e39f4a6abc02ac587738b46d33a6429154edd198a8301763296617a05048ddca6e73ddbc2480469132d80
-  data.tar.gz: b6984ef09f1fa1dcced0074503960b5929540a4917c6b15a5665cbe3ae59dfda4a5d081f6c2934220462f206dd458107bfc30dd872f1a1b03400ab3c5bd6e98b
+  metadata.gz: 9c1e0d821df239bec6bf705c0058f05efa704f3d5e44d99dc789f15f6dc17b015af4aa387e7885a8adf87c3d0343fbfb32900adcacd9dc396a54e6463a33ec04
+  data.tar.gz: c38ad25dbe2d01109aee4108c3114f9adf49859f6ae45ccf10c4be666524d752e4983dec715b0401c59b1ba13ea71b6c16e3942827b8b519a5a0fa93288aa1a8

data/README.md

@@ -36,10 +36,16 @@ class SampleList
   end
 
   def render
-    ul class: 'simple-list', hook: Hook.method(:create_hook) do
-      @elements.each do |string|
-        li do
-          text string
+    # You can use chained methods
+    # to add class to elements
+    # use bang method to define element id
+
+    p.id! do
+      ul.simple_list.list(hook: Hook.method(method(:create_hook))) do
+        @elements.each do |string|
+          li class: class_names({empty: string.empty?}) do
+            text string
+          end
         end
       end
     end
@@ -47,8 +53,8 @@ class SampleList
 end
 
 $document.ready do
-  list = SampleList.new(%w(one two three)).render
-  back = SampleList.new(%w(three two one)).render
+  list = SampleList.new(%w(one two three)).render.to_vnode
+  back = SampleList.new(%w(three two one)).render.to_vnode
 
   root_node = VirtualDOM.create(list)
   $document.body.inner_dom = root_node

data/opal-virtual-dom.gemspec

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

data/opal/virtual_dom.rb

@@ -1,7 +1,7 @@
 require 'vendor/virtual-dom'
+require 'virtual_dom/dom'
 require 'virtual_dom/virtual_node'
 require 'virtual_dom/wrapper'
-require 'virtual_dom/dom'
 require 'virtual_dom/hook'
 require 'virtual_dom/support'
 

data/opal/virtual_dom/dom.rb

@@ -11,21 +11,50 @@ module VirtualDOM
 
     HTML_TAGS.each do |tag|
       define_method tag do |params = {}, &block|
-        @__virtual_nodes__ ||= []
-        if block
-          current = @__virtual_nodes__
-          @__virtual_nodes__ = []
-          result = block.call || ''
-          vnode = VirtualNode.new(tag, process_params(params), @__virtual_nodes__.count == 0 ? result : @__virtual_nodes__).to_n
-          @__virtual_nodes__ = current
-        elsif params.is_a?(String)
-          vnode = VirtualNode.new(tag, {}, [params]).to_n
-        else
-          vnode = VirtualNode.new(tag, process_params(params), []).to_n
-        end
-        @__virtual_nodes__ << vnode
-        vnode
+        process_tag(tag, params, block)
+      end
+    end
+
+    def process_tag(tag, params, block)
+      @__virtual_nodes__ ||= []
+      if block
+        current = @__virtual_nodes__
+        @__virtual_nodes__ = []
+        result = block.call || ''
+        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), [])
       end
+      @__last_virtual_node__ = vnode
+      @__virtual_nodes__ << @__last_virtual_node__.to_n
+      self
+    end
+
+    def method_missing(clazz, params = {}, &block)
+      return unless @__last_virtual_node__
+      return unless @__virtual_nodes__
+      @__virtual_nodes__.pop
+      class_params = @__last_virtual_node__.params.delete(:className)
+      method_params = if clazz.end_with?('!')
+                        { id: clazz[0..-2],
+                          class: merge_string(class_params, params[:class]) }
+                      else
+                        { 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)
+    end
+
+    def merge_string(*params)
+      arr = []
+      params.each do |string|
+        next unless string
+        arr << string.split(' ')
+      end
+      arr.join(' ')
     end
 
     def process_params(params)
@@ -51,14 +80,24 @@ module VirtualDOM
       end
     end
 
-    # for backwards compatibility, you can return string
     def text(string)
       @__virtual_nodes__ << string.to_s
     end
 
-    # for backwards compatibility
-    def virtual_dom(&block)
-      block.call
+    def to_vnode
+      if @__virtual_nodes__.one?
+        @__virtual_nodes__.first
+      else
+        VirtualNode.new('div', {}, @__virtual_nodes__).to_n
+      end
+    end
+
+    def class_names(hash)
+      class_names = []
+      hash.each do |key, value|
+        class_names << key if value
+      end
+      class_names.join(' ')
     end
   end
 end

data/opal/virtual_dom/virtual_node.rb

@@ -1,5 +1,9 @@
 module VirtualDOM
   class VirtualNode
+    #include VirtualDOM::DOM
+
+    attr_reader :name, :params, :children
+
     def initialize(name, params = {}, children = [])
       @name = name
       @params = params
@@ -11,7 +15,7 @@ module VirtualDOM
     end
 
     def to_s
-      "<#{@name}#{to_s_params}>#{@children.map(&:to_s).join}</#{@name}>"
+      "<#{@name}#{to_s_params}>#{to_s_children}</#{@name}>"
     end
 
     def to_s_params
@@ -20,5 +24,13 @@ module VirtualDOM
         "#{k}=\"#{v}\""
       end.join(' ')
     end
+
+    def to_s_children
+      return @children if @children.is_a?(String)
+      return unless @children.any?
+      @children
+        .map(&:to_s)
+        .join
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-virtual-dom
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Michał Kalbarczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal