caboodle 0.2.21 → 0.2.22

data/VERSION

@@ -1 +1 @@
-0.2.21
+0.2.22

data/lib/caboodle/app/config/site.yml

@@ -9,4 +9,5 @@ kits:
 - Gravatar
 - Lazyload
 - SEO
-- About
+- About
+- Page

data/lib/caboodle/config.rb

@@ -55,6 +55,7 @@ module Caboodle
           kit_name = kit_name.downcase
           orig = Caboodle.constants
           begin
+            puts kit_name
             require "caboodle/kits/#{kit_name}/#{kit_name}"
             added = Caboodle.constants - orig
             added.each do |d| 

data/lib/caboodle/kits/feed/config/feed.yml

@@ -1,2 +1,3 @@
 :feeds:
-  News: http://feeds.feedburner.com/github
+  -
+    News: http://feeds.feedburner.com/github

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

@@ -12,7 +12,6 @@ module Caboodle
     configure do
       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!

data/lib/caboodle/kits/page/page.rb

@@ -1,65 +1,21 @@
-require 'haml'
-
 module Caboodle
-  Pages = []
-  class Page
-  
-    attr_accessor :slug
-    attr_accessor :body
-    attr_accessor :file
-  
-    def initialize slug
-      @slug = slug
-    end
-  
-    def file
-      @file ||= File.new(Dir[File.join(File.dirname(__FILE__),"pages","#{@slug}.haml")].first)
-    end
-  
-    def self.all
-      return Caboodle::Pages unless Caboodle::Pages.empty?
-      Dir[File.join(File.dirname(__FILE__),"pages","*.haml")].map do |a| 
-        p = Page.new(a.split("/").last.gsub(".haml",""))
-        Caboodle::Pages << p
-        Caboodle::MenuItems << {:display=>p.title, :link=>p.link}
+  class Page < Caboodle::Kit
+    
+    description "Create markdown pages in the config directory and they are displayed as menu items and pages"
+
+    configure do
+      pages = []
+      Dir[File.join(Caboodle::App.root,"pages","*.md")].map do |a| 
+        pages << a.split("/").last.split(".").first
       end
       
-      return Caboodle::Pages
-    end
-  
-    def self.get slug
-      STDERR.puts "Get page: #{slug}"
-      return nil unless Caboodle::Pages.map{|a| a.slug}.include?(slug)
-      Page.new(slug.gsub(" ", "_"))
-    end
-  
-    def body
-      @body ||= file.read
-    end
-  
-    def to_html
-      Haml::Engine.new(body).render
-    end
-  
-    def title
-      @slug.gsub("_","").capitalize
-    end
+      puts pages.inspect
     
-    def link
-      "/#{slug}"
-    end
-  
-  end
-  
-  class PageApp < Caboodle::Kit
-        
-    Caboodle::Site.pages = Caboodle::Page.all
-    Caboodle::Site.pages.each do |page|
-      get "/#{page.slug}" do
-        @page = Page.get(request.path_info.gsub("/",""))
-        pass if @page.blank?
-        @title = @page.title
-        haml :page, :locals => {:page => @page}
+      pages.each do |page|
+        puts "Add page: #{page}"
+        menu "#{page.capitalize.gsub('_',' ')}" do
+          markdown :"#{page}"
+        end
       end
     end
   end

data/lib/caboodle/markdown.rb

@@ -2,8 +2,15 @@ module Sinatra
   class Base
     def markdown sym
       md = File.expand_path(File.join(Caboodle::App.root,"config","#{sym.to_s}.md"))
-      @content = Maruku.new(open(md).read).to_html_document
-      haml ".page.about.thin_page= @content"
+      unless File.exists?(md)
+        md = File.expand_path(File.join(Caboodle::App.root,"pages","#{sym.to_s}.md"))
+      end
+      if File.exists?(md)
+        @content = Maruku.new(open(md).read).to_html_document
+        haml ".page.#{sym.to_s}.thin_page= @content"
+      else
+        haml "%h2.#{sym.to_s}= 'Sorry - #{sym.to_s}.md was not found"
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 2
-  - 21
-  version: 0.2.21
+  - 22
+  version: 0.2.22
 platform: ruby
 authors: 
 - Stef Lewandowski
@@ -342,7 +342,6 @@ files:
 - lib/caboodle/kits/onepage/onepage.rb
 - lib/caboodle/kits/onepage/views/contact.haml
 - lib/caboodle/kits/page/page.rb
-- lib/caboodle/kits/page/views/page.haml
 - lib/caboodle/kits/posterous/posterous.rb
 - lib/caboodle/kits/posterous/views/_post.haml
 - lib/caboodle/kits/posterous/views/post.haml

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

@@ -1,2 +0,0 @@
-.page
-  = page.to_html