dominate 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a7bcd918c55a4b1bc2182aa3af2d1c99815e86f
-  data.tar.gz: 70a234db125eef1641b0eead1332eb009a3f1e79
+  metadata.gz: 9c1400088bbf6912de35de8603f32b9ced944c1e
+  data.tar.gz: 567983d23410a20dc5345ea7e2604634c4773b2f
 SHA512:
-  metadata.gz: 2272c1f3a61ede1f6c123370a339d21b1f515d3f5472978690e295da235378ae43c3d407500b3fa572ba8a644de641efc43099be93eea3799ed6183518744738
-  data.tar.gz: 09003081a2758df05c5c268379a5fd23194b403089165cebf98c3f4164957235ecf8f4886f3f7f75b7308a66936a0d08777ad5d7b9f4454dd663fa7c4833b327
+  metadata.gz: 534cf36a5da54a097a0a024d3768aeb016f143af2ad3f9e9b31191e853f2f24f8a2a9e73fa26ac1d6b3bc90176e00e7e009119dd05dd0be735c97483fafff527
+  data.tar.gz: 5072be8a698f922d1f8bf8839874acfd31f44426b8a171fb503ff11980cb33850c1fad5cac9a457c37c45dcfb8664b2d17abee6e848f7cfc61c3b1948f32c29b

data/lib/dominate/scope.rb

@@ -47,7 +47,7 @@ module Dominate
 
     def apply_list doc, data_list, &block
       # child placement
-      placement = 'after'
+      placement = 'add_child'
       # clean the html, removing spaces and returns
       doc.inner_html = doc.inner_html.strip
       # grab the first element before we remove the rest
@@ -55,7 +55,7 @@ module Dominate
       # remove all the children
       doc.children.each_with_index do |node, index|
         if "#{node}"['data-scope']
-          placement = (index == 0 ? 'after' : 'before')
+          placement = (index == 0 ? 'add_child' : 'before')
         else
           node.remove
         end
@@ -66,21 +66,30 @@ module Dominate
         # dup the element
         elem = first_elem.dup
 
-        data = data.to_deep_ostruct
+        data = data.to_deep_ostruct if data.is_a? Hash
 
         # lets look for data-prop elements
         elem.traverse do |x|
           if x.attributes.keys.include? 'data-prop'
             prop_val = x.attr('data-prop').to_s
 
-            value = value_for data.instance_eval(prop_val), data, elem
+            if prop_val.length > 0
+              value = value_for data.instance_eval(prop_val), data, elem
+            else
+              value = value_for data, data, elem
+            end
             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)
+        if placement == 'add_child'
+          doc.add_child elem
+        elsif placement == 'before'
+          doc.children.before elem
+        end
       end
 
       doc

data/lib/dominate/version.rb

@@ -1,3 +1,3 @@
 module Dominate
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/test/dominate_test.rb

@@ -93,4 +93,11 @@ scope 'dominate' do
     dom = Dominate::HTML.file 'index'
     assert dom.html['data-scope']
   end
+
+  test 'flat' do
+    dom = Dominate::HTML.file 'flat'
+    dom.scope(:flat).apply ['moo', 'cow']
+    assert dom.html['Moo']
+    assert dom.html['Cow']
+  end
 end

data/test/dummy/flat.slim

@@ -0,0 +1,2 @@
+ul data-scope='flat'
+  li data-prop='capitalize'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dominate
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - cj
@@ -143,6 +143,7 @@ files:
 - lib/dominate/version.rb
 - test/dominate_test.rb
 - test/dummy/app.slim
+- test/dummy/flat.slim
 - test/dummy/footer.slim
 - test/dummy/header.html
 - test/dummy/index.html
@@ -174,6 +175,7 @@ summary: Templating Engine.
 test_files:
 - test/dominate_test.rb
 - test/dummy/app.slim
+- test/dummy/flat.slim
 - test/dummy/footer.slim
 - test/dummy/header.html
 - test/dummy/index.html