nutmeg 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa5c29f2a577c86a36fec11a3188fe85e4ae4133
-  data.tar.gz: dcb623c140e4c6f936d7ca6a5cbd463fd5d2a657
+  metadata.gz: a5a48995ca11ced8e2a500ce801dd212aa5423b6
+  data.tar.gz: 71622c3200cf5ca25eb53792093fa3d1e9bf7ddb
 SHA512:
-  metadata.gz: 1c75765380e498c42d16935e69fdd5a52b9a90809eafe76fab494141e8c89433e1875f193654b77cf58046fedb9a97158135ca376c3d194375189fc2fc9f9cf2
-  data.tar.gz: 09ef6c8ed689511b0781d716178b299c8be55c00ad32d46c99d2cc00fde179120e520d7242591f73f70ae5ccb9252eb0a63d9306789d4f3752e0b88e4e171d9d
+  metadata.gz: 02b1843cf8865dfacc6512770db05c2aa3124f5756a473ebbcb7a40e80ad80823e0a2511d370a36906b1fc52d56c24aefc1d7b528bafe207679856cf8bee034b
+  data.tar.gz: bd08b2a0f9e09b1f6cc53f0852dfbf47abd1f7bda0553f51ae8097a1c9064e569c78fd430b0b7c12bcef341f627de02b2d88deb4b4c879b9f5f9c5a5d6f3e227

data/lib/nutmeg/tag_tree_helper.rb

@@ -19,22 +19,23 @@ module Nutmeg
       node.content[:name] || node.content[:slug]
     end
 
-    def print_html(tags_given, greedy = false)
-      [print_node(@tree.original, tags_given, greedy)].join("")
+    def print_html(tags_given, greedy = false, extra_html = nil)
+      [print_node(@tree.original, tags_given, greedy, extra_html)].join("")
     end
 
-    def node_html(node, active, leaf, content)
-      "<li class='level_#{node.level}#{leaf ? ' leaf' : ''}#{active ? ' active' : ''}'> <a #{(leaf) ? "href=\'#{prepend_path}#{node_path(node)}#{append_path}\'" : ''}>#{content}</a>"
+    def node_html(node, active, leaf, content, extra_html = nil)
+      "<li class='level_#{node.level}#{leaf ? ' leaf' : ''}#{active ? ' active' : ''}'> <a #{(leaf) ? "href=\'#{prepend_path}#{node_path(node)}#{append_path}\'" : ''}>#{content}</a>#{extra_html && active && leaf ? extra_html : ''}"
     end
 
     def node_path(node)
       ([""] + 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)
+    def print_node(node, tags_given, greedy = false, extra_html = nil)
       output = []
+
       if render_node?(node,tags_given)
-        output << node_html(node, (!@tree.get_paths(tags_given).first.nil? && @tree.get_paths(tags_given).first.map(&:name).include?(node.name) || (greedy == true && tags_given.include?(node.content[:slug]))), node.is_leaf?, title(node))
+        output << node_html(node, (!@tree.get_paths(tags_given).first.nil? && @tree.get_paths(tags_given).first.map(&:name).include?(node.name) || (greedy == true && tags_given.include?(node.content[:slug]))), node.is_leaf?, title(node), extra_html)
       end
 
       if !traverse_node?(node, tags_given)
@@ -44,7 +45,7 @@ module Nutmeg
       if node.has_children?
         output << "<ul>"
           node.children.each do |child|
-            output << print_node(child, tags_given, greedy)
+            output << print_node(child, tags_given, greedy,extra_html)
           end
         output << "</ul>"
       end

data/lib/nutmeg/version.rb

@@ -1,3 +1,3 @@
 module Nutmeg
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/tag_tree_helper_spec.rb

@@ -28,6 +28,14 @@ describe Nutmeg::TagTreeHelper do
         subtree = @tree_from_json.tree
         expect(Nutmeg::TagTreeHelper.new(subtree, {:prepend_path => "/nl/t"}).print_html(["men", "collections"],false)).to eq("<ul><li class='level_1'> <a >North</a><ul><li class='level_2'> <a >Men</a><ul><li class='level_3 leaf'> <a href='/nl/t/north/men/footwear'>Footwear</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
+      context "additional leaf content" 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
     end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutmeg
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Dennis van der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubytree