caboodle 0.2.16 → 0.2.18

data/VERSION

@@ -1 +1 @@
-0.2.16
+0.2.18

data/lib/caboodle.rb

@@ -1,3 +1,3 @@
 $:<<File.dirname(__FILE__)
 $:<<File.join(File.dirname(__FILE__),"caboodle")
-%{sinatra/base yaml hashie haml maruku find sinatra/base sinatra/compass sinatra/advanced_routes compass susy pp sleepy caboodle/helpers caboodle/config caboodle/kit caboodle/app caboodle/scrape}.split.each{|a| require a}
+%{sinatra/base yaml hashie haml maruku find sinatra/base sinatra/compass sinatra/advanced_routes compass susy pp sleepy caboodle/config caboodle/markdown caboodle/helpers caboodle/config caboodle/kit caboodle/app caboodle/scrape}.split.each{|a| require a}

data/lib/caboodle/app.rb

@@ -5,6 +5,7 @@ module Caboodle
     set :root, File.expand_path(".")
     set :views, Proc.new { File.join(root, "views") }
     set :public, Proc.new { File.join(root, "public") }
+    set :run, false
     
     helpers Sinatra::CaboodleHelpers
     

data/lib/caboodle/app/config.ru

@@ -1,2 +1,3 @@
+$:<<"../../caboodle/lib"
 require 'caboodle'
 run Caboodle::App

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

@@ -8,4 +8,5 @@ kits:
 - Jquery
 - Gravatar
 - Lazyload
-- SEO
+- SEO
+- About

data/lib/caboodle/app/views/layout.haml

@@ -1,7 +1,7 @@
 !!!
 %html{:dir => "ltr", :lang => "en-US", :xmlns => "http://www.w3.org/1999/xhtml"}
   %head{:profile => "http://gmpg.org/xfn/11"}
-    %link{:href => Caboodle::Site.url_base, :rel => "index", :title => Caboodle::Site.title}/
+    %link{:href => @url_base, :rel => "index", :title => @title}/
     %meta{:content => "text/html; charset=utf-8", "http-equiv" => "content-type"}/
     %meta{:content => "index,follow", :name => "robots"}/
     %meta{:content => "Caboodle", :name => "generator"}/
@@ -37,18 +37,18 @@
       = before_header
       %header#site-header
         = above_header
-        - unless Caboodle::Site.logo_url.to_s.blank?
+        - unless @logo_url.to_s.blank?
           #logo
             %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
-              %img{:src=>Caboodle::Site.logo_url, :width=>"64", :height=>"64"}
-        - unless Caboodle::Site.title.blank?
+              %img{:src=>@logo_url, :width=>"64", :height=>"64", :alt=>"Logo"}
+        - unless @title.blank?
           #site-title
             %h1
               %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
                 = Caboodle::Site.title
-        - unless Caboodle::Site.description.to_s.blank?
+        - unless @description.to_s.blank?
           #site-description
-            %h2= Caboodle::Site.description
+            %h2= @description
         #access
           .skip-link
             %a{:href => "#content", :title => "Skip navigation to the content"} Skip to content
@@ -101,11 +101,11 @@
       = before_footer
       %footer#footer
         = above_footer
-        - if Caboodle::Site.has_footer
+        - if @has_footer
           %p
             \© 
-            = Caboodle::Site.author
-            - if Caboodle::Site.has_caboodle_link
+            = @author
+            - if @has_caboodle_link
               |
               Powered by 
               %a{:href=>"http://github.com/stefl/caboodle"}

data/lib/caboodle/command.rb

@@ -19,27 +19,23 @@ module Caboodle
           puts `cd #{site_name} && cp -i #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/public .`
           puts `cd #{site_name} && git init`
           config = File.expand_path(File.join(".",site_name,"config","site.yml"))
-          Caboodle::Kit.configure_site config
+          Caboodle::Config.configure_site config
           puts "Please set a few settings to get started"
           Caboodle::Kit.ask_user_for_all_missing_settings
           puts `cd #{site_name} && git add .`
           puts `cd #{site_name} && git commit -m"initial setup"`
         when /kit:add/
-          Caboodle::Kit.load_kit args.first.capitalize
+          Caboodle::Config.load_kit args.first.capitalize
           puts "Dump config"
           Caboodle::Kit.dump_config
           puts `git commit -m"kit:add #{args}" -a`
         when /kit:home/
-          if Caboodle::Kit.available_kits.include?(args.first.capitalize)
-            Caboodle::Site.home_kit = args.first.capitalize
-          else
-            puts "Sorry - that Kit isn't available. Try:"
-            Caboodle::Kit.available_kits.each {|kit| puts kit}
-          end
+          Caboodle::Site.home_kit = args.first.capitalize
+          Caboodle::Kit.dump_config
         when /kit:list/
           Caboodle::Kit.available_kits.each {|kit| puts kit}
         when /kit:remove/
-          Caboodle::Kit.unload_kit args.first.capitalize
+          Caboodle::Config.unload_kit args.first.capitalize
           puts `git commit -m"kit:remove #{args}" -a`
         when /config:list/
           configure

data/lib/caboodle/config.rb

@@ -15,4 +15,84 @@ module Caboodle
   
   Site.required_settings = []
   Site.kits = [] unless Site.kits
+  
+  module Config
+    class << self
+      
+      def setup
+        require_all
+        use_all
+      end
+ 
+      def load_config p
+        loaded = YAML.load(p)
+        Hashie::Mash.new(loaded).each{ |k,v| 
+          v.strip! if v.class == String
+          Caboodle::Site[k.to_s] = v } rescue puts "Warning! Skipping #{p}"
+        Caboodle::Site.kits.uniq!
+      end
+
+      def load_config_file p
+        configure_site(open(p).read)
+      end
+    
+      def require_all ask=true
+        if(Caboodle::Site.kits)
+          Caboodle::Site.kits.each { |k| load_kit k, ask }
+        else
+          STDERR.puts "No kits to register"
+        end
+        Caboodle::Kits
+      end
+    
+      def use_all
+        Caboodle::Kits.each { |p| p.start }
+      end
+      
+      def load_kit name, ask=true
+        unless name.blank?
+          kit_name = name.to_s.split("::").last || name
+          kit_name = kit_name.downcase
+          orig = Caboodle.constants
+          begin
+            require "caboodle/kits/#{kit_name}/#{kit_name}"
+            added = Caboodle.constants - orig
+            added.each do |d| 
+              c = Caboodle.const_get(d)
+              if c.respond_to?(:is_a_caboodle_kit)
+                c.register_kit ask
+              end
+            end
+          rescue Exception=>e
+            if ENV["RACK_ENV"] == "production"
+              Caboodle::Errors << Hashie::Mash.new({:title=>"Failed to load #{name} kit", :reason=>e.backtrace})
+              puts "Failed to load #{name} kit: #{e.backtrace}"
+            else
+              raise e
+            end
+          end
+        end
+        Caboodle::Kits
+      end
+      
+      def unload_kit name
+        unless name.blank?
+          kit_name = name.to_s.split("::").last || name
+          kit_name = kit_name.downcase
+          puts "Unloading Kit: #{kit_name}"
+          orig = Caboodle.constants
+          require "caboodle/kits/#{kit_name}/#{kit_name}"
+          added = Caboodle.constants - orig
+          added.each do |d| 
+            c = Caboodle.const_get(d)
+            if c.respond_to?(:is_a_caboodle_kit)
+              c.unregister_kit
+            end
+          end
+        end
+        Caboodle::Kits
+      end
+      
+    end
+  end
 end

data/lib/caboodle/kit.rb

@@ -17,6 +17,13 @@ module Caboodle
     before do
       Caboodle::Site.cache_for ||= 600
       response.headers['Cache-Control'] = "public, max-age=#{Caboodle::Site.cache_for}"
+      
+      env['caboodle.config'] ||= Caboodle::Site.clone
+      env['caboodle.config'].merge!(Settings)
+      
+      env['caboodle.config'].each do |k,v|
+        self.instance_variable_set("@#{k}".to_sym,v)
+      end
     end
     
     error SocketError do
@@ -25,28 +32,11 @@ module Caboodle
       haml File.open(File.join(Caboodle::Kit.root, "views","error.haml")).read
     end
     
-    Config = Hashie::Mash.new
-    
-    def markdown sym
-      puts 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"
-    end
+    Settings = Hashie::Mash.new
     
     class << self
       
       attr_accessor :credit_link
-        
-      def configure_site config_path
-        set :config_path, config_path
-        if File.exists?(config_path)
-          Caboodle::Kit.load_config(config_path)
-          Caboodle::Kit.setup
-        else
-          puts "No such configuration file: #{config_path}"
-        end
-      end
       
       def inherited subclass
         set :kit_root, File.expand_path(File.dirname(caller[0].split(/:in/).last))
@@ -63,34 +53,13 @@ module Caboodle
         true
       end
       
-      def load_config p
-        set :config, p
-        loaded = YAML.load_file(p)
-        Hashie::Mash.new(loaded).each{ |k,v| 
-          v.strip! if v.class == String
-          Caboodle::Site[k.to_s] = v } rescue puts "Warning! Skipping #{p}"
-        Caboodle::Site.kits.uniq!
-      end
-      
       def load_custom_config p
         loaded = YAML.load_file(p)
         Hashie::Mash.new(loaded).each{ |k,v| 
           v.strip! if v.class == String
-          Config[k.to_s] = v 
+          Settings[k.to_s] = v 
         }
       end
-
-      def dump_config
-        begin
-          p = config
-          d = Caboodle::Site.clone
-          e = d.to_hash
-          e.delete("required_settings")
-          File.open(p, 'w') {|f| f.write(YAML::dump(e))}
-        rescue
-          puts "Cannot write to config file: #{p}"
-        end
-      end
       
       def config_files array_of_files
         configure do
@@ -121,116 +90,10 @@ module Caboodle
         puts "\n"
         puts "#{name.to_s.split("::").last}: #{string}"
       end
-
-      def setup
-        require_all
-        use_all
-      end
-      
-      def load_kit name
-        unless name.blank?
-          kit_name = name.to_s.split("::").last || name
-          kit_name = kit_name.downcase
-          orig = Caboodle.constants
-          begin
-            require "caboodle/kits/#{kit_name}/#{kit_name}"
-            added = Caboodle.constants - orig
-            added.each do |d| 
-              c = Caboodle.const_get(d)
-              if c.respond_to?(:is_a_caboodle_kit)
-                c.register_kit
-              end
-            end
-          rescue Exception=>e
-            if ENV["RACK_ENV"] == "production"
-              Caboodle::Errors << Hashie::Mash.new({:title=>"Failed to load #{name} kit", :reason=>e.backtrace})
-            else
-              raise e
-            end
-          end
-        end
-        Caboodle::Kits
-      end
-      
-      def unload_kit name
-        unless name.blank?
-          kit_name = name.to_s.split("::").last || name
-          kit_name = kit_name.downcase
-          puts "Unloading Kit: #{kit_name}"
-          orig = Caboodle.constants
-          require "caboodle/kits/#{kit_name}/#{kit_name}"
-          added = Caboodle.constants - orig
-          added.each do |d| 
-            c = Caboodle.const_get(d)
-            if c.respond_to?(:is_a_caboodle_kit)
-              c.unregister_kit
-            end
-          end
-        end
-        Caboodle::Kits
-      end
       
       def name
         self.to_s.split("::").last
       end
-      
-      def register_kit
-        ask_user_for_missing_settings
-        Site.kits << name
-        Site.kits.uniq!
-        Caboodle::Kits << self
-        Caboodle::Kits
-      end
-      
-      def ask_user r, optional=false       
-        unless ENV["RACK_ENV"] == "production"
-          puts " "
-          opt = "Optional: " if optional
-          puts "#{opt}Please set a value for #{r}:"
-          v = STDIN.gets
-          Caboodle::Site[r] = v
-          Caboodle::Kit.dump_config
-        end
-      end
-      
-      def ask_user_for_missing_settings
-        required_settings.each do |r|
-          if Caboodle::Site[r].blank?
-            ask_user r
-          end
-        end
-        optional_settings.each do |r|
-          unless defined?(Caboodle::Site[r])
-            ask_user r, true
-          end
-        end
-      end
-      
-      def ask_user_for_all_missing_settings
-        Caboodle::Kits.each do |kit|
-          kit.ask_user_for_missing_settings
-        end
-      end
-      
-      def unregister_kit
-        Caboodle::Kits.delete(self)
-        Caboodle::Site.kits.delete(self.to_s)
-        Caboodle::Kit.dump_config
-        Caboodle::Kits
-      end      
-    
-      def require_all
-        if(Caboodle::Site.kits)
-          Caboodle::Site.kits.each { |k| load_kit k }
-        else
-          STDERR.puts "No kits to register"
-        end
-        Caboodle::Kits
-      end
-    
-      def use_all
-        Caboodle::Kits.each { |p| p.start }
-      end
     
       def menu display, path=nil, &block
         #todo proper slugify
@@ -257,6 +120,8 @@ module Caboodle
         if keys.class == Array
           keys.each do |k| 
             self.required_settings << k
+            puts "self.set #{k}, #{Caboodle::Site[k]}"
+            self.set k.to_s.to_sym, Caboodle::Site[k].to_s
           end
         else
           self.required_settings << keys
@@ -268,11 +133,13 @@ module Caboodle
         if keys.class == Array
           keys.each do |k| 
             self.optional_settings << k
+            self.set k.to_s.to_sym, Caboodle::Site[k].to_s
           end
         else
           self.optional_settings << keys
         end
-        self.optional_settings      end
+        self.optional_settings      
+      end
       
       def stylesheets array_of_css_files
         if array_of_css_files.class == Array
@@ -351,7 +218,74 @@ module Caboodle
         OptionalSettings[kit_name] ||= [] 
         OptionalSettings[kit_name]
       end
+      
+      def register_kit ask=true
+        ask_user_for_missing_settings if ask
+        Site.kits << name
+        Site.kits.uniq!
+        Caboodle::Kits << self
+        Caboodle::Kits
+      end
+      
+      def unregister_kit
+        Caboodle::Kits.delete(self)
+        Caboodle::Site.kits.delete(self.to_s)
+        Caboodle::Kit.dump_config
+        Caboodle::Kits
+      end
+      
+      def ask_user r, optional=false       
+        unless ENV["RACK_ENV"] == "production"
+          puts " "
+          opt = "Optional: " if optional
+          puts "#{opt}Please set a value for #{r}:"
+          v = STDIN.gets
+          Caboodle::Site[r] = v
+          Caboodle::Kit.dump_config
+        end
+      end
+
+      def ask_user_for_missing_settings
+        required_settings.each do |r|
+          if Caboodle::Site[r].blank?
+            ask_user r
+          end
+          puts self
+          self.set r.to_s.to_sym, Caboodle::Site[r].to_s
+        end
+        optional_settings.each do |r|
+          unless defined?(Caboodle::Site[r])
+            ask_user r, true
+          end
+          self.set r.to_s.to_sym, Caboodle::Site[r].to_s
+        end
+      end
+
+      def ask_user_for_all_missing_settings
+        Caboodle::Kits.each do |kit|
+          kit.ask_user_for_missing_settings
+        end
+      end
     
+      def dump_config
+        begin
+          puts "Dump config to: #{config_path}"
+          p = config_path
+          d = Caboodle::Site.clone
+          e = d.to_hash
+          e.delete("required_settings")
+          File.open(p, 'w') {|f| f.write(YAML::dump(e))}
+        rescue
+          puts "Cannot write to config file: #{p}"
+        end
+      end
+      
+      def configure_site configuration_yaml_path
+        self.set :config_path, configuration_yaml_path
+        Caboodle::Config.load_config(open(configuration_yaml_path).read)
+        Caboodle::Config.setup
+      end
+      
       def kit_name
         self.ancestors.first.to_s.split("::").last
       end
@@ -361,7 +295,6 @@ module Caboodle
       end
       
       def start
-        
         errors = []
         self.required_settings.each do |s|
           if Site[s].blank?
@@ -378,6 +311,7 @@ module Caboodle
           Caboodle::Errors << Hashie::Mash.new(:title=>"#{kit_name} is disable", :reason=>errors.join(";"))
         end
       end
+
     end
   end
 end

data/lib/caboodle/kits/analytics/analytics.rb

@@ -7,7 +7,7 @@ class Caboodle::Analytics < Caboodle::Kit
   if ENV["RACK_ENV"] == "production"
     add_layout :after_body, "<script type=\"text/javascript\">
       var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', '#{Caboodle::Site.analytics_id}']);
+      _gaq.push(['_setAccount', '#{analytics_id}']);
       _gaq.push(['_setDomainName', 'none']);
       _gaq.push(['_setAllowLinker', true]);
       _gaq.push(['_trackPageview']);

data/lib/caboodle/kits/beta/beta.rb

@@ -6,5 +6,5 @@ class Caboodle::Beta < Caboodle::Kit
   
   add_sass ["beta"]
   
-  add_layout :above_header, "<div id='beta'><p>#{Caboodle::Site.beta_message}</p></div>"
+  add_layout :above_header, "<div id='beta'><p>#{beta_message}</p></div>"
 end

data/lib/caboodle/kits/carbonmade/carbonmade.rb

@@ -6,7 +6,7 @@ module Caboodle
     
     required [:carbonmade_url]
     
-    credit Caboodle::Site.carbonmade_url, "Carbonmade portfolio"
+    credit carbonmade_url, "Carbonmade portfolio"
     
     add_sass ["carbonmade"]
   end

data/lib/caboodle/kits/carbonmade/views/portfolio.haml

@@ -1,2 +1,2 @@
 #carbonmade.page
-  %iframe#carbonmade{:scrolling=>"no",:src=>Caboodle::Site.carbonmade_url}
+  %iframe#carbonmade{:scrolling=>"no",:src=>@carbonmade_url}

data/lib/caboodle/kits/debugger/debugger.rb

@@ -1,12 +1,10 @@
 module Caboodle
-  class Debugger < Caboodle::Kit
-    
-    Caboodle::Debug.each do |debug|
-      Caboodle::Layout.below_footer = "<div id='debug'>"
-      Caboodle::Layout.below_footer << "<p>#{debug}</p>"
-      Caboodle::Layout.below_footer << "</div>"
+  class Debugger < Caboodle::Kit    
+    Debug.each do |debug|
+      Layout.below_footer = "<div id='debug'>"
+      Layout.below_footer << "<p>#{debug}</p>"
+      Layout.below_footer << "</div>"
     end
-    
   end
 end
 

data/lib/caboodle/kits/disqus/views/chat.haml

@@ -3,11 +3,11 @@
     var disqus_developer = true;
     
 #disqus.page
-  - if Caboodle::Site.disqus
+  - if disqus
     #disqus_thread
-    %script{:src => "http://disqus.com/forums/#{Caboodle::Site.disqus}/embed.js", :type => "text/javascript"}
+    %script{:src => "http://disqus.com/forums/#{@disqus}/embed.js", :type => "text/javascript"}
     %noscript
-      %a{:href => "http://#{Caboodle::Site.disqus}.disqus.com/?url=ref"} View the discussion thread.
+      %a{:href => "http://#{@disqus}.disqus.com/?url=ref"} View the discussion thread.
     %a.dsq-brlink{:href => "http://disqus.com"}
       Discussion powered by
       %span.logo-disqus Disqus

data/lib/caboodle/kits/flickr/flickr.rb

@@ -12,7 +12,7 @@ module Caboodle
         doc = ::Nokogiri::XML.parse(open(url).read)
         val = doc.css("owner").first.attributes["nsid"].value
         Site.flickr_user_id = val
-        Caboodle::Kit.dump_config
+        Config.dump_config
       end
       Site.flickr_user_id
     end
@@ -22,7 +22,7 @@ module Caboodle
     end
   
     declare "photosets" do |r|
-      r.url = "http://api.flickr.com/services/rest/?method=flickr.photosets.getList&api_key=#{Site.flickr_api_key}&user_id=#{Caboodle::FlickrAPI.flickr_user_id}"
+      r.url = "http://api.flickr.com/services/rest/?method=flickr.photosets.getList&api_key=#{Site.flickr_api_key}&user_id=#{FlickrAPI.flickr_user_id}"
       r.via = :get
     end
     
@@ -51,6 +51,8 @@ module Caboodle
     
     description "A browsable Flickr.com gallery with sets"
     
+    required [:flickr_username, :flickr_api_key]
+    
     menu "Photography" do
       @photosets = FlickrAPI.photosets rescue []
       haml :photography
@@ -59,17 +61,15 @@ module Caboodle
     get "/photography/:set_id" do |set_id|
       @photosets = FlickrAPI.photosets rescue []
       @set_id = set_id
-      @photoset = Caboodle::FlickrAPI.photoset_info(@set_id) rescue nil
+      @photoset = FlickrAPI.photoset_info(@set_id) rescue nil
       @title = "Photography: #{@photoset.title if @photoset.respond_to?(:title)}"
       haml :photography
     end
     
-    required [:flickr_username, :flickr_api_key]
-    
     javascripts ["/galleria.noconflict.min.js"]
     
     add_sass ["photography"]
     
-    credit "http://flickr.com/#{Caboodle::Site.flickr_username}"
+    credit "http://flickr.com/#{flickr_username}", "#{flickr_username} on Flickr.com"
   end
 end

data/lib/caboodle/kits/flickr/views/photography.haml

@@ -8,9 +8,9 @@
     jQuery(document).ready(function(){
 	
       var ifo = {
-              Api : '#{Caboodle::Site.flickr_api_key}', //flickr api
+              Api : '#{@flickr_api_key}', //flickr api
       	Set : '#{@set_id}', //photo set
-      	fLink : 'http://www.flickr.com/photos/#{Caboodle::Site.flickr_username}/',
+      	fLink : 'http://www.flickr.com/photos/#{@flickr_username}/',
       	Cant : 24
       };
   

data/lib/caboodle/kits/github/github.rb

@@ -18,21 +18,21 @@ module Caboodle
     
     required [:github_username]
         
-    credit "http://github.com/#{Site.github_username}", "Fork #{Site.github_username} on Github"
+    credit "http://github.com/#{github_username}", "Fork #{github_username} on Github"
   end
 
   class GithubAPI < Weary::Base
     
-      declare "repositories" do |r|
-        r.url = "http://github.com/api/v2/json/repos/show/#{Caboodle::Site.github_username}"
-        r.via = :get
-      end
-      
-      def self.repositories
-        a = Hashie::Mash.new(GithubAPI.new.repositories.perform_sleepily.parse).repositories
-        puts a.inspect
-        a
-      end
+    declare "repositories" do |r|
+      r.url = "http://github.com/api/v2/json/repos/show/#{Caboodle::Site.github_username}"
+      r.via = :get
+    end
+    
+    def self.repositories
+      a = Hashie::Mash.new(GithubAPI.new.repositories.perform_sleepily.parse).repositories
+      puts a.inspect
+      a
+    end
 
   end
 end

data/lib/caboodle/kits/googlelocal/googlelocal.rb

@@ -10,14 +10,14 @@ module Caboodle
     stylesheets ["http://www.google.com/uds/solutions/mapsearch/gsmapsearch.css", "http://www.google.com/uds/css/gsearch.css"]
     
     before do
-      @locations = Config.google_local_locations
-      @location = Config.google_local_locations.first
+      @locations = Settings.google_local_locations
+      @location = Settings.google_local_locations.first
     end
     
     menu "Near me"
     
     get "/near_me/:slug" do
-      Config.google_local_locations.each do |loc|
+      Settings.google_local_locations.each do |loc|
         if loc.title.downcase.gsub(" ","-") == params[:slug]
           @location = loc
         end

data/lib/caboodle/kits/googlelocal/views/near_me.haml

@@ -9,8 +9,8 @@
     %span
       Loading...
 
-  %script{:src=>"http://maps.google.com/maps?file=api&v=2&key=#{Caboodle::Site.google_maps_api_key}", :type=>"text/javascript"}
-  %script{:src=>"http://www.google.com/uds/api?file=uds.js&v=1.0&source=uds-msw&key=#{Caboodle::Site.google_maps_api_key}", :type=>"text/javascript"}
+  %script{:src=>"http://maps.google.com/maps?file=api&v=2&key=#{@google_maps_api_key}", :type=>"text/javascript"}
+  %script{:src=>"http://www.google.com/uds/api?file=uds.js&v=1.0&source=uds-msw&key=#{@google_maps_api_key}", :type=>"text/javascript"}
   :javascript
     window._uds_msw_donotrepair = true;
   %script{:src=>"http://www.google.com/uds/solutions/mapsearch/gsmapsearch.js?mode=new", :type=>"text/javascript"}
@@ -19,7 +19,7 @@
     function LoadMapSearchControl() {
       var options = {
         zoomControl : GSmapSearchControl.ZOOM_CONTROL_ENABLE_ALL,
-        title : '#{Caboodle::Site.title}',
+        title : '#{title}',
         url : '#{request.host}',
               idleMapZoom : GSmapSearchControl.ACTIVE_MAP_ZOOM+1,
               activeMapZoom : GSmapSearchControl.ACTIVE_MAP_ZOOM+1

data/lib/caboodle/kits/gravatar/gravatar.rb

@@ -1,15 +1,17 @@
 require 'digest/md5'
 
-class Caboodle::Gravatar < Caboodle::Kit
+module Caboodle
+  class Gravatar < Caboodle::Kit
   
-  description "Sets the logo of the site to your gravatar.com image"
+    description "Sets the logo of the site to your gravatar.com image"
   
-  optional [:email]
+    optional [:email]
   
-  configure do
-    if Caboodle::Site.logo_url.to_s.blank? && !Caboodle::Site.email.to_s.blank?
-      hash = Digest::MD5.hexdigest(Caboodle::Site.email)
-      Caboodle::Site.logo_url = "http://www.gravatar.com/avatar/#{hash}"
+    configure do
+      if Site.logo_url.to_s.blank? && !Site.email.to_s.blank?
+        hash = Digest::MD5.hexdigest(Site.email)
+        Site.logo_url = "http://www.gravatar.com/avatar/#{hash}"
+      end
     end
   end
 end

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

@@ -1,8 +1,8 @@
 - #todo - this should be a vcalendar
 #history.page
   %dl
-    - if Caboodle::History::Config.history_years.respond_to?(:sort)
-      - Caboodle::History::Config.history_years.sort.reverse.each do |year,items|
+    - if @history_years.respond_to?(:sort)
+      - @history_years.sort.reverse.each do |year,items|
         %dt.year{:class=>year}
           = year
         %dd

data/lib/caboodle/kits/jquery/jquery.rb

@@ -1,4 +1,5 @@
 class Caboodle::Jquery < Caboodle::Kit
   description "Adds Jquery to every page of the site"
+  optional [:jquery_version]
   javascripts ["http://ajax.googleapis.com/ajax/libs/jquery/#{Caboodle::Site.jquery_version || "1.4.2"}/jquery.min.js"]
 end

data/lib/caboodle/kits/lastfm/lastfm.rb

@@ -4,12 +4,8 @@ class Caboodle::Lastfm < Caboodle::Kit
   
   required [:lastfm_username]
   
-  def scrape 
-    @last ||= Caboodle.scrape("http://www.last.fm/user/#{Caboodle::Site.lastfm_username}")
-  end
-  
   menu "Listening" do
-
+    scrape = Caboodle.scrape("http://www.last.fm/user/#{Caboodle::Site.lastfm_username}")
     @recent = scrape.css("#recentTracks .module-body").to_html
     @recent.gsub!("href=\"/", 'href="http://last.fm/')
     @top = scrape.css(".modulechartsartists .module-body").to_html
@@ -18,6 +14,6 @@ class Caboodle::Lastfm < Caboodle::Kit
     haml :listening
   end
   
-  credit "http://www.last.fm/listen/user/#{Caboodle::Site.lastfm_username}", "#{Caboodle::Site.lastfm_username} on Last.fm"
+  credit "http://www.last.fm/listen/user/#{lastfm_username}", "#{lastfm_username} on Last.fm"
   
 end

data/lib/caboodle/kits/linkedin/linkedin.rb

@@ -5,9 +5,9 @@ module Caboodle
     attr_accessor :full
     
     def initialize
-      @full = Caboodle.scrape(Caboodle::Site.linkedin_profile_url)
+      @full = Caboodle.scrape(Site.linkedin_profile_url)
       @full.css('.showhide-link').each{|a| @full.delete(a)}
-      @full = @full.css("#main").to_html.gsub("#{Caboodle::Site.linkedin_full_name}’s ","")
+      @full = @full.css("#main").to_html.gsub("#{Site.linkedin_full_name}’s ","")
     end
     def method_missing(method_name)
       @data.send(method_name.to_sym)
@@ -25,7 +25,7 @@ module Caboodle
     
     required [:linkedin_full_name, :linkedin_profile_url]
     
-    credit Caboodle::Site.linkedin_profile_url, "Linkedin profile"
+    credit linkedin_profile_url, "Linkedin profile"
     
     add_sass ["linkedin"]
     

data/lib/caboodle/kits/onepage/onepage.rb

@@ -7,6 +7,6 @@ module Caboodle
     
     required [:onepage_username]
     
-    credit "http://myonepage.com/#{Caboodle::Site.onepage_username}"
+    credit "http://myonepage.com/#{onepage_username}"
   end
 end

data/lib/caboodle/kits/onepage/views/contact.haml

@@ -1,2 +1,2 @@
 #onepage.page
-  %iframe#onepage{:scrolling=>"no",:src=>"http://myonepage.com/#{Caboodle::Site.onepage_username}/widget"}
+  %iframe#onepage{:scrolling=>"no",:src=>"http://myonepage.com/#{@onepage_username}/widget"}

data/lib/caboodle/kits/posterous/posterous.rb

@@ -7,20 +7,20 @@ module Caboodle
   class PosterousAPI < Weary::Base
   
     def initialize(opts={})
-      Caboodle::Site.posterous_password ||= ENV["posterous_password"]
-      self.credentials(opts[:username] || Caboodle::Site.posterous_username, opts[:password] || Caboodle::Site.posterous_password)
-      sitename = opts[:sitename] || Caboodle::Site.posterous_sitename
-      unless defined?(Caboodle::Site.posterous_site_id)
+      Site.posterous_password ||= ENV["posterous_password"]
+      self.credentials(opts[:username] || Site.posterous_username, opts[:password] || Site.posterous_password)
+      sitename = opts[:sitename] || Site.posterous_sitename
+      unless defined?(Site.posterous_site_id)
         sites = Hashie::Mash.new(getsites.perform_sleepily.parse).rsp.site
       
         sites.each do |site|
-          if site.url.include?("http://#{Caboodle::Site.posterous_sitename}.posterous.com")
-            Caboodle::Site.posterous_site_id = site.id
+          if site.url.include?("http://#{Site.posterous_sitename}.posterous.com")
+            Site.posterous_site_id = site.id
           end
         end
       end
       
-      self.defaults = {:site_id => Caboodle::Site.posterous_site_id}
+      self.defaults = {:site_id => Site.posterous_site_id}
     end
   
     declare "getsites" do |r|
@@ -50,14 +50,12 @@ module Caboodle
     end
   
     def self.from_slug(slug)
-      doc = Caboodle.scrape("http://#{Caboodle::Site.posterous_sitename}.posterous.com/#{slug}")
+      doc = Caboodle.scrape("http://#{Site.posterous_sitename}.posterous.com/#{slug}")
       opts = {}
       opts["body"] = doc.css('div.bodytext').inner_html
       opts["title"] = doc.css('title').inner_html.split(" - ").first
-      opts["link"] = "http://#{Caboodle::Site.posterous_sitename}.posterous.com/#{slug}"
+      opts["link"] = "http://#{Site.posterous_sitename}.posterous.com/#{slug}"
       perma = doc.css('.permalink').inner_html
-      STDERR.puts "Opts: #{opts.inspect}"
-      STDERR.puts "Perma: #{perma}"
       opts["date"] = Date.parse(perma)
       PosterousPost.new(opts)
     end
@@ -69,9 +67,8 @@ module Caboodle
   
     def self.all(opts={})
       r = []
-      STDERR.puts "All posts for: #{opts.inspect}"
       p = PosterousAPI.new
-      opts[:site_id] = Caboodle::Site.posterous_site_id 
+      opts[:site_id] = Site.posterous_site_id 
       rsp = p.all(opts).perform_sleepily.parse["rsp"]
       rsp["post"].each{|a| r << PosterousPost.new(a)} if rsp["post"]
       r
@@ -122,7 +119,7 @@ module Caboodle
     end
 
   	def full_url
-  		Caboodle::Site.url_base.gsub(/\/$/, '') + url
+  		Site.url_base.gsub(/\/$/, '') + url
   	end
   
     def slug
@@ -134,6 +131,10 @@ module Caboodle
   
     description "Displays a Posterous blog with permalinks, pagination and commends if the Disqus kit is included"
     
+    required [:posterous_sitename, :posterous_username, :posterous_password]
+    
+    optional [:disqus]
+    
     get "/posterous/:page_number" do |page_number|
       @posts = PosterousPost.page(page_number)
       not_found if @posts.class == Array && @posts.blank?
@@ -153,16 +154,12 @@ module Caboodle
       @posts = PosterousPost.all(:page=>(params[:page] || 1))
       haml :posts.to_sym
     end
-    
-    required [:posterous_sitename, :posterous_username, :posterous_password]
-    
-    optional [:disqus]
-    
-    stylesheets ["http://disqus.com/stylesheets/#{Caboodle::Site.disqus}/disqus.css?v=2.0"]
+
+    stylesheets ["http://disqus.com/stylesheets/#{disqus}/disqus.css?v=2.0"] if disqus
      
     rss ["feed://stef.posterous.com/rss.xml"]
     
-    credit "http://#{Caboodle::Site.posterous_sitename}.posterous.com", "#{Caboodle::Site.posterous_sitename} on Posterous"
+    credit "http://#{posterous_sitename}.posterous.com", "#{posterous_sitename} on Posterous"
     
     add_sass ["posterous"]
   end

data/lib/caboodle/kits/seo/seo.rb

@@ -1,5 +1,6 @@
 class Caboodle::SEO < Caboodle::Kit
   description "Adds basic search engine optimisation"
-  add_layout :meta, "<meta type='keywords' value='#{Caboodle::Site.seo_keywords}' /><meta type='description' value='#{Caboodle::Site.seo_description}' />"    
   optional [:seo_keywords,:seo_description]
+  add_layout :meta, "<meta type='keywords' value='#{seo_keywords}' />" if seo_keywords
+  add_layout :meta, "<meta type='description' value='#{seo_description}' />" if seo_description
 end

data/lib/caboodle/kits/skimmed/skimmed.rb

@@ -1,4 +1,6 @@
-class Skimmed < Caboodle::Kit
-  javascripts ["http://skimlinks.com/js/#{Caboodle::Site.skimmed}.js"]
-  required [:skimmed]
+module Caboodle
+  class Skimmed < Caboodle::Kit
+    javascripts ["http://skimlinks.com/js/#{Site.skimmed}.js"]
+    required [:skimmed]
+  end
 end

data/lib/caboodle/kits/soundcloud/views/music.haml

@@ -6,12 +6,12 @@
           = mix.title
       %dd
         - url = "http%3A%2F%2Fsoundcloud.com%2F#{mix.user.permalink}%2Fsets%2F#{mix.permalink}"
-        - if Caboodle::Site.soundcloud_widget == "comments"
+        - if soundcloud_widget == "comments"
           :plain
             <object height="136" width="100%"> <param name="movie" value="http://player.soundcloud.com/player.swf?url=#{url}"></param> <param name="allowscriptaccess" value="always"></param> <embed allowscriptaccess="always" height="136" src="http://player.soundcloud.com/player.swf?url=#{url}" type="application/x-shockwave-flash" width="100%"></embed> </object>
-        - elsif Caboodle::Site.soundcloud_widget == "tiny"
+        - elsif soundcloud_widget == "tiny"
           :plain
             <object height="18" width="100%"> <param name="movie" value="http://player.soundcloud.com/player.swf?url=#{url}&amp;auto_play=false&amp;player_type=tiny&amp;font=Arial&amp;color=0066cc"> <param name="allowscriptaccess" value="always"> <embed allowscriptaccess="always" height="18" src="http://player.soundcloud.com/player.swf?url=#{url}&amp;auto_play=false&amp;player_type=tiny&amp;font=Arial&amp;color=0066cc" type="application/x-shockwave-flash" width="100%"> </object>
-        - else Caboodle::Site.soundcloud_widget == "artwork"
+        - else soundcloud_widget == "artwork"
           :plain
             <object height="200" width="200"> <param name="movie" value="http://player.soundcloud.com/player.swf?url=#{url}&amp;auto_play=false&amp;player_type=artwork&amp;color=0066cc"> <param name="allowscriptaccess" value="always"> <embed allowscriptaccess="always" height="200" src="http://player.soundcloud.com/player.swf?url=#{url}&amp;auto_play=false&amp;player_type=artwork&amp;color=0066cc" type="application/x-shockwave-flash" width="200"> </object>

data/lib/caboodle/kits/standard/standard.rb

@@ -1,8 +1,9 @@
 class Caboodle::Standard < Caboodle::Kit
-  description "The default home page and site options"
+  description "The default home page"
   required [:title, :description, :author]
   optional [:logo_url]
-  if Caboodle::Site.home_kit.blank?
+  puts "Home kit: #{Caboodle::Site.home_kit}"
+  if Caboodle::Site.home_kit.blank? || Caboodle::Site.home_kit =="Standard"
     puts "Using the default home kit - you will want to run 'caboodle kit:home <kit name>' to specify your own kit"
     get "/" do
       haml :standard

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

@@ -1,4 +1,4 @@
-#standard.page
+#standard.page.thin_page
   %h2 
     Welcome to Caboodle
   

data/lib/caboodle/kits/susy/susy.rb

@@ -15,8 +15,8 @@ module Caboodle
     get("/susy/:name.css") do
       content_type 'text/css', :charset => 'utf-8'
       sass_dir = File.expand_path(File.join(File.dirname(__FILE__),"views","susy"))
-      load_paths = [Caboodle::App.root, File.join(Caboodle::App.root,"views"), File.join(Caboodle::App.root,"views","stylesheets"), sass_dir] + ::Compass.sass_engine_options[:load_paths]
-      Caboodle::Kits.each do |name|
+      load_paths = [App.root, File.join(App.root,"views"), File.join(App.root,"views","stylesheets"), sass_dir] + ::Compass.sass_engine_options[:load_paths]
+      Kits.each do |name|
         kit_name = name.to_s.split("::").last || name
         kit_name = kit_name.downcase
         path = File.expand_path(File.join(File.dirname(__FILE__),"..",kit_name,"views"))
@@ -26,7 +26,7 @@ module Caboodle
       options = {:sass_dir => sass_dir, :syntax => :scss, :load_paths => load_paths}
       the_sass = open(File.join(File.dirname(__FILE__),"views","susy","screen.scss")).read
       imported_files = []
-      Caboodle::SASS.each do |s|
+      SASS.each do |s|
         the_sass << "\n"
         add_file = "@import \"#{s}\";"
         imported_files << add_file

data/lib/caboodle/kits/tumblr/tumblr.rb

@@ -1,36 +1,37 @@
 gem "tumblr-rb"
 require 'tumblr'
 
-class Caboodle::Tumblr < Caboodle::Kit   
-  description "Includes a tumblr.com account"
+module Caboodle
+  class Tumblr < Caboodle::Kit   
+    description "Includes a tumblr.com account"
   
-  helpers do
-    def semantic_date post
-      date = Date.parse(post.date)
-      a = []
-      a << "slug-#{post.slug}"
-      a << "y#{date.year}"
-      a << "m#{date.month}"
-      a << "d#{date.day}"
-      a.join(" ")
+    helpers do
+      def semantic_date post
+        date = Date.parse(post.date)
+        a = []
+        a << "slug-#{post.slug}"
+        a << "y#{date.year}"
+        a << "m#{date.month}"
+        a << "d#{date.day}"
+        a.join(" ")
+      end
     end
-  end
    
-  required [:tumblr_email, :tumblr_password, :tumblr_sitename]
-  
-  menu "Tumblr" do
-    tumblr = ::Tumblr::Reader.new(Caboodle::Site.tumblr_email,Caboodle::Site.tumblr_password)
-    req = tumblr.read(Caboodle::Site.tumblr_sitename, {:num=>10}).perform_sleepily
-    posts = ::Tumblr::Reader.get_posts(req)
-    haml :tumblr, :locals => { :posts => posts }
-  end
+    required [:tumblr_email, :tumblr_password, :tumblr_sitename]
   
-  get "/tumblr/page/:page" do
-    tumblr = ::Tumblr::Reader.new(Caboodle::Site.tumblr_email,Caboodle::Site.tumblr_password)
-    posts = tumblr.get_posts()
-    haml :tumblr, :locals => { :posts => posts }
-  end
+    menu "Tumblr" do
+      tumblr = ::Tumblr::Reader.new(@tumblr_email,@tumblr_password)
+      req = tumblr.read(@tumblr_sitename, {:num=>10}).perform_sleepily
+      posts = ::Tumblr::Reader.get_posts(req)
+      haml :tumblr, :locals => { :posts => posts }
+    end
   
-  add_sass ["tumblr"]
+    get "/tumblr/page/:page" do
+      tumblr = ::Tumblr::Reader.new(@tumblr_email,@tumblr_password)
+      posts = tumblr.get_posts()
+      haml :tumblr, :locals => { :posts => posts }
+    end
   
+    add_sass ["tumblr"]
+  end
 end

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

@@ -6,7 +6,7 @@
         %aside.entry-meta
           %span.meta-prep.meta-prep-author By
           %span.author.vcard
-            %a.url.fn.n{:href => "/about", :title => "About the author"}= Caboodle::Site.author
+            %a.url.fn.n{:href => "/about", :title => "About the author"}= author
           %span.meta-sep.meta-sep-entry-date |
           %span.meta-prep.meta-prep-entry-date Published:
           %span.entry-date

data/lib/caboodle/kits/twitter/twitter.rb

@@ -1,11 +1,23 @@
-class Caboodle::Twitter < Caboodle::Kit
-  description "Display recent tweets from a given twitter account, with infinite scrolling for looking back in time."
+require 'nokogiri'
+require 'open-uri'
+
+module Caboodle
+  class Twitter < Caboodle::Kit
+    description "Display recent tweets from a given twitter account, with infinite scrolling for looking back in time."
   
-  menu "Twitter"
+    required [:twitter_username]
   
-  required [:twitter_username]
+    menu "Twitter"
   
-  credit "http://twitter.com/#{Caboodle::Site.twitter_username}", "Follow @#{Caboodle::Site.twitter_username} on Twitter"
+    configure do
+      if Site.logo_url.to_s.blank? && !Site.twitter_username.to_s.blank?
+        xml = Nokogiri::XML(open("http://twitter.com/users/#{Site.twitter_username}.xml").read)
+        Site.logo_url = xml.css("profile_image_url").children.first.to_s 
+      end
+    end
   
-  add_sass ["twitter"]
+    credit "http://twitter.com/#{twitter_username}", "Follow @#{twitter_username} on Twitter"
+  
+    add_sass ["twitter"]
+  end
 end

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

@@ -34,7 +34,7 @@
   	/**
   	* Username to load the timeline from
   	*/
-  	var username = '#{Caboodle::Site.twitter_username}';
+  	var username = '#{@twitter_username}';
 
   	/**
   	* Variable for the current page

data/lib/caboodle/kits/typekit/typekit.rb

@@ -1,8 +1,8 @@
 module Caboodle
   class Typekit < Caboodle::Kit    
     description "Adds support for Typekit.com CSS options"
-    javascripts ["http://use.typekit.com/#{Caboodle::Site.typekit}.js","/typekit.js"]
     required [:typekit]
     add_sass ["typekit"]
+    javascripts ["http://use.typekit.com/#{typekit}.js","/typekit.js"]
   end
 end

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

@@ -1,2 +1,3 @@
-%h2
-  Simple layout
+.page.vimeo.thin_page
+  %h2
+    Simple layout

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

@@ -0,0 +1,7 @@
+.page.thin_page.youtube
+  - @videos.each do |video|
+    %article.youtube_video
+      %h2
+        = video.title
+      = video.embed_html
+  

data/lib/caboodle/kits/youtube/youtube.rb

@@ -0,0 +1,16 @@
+require 'youtube_g'
+
+module Caboodle
+  class Youtube < Caboodle::Kit
+    description "Display's a user's public videos as a page"
+    
+    required [:youtube_username]
+    
+    menu "Youtube" do
+      client = YouTubeG::Client.new
+      @videos = client.videos_by(:user => @youtube_username).videos
+      haml :youtube
+    end
+    
+  end
+end

data/lib/caboodle/markdown.rb

@@ -0,0 +1,9 @@
+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"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 2
-  - 16
-  version: 0.2.16
+  - 18
+  version: 0.2.18
 platform: ruby
 authors: 
 - Stef Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +01:00
+date: 2010-09-04 00:00:00 +01:00
 default_executable: caboodle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -351,6 +351,9 @@ files:
 - lib/caboodle/kits/typekit/views/typekit.scss
 - lib/caboodle/kits/vimeo/views/vimeo.haml
 - lib/caboodle/kits/vimeo/vimeo.rb
+- lib/caboodle/kits/youtube/views/youtube.haml
+- lib/caboodle/kits/youtube/youtube.rb
+- lib/caboodle/markdown.rb
 - lib/caboodle/scrape.rb
 - test/helper.rb
 - test/test_caboodle.rb