nutmeg 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e34dc8d400048a8654846073af14fd44e0ceef
-  data.tar.gz: d438e2b3fa1788d226f141d799a44e2c0f8c672c
+  metadata.gz: e37875ea673b1b17788595a4498cf49a225ccd9a
+  data.tar.gz: 0ed69982fee93ef14494a6b2c3ba36468cd7abb5
 SHA512:
-  metadata.gz: 3939c6bebaf518d17b43e57b151105c287bf44df7e4a34405faf7bb7a5ee1946464a3432e7ae27b819c376bda2f2422cc4f9f698a6f8750921b7b62e6c290c91
-  data.tar.gz: f1979b7501fe1337573ecf78e748c2b67f606aa8ca608ee9240c6762a2a374d0567cff6b8681832aeb3f1e6d093bf9f9459aceb41b9b292144878e63af14a036
+  metadata.gz: 9b21a83abfbb1905df9e9a207c816a0015324ff0d441e2fe24f75f1fa72ad96f66f5af42649e8c64ec93d01b9e3f0c032da471e1f7ea1ed4b84c8b5a860c7716
+  data.tar.gz: 578e03eccafb6f30dba1ff7a5ea3e69be552c3b840a5125feeb2a139dd603350b202860a291aa084a6e966e3d7240a94669e833bbebf442800a25231ab0fb0f2

data/lib/nutmeg/tag_tree_helper.rb

@@ -18,9 +18,8 @@ module Nutmeg
     def title(node)
       node.content[:name] || node.content[:slug]
     end
-
-    def print_html(tags_given, greedy = false, extra_html = nil)
-      [print_node(@tree.original, tags_given, greedy, extra_html)].join("")
+    def print_html(tags_given, greedy = false, extra_html = nil, do_not_wrap = false)
+      [print_node(@tree.original, tags_given, greedy, extra_html, do_not_wrap)].join("")
     end
 
     def node_html(node, active, leaf, content, extra_html = nil)
@@ -31,7 +30,7 @@ module Nutmeg
       ([""] + node.parentage.map{|p| p.content[:slug]}.reverse.reject{|n| n == "root"} + [node.content[:slug]]).join("/")
     end
 
-    def print_node(node, tags_given, greedy = false, extra_html = nil)
+    def print_node(node, tags_given, greedy = false, extra_html = nil, do_not_wrap = false)
       output = []
 
       if render_node?(node,tags_given)
@@ -43,11 +42,11 @@ module Nutmeg
         return output
       end
       if node.has_children?
-        output << "<ul>"
+        output << (do_not_wrap && node.is_root? ? "" : "<ul>")
           node.children.each do |child|
-            output << print_node(child, tags_given, greedy,extra_html)
+            output << print_node(child, tags_given, greedy,extra_html, do_not_wrap)
           end
-        output << "</ul>"
+        output << (do_not_wrap && node.is_root? ? "" : "</ul>")
       end
       if render_node?(node,tags_given)
         output << "</li>"

data/lib/nutmeg/version.rb

@@ -1,3 +1,3 @@
 module Nutmeg
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/tag_tree_helper_spec.rb

@@ -32,9 +32,16 @@ describe Nutmeg::TagTreeHelper do
         it "renders additional content in the leaf" do
           subtree = @tree_from_json.tree
           expect(Nutmeg::TagTreeHelper.new(subtree, {:prepend_path => "/nl/t"}).print_html(["north", "men", "footwear"],false, "<a href='#'>Extra content</a>")).to eq("<ul><li class='level_1 active'> <a >North</a><ul><li class='level_2 active'> <a >Men</a><ul><li class='level_3 leaf active'> <a href='/nl/t/north/men/footwear'>Footwear</a><a href='#'>Extra content</a></li><li class='level_3 leaf'> <a href='/nl/t/north/men/eyewear'>Eyewear</a></li></ul></li><li class='level_2'> <a >Women</a><ul><li class='level_3 leaf'> <a href='/nl/t/north/women/footwear'>Footwear</a></li><li class='level_3'> <a >Eyewear</a><ul><li class='level_4 leaf'> <a href='/nl/t/north/women/eyewear/gfdgdfs'>gfdgdfs</a></li></ul></li></ul></li><li class='level_2 leaf'> <a href='/nl/t/north/collaboration'>Collaboration</a></li></ul></li><li class='level_1'> <a >South</a><ul><li class='level_2'> <a >Men</a><ul><li class='level_3 leaf'> <a href='/nl/t/south/men/collection'>Collection</a></li><li class='level_3 leaf'> <a href='/nl/t/south/men/footwear'>Footwear</a></li><li class='level_3 leaf'> <a href='/nl/t/south/men/eyewear'>Eyewear</a></li></ul></li><li class='level_2'> <a >Women</a><ul><li class='level_3 leaf'> <a href='/nl/t/south/women/collection'>Collection</a></li><li class='level_3 leaf'> <a href='/nl/t/south/women/footwear'>Footwear</a></li><li class='level_3 leaf'> <a href='/nl/t/south/women/eyewear'>Eyewear</a></li></ul></li><li class='level_2 leaf'> <a href='/nl/t/south/collaboration'>Collaboration</a></li></ul></li></ul>")
+        end
+      end
 
+      context "Wrapping ul element" do
+        it "do not return wrapping ul" do
+          subtree = @tree_from_json.tree
+          expect(Nutmeg::TagTreeHelper.new(subtree, {:prepend_path => "/nl/t"}).print_html(["north", "men", "footwear"],false, "<a href='#'>Extra content</a>", true)).to eq("<li class='level_1 active'> <a >North</a><ul><li class='level_2 active'> <a >Men</a><ul><li class='level_3 leaf active'> <a href='/nl/t/north/men/footwear'>Footwear</a><a href='#'>Extra content</a></li><li class='level_3 leaf'> <a href='/nl/t/north/men/eyewear'>Eyewear</a></li></ul></li><li class='level_2'> <a >Women</a><ul><li class='level_3 leaf'> <a href='/nl/t/north/women/footwear'>Footwear</a></li><li class='level_3'> <a >Eyewear</a><ul><li class='level_4 leaf'> <a href='/nl/t/north/women/eyewear/gfdgdfs'>gfdgdfs</a></li></ul></li></ul></li><li class='level_2 leaf'> <a href='/nl/t/north/collaboration'>Collaboration</a></li></ul></li><li class='level_1'> <a >South</a><ul><li class='level_2'> <a >Men</a><ul><li class='level_3 leaf'> <a href='/nl/t/south/men/collection'>Collection</a></li><li class='level_3 leaf'> <a href='/nl/t/south/men/footwear'>Footwear</a></li><li class='level_3 leaf'> <a href='/nl/t/south/men/eyewear'>Eyewear</a></li></ul></li><li class='level_2'> <a >Women</a><ul><li class='level_3 leaf'> <a href='/nl/t/south/women/collection'>Collection</a></li><li class='level_3 leaf'> <a href='/nl/t/south/women/footwear'>Footwear</a></li><li class='level_3 leaf'> <a href='/nl/t/south/women/eyewear'>Eyewear</a></li></ul></li><li class='level_2 leaf'> <a href='/nl/t/south/collaboration'>Collaboration</a></li></ul></li>")
         end
       end
+
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutmeg
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Dennis van der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubytree