dominate 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f420bad8c25bc8fb0ea788e7eb0f13ecda46047
-  data.tar.gz: 37cd280f32a2536aa9dbc05908e8bcec3a931766
+  metadata.gz: 61a49494a53476a0d74388878a9ee0f901d75b25
+  data.tar.gz: 3a28099fb6c50171da8dbf16cee5f762e353aaae
 SHA512:
-  metadata.gz: 5b0fcfc52fad1756420467d97511002cda7cbde2eb0db66d004200c51bdc9812313caf5640c8ca93398cb732b73a721f74161ce70c84d5f1c0ff36cbe4951bf5
-  data.tar.gz: 29865ebfedb3b9baf2dfdf8a7af900468f50dce1d1a0c23c9b515c892f819b9607ca505802af084f066d0705e43a29a79b9115852e49ab0675336510144e132e
+  metadata.gz: ee8d6e3796133e2f233a57ab8e496e4a841d3c4fbd2f78c3ad71dae6758051bc07348a337c73db37aee13d22fee8190d8b627d65b8ea2cdf22dcd27e090b2bf5
+  data.tar.gz: c9dc24d1abfa7cba0e0f6e78b2a24f1b8dd0f3bc6a9bd16549eaee234b55704751d09d6c2c61a64c58b35ecc5b2bf45b79b8180dff2c72752cc600022b2dea23

data/lib/dominate/version.rb

@@ -1,3 +1,3 @@
 module Dominate
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/dominate.rb

@@ -18,38 +18,50 @@ module Dominate
     end
 
     def scope name
-      Scope.new doc.search "[data-scope='#{name}']", instance
+      reset_html
+      Scope.new instance, doc.search("[data-scope='#{name}']")
     end
 
     def html
-      apply_instance if instance
-
-      @html ||= "#{doc}"
+      @html ||= begin
+        apply_instance if instance
+        "#{doc}"
+      end
     end
 
     def apply_instance
-      Scope.new(doc, instance).apply_instance
+      reset_html
+      Scope.new(instance, doc).apply_instance
+    end
+
+    private
+
+    def reset_html
+      @html = false
     end
   end
 
-  class Scope < Struct.new :root_doc, :instance
+  class Scope < Struct.new :instance, :root_doc
 
-    def apply data
+    def apply data, &block
       @data = data
 
       root_doc.each do |doc|
         if data.is_a? Array
-          doc = apply_list doc, data
+          doc = apply_list doc, data, &block
         else
-          doc = apply_data doc, data
+          doc = apply_data doc, data, &block
         end
       end
+
+      root_doc
     end
 
     def apply_instance
       root_doc.traverse do |x|
         if defined?(x.attributes) && x.attributes.keys.include?('data-instance')
-          method  = x.attr('data-instance')
+          method  = x.attr 'data-instance'
+
           begin
             x.inner_html = instance.instance_eval method
           rescue
@@ -63,14 +75,17 @@ module Dominate
 
     private
 
-    def apply_data doc, data
+    def apply_data doc, data, &block
       doc.traverse do |x|
         if x.attributes.keys.include? 'data-prop'
+          x.inner_html = value_for(
+            data[x.attr('data-prop').to_s.to_sym], data, doc
+          )
         end
       end
     end
 
-    def apply_list doc, data_list
+    def apply_list doc, data_list, &block
       # child placement
       placement = 'after'
       # clean the html, removing spaces and returns
@@ -81,8 +96,6 @@ module Dominate
       doc.children.each_with_index do |node, index|
         if "#{node}"['data-scope']
           placement = (index == 0 ? 'after' : 'before')
-          # TODO: Scope.new doc.search "[data-scope='#{name}']"
-          # create a new scope
         else
           node.remove
         end
@@ -96,15 +109,34 @@ module Dominate
         # lets look for data-prop elements
         elem.traverse do |x|
           if x.attributes.keys.include? 'data-prop'
-            x.inner_html = data[x.attr('data-prop').to_s.to_sym]
+            value = value_for data[x.attr('data-prop').to_s.to_sym], data, elem
+            x.inner_html = value
           end
         end
 
+        block.call elem, data if block
         # add the element back to the doc
         doc.children.public_send(placement, elem)
       end
 
       doc
     end
+
+    private
+
+    def value_for value, data, elem
+      if value.is_a? Proc
+        if value.parameters.length == 0
+          instance.instance_exec(&value).to_s
+        elsif value.parameters.length == 1
+          instance.instance_exec(data, &value).to_s
+        elsif value.parameters.length == 2
+          instance.instance_exec(data, elem, &value).to_s
+        end
+      else
+        value.to_s
+      end
+    end
+
   end
 end

data/test/dominate_test.rb

@@ -2,60 +2,86 @@ require_relative 'helper'
 require 'dominate'
 
 setup do
-  OpenStruct.new({
+  inline_html = <<-D
+    <div>
+      <div>
+        <h1 data-scope='admin_only'>Admin</h1>
+        <span>current_user:
+          <span data-instance="current_user.first_name">John</span>
+          <span data-instance="current_user.last_name">Doe</span>
+        </span>
+      </div>
+      <ul data-scope="list">
+        <li>
+          <a href="#" data-prop="todo">test</a>
+        </li>
+        <li>
+          <a href="#" data-prop="todo">testing</a>
+        </li>
+        <li>
+          <ul data-scope="list-nested">
+            <li data-prop="todo"></li>
+          </ul>
+        </li>
+      </ul>
+    </div>
+  D
+  instance = OpenStruct.new({
     current_user: OpenStruct.new({
       first_name: 'CJ',
       last_name: 'Lazell'
-    }),
-    inline_html: <<-D
-      <div>
-        <div>
-          <span>current_user:
-            <span data-instance="current_user.first_name">John</span>
-            <span data-instance="current_user.last_name">Doe</span>
-          </span>
-        </div>
-        <ul data-scope="list">
-          <li>
-            <a href="#" data-prop="todo">test</a>
-          </li>
-          <li>
-            <a href="#" data-prop="todo">testing</a>
-          </li>
-          <li>
-            <ul data-scope="list-nested">
-              <li data-prop="todo"></li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-    D
+    })
+  })
+
+  OpenStruct.new({
+    current_user: instance.current_user,
+    dom: Dominate::HTML(inline_html, instance),
   })
 end
 
 scope 'dominate' do
   test 'render html' do |a|
-    dom = Dominate::HTML a.inline_html
-    assert dom.html['test']
-    assert dom.html.scan(/<a.*>/).length == 2
+    assert a.dom.html['test']
+    assert a.dom.html.scan(/<a.*>/).length == 2
   end
 
   test 'binding data' do |a|
-    dom = Dominate::HTML a.inline_html
-    dom.scope(:list).apply([
+    a.dom.scope(:list).apply([
       { todo: 'get milk' },
       { todo: 'get cookies' },
       { todo: 'work out' },
     ])
-    assert dom.html['test'] == nil
-    assert dom.html.scan(/<a.*>/).length == 3
-    assert dom.html['get milk']
-    assert dom.html['get cookies']
+
+    assert a.dom.html['test'] == nil
+    assert a.dom.html.scan(/<a.*>/).length == 3
+    assert a.dom.html['get milk']
+    assert a.dom.html['get cookies']
   end
 
   test 'binding context' do |a|
-    dom = Dominate::HTML a.inline_html, a
-    assert dom.html['John'] == nil
-    assert dom.html['CJ']
+    assert a.dom.html['John'] == nil
+    assert a.dom.html['CJ']
+  end
+
+  test 'blocks' do |a|
+    a.dom.scope(:admin_only).each do |node|
+      unless a.current_user.admin
+        node.remove
+      end
+    end
+    assert a.dom.html['Admin'] == nil
+  end
+
+  test 'procs' do |a|
+    data = [
+      {todo: -> {
+        current_user.admin ? 'do admin stuff' : 'do normal person stuff'}
+      },
+      {todo: ->(d) { d.length }
+      }
+    ]
+
+    a.dom.scope(:list).apply(data)
+    assert a.dom.html['do normal person stuff']
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dominate
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri