nutmeg 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 839f3094a2c5de6f59f396e3c31a456c2910cee0
-  data.tar.gz: c58024fe9671ff83ab4a3e6b6104b6b440999ead
+  metadata.gz: b68dde6b721ba5628dd4c0f11b27baf1088a9a73
+  data.tar.gz: 07ec3c8770abb0d8083f73750669fbdd42ecbfee
 SHA512:
-  metadata.gz: f2a22c789b3eb03b59c21069ec5408e5ada70dcaa21d6b3dafa44bb9917933b062a8e92ede09544ad6b737598e842ba7b1252655fc540f9db62c315069c90d55
-  data.tar.gz: 3908dcf8684c2e9b53e33182001586acf4ae8bc162a600caa9abfc1ed014225d6465e804874cf6bd4a949e58f36fb4da7a37f43bcdb3b9b3a4c76771441e4fed
+  metadata.gz: fb84459fa571a321194c60b9286bd319aa88a03d66081ccbf42dd827fdb51f8f3b7b6a71adb577c3d71ba9a8801486a8c7b105d412959f296ca886661304e4b0
+  data.tar.gz: 50d53ebfb824495c3bdfcb382f6cc44c67431c090517f45963d0026ff588f48e9500bed9f5de9f54456f92b178a0122b6051462a38452afb8b15b5cf37716f92

data/lib/nutmeg/tag_tree.rb

@@ -14,8 +14,8 @@ module Nutmeg
     end
 
     def get_paths(tags_given)
-      start_nodes = @original.children.select{|l| tags_given.include?(l.content[:tag_id])}
-      end_nodes = @original.each_leaf.select{|l| tags_given.include?(l.content[:tag_id])}
+      start_nodes = @original.children.select{|l| tags_given.include?(l.content[:slug])}
+      end_nodes = @original.each_leaf.select{|l| tags_given.include?(l.content[:slug])}
 
       end_nodes.select do |end_node|
         (end_node.parentage & start_nodes).count >= 1
@@ -23,7 +23,7 @@ module Nutmeg
         ([leaf] + leaf.parentage).reverse
       end.select do |path|
         # we always include the 'root' tag
-        (path.map{|tag| tag.content[:tag_id] } - tags_given).count == 1
+        (path.map{|tag| tag.content[:slug] } - tags_given).count == 1
       end
     end
 

data/lib/nutmeg/tag_tree_helper.rb

@@ -49,7 +49,7 @@ module Nutmeg
     def traverse_node?(node, tags_given)
       return true if node.is_root?
       return true if node.level == 1
-      (node.parentage.select{|n| n.level == 1}.map{|n| n.content[:tag_id]} & tags_given).count >= 1
+      (node.parentage.select{|n| n.level == 1}.map{|n| n.content[:slug]} & tags_given).count >= 1
     end
   end
 end

data/lib/nutmeg/version.rb

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

data/spec/tag_tree_helper_spec.rb

@@ -9,7 +9,7 @@ describe Nutmeg::TagTreeHelper do
   describe "#print_html" do
     it "outputs html" do
       expect(Nutmeg::TagTreeHelper.new(@tree_from_yaml.tree).print_html([1]).class).to eq(String)
-      expect(Nutmeg::TagTreeHelper.new(@tree_from_yaml.tree).print_html([1,3,5,10])).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 active'> <a >collections</a><ul><li class='level_4 leaf'> <a href='/north/men/collections/winter_2015'>winter_2015</a></li><li class='level_4 leaf'> <a href='/north/men/collections/spring_2015'>spring_2015</a></li><li class='level_4 leaf active'> <a href='/north/men/collections/summer_2015'>summer_2015</a></li></ul></li></ul></li><li class='level_2'> <a >women</a><ul><li class='level_3'> <a >collections</a><ul><li class='level_4 leaf'> <a href='/north/women/collections/winter_2015'>winter_2015</a></li><li class='level_4 leaf'> <a href='/north/women/collections/spring_2015'>spring_2015</a></li><li class='level_4 leaf'> <a href='/north/women/collections/summer_2015'>summer_2015</a></li></ul></li></ul></li><li class='level_2'> <a >events</a><ul><li class='level_3 leaf'> <a href='/north/events/lowlands_2014'>lowlands_2014</a></li><li class='level_3 leaf'> <a href='/north/events/sinterklaas_2014'>sinterklaas_2014</a></li></ul></li><li class='level_2'> <a >collaborations</a><ul><li class='level_3 leaf'> <a href='/north/collaborations/afro_jack'>afro_jack</a></li><li class='level_3 leaf'> <a href='/north/collaborations/pr_co'>pr_co</a></li></ul></li></ul></li><li class='level_1'> <a >south</a><ul></li></li></ul></li></ul>")
+      expect(Nutmeg::TagTreeHelper.new(@tree_from_yaml.tree).print_html(["north", "men", "collections", "summer_2015"])).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 active'> <a >collections</a><ul><li class='level_4 leaf'> <a href='/north/men/collections/winter_2015'>winter_2015</a></li><li class='level_4 leaf'> <a href='/north/men/collections/spring_2015'>spring_2015</a></li><li class='level_4 leaf active'> <a href='/north/men/collections/summer_2015'>summer_2015</a></li></ul></li></ul></li><li class='level_2'> <a >women</a><ul><li class='level_3'> <a >collections</a><ul><li class='level_4 leaf'> <a href='/north/women/collections/winter_2015'>winter_2015</a></li><li class='level_4 leaf'> <a href='/north/women/collections/spring_2015'>spring_2015</a></li><li class='level_4 leaf'> <a href='/north/women/collections/summer_2015'>summer_2015</a></li></ul></li></ul></li><li class='level_2'> <a >events</a><ul><li class='level_3 leaf'> <a href='/north/events/lowlands_2014'>lowlands_2014</a></li><li class='level_3 leaf'> <a href='/north/events/sinterklaas_2014'>sinterklaas_2014</a></li></ul></li><li class='level_2'> <a >collaborations</a><ul><li class='level_3 leaf'> <a href='/north/collaborations/afro_jack'>afro_jack</a></li><li class='level_3 leaf'> <a href='/north/collaborations/pr_co'>pr_co</a></li></ul></li></ul></li><li class='level_1'> <a >south</a><ul></li></li></ul></li></ul>")
     end
   end
 end

data/spec/tag_tree_spec.rb

@@ -27,7 +27,7 @@ describe Nutmeg::TagTree do
 
   describe "#get_paths_formatted" do
     it "returns base/child when using [1,2] as selector" do
-      expect(@tag_tree.get_paths_formatted([1,2]).first).to eq("base/child")
+      expect(@tag_tree.get_paths_formatted(["base", "child"]).first).to eq("base/child")
     end
   end
 end

metadata

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