caboodle 0.2.19 → 0.2.20

data/VERSION

@@ -1 +1 @@
-0.2.19
+0.2.20

data/lib/caboodle/kit.rb

@@ -99,21 +99,19 @@ module Caboodle
         #todo proper slugify
         slug = display.downcase.gsub(" ","-").gsub("'","")
         path = "/#{slug}" unless path
-        path = "/" if Site.home_kit == self.to_s.gsub("Caboodle::","")
+        puts "set /#{slug} - menu items: #{Settings.menu_items.inspect}"
+        path = "/" if Site.home_kit == self.to_s.gsub("Caboodle::","") && !Settings.menu_items.include?("/")
         Caboodle::MenuItems << {:display=>display, :link=>path, :kit=>self}
-        self.before {@title = display}
         if block
           self.get path, &block
         else
           eval "self.get '#{path}' do
+          @title = '#{display}'
           haml :#{slug.gsub("-","_")}
           end"
         end
-        @@has_menu = true
-      end
-      
-      def has_menu?
-        defined?(@@has_menu)
+        Settings.menu_items ||= [] 
+        Settings.menu_items << path
       end
       
       def required keys

data/lib/caboodle/kits/feed/feed.rb

@@ -10,13 +10,14 @@ module Caboodle
     add_sass ["feed"]
     
     configure do
-      puts "Configure it"
-      puts Settings.feeds.inspect
-      Settings.feeds.each do |feed_name,feed_url|
-        menu feed_name do
-          @feed = FeedNormalizer::FeedNormalizer.parse open(feed_url)
-          @feed.clean!
-          haml :feed
+      if Settings.feeds
+        Settings.feeds.map{|q| q.first}.each do |feed_name,feed_url|
+          puts "menu #{feed_name}" 
+          menu feed_name do
+            @feed = FeedNormalizer::FeedNormalizer.parse open(feed_url)
+            @feed.clean!
+            haml :feed
+          end
         end
       end
     end

data/lib/caboodle/kits/feed/views/feed.haml

@@ -3,5 +3,6 @@
     - @feed.entries.each do |post|
       %article
         %h2
-          = post.title
+          %a{:href=>post.url}
+            = post.title
         = post.content

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 2
-  - 19
-  version: 0.2.19
+  - 20
+  version: 0.2.20
 platform: ruby
 authors: 
 - Stef Lewandowski