nutmeg 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 123b62c1b70f93ad02f00b754a735d2cab3e9e74
-  data.tar.gz: 7f189ebe9a2a44b3634b16b5874b7387c2466ed2
+  metadata.gz: d46add46ba66cdd0a75ef3f905581a56d19c52a9
+  data.tar.gz: 0a823d5a6a20be742c214bdf56cbf7ff5ae1e432
 SHA512:
-  metadata.gz: 489de4a4be48f792cee9a68efdacb700bbd86c808a8d8eb6b8b22fabcdcec068aead0d045ebe1e462d67873c94f7853c1e1aadeb18f051886ed25032b83dac4f
-  data.tar.gz: f8d6f1f8845d61d8308446eb977a203f27870bc8fe4a26af16958ecd8c26636c91c071b808a251f8c131f8dbfc9756085efb52ce75359b3d6a2da5714ae3713c
+  metadata.gz: 13453f13317042df4e4fdd803ec9377f7f218453b0eba8472958ed5f2008d26834f7fb7c6947bdb9291053c621f040ec1b56118730a2c26d065264840b1578cb
+  data.tar.gz: ab785e32e4ee8f80e4a111da75d3f8498d21c88a93eab0297dce37668523fb662cf45d6d742637f69db1bf667e948a19c6a458e2f51374dcdcb80b3cf395a448

data/lib/nutmeg/tag_tree_helper.rb

@@ -6,8 +6,8 @@ module Nutmeg
       @tree = tree
     end
 
-    def print_html(tags_given)
-      [print_node(@tree.original, tags_given)].join("")
+    def print_html(tags_given, greedy = false)
+      [print_node(@tree.original, tags_given, greedy)].join("")
     end
 
     def node_html(node, active, leaf, content)
@@ -18,10 +18,10 @@ 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)
+    def print_node(node, tags_given, greedy = false)
       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)), node.is_leaf?, node.content[:slug])
+        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?, node.content[:slug])
       end
 
       if !traverse_node?(node, tags_given)
@@ -31,7 +31,7 @@ module Nutmeg
       if node.has_children?
         output << "<ul>"
           node.children.each do |child|
-            output << print_node(child, tags_given)
+            output << print_node(child, tags_given, greedy)
           end
         output << "</ul>"
       end

data/lib/nutmeg/version.rb

@@ -1,3 +1,3 @@
 module Nutmeg
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/tag_tree_helper_spec.rb

@@ -17,6 +17,11 @@ describe Nutmeg::TagTreeHelper do
       expect(Nutmeg::TagTreeHelper.new(subtree).print_html(["men", "collections", "summer_2015"])).to eq("<ul><li class='level_1 active'> <a >men</a><ul><li class='level_2 active'> <a >collections</a><ul><li class='level_3 leaf'> <a href='/north/men/collections/winter_2015'>winter_2015</a></li><li class='level_3 leaf'> <a href='/north/men/collections/spring_2015'>spring_2015</a></li><li class='level_3 leaf active'> <a href='/north/men/collections/summer_2015'>summer_2015</a></li></ul></li></ul></li><li class='level_1'> <a >women</a><ul><li class='level_2'> <a >collections</a><ul><li class='level_3 leaf'> <a href='/north/women/collections/winter_2015'>winter_2015</a></li><li class='level_3 leaf'> <a href='/north/women/collections/spring_2015'>spring_2015</a></li><li class='level_3 leaf'> <a href='/north/women/collections/summer_2015'>summer_2015</a></li></ul></li></ul></li><li class='level_1'> <a >events</a><ul><li class='level_2 leaf'> <a href='/north/events/lowlands_2014'>lowlands_2014</a></li><li class='level_2 leaf'> <a href='/north/events/sinterklaas_2014'>sinterklaas_2014</a></li></ul></li><li class='level_1'> <a >collaborations</a><ul><li class='level_2 leaf'> <a href='/north/collaborations/afro_jack'>afro_jack</a></li><li class='level_2 leaf'> <a href='/north/collaborations/pr_co'>pr_co</a></li></ul></li></ul>")
     end
 
+    it "outputs html for subtree (greedy)" do
+      subtree = @tree_from_yaml.tree.subtree("north")
+      expect(Nutmeg::TagTreeHelper.new(subtree).print_html(["men", "collections"],true)).to eq("<ul><li class='level_1 active'> <a >men</a><ul><li class='level_2 active'> <a >collections</a><ul><li class='level_3 leaf'> <a href='/north/men/collections/winter_2015'>winter_2015</a></li><li class='level_3 leaf'> <a href='/north/men/collections/spring_2015'>spring_2015</a></li><li class='level_3 leaf'> <a href='/north/men/collections/summer_2015'>summer_2015</a></li></ul></li></ul></li><li class='level_1'> <a >women</a><ul><li class='level_2 active'> <a >collections</a><ul><li class='level_3 leaf'> <a href='/north/women/collections/winter_2015'>winter_2015</a></li><li class='level_3 leaf'> <a href='/north/women/collections/spring_2015'>spring_2015</a></li><li class='level_3 leaf'> <a href='/north/women/collections/summer_2015'>summer_2015</a></li></ul></li></ul></li><li class='level_1'> <a >events</a><ul><li class='level_2 leaf'> <a href='/north/events/lowlands_2014'>lowlands_2014</a></li><li class='level_2 leaf'> <a href='/north/events/sinterklaas_2014'>sinterklaas_2014</a></li></ul></li><li class='level_1'> <a >collaborations</a><ul><li class='level_2 leaf'> <a href='/north/collaborations/afro_jack'>afro_jack</a></li><li class='level_2 leaf'> <a href='/north/collaborations/pr_co'>pr_co</a></li></ul></li></ul>")
+    end
+
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nutmeg
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Dennis van der Vliet